Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#3889 2: electric boogaloo (#4056)

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-12-20 20:22:01 +01:00
committed by GitHub
parent 22221a0f28
commit 118ae8e87d
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
core/assets-raw/sprites/blocks/drills/drill-top.png → core/assets-raw/sprites/blocks/drills/drill-item-2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

BIN
core/assets-raw/sprites/blocks/drills/drill-item-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
core/assets-raw/sprites/blocks/drills/drill-item-4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

8
core/src/mindustry/content/Blocks.java
View File

@@ -1262,24 +1262,27 @@ public class Blocks implements ContentList{
mechanicalDrill = new Drill("mechanical-drill"){{ mechanicalDrill = new Drill("mechanical-drill"){{
requirements(Category.production, with(Items.copper, 12), true); requirements(Category.production, with(Items.copper, 12), true);
drawMineItem = true;
tier = 2; tier = 2;
drillTime = 600; drillTime = 600;
size = 2; size = 2;
drawMineItem = true;
consumes.liquid(Liquids.water, 0.05f).boost(); consumes.liquid(Liquids.water, 0.05f).boost();
}}; }};
pneumaticDrill = new Drill("pneumatic-drill"){{ pneumaticDrill = new Drill("pneumatic-drill"){{
requirements(Category.production, with(Items.copper, 18, Items.graphite, 10)); requirements(Category.production, with(Items.copper, 18, Items.graphite, 10));
drawMineItem = true;
tier = 3; tier = 3;
drillTime = 400; drillTime = 400;
size = 2; size = 2;
drawMineItem = true;
consumes.liquid(Liquids.water, 0.06f).boost(); consumes.liquid(Liquids.water, 0.06f).boost();
}}; }};
laserDrill = new Drill("laser-drill"){{ laserDrill = new Drill("laser-drill"){{
requirements(Category.production, with(Items.copper, 35, Items.graphite, 30, Items.silicon, 30, Items.titanium, 20)); requirements(Category.production, with(Items.copper, 35, Items.graphite, 30, Items.silicon, 30, Items.titanium, 20));
drawMineItem = true;
drillTime = 280; drillTime = 280;
size = 3; size = 3;
hasPower = true; hasPower = true;
@@ -1293,6 +1296,7 @@ public class Blocks implements ContentList{
blastDrill = new Drill("blast-drill"){{ blastDrill = new Drill("blast-drill"){{
requirements(Category.production, with(Items.copper, 65, Items.silicon, 60, Items.titanium, 50, Items.thorium, 75)); requirements(Category.production, with(Items.copper, 65, Items.silicon, 60, Items.titanium, 50, Items.thorium, 75));
drawMineItem = true;
drillTime = 280; drillTime = 280;
size = 4; size = 4;
drawRim = true; drawRim = true;

5
core/src/mindustry/world/blocks/production/Drill.java
View File

@@ -57,6 +57,7 @@ public class Drill extends Block{
public @Load("@-rim") TextureRegion rimRegion; public @Load("@-rim") TextureRegion rimRegion;
public @Load("@-rotator") TextureRegion rotatorRegion; public @Load("@-rotator") TextureRegion rotatorRegion;
public @Load("@-top") TextureRegion topRegion; public @Load("@-top") TextureRegion topRegion;
public @Load(value = "@-item", fallback = "drill-item-@size") TextureRegion itemRegion;
public Drill(String name){ public Drill(String name){
super(name); super(name);
@@ -80,7 +81,7 @@ public class Drill extends Block{
if(returnItem == null || !drawMineItem) return; if(returnItem == null || !drawMineItem) return;
Draw.color(returnItem.color); Draw.color(returnItem.color);
Draw.rect("drill-top", req.drawx(), req.drawy()); Draw.rect(itemRegion, req.drawx(), req.drawy());
Draw.color(); Draw.color();
} }
@@ -304,7 +305,7 @@ public class Drill extends Block{
if(dominantItem != null && drawMineItem){ if(dominantItem != null && drawMineItem){
Draw.color(dominantItem.color); Draw.color(dominantItem.color);
Draw.rect("drill-top", x, y); Draw.rect(itemRegion, x, y);
Draw.color(); Draw.color();
} }
} }