Thermal generator now based on floor / Power restructuring

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

@@ -36,7 +36,7 @@ public class Blocks implements ContentList{
     grass, shrub, rock, icerock, blackrock, rocks, cliffs, pine,
 
     //crafting
-    siliconSmelter, graphitePress, plastaniumCompressor, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
+    siliconSmelter, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
     melter, separator, centrifuge, biomatterCompressor, pulverizer, incinerator,
 
     //sandbox
@@ -226,6 +226,33 @@ public class Blocks implements ContentList{
         //endregion
         //region crafting
 
+        graphitePress = new GenericCrafter("graphite-press"){{
+            requirements(Category.crafting, ItemStack.with(Items.copper, 300, Items.lead, 50));
+
+            craftEffect = Fx.pulverizeMedium;
+            output = Items.graphite;
+            craftTime = 90f;
+            size = 2;
+            hasItems = true;
+
+            consumes.item(Items.coal, 2);
+        }};
+
+        multiPress = new GenericCrafter("multi-press"){{
+            requirements(Category.crafting, ItemStack.with(Items.titanium, 200, Items.silicon, 50, Items.lead, 200, Items.graphite, 100));
+
+            craftEffect = Fx.pulverizeMedium;
+            output = Items.graphite;
+            craftTime = 30f;
+            size = 2;
+            hasItems = true;
+            hasLiquids = true;
+
+            consumes.power(0.2f);
+            consumes.item(Items.coal, 2);
+            consumes.liquid(Liquids.water, 0.1f);
+        }};
+
         siliconSmelter = new PowerSmelter("silicon-smelter"){{
             requirements(Category.crafting, ItemStack.with(Items.copper, 60, Items.lead, 50));
             craftEffect = Fx.smeltsmoke;
@@ -239,18 +266,6 @@ public class Blocks implements ContentList{
             consumes.power(0.05f);
         }};
 
-        graphitePress = new GenericCrafter("graphite-press"){{
-            requirements(Category.crafting, ItemStack.with(Items.copper, 200, Items.lead, 50));
-
-            craftEffect = Fx.pulverizeMedium;
-            output = Items.graphite;
-            craftTime = 90f;
-            size = 2;
-            hasItems = true;
-
-            consumes.item(Items.coal, 2);
-        }};
-
         plastaniumCompressor = new PlastaniumCompressor("plastanium-compressor"){{
             requirements(Category.crafting, ItemStack.with(Items.silicon, 160, Items.lead, 230, Items.graphite, 120, Items.titanium, 160));
             hasItems = true;
@@ -693,9 +708,8 @@ public class Blocks implements ContentList{
             itemDuration = 40f;
         }};
 
-        thermalGenerator = new LiquidHeatGenerator("thermal-generator"){{
+        thermalGenerator = new ThermalGenerator("thermal-generator"){{
             requirements(Category.power, ItemStack.with(Items.copper, 80, Items.graphite, 70, Items.lead, 100, Items.silicon, 70, Items.thorium, 70));
-            maxLiquidGenerate = 2f;
             powerProduction = 2f;
             generateEffect = Fx.redgeneratespark;
             size = 2;

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

@@ -37,8 +37,8 @@ public class Items implements ContentList{
         }};
 
         coal = new Item("coal", Color.valueOf("272727")){{
-            explosiveness = 0.2f;
-            flammability = 0.5f;
+            explosiveness = 0.4f;
+            flammability = 1f;
             hardness = 2;
             genOre = true;
         }};
@@ -52,9 +52,9 @@ public class Items implements ContentList{
 
         thorium = new Item("thorium", Color.valueOf("f9a3c7")){{
             type = ItemType.material;
-            explosiveness = 0.1f;
+            explosiveness = 0.2f;
             hardness = 4;
-            radioactivity = 0.5f;
+            radioactivity = 1f;
             cost = 1.4f;
             genOre = true;
         }};
@@ -70,16 +70,16 @@ public class Items implements ContentList{
 
         plastanium = new Item("plastanium", Color.valueOf("cbd97f")){{
             type = ItemType.material;
-            flammability = 0.1f;
-            explosiveness = 0.1f;
+            flammability = 0.2f;
+            explosiveness = 0.2f;
             cost = 1.6f;
         }};
 
         phasefabric = new Item("phase-fabric", Color.valueOf("f4ba6e")){{
             type = ItemType.material;
             cost = 1.5f;
-            fluxiness = 0.9f;
-            radioactivity = 0.3f;
+            fluxiness = 1.8f;
+            radioactivity = 0.6f;
         }};
 
         surgealloy = new Item("surge-alloy", Color.valueOf("f3e979")){{
@@ -87,22 +87,22 @@ public class Items implements ContentList{
         }};
 
         biomatter = new Item("biomatter", Color.valueOf("648b55")){{
-            flammability = 0.55f;
-            fluxiness = 0.3f;
+            flammability = 1.05f;
+            fluxiness = 0.6f;
         }};
 
         sand = new Item("sand", Color.valueOf("e3d39e")){{
-            fluxiness = 0.5f;
+            fluxiness = 1f;
         }};
 
         blastCompound = new Item("blast-compound", Color.valueOf("ff795e")){{
-            flammability = 0.2f;
-            explosiveness = 0.6f;
+            flammability = 0.4f;
+            explosiveness = 1.2f;
         }};
 
         pyratite = new Item("pyratite", Color.valueOf("ffaa5f")){{
-            flammability = 0.7f;
-            explosiveness = 0.2f;
+            flammability = 1.4f;
+            explosiveness = 0.4f;
         }};
     }
 }

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

@@ -25,8 +25,8 @@ public class Liquids implements ContentList{
 
         oil = new Liquid("oil", Color.valueOf("313131")){{
             viscosity = 0.7f;
-            flammability = 0.6f;
-            explosiveness = 0.6f;
+            flammability = 1.2f;
+            explosiveness = 1.2f;
             heatCapacity = 0.7f;
             tier = 1;
             effect = StatusEffects.tarred;