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 0000000000..ed716408b2 Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/drill-item-3.png differ diff --git a/core/assets-raw/sprites/blocks/drills/drill-item-4.png b/core/assets-raw/sprites/blocks/drills/drill-item-4.png new file mode 100644 index 0000000000..a18efb5dd4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/drill-item-4.png differ 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(); } }