Many crazy things

core/src/mindustry/content/Blocks.java

@@ -60,7 +60,7 @@ public class Blocks implements ContentList{
     //crafting
     siliconSmelter, siliconCrucible, siliconArcFurnace, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
     melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge,
-    heatReactor, carbideCrucible,
+    oxidizer, heatReactor, carbideCrucible,
     cellSynthesisChamber,
 
     //sandbox
@@ -75,13 +75,16 @@ public class Blocks implements ContentList{
     //transport
     conveyor, titaniumConveyor, plastaniumConveyor, armoredConveyor, distributor, junction, itemBridge, phaseConveyor, sorter, invertedSorter, router,
     overflowGate, underflowGate, massDriver,
+
+    //transport - alternate
     duct, ductRouter, ductBridge, ductUnloader,
     surgeConveyor, surgeRouter,
 
     //liquid
-    mechanicalPump, rotaryPump, thermalPump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
+    mechanicalPump, rotaryPump, impulsePump, conduit, pulseConduit, platedConduit, liquidRouter, liquidContainer, liquidTank, liquidJunction, bridgeConduit, phaseConduit,
 
-    reinforcedConduit, reinforcedBridgeConduit, reinforcedLiquidRouter, reinforcedLiquidContainer, reinforcedLiquidTank,
+    //liquid - reinforced
+    reinforcedPump, reinforcedConduit, reinforcedBridgeConduit, reinforcedLiquidRouter, reinforcedLiquidContainer, reinforcedLiquidTank,
 
     //power
     combustionGenerator, thermalGenerator, steamGenerator, differentialGenerator, rtgGenerator, solarPanel, largeSolarPanel, thoriumReactor,
@@ -943,11 +946,21 @@ public class Blocks implements ContentList{
             consumes.power(0.50f);
         }};
 
+        oxidizer = new HeatProducer("oxidizer"){{
+            requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
+            //TODO bigger?
+            size = 2;
+
+            //TODO multi liquid output
+            //converts oxygen (?) + beryllium into heat + oxide
+        }};
+
         heatReactor = new HeatProducer("heat-reactor"){{
             //TODO quadvent
+            //TODO coolant?
             requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 30));
             size = 3;
-            consumeTime = 60f * 10f;
+            craftTime = 60f * 10f;
             consumes.item(Items.fissileMatter, 1);
         }};
 
@@ -1370,7 +1383,7 @@ public class Blocks implements ContentList{
             size = 2;
         }};
 
-        thermalPump = new Pump("thermal-pump"){{
+        impulsePump = new Pump("impulse-pump"){{
             requirements(Category.liquid, with(Items.copper, 80, Items.metaglass, 90, Items.silicon, 30, Items.titanium, 40, Items.thorium, 35));
             pumpAmount = 0.22f;
             consumes.power(1.3f);
@@ -1439,6 +1452,21 @@ public class Blocks implements ContentList{
             consumes.power(0.30f);
         }};
 
+        //reinforced stuff
+
+        //TODO different name
+        reinforcedPump = new Pump("reinforced-pump"){{
+            requirements(Category.liquid, with(Items.beryllium, 70, Items.tungsten, 20, Items.silicon, 20));
+            //TODO perhaps something else?
+            consumes.item(Items.beryllium);
+
+            pumpAmount = 0.4f;
+            consumes.power(0.5f);
+            liquidCapacity = 40f;
+            hasPower = true;
+            size = 2;
+        }};
+
         reinforcedConduit = new ArmoredConduit("reinforced-conduit"){{
             requirements(Category.liquid, with(Items.beryllium, 2, Items.graphite, 1));
             botColor = Pal.darkestMetal;

core/src/mindustry/content/Items.java

@@ -8,7 +8,7 @@ public class Items implements ContentList{
     public static Item
     scrap, copper, lead, graphite, coal, titanium, thorium, silicon, plastanium,
     phaseFabric, surgeAlloy, sporePod, sand, blastCompound, pyratite, metaglass,
-    beryllium, fissileMatter, dormantCyst, tungsten, carbide;
+    beryllium, tungsten, oxide, carbide, fissileMatter, dormantCyst;
 
     @Override
     public void load(){
@@ -98,6 +98,19 @@ public class Items implements ContentList{
             cost = 1.3f;
         }};
 
+        tungsten = new Item("tungsten", Color.valueOf("768a9a")){{
+            hardness = 5;
+            cost = 1.5f;
+        }};
+
+        oxide = new Item("oxide", Color.valueOf("e4ffd6")){{
+            cost = 1.1f;
+        }};
+
+        carbide = new Item("carbide", Color.valueOf("89769a")){{
+            cost = 1.3f;
+        }};
+
         fissileMatter = new Item("fissile-matter", Color.valueOf("5e988d")){{
             radioactivity = 1.5f;
         }};
@@ -105,14 +118,5 @@ public class Items implements ContentList{
         dormantCyst = new Item("dormant-cyst", Color.valueOf("df824d")){{
             flammability = 0.1f;
         }};
-
-        tungsten = new Item("tungsten", Color.valueOf("768a9a")){{
-            hardness = 5;
-            cost = 1.5f;
-        }};
-
-        carbide = new Item("carbide", Color.valueOf("89769a")){{
-            cost = 1.3f;
-        }};
     }
 }

core/src/mindustry/content/Liquids.java

@@ -5,7 +5,8 @@ import mindustry.ctype.*;
 import mindustry.type.*;
 
 public class Liquids implements ContentList{
-    public static Liquid water, slag, oil, cryofluid, neoplasm;
+    public static Liquid water, slag, oil, cryofluid, neoplasm,
+    ozone, hydrogen;
 
     @Override
     public void load(){
@@ -55,5 +56,21 @@ public class Liquids implements ContentList{
             colorFrom = Color.valueOf("f98f4a");
             colorTo = Color.valueOf("9e172c");
         }};
+
+        //TODO reactivity, etc
+        ozone = new Liquid("ozone", Color.valueOf("bdd7ff")){{
+            gas = true;
+            barColor = Color.valueOf("97bdf7");
+            explosiveness = 1f;
+            flammability = 1f;
+        }};
+
+        //TODO combustion
+        hydrogen = new Liquid("hydrogen", Color.valueOf("e8d1ff")){{
+            gas = true;
+            barColor = Color.valueOf("c599f0");
+        }};
+
+        //TODO dicyanoacetylene
     }
 }

core/src/mindustry/content/TechTree.java

@@ -104,7 +104,7 @@ public class TechTree implements ContentList{
                                     });
 
                                     node(rotaryPump, () -> {
-                                        node(thermalPump, () -> {
+                                        node(impulsePump, () -> {
 
                                         });
                                     });