From 118ae8e87deb0be4a90a660e273755958c7fe888 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Sun, 20 Dec 2020 20:22:01 +0100 Subject: [PATCH] #3889 2: electric boogaloo (#4056) --- .../drills/{drill-top.png => drill-item-2.png} | Bin .../sprites/blocks/drills/drill-item-3.png | Bin 0 -> 1562 bytes .../sprites/blocks/drills/drill-item-4.png | Bin 0 -> 1542 bytes core/src/mindustry/content/Blocks.java | 8 ++++++-- .../mindustry/world/blocks/production/Drill.java | 5 +++-- 5 files changed, 9 insertions(+), 4 deletions(-) rename core/assets-raw/sprites/blocks/drills/{drill-top.png => drill-item-2.png} (100%) create mode 100644 core/assets-raw/sprites/blocks/drills/drill-item-3.png create mode 100644 core/assets-raw/sprites/blocks/drills/drill-item-4.png diff --git a/core/assets-raw/sprites/blocks/drills/drill-top.png b/core/assets-raw/sprites/blocks/drills/drill-item-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/drills/drill-top.png rename to core/assets-raw/sprites/blocks/drills/drill-item-2.png diff --git a/core/assets-raw/sprites/blocks/drills/drill-item-3.png b/core/assets-raw/sprites/blocks/drills/drill-item-3.png new file mode 100644 index 0000000000000000000000000000000000000000..ed716408b2265e22320e14a06da4ee78726e2f96 GIT binary patch literal 1562 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 literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 32a322b5a5..33e11eed93 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1262,24 +1262,27 @@ public class Blocks implements ContentList{ mechanicalDrill = new Drill("mechanical-drill"){{ requirements(Category.production, with(Items.copper, 12), true); + drawMineItem = true; tier = 2; drillTime = 600; size = 2; - drawMineItem = true; + consumes.liquid(Liquids.water, 0.05f).boost(); }}; pneumaticDrill = new Drill("pneumatic-drill"){{ requirements(Category.production, with(Items.copper, 18, Items.graphite, 10)); + drawMineItem = true; tier = 3; drillTime = 400; size = 2; - drawMineItem = true; + consumes.liquid(Liquids.water, 0.06f).boost(); }}; laserDrill = new Drill("laser-drill"){{ requirements(Category.production, with(Items.copper, 35, Items.graphite, 30, Items.silicon, 30, Items.titanium, 20)); + drawMineItem = true; drillTime = 280; size = 3; hasPower = true; @@ -1293,6 +1296,7 @@ public class Blocks implements ContentList{ blastDrill = new Drill("blast-drill"){{ requirements(Category.production, with(Items.copper, 65, Items.silicon, 60, Items.titanium, 50, Items.thorium, 75)); + drawMineItem = true; drillTime = 280; size = 4; drawRim = true; diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index a0375ea203..e179d18e0e 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -57,6 +57,7 @@ public class Drill extends Block{ public @Load("@-rim") TextureRegion rimRegion; public @Load("@-rotator") TextureRegion rotatorRegion; public @Load("@-top") TextureRegion topRegion; + public @Load(value = "@-item", fallback = "drill-item-@size") TextureRegion itemRegion; public Drill(String name){ super(name); @@ -80,7 +81,7 @@ public class Drill extends Block{ if(returnItem == null || !drawMineItem) return; Draw.color(returnItem.color); - Draw.rect("drill-top", req.drawx(), req.drawy()); + Draw.rect(itemRegion, req.drawx(), req.drawy()); Draw.color(); } @@ -304,7 +305,7 @@ public class Drill extends Block{ if(dominantItem != null && drawMineItem){ Draw.color(dominantItem.color); - Draw.rect("drill-top", x, y); + Draw.rect(itemRegion, x, y); Draw.color(); } }