From 7798bb670239600ecaf498e1efebf5c5ccd1b43d Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 16 Nov 2021 23:10:49 -0500 Subject: [PATCH] Fixed packing issues --- ...{alloy-smelter-top.png => surge-smelter-top.png} | Bin .../{alloy-smelter.png => surge-smelter.png} | Bin core/src/mindustry/content/Blocks.java | 3 ++- core/src/mindustry/content/Liquids.java | 2 ++ core/src/mindustry/world/draw/DrawTurret.java | 3 ++- 5 files changed, 6 insertions(+), 2 deletions(-) rename core/assets-raw/sprites/blocks/production/{alloy-smelter-top.png => surge-smelter-top.png} (100%) rename core/assets-raw/sprites/blocks/production/{alloy-smelter.png => surge-smelter.png} (100%) diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png b/core/assets-raw/sprites/blocks/production/surge-smelter-top.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/alloy-smelter-top.png rename to core/assets-raw/sprites/blocks/production/surge-smelter-top.png diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter.png b/core/assets-raw/sprites/blocks/production/surge-smelter.png similarity index 100% rename from core/assets-raw/sprites/blocks/production/alloy-smelter.png rename to core/assets-raw/sprites/blocks/production/surge-smelter.png diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 1e7bb15dc4..4268fb20e1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1035,7 +1035,7 @@ public class Blocks implements ContentList{ consumes.power(2f); }}; - //TODO implement + //TODO implement - is this even necessary? if(false) slagCentrifuge = new GenericCrafter("slag-centrifuge"){{ requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 60, Items.oxide, 40)); @@ -1044,6 +1044,7 @@ public class Blocks implements ContentList{ }}; //TODO implement + //TODO should have a useful turret ammo byproduct? //original: consumes.items(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3)); if(false) surgeCrucible = new GenericCrafter("surge-crucible"){{ diff --git a/core/src/mindustry/content/Liquids.java b/core/src/mindustry/content/Liquids.java index 27b9ed8c5e..eabc1e9cc8 100644 --- a/core/src/mindustry/content/Liquids.java +++ b/core/src/mindustry/content/Liquids.java @@ -73,5 +73,7 @@ public class Liquids implements ContentList{ }}; //TODO dicyanoacetylene + + //TODO molten lead (maybe) } } diff --git a/core/src/mindustry/world/draw/DrawTurret.java b/core/src/mindustry/world/draw/DrawTurret.java index 550ba365f4..078649fe25 100644 --- a/core/src/mindustry/world/draw/DrawTurret.java +++ b/core/src/mindustry/world/draw/DrawTurret.java @@ -78,7 +78,8 @@ public class DrawTurret extends DrawBlock{ } /** @return the generated icons to be used for this block. */ - public TextureRegion[] icons(Turret block){ + @Override + public TextureRegion[] icons(Block block){ return top.found() ? new TextureRegion[]{base, block.region, top} : new TextureRegion[]{base, block.region}; } }