diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 80ce096bc6..82d3ab071f 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -2449,10 +2449,9 @@ public class Blocks{ researchCost = with(Items.beryllium, 15); }}; - //TODO rename chemicalCombustionChamber = new ConsumeGenerator("chemical-combustion-chamber"){{ requirements(Category.power, with(Items.graphite, 40, Items.tungsten, 40, Items.oxide, 40f, Items.silicon, 30)); - powerProduction = 9f; + powerProduction = 8f; consumeLiquids(LiquidStack.with(Liquids.ozone, 2f / 60f, Liquids.arkycite, 40f / 60f)); size = 3; drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawPistons(){{ diff --git a/core/src/mindustry/graphics/Layer.java b/core/src/mindustry/graphics/Layer.java index d87ef9f185..7d8d9f343a 100644 --- a/core/src/mindustry/graphics/Layer.java +++ b/core/src/mindustry/graphics/Layer.java @@ -35,6 +35,9 @@ public class Layer{ //informal layer used for additive blending overlay, grouped together to reduce draw calls blockAdditive = 31, + //props such as boulders + blockProp = 32, + //things drawn over blocks (intermediate layer) blockOver = 35, @@ -83,7 +86,7 @@ public class Layer{ //shield effects shields = 125, - //weather effects, e.g. rain and snow TODO draw before overlay UI? + //weather effects, e.g. rain and snow weather = 130, //light rendering *shaders used* diff --git a/core/src/mindustry/net/NetworkIO.java b/core/src/mindustry/net/NetworkIO.java index 87f420f63a..c6b2ce1478 100644 --- a/core/src/mindustry/net/NetworkIO.java +++ b/core/src/mindustry/net/NetworkIO.java @@ -44,10 +44,8 @@ public class NetworkIO{ stream.writeLong(GlobalVars.rand.seed0); stream.writeLong(GlobalVars.rand.seed1); - Writes write = new Writes(stream); - stream.writeInt(player.id); - player.write(write); + player.write(new Writes(stream)); SaveIO.getSaveWriter().writeContentHeader(stream); SaveIO.getSaveWriter().writeMap(stream); diff --git a/core/src/mindustry/world/blocks/environment/Prop.java b/core/src/mindustry/world/blocks/environment/Prop.java index 0e7807acdd..1564ee6795 100644 --- a/core/src/mindustry/world/blocks/environment/Prop.java +++ b/core/src/mindustry/world/blocks/environment/Prop.java @@ -5,9 +5,11 @@ import arc.graphics.g2d.*; import arc.math.*; import mindustry.content.*; import mindustry.gen.*; +import mindustry.graphics.*; import mindustry.world.*; public class Prop extends Block{ + public float layer = Layer.blockProp; public Prop(String name){ super(name); @@ -20,6 +22,7 @@ public class Prop extends Block{ @Override public void drawBase(Tile tile){ + Draw.z(layer); Draw.rect(variants > 0 ? variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))] : region, tile.worldx(), tile.worldy()); }