Added biomatter extractor, sulfuric acid

core/assets/version.properties

@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Mon Mar 05 14:09:58 EST 2018
+#Mon Mar 05 16:14:27 EST 2018
 version=release
-androidBuildCode=391
+androidBuildCode=395
 name=Mindustry
 code=3.4
 build=custom build

core/src/io/anuke/mindustry/resource/Liquid.java

@@ -9,15 +9,51 @@ public class Liquid {
 	private static final Array<Liquid> liquids = new Array<>();
 
 	public static final Liquid
-		water = new Liquid("water", Color.ROYAL),
+
-		plasma = new Liquid("plasma", Color.CORAL),
+	water = new Liquid("water", Color.ROYAL),
-		lava = new Liquid("lava", Color.valueOf("ed5334")),
+	plasma = new Liquid("plasma", Color.CORAL){
-		oil = new Liquid("oil", Color.valueOf("292929")),
+		{
-		cryofluid = new Liquid("cryofluid", Color.SKY);
+			flammability = 0.4f;
+			viscosity = 0.1f;
+			heatCapacity = 0.2f;
+		}
+	},
+	lava = new Liquid("lava", Color.valueOf("ed5334")){
+		{
+			temperature = 0.7f;
+			viscosity = 0.8f;
+		}
+	},
+	oil = new Liquid("oil", Color.valueOf("292929")){
+		{
+			viscosity = 0.7f;
+			flammability = 0.5f;
+			explosiveness = 0.6f;
+		}
+	},
+	cryofluid = new Liquid("cryofluid", Color.SKY){
+		{
+			heatCapacity = 0.8f;
+			temperature = 0.1f;
+		}
+	},
+	sulfuricAcid = new Liquid("sulfuricAcid", Color.YELLOW){
+		{
+			flammability = 0.4f;
+			explosiveness = 0.4f;
+			heatCapacity = 0.4f;
+		}
+	};
 	
 	public final Color color;
 	public final String name;
 	public final int id;
+
+	public float flammability;
+	public float temperature = 0.5f;
+	public float heatCapacity = 0.5f;
+	public float viscosity = 0.5f;
+	public float explosiveness;
 	
 	public Liquid(String name, Color color) {
 		this.name = name;

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

@@ -64,7 +64,7 @@ public class Recipes {
 			new Recipe(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 50), stack(Item.steel, 50)),
 			new Recipe(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)),
 			new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)),
-			new Recipe(production, ProductionBlocks.omnidrill, stack(Item.titanium, 40), stack(Item.dirium, 40)),
+			new Recipe(production, ProductionBlocks.biomatterextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)),
 
 			new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30), stack(Item.stone, 20)),
 			new Recipe(power, ProductionBlocks.thermalgenerator, stack(Item.steel, 30), stack(Item.iron, 30)),

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

@@ -140,6 +140,7 @@ public class ProductionBlocks{
 		{
 			resource = Blocks.iron;
 			result = Item.iron;
+			time = 6;
 		}
 	},
 	
@@ -182,6 +183,15 @@ public class ProductionBlocks{
 		}
 	},
 
+	biomatterextractor = new Drill("biomatterextractor"){
+		{
+			resource = Blocks.grass;
+			result = Item.biomatter;
+			time = 5;
+			size = 2;
+		}
+	},
+
 	coalgenerator = new ItemPowerGenerator("coalgenerator"){
 		{
 			generateItem = Item.coal;

core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java

@@ -87,7 +87,7 @@ public class Drill extends Block{
 	}
 
 	boolean isValid(Tile tile){
-		return tile.floor() == resource || (resource != null && resource.drops.equals(tile.floor().drops));
+		return tile.floor() == resource || (resource != null && resource.drops != null && resource.drops.equals(tile.floor().drops));
 	}
 
 }