diff --git a/core/assets-raw/sprites/blocks/production/eletric-heater-heat.png b/core/assets-raw/sprites/blocks/production/electric-heater-heat.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/eletric-heater-heat.png rename to core/assets-raw/sprites/blocks/production/electric-heater-heat.png diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-liquid.png b/core/assets-raw/sprites/blocks/production/electric-heater-liquid.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/slag-heater-liquid.png rename to core/assets-raw/sprites/blocks/production/electric-heater-liquid.png diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top1.png b/core/assets-raw/sprites/blocks/production/electric-heater-top1.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/slag-heater-top1.png rename to core/assets-raw/sprites/blocks/production/electric-heater-top1.png diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top2.png b/core/assets-raw/sprites/blocks/production/electric-heater-top2.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/slag-heater-top2.png rename to core/assets-raw/sprites/blocks/production/electric-heater-top2.png diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png b/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png new file mode 100644 index 0000000000..07cfe1dc61 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/vent-condenser-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png b/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png new file mode 100644 index 0000000000..b70942ba6b Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/vent-condenser-mid.png differ diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png b/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png index f9ec07df8b..09acceb3e5 100644 Binary files a/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png and b/core/assets-raw/sprites/blocks/production/vent-condenser-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/production/vent-condenser.png b/core/assets-raw/sprites/blocks/production/vent-condenser.png index c663d14363..c2eb1105c9 100644 Binary files a/core/assets-raw/sprites/blocks/production/vent-condenser.png and b/core/assets-raw/sprites/blocks/production/vent-condenser.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 61a8973f39..fad5a899bc 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1073,6 +1073,7 @@ public class Blocks{ requirements(Category.crafting, with(Items.tungsten, 30, Items.graphite, 30)); drawer = new DrawMulti(new DrawHeatOutput(true)); + rotateDraw = false; drawer.iconOverride = new String[]{""}; size = 2; heatOutput = 2f; @@ -2015,7 +2016,7 @@ public class Blocks{ spinSpeed = 0.6f; spinners = true; hasLiquids = true; - outputLiquid = new LiquidStack(Liquids.water, 10f / 60f / 9f); + outputLiquid = new LiquidStack(Liquids.water, 5f / 60f / 9f); liquidCapacity = 20f; }}; @@ -2189,11 +2190,9 @@ public class Blocks{ baseEfficiency = 0f; displayEfficiency = false; craftEffect = Fx.turbinegenerate; - drawer = new DrawMulti(new DrawBlock(), new DrawBlurSpin("-rotator"){{ - rotateSpeed = 6f; - }}); - ignoreLiquidFullness = true; - craftTime = 50f; + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawBlurSpin("-rotator", 6f), new DrawRegion("-mid"), new DrawLiquidTile(Liquids.water, 38f / 4f), new DrawBlock()); + drawer.iconOverride = new String[]{"-bottom", "-rotator", ""}; + craftTime = 120f; size = 3; ambientSound = Sounds.hum; ambientSoundVolume = 0.06f; diff --git a/core/src/mindustry/world/blocks/production/AttributeCrafter.java b/core/src/mindustry/world/blocks/production/AttributeCrafter.java index 0568404d90..c40ebd6d6b 100644 --- a/core/src/mindustry/world/blocks/production/AttributeCrafter.java +++ b/core/src/mindustry/world/blocks/production/AttributeCrafter.java @@ -72,6 +72,7 @@ public class AttributeCrafter extends GenericCrafter{ @Override public void pickedUp(){ attrsum = 0f; + warmup = 0f; } @Override diff --git a/core/src/mindustry/world/draw/DrawBlurSpin.java b/core/src/mindustry/world/draw/DrawBlurSpin.java index a02bc29d95..760b2dead1 100644 --- a/core/src/mindustry/world/draw/DrawBlurSpin.java +++ b/core/src/mindustry/world/draw/DrawBlurSpin.java @@ -14,8 +14,9 @@ public class DrawBlurSpin extends DrawBlock{ public String suffix = ""; public float rotateSpeed = 1f, x, y, blurThresh = 0.7f; - public DrawBlurSpin(String suffix){ + public DrawBlurSpin(String suffix, float speed){ this.suffix = suffix; + rotateSpeed = speed; } public DrawBlurSpin(){