thorium balance change (#76)

3 files changed, 19 insertions, 18 deletions

diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java
index cdaabe9eba..564e5347d9 100644
--- a/src/main/java/goodgenerator/items/MyMaterial.java
+++ b/src/main/java/goodgenerator/items/MyMaterial.java
@@ -65,8 +65,8 @@ public class MyMaterial implements Runnable {
             new Werkstoff.GenerationFeatures().disable().addMixerRecipes().onlyDust(),
             OffsetID + 4,
             TextureSet.SET_DULL,
-            new Pair<>(Thorium, 8),
-            new Pair<>(WerkstoffLoader.Thorium232, 4),
+            new Pair<>(Thorium, 11),
+            new Pair<>(WerkstoffLoader.Thorium232, 1),
             new Pair<>(Uranium235, 1),
             new Pair<>(Carbon, 3));
 
@@ -93,7 +93,7 @@ public class MyMaterial implements Runnable {
     public static final Werkstoff thoriumBasedLiquidFuelDepleted = new Werkstoff(
             new short[] {0x7d, 0x6c, 0x8a},
             "Thorium Based Liquid Fuel (Depleted)",
-            subscriptNumbers("Lu?Pr?B?In?"),
+            subscriptNumbers("Th?Pr?B?In?"),
             new Werkstoff.Stats().setToxic(true),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().addCells(),
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java
index 1850a9cc82..70696d53ba 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader.java
@@ -144,17 +144,17 @@ public class RecipeLoader {
                 },
                 null,
                 ItemRefer.Wrapped_Thorium_Ingot.get(1),
-                1000,
+                300,
                 480);
 
         GT_Values.RA.addImplosionRecipe(
                 ItemRefer.Wrapped_Thorium_Ingot.get(1),
                 4,
                 ItemRefer.High_Density_Thorium_Nugget.get(1),
-                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 3));
+                GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 8));
 
         GT_Values.RA.addCompressorRecipe(
-                ItemRefer.High_Density_Thorium_Nugget.get(9), ItemRefer.High_Density_Thorium.get(1), 400, 120);
+                ItemRefer.High_Density_Thorium_Nugget.get(9), ItemRefer.High_Density_Thorium.get(1), 200, 120);
 
         GT_Values.RA.addMixerRecipe(
                 ItemRefer.High_Density_Thorium.get(1),
@@ -172,7 +172,7 @@ public class RecipeLoader {
                 GT_Utility.getIntegratedCircuit(1),
                 null,
                 null,
-                Materials.Helium.getPlasma(750L),
+                Materials.Helium.getPlasma(250L),
                 null,
                 MyMaterial.thoriumBasedLiquidFuelExcited.get(OrePrefixes.cell, 1),
                 120,
@@ -292,13 +292,14 @@ public class RecipeLoader {
                 100,
                 30);
 
+        // ZnCl2 + 3Ca + ThF4 = ZnTh + CaCl2 + 2CaF2
         GT_Values.RA.addBlastRecipe(
-                MyMaterial.zincChloride.get(OrePrefixes.dust, 1),
+                MyMaterial.zincChloride.get(OrePrefixes.dust, 3),
                 Materials.Calcium.getDust(3),
                 MyMaterial.thorium232Tetrafluoride.getFluidOrGas(1000),
-                WerkstoffLoader.CalciumChloride.getFluidOrGas(1000),
+                WerkstoffLoader.CalciumChloride.getFluidOrGas(3000),
                 MyMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1),
-                WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 8),
+                WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 6),
                 300,
                 120,
                 3000);
@@ -307,7 +308,7 @@ public class RecipeLoader {
                 MyMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1),
                 GT_Utility.getIntegratedCircuit(11),
                 Materials.Argon.getGas(250),
-                Materials.Zinc.getMolten(48),
+                Materials.Zinc.getMolten(144),
                 WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1),
                 null,
                 150,
@@ -1487,13 +1488,13 @@ public class RecipeLoader {
                 null,
                 MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000),
                 null,
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 64),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 48),
-                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 32),
+                WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64),
+                WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 16),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 64),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 32),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 4),
-                new int[] {9000, 7000, 1500, 10000, 3000, 5000},
+                new int[] {10000, 8000, 1000, 8000, 3000, 5000},
                 1500,
                 1040);
 
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index 5aa5b00e02..c520800538 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -1684,7 +1684,7 @@ public class RecipeLoader_02 {
                 ItemRefer.Fuel_Rod_Pu_Depleted_1.get(1),
                 null,
                 null,
-                WerkstoffLoader.Krypton.getFluidOrGas(32),
+                Materials.Argon.getGas(32),
                 ItemRefer.Advanced_Fuel_Rod.get(1),
                 Materials.Plutonium.getDust(5),
                 Materials.Plutonium241.getDust(2),
@@ -1699,7 +1699,7 @@ public class RecipeLoader_02 {
                 ItemRefer.Fuel_Rod_Pu_Depleted_2.get(1),
                 null,
                 null,
-                WerkstoffLoader.Krypton.getFluidOrGas(64),
+                Materials.Argon.getGas(64),
                 ItemRefer.Advanced_Fuel_Rod.get(2),
                 Materials.Plutonium.getDust(10),
                 Materials.Plutonium241.getDust(4),
@@ -1714,7 +1714,7 @@ public class RecipeLoader_02 {
                 ItemRefer.Fuel_Rod_Pu_Depleted_4.get(1),
                 null,
                 null,
-                WerkstoffLoader.Krypton.getFluidOrGas(128),
+                Materials.Argon.getGas(128),
                 ItemRefer.Advanced_Fuel_Rod.get(4),
                 Materials.Plutonium.getDust(20),
                 Materials.Plutonium241.getDust(8),