feat: balance conversation part 2

GregTechCEu · Jul 21, 2024 · 644941a · 644941a
1 parent a98dd0f
commit 644941a
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 9 deletions.
diff --git a/src/main/java/gregtech/api/unification/material/Materials.java b/src/main/java/gregtech/api/unification/material/Materials.java
@@ -493,6 +493,8 @@ public static void register() {
     public static Material Inconel;
     public static Material BoronTrioxide;
     public static Material BoronCarbide;
+    public static Material HeavyWater;
+    public static Material HighPressureHeavyWater;
 
     /**
      * Organic chemistry

diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java
@@ -678,6 +678,7 @@ public static void register() {
                 .color(0x232323).iconSet(METALLIC)
                 .flags(DISABLE_DECOMPOSITION)
                 .components(Uranium, 1, Oxygen, 2)
+                .fissionFuel(1800, 300, 55., 1., 1000., 0., 2.4)
                 .build()
                 .setFormula("UO2", true);
 
@@ -1673,5 +1674,18 @@ public static void register() {
                 .components(Boron, 4, Carbon, 1)
                 .iconSet(METALLIC)
                 .build();
+
+        HeavyWater = new Material.Builder(467, gregtechId("heavy_water"))
+                .fluid()
+                .color(0x3673D6)
+                .components(Deuterium, 2, Oxygen, 1)
+                .build();
+
+        HighPressureHeavyWater = new Material.Builder(468, gregtechId("high_pressure_heavy_water"))
+                .gas(new FluidBuilder().temperature(500))
+                .color(0xCCD9F0)
+                .flags(DISABLE_DECOMPOSITION)
+                .components(Deuterium, 2, Oxygen, 1)
+                .build();
     }
 }
diff --git a/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java b/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java
@@ -61,9 +61,6 @@ public static void register() {
         oreProp.setOreByProducts(Nickel, Nickel, Cobalt, Palladium);
         oreProp.setWashedIn(Mercury);
 
-        oreProp = Plutonium239.getProperty(PropertyKey.ORE);
-        oreProp.setOreByProducts(Uraninite, Lead, Uraninite);
-
         // oreProp = Silicon.getProperty(PropertyKey.ORE);
         // oreProp.setOreByProducts(SiliconDioxide);
 
@@ -415,5 +412,10 @@ public static void register() {
                 new CoolantProperty(DistilledWater, HighPressureSteam, FluidStorageKeys.LIQUID, 1., 1000,
                         373, 2260000, 4168.)
                                 .setAccumulatesHydrogen(true));
+
+        HeavyWater.setProperty(PropertyKey.COOLANT,
+                new CoolantProperty(HeavyWater, HighPressureHeavyWater, FluidStorageKeys.LIQUID, 4., 1000,
+                        374.4, 2064000, 4228.)
+                        .setAccumulatesHydrogen(true));
     }
 }
diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/NuclearRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/NuclearRecipes.java
@@ -70,15 +70,15 @@ public static void init() {
                 .buildAndRegister();
 
         BLAST_RECIPES.recipeBuilder().duration(200).EUt(VA[EV]).blastFurnaceTemp(1400)
-                .input(dust, ZirconiumDioxide, 1)
+                .input(dust, ZirconiumDioxide, 3)
                 .input(dust, Carbon, 1)
                 .fluidInputs(Chlorine.getFluid(4000))
                 .fluidOutputs(CarbonDioxide.getFluid(1000))
                 .output(dust, ZirconiumTetrachloride, 5)
                 .buildAndRegister();
 
         BLAST_RECIPES.recipeBuilder().duration(200).EUt(VA[EV]).blastFurnaceTemp(1250)
-                .input(dust, HafniumDioxide, 1)
+                .input(dust, HafniumDioxide, 3)
                 .input(dust, Carbon, 1)
                 .fluidInputs(Chlorine.getFluid(4000))
                 .fluidOutputs(CarbonDioxide.getFluid(1000))
@@ -254,10 +254,10 @@ public static void init() {
 
         CENTRIFUGE_RECIPES.recipeBuilder().duration(200).EUt(VA[LV])
                 .input(dustBredFuel, LEU235)
-                .chancedOutput(dust, Plutonium239, 235, 0)
-                .chancedOutput(dust, Plutonium240, 110, 0)
-                .chancedOutput(dust, Plutonium241, 70, 0)
-                .chancedOutput(dust, Neptunium239, 15, 0)
+                .chancedOutput(dust, Plutonium239, 282, 0)
+                .chancedOutput(dust, Plutonium240, 132, 0)
+                .chancedOutput(dust, Plutonium241, 84, 0)
+                .chancedOutput(dust, Neptunium239, 18, 0)
                 .buildAndRegister();
 
         CENTRIFUGE_RECIPES.recipeBuilder().duration(200).EUt(VA[LV])

diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
@@ -697,5 +697,11 @@ public static void init() {
                 .fluidOutputs(PolychlorinatedBiphenyl.getFluid(1000))
                 .fluidOutputs(HydrochloricAcid.getFluid(2000))
                 .duration(200).EUt(VH[HV]).buildAndRegister();
+
+        CHEMICAL_RECIPES.recipeBuilder()
+                .fluidInputs(Deuterium.getFluid(2000))
+                .fluidInputs(Oxygen.getFluid(1000))
+                .fluidOutputs(HeavyWater.getFluid(1000))
+                .duration(200).EUt(VH[LV]).buildAndRegister();
     }
 }