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

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2020-12-21 13:10:00 -05:00
parent e4e428f84a 9a577adf5f
commit 952639a72e
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1262,7 +1262,6 @@ 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;
@@ -1272,7 +1271,6 @@ public class Blocks implements ContentList{
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;
@@ -1282,7 +1280,6 @@ public class Blocks implements ContentList{
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;
@@ -1296,7 +1293,6 @@ 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;

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

@@ -42,7 +42,7 @@ public class Drill extends Block{
protected int returnCount; protected int returnCount;
/** Whether to draw the item this drill is mining. */ /** Whether to draw the item this drill is mining. */
public boolean drawMineItem = false; public boolean drawMineItem = true;
/** Effect played when an item is produced. This is colored. */ /** Effect played when an item is produced. This is colored. */
public Effect drillEffect = Fx.mine; public Effect drillEffect = Fx.mine;
/** Speed the drill bit rotates at. */ /** Speed the drill bit rotates at. */