Start of drill re-tiering / Animated drills / Fixed fracker bugs

core/src/io/anuke/mindustry/content/Items.java

@@ -1,36 +1,52 @@
 package io.anuke.mindustry.content;
 
+import com.badlogic.gdx.graphics.Color;
 import io.anuke.mindustry.resource.Item;
 
 public class Items {
     public static final Item
 
-    stone = new Item("stone") {
+    stone = new Item("stone", Color.valueOf("777777")) {
         {
             material = false;
+            hardness = 2;
         }
     },
-    iron = new Item("iron"),
-    lead = new Item("lead"),
-    coal = new Item("coal") {
+    iron = new Item("iron", Color.valueOf("bc8271")){
+        {
+            hardness = 1;
+        }
+    },
+    lead = new Item("lead", Color.valueOf("8e85a2")){
+        {
+            hardness = 1;
+        }
+    },
+    coal = new Item("coal", Color.valueOf("272727")) {
         {
             explosiveness = 0.2f;
             flammability = 0.5f;
             fluxiness = 0.5f;
             material = false;
+            hardness = 2;
         }
     },
-    steel = new Item("steel"),
-    titanium = new Item("titanium"),
-    thorium = new Item("thorium") {
+    steel = new Item("steel", Color.valueOf("e2e2e2")),
+    titanium = new Item("titanium", Color.valueOf("8da1e3")){
+        {
+            hardness = 3;
+        }
+    },
+    thorium = new Item("thorium", Color.valueOf("bb80bd")) {
         {
             explosiveness = 0.1f;
+            hardness = 4;
         }
     },
-    silicon = new Item("silicon"),
-    plastic = new Item("plastic"),
-    densealloy = new Item("densealloy"),
-    biomatter = new Item("biomatter") {
+    silicon = new Item("silicon", Color.valueOf("53565c")),
+    plastic = new Item("plastic", Color.valueOf("e9ead3")),
+    densealloy = new Item("densealloy", Color.valueOf("b4d5c7")),
+    biomatter = new Item("biomatter", Color.valueOf("648b55")) {
         {
             material = false;
             flammability = 0.4f;

core/src/io/anuke/mindustry/content/Recipes.java

@@ -68,7 +68,10 @@ public class Recipes {
 		new Recipe(crafting, CraftingBlocks.weaponFactory, stack(Items.steel, 60), stack(Items.iron, 60)).setDesktop(),
 
 		//new Recipe(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)),
-		new Recipe(production, ProductionBlocks.irondrill, stack(Items.iron, 25)),
+		new Recipe(production, ProductionBlocks.ironDrill, stack(Items.iron, 25)),
+		new Recipe(production, ProductionBlocks.reinforcedDrill, stack(Items.iron, 25)),
+		new Recipe(production, ProductionBlocks.steelDrill, stack(Items.iron, 25)),
+		new Recipe(production, ProductionBlocks.titaniumDrill, stack(Items.iron, 25)),
 		//new Recipe(production, ProductionBlocks.leaddrill, stack(Items.iron, 25)),
 		//new Recipe(production, ProductionBlocks.coaldrill, stack(Items.iron, 25), stack(Items.iron, 40)),
 		//new Recipe(production, ProductionBlocks.titaniumdrill, stack(Items.iron, 50), stack(Items.steel, 50)),

core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java

@@ -9,51 +9,35 @@ import io.anuke.mindustry.world.blocks.types.production.*;
 public class ProductionBlocks {
     public static final Block
 
-    stonedrill = new Drill("stonedrill") {{
-        resource = Blocks.stone;
-        result = Items.stone;
-        drillTime = 240;
-    }},
-
-    irondrill = new Drill("irondrill") {{
-        resource = Blocks.iron;
-        result = Items.iron;
-        drillTime = 360;
-    }},
-
-    leaddrill = new Drill("leaddrill") {{
-        resource = Blocks.lead;
-        result = Items.lead;
+    ironDrill = new Drill("irondrill") {{
+        tier = 1;
         drillTime = 400;
     }},
 
-    coaldrill = new Drill("coaldrill") {{
-        resource = Blocks.coal;
-        result = Items.coal;
-        drillTime = 420;
+    reinforcedDrill = new Drill("reinforceddrill") {{
+        tier = 2;
+        drillTime = 360;
     }},
 
-    thoriumdrill = new Drill("thoriumdrill") {{
-        resource = Blocks.thorium;
-        result = Items.thorium;
-        drillTime = 600;
+    steelDrill = new Drill("steeldrill") {{
+        tier = 3;
+        drillTime = 320;
     }},
 
-    titaniumdrill = new Drill("titaniumdrill") {{
-        resource = Blocks.titanium;
-        result = Items.titanium;
-        drillTime = 540;
+    titaniumDrill = new Drill("titaniumdrill") {{
+        tier = 4;
+        drillTime = 280;
     }},
 
     laserdrill = new GenericDrill("laserdrill") {{
-        drillTime = 200;
+        drillTime = 220;
         size = 2;
         powerUse = 0.2f;
         hasPower = true;
     }},
 
     nucleardrill = new GenericDrill("nucleardrill") {{
-        drillTime = 240;
+        drillTime = 170;
         size = 3;
         powerUse = 0.32f;
         hasPower = true;
@@ -61,21 +45,13 @@ public class ProductionBlocks {
 
     plasmadrill = new GenericDrill("plasmadrill") {{
         inputLiquid = Liquids.plasma;
-        drillTime = 240;
+        drillTime = 110;
         size = 4;
         powerUse = 0.16f;
         hasLiquids = true;
         hasPower = true;
     }},
 
-    quartzextractor = new GenericDrill("quartzextractor") {{
-        powerUse = 0.1f;
-        resource = Blocks.sand;
-        result = Items.silicon;
-        drillTime = 320;
-        size = 2;
-    }},
-
     waterextractor = new SolidPump("waterextractor") {{
         result = Liquids.water;
         powerUse = 0.2f;
@@ -97,7 +73,6 @@ public class ProductionBlocks {
     }},
 
     cultivator = new Cultivator("cultivator") {{
-        resource = Blocks.grass;
         result = Items.biomatter;
         inputLiquid = Liquids.water;
         liquidUse = 0.2f;