From 28bef2f9724c7d4d91fcef96a162d0a6bc891a01 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Wed, 20 Nov 2024 23:42:43 +0700 Subject: [PATCH 1/6] fix chlorine mismatch in silver lines --- .../elements/d_block/group11/SilverChain.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy index 04c57c76d..ec2779ea4 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy @@ -82,7 +82,7 @@ ELECTROLYTIC_CELL.recipeBuilder() .notConsumable(metaitem('stickSilver')) .notConsumable(metaitem('graphite_electrode')) .outputs(metaitem('dustSilver') * 2) - .fluidOutputs(fluid('chlorine') * 2000) + .fluidOutputs(fluid('chlorine') * 4000) .fluidOutputs(fluid('sodium_cyanide_solution') * 8000) .duration(480) .EUt(Globals.voltAmps[2]) @@ -113,7 +113,7 @@ ELECTROLYTIC_CELL.recipeBuilder() .notConsumable(metaitem('stickSilver')) .notConsumable(metaitem('graphite_electrode')) .outputs(metaitem('dustSilver') * 3) - .fluidOutputs(fluid('chlorine') * 6000) + .fluidOutputs(fluid('chlorine') * 3000) .fluidOutputs(fluid('sodium_cyanide_solution') * 12000) .duration(480) .EUt(Globals.voltAmps[2]) @@ -145,7 +145,7 @@ ELECTROLYTIC_CELL.recipeBuilder() .notConsumable(metaitem('stickSilver')) .notConsumable(metaitem('graphite_electrode')) .outputs(metaitem('dustSilver') * 5) - .fluidOutputs(fluid('chlorine') * 5000) + .fluidOutputs(fluid('chlorine') * 2500) .fluidOutputs(fluid('sodium_cyanide_solution') * 20000) .duration(480) .EUt(Globals.voltAmps[2]) From 5f9db1b6616f506ed36172158eaca3167e765c58 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 21 Nov 2024 14:01:52 +0700 Subject: [PATCH 2/6] stoik fixes --- groovy/material/FirstDegreeMaterials.groovy | 17 +++++++++-------- .../d_block/group11/SilverChain.groovy | 18 +++++++++--------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index ad1752a03..67d9046a1 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -1031,10 +1031,11 @@ public class FirstDegreeMaterials { SulfidicSilverCyanideSolution = new Material.Builder(8247, SuSyUtility.susyId('sulfidic_silver_cyanide_solution')) .liquid() - .components(Silver * 2, Carbon * 4, Nitrogen * 4, Sodium * 4, Sulfur, Water * 4) + .components(Silver * 2, Carbon * 4, Nitrogen * 4, Sodium * 4, Sulfur, Water * 8) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() + .setFormula("(Na[Ag(CN)2])2(Na2S)(H2O)8", true) SilverCyanideSolution = new Material.Builder(8248, SuSyUtility.susyId('silver_cyanide_solution')) .liquid() @@ -1046,11 +1047,11 @@ public class FirstDegreeMaterials { SulfidicPyrargyriteCyanideLeachSolution = new Material.Builder(8249, SuSyUtility.susyId('sulfidic_pyrargyrite_cyanide_leach_solution')) .liquid() - .components(Sodium * 6, Silver * 3, Carbon * 6, Nitrogen * 6, Antimony, Sulfur * 3, Water * 6) + .components(Sodium * 6, Silver * 3, Carbon * 6, Nitrogen * 6, Antimony, Sulfur * 3, Water * 12) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() - .setFormula("(Na[Ag(CN)2])3(Na3SbS3)(H2O)6", true) + .setFormula("(Na[Ag(CN)2])3(Na3SbS3)(H2O)12", true) PyrargyriteCyanideLeachSolution = new Material.Builder(8250, SuSyUtility.susyId('pyrargyrite_cyanide_leach_solution')) .liquid() @@ -1058,7 +1059,7 @@ public class FirstDegreeMaterials { .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() - .setFormula("(Na[Ag(CN)2])3(NaCl)2(NaSbCl4)(H2O)6", true) + .setFormula("(Na[Ag(CN)2])3(NaCl)3(H2O)12", true) PyrargyriteThiosulfateLeachSolution = new Material.Builder(8251, SuSyUtility.susyId('pyrargyrite_thiosulfate_leach_solution')) .liquid() @@ -1084,19 +1085,19 @@ public class FirstDegreeMaterials { SulfidicStephaniteCyanideLeachSolution = new Material.Builder(8254, SuSyUtility.susyId('sulfidic_stephanite_cyanide_leach_solution')) .liquid() - .components(Sodium * 10, Silver * 5, Carbon * 10, Nitrogen * 10, Antimony, Sulfur * 4, Water * 12) + .components(Sodium * 10, Silver * 5, Carbon * 10, Nitrogen * 10, Antimony, Sulfur * 4, Water * 10) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() - .setFormula("(Na[Ag(CN)2])5(Na3SbS3)(Na2S)(H2O)12", true) + .setFormula("(Na[Ag(CN)2])5(Na3SbS3)(Na2S)(H2O)20", true) StephaniteCyanideLeachSolution = new Material.Builder(8255, SuSyUtility.susyId('stephanite_cyanide_leach_solution')) .liquid() - .components(Sodium * 10, Silver * 5, Carbon * 10, Nitrogen * 10, Chlorine * 5, Water * 20) + .components(Sodium * 10, Silver * 5, Carbon * 10, Nitrogen * 10, Chlorine * 5, Water * 10) .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() - .setFormula("(Na[Ag(CN)2])5(NaCl)2(NaSbCl6)(H2O)20", true) + .setFormula("(Na[Ag(CN)2])5(NaCl)2(H2O)20", true) ProustiteThiosulfateLeachSolution = new Material.Builder(8256, SuSyUtility.susyId('proustite_thiosulfate_leach_solution')) .liquid() diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy index ec2779ea4..8f858f6a4 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy @@ -93,7 +93,7 @@ BATCH_REACTOR.recipeBuilder() .inputs(ore('dustPyrargyrite')) .inputs(ore('dustSodiumCyanide') * 18) .fluidInputs(fluid('distilled_water') * 12000) - .fluidOutputs(fluid('sulfidic_pyrargyrite_cyanide_leach_solution') * 12000) + .fluidOutputs(fluid('sulfidic_pyrargyrite_cyanide_leach_solution') * 12000) //missing 90% ratio? .duration(120) .EUt(Globals.voltAmps[2]) .buildAndRegister() @@ -157,22 +157,22 @@ BATCH_REACTOR.recipeBuilder() .inputs(ore('dustPyrargyrite') * 7) .inputs(ore('dustSodiumThiosulfate') * 42) .fluidInputs(fluid('distilled_water') * 5000) - .fluidOutputs(fluid('pyrargyrite_thiosulfate_leach_solution') * 1000) + .fluidOutputs(fluid('pyrargyrite_thiosulfate_leach_solution') * 5000) .duration(120) .EUt(Globals.voltAmps[2]) .buildAndRegister() BATCH_REACTOR.recipeBuilder() .inputs(ore('dustSodiumSulfide') * 9) - .fluidInputs(fluid('pyrargyrite_thiosulfate_leach_solution') * 2000) + .fluidInputs(fluid('pyrargyrite_thiosulfate_leach_solution') * 5000) .outputs(metaitem('dustSilverSulfide') * 9) - .fluidOutputs(fluid('thiosulfate_thioantimonite_solution') * 2000) + .fluidOutputs(fluid('thiosulfate_thioantimonite_solution') * 5000) .duration(120) .EUt(Globals.voltAmps[2]) .buildAndRegister() BATCH_REACTOR.recipeBuilder() - .fluidInputs(fluid('thiosulfate_thioantimonite_solution') * 1000) + .fluidInputs(fluid('thiosulfate_thioantimonite_solution') * 5000) .fluidInputs(fluid('iron_iii_chloride_solution') * 1000) .outputs(metaitem('dustIronThioantimonite') * 5) .fluidOutputs(fluid('sodium_thiosulfate_solution') * 6000) @@ -203,22 +203,22 @@ BATCH_REACTOR.recipeBuilder() .inputs(ore('dustProustite') * 7) .inputs(ore('dustSodiumThiosulfate') * 42) .fluidInputs(fluid('distilled_water') * 5000) - .fluidOutputs(fluid('proustite_thiosulfate_leach_solution') * 1000) + .fluidOutputs(fluid('proustite_thiosulfate_leach_solution') * 5000) .duration(120) .EUt(Globals.voltAmps[2]) .buildAndRegister() BATCH_REACTOR.recipeBuilder() .inputs(ore('dustSodiumSulfide') * 9) - .fluidInputs(fluid('proustite_thiosulfate_leach_solution') * 2000) + .fluidInputs(fluid('proustite_thiosulfate_leach_solution') * 5000) .outputs(metaitem('dustSilverSulfide') * 9) - .fluidOutputs(fluid('thiosulfate_thioarsenite_solution') * 2000) + .fluidOutputs(fluid('thiosulfate_thioarsenite_solution') * 5000) .duration(120) .EUt(Globals.voltAmps[2]) .buildAndRegister() BATCH_REACTOR.recipeBuilder() - .fluidInputs(fluid('thiosulfate_thioarsenite_solution') * 1000) + .fluidInputs(fluid('thiosulfate_thioarsenite_solution') * 5000) .fluidInputs(fluid('iron_iii_chloride_solution') * 1000) .outputs(metaitem('dustIronThioarsenite') * 5) .fluidOutputs(fluid('sodium_thiosulfate_solution') * 6000) From c65ff7e5598cc49288657dc15abb648d6c6f2f7d Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 21 Nov 2024 14:03:45 +0700 Subject: [PATCH 3/6] Update FirstDegreeMaterials.groovy --- groovy/material/FirstDegreeMaterials.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index 67d9046a1..90d13671b 100644 --- a/groovy/material/FirstDegreeMaterials.groovy +++ b/groovy/material/FirstDegreeMaterials.groovy @@ -1097,7 +1097,7 @@ public class FirstDegreeMaterials { .flags(DISABLE_DECOMPOSITION) .colorAverage() .build() - .setFormula("(Na[Ag(CN)2])5(NaCl)2(H2O)20", true) + .setFormula("(Na[Ag(CN)2])5(NaCl)3(H2O)20", true) ProustiteThiosulfateLeachSolution = new Material.Builder(8256, SuSyUtility.susyId('proustite_thiosulfate_leach_solution')) .liquid() From 3a67334fac6489caa19f24c60a15a202f0669720 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 21 Nov 2024 14:10:01 +0700 Subject: [PATCH 4/6] more comments --- .../elements/d_block/group11/SilverChain.groovy | 2 ++ .../elements/p_block/group15/ArsenicChain.groovy | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy index 8f858f6a4..3db36a5a0 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy @@ -175,6 +175,7 @@ BATCH_REACTOR.recipeBuilder() .fluidInputs(fluid('thiosulfate_thioantimonite_solution') * 5000) .fluidInputs(fluid('iron_iii_chloride_solution') * 1000) .outputs(metaitem('dustIronThioantimonite') * 5) + .outputs(metaitem('dustSalt') * 3) //this should be dissolved in the sodium thiosulfate solution. .fluidOutputs(fluid('sodium_thiosulfate_solution') * 6000) .duration(120) .EUt(Globals.voltAmps[2]) @@ -221,6 +222,7 @@ BATCH_REACTOR.recipeBuilder() .fluidInputs(fluid('thiosulfate_thioarsenite_solution') * 5000) .fluidInputs(fluid('iron_iii_chloride_solution') * 1000) .outputs(metaitem('dustIronThioarsenite') * 5) + .outputs(metaitem('dustSalt') * 3) //this should be dissolved in the sodium thiosulfate solution. .fluidOutputs(fluid('sodium_thiosulfate_solution') * 6000) .duration(120) .EUt(Globals.voltAmps[2]) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy index 281a02f33..c5137d978 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/p_block/group15/ArsenicChain.groovy @@ -178,7 +178,8 @@ BATCH_REACTOR.recipeBuilder() .inputs(ore('dustProustite') * 7) .inputs(ore('dustSalt') * 6) .fluidInputs(fluid('sodium_hydroxide_solution') * 1000) - .fluidInputs(fluid('distilled_water') * 5000) + .fluidInputs(fluid('distilled_water') * 5000) + //where does the distilled water go in the fluid output? .outputs(metaitem('dustSilverChloride') * 6) //TO SILVER PROCESSING .fluidOutputs(fluid('proustite_alkaline_leach_solution') * 1000) .duration(240) From 3b390d7f383c3d5dd97144716ded1fd1f4011411 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 21 Nov 2024 19:42:41 +0700 Subject: [PATCH 5/6] Update SilverChain.groovy --- .../elements/d_block/group11/SilverChain.groovy | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy index 3db36a5a0..95fe3fe31 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy @@ -121,6 +121,7 @@ ELECTROLYTIC_CELL.recipeBuilder() //STEPHANITE (100%) BATCH_REACTOR.recipeBuilder() + .circuitMeta(1) .inputs(ore('dustStephanite')) .inputs(ore('dustSodiumCyanide') * 15) .fluidInputs(fluid('distilled_water') * 10000) @@ -130,6 +131,16 @@ BATCH_REACTOR.recipeBuilder() .EUt(Globals.voltAmps[2]) .buildAndRegister() +BATCH_REACTOR.recipeBuilder() + .circuitMeta(2) + .inputs(ore('dustStephanite')) + .inputs(ore('dustSodiumCyanide') * 30) + .fluidInputs(fluid('distilled_water') * 20000) + .fluidOutputs(fluid('sulfidic_stephanite_cyanide_leach_solution') * 20000) + .duration(480) + .EUt(Globals.voltAmps[2]) + .buildAndRegister() + BATCH_REACTOR.recipeBuilder() .fluidInputs(fluid('sulfidic_stephanite_cyanide_leach_solution') * 10000) .fluidInputs(fluid('hydrogen_chloride') * 2500) From 6f648b017184147fd730539579bf964776f035a7 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Thu, 21 Nov 2024 19:43:52 +0700 Subject: [PATCH 6/6] Update SilverChain.groovy --- .../elements/d_block/group11/SilverChain.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy index 95fe3fe31..927149c2f 100644 --- a/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy +++ b/groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group11/SilverChain.groovy @@ -121,7 +121,7 @@ ELECTROLYTIC_CELL.recipeBuilder() //STEPHANITE (100%) BATCH_REACTOR.recipeBuilder() - .circuitMeta(1) + .circuitMeta(1) .inputs(ore('dustStephanite')) .inputs(ore('dustSodiumCyanide') * 15) .fluidInputs(fluid('distilled_water') * 10000) @@ -132,7 +132,7 @@ BATCH_REACTOR.recipeBuilder() .buildAndRegister() BATCH_REACTOR.recipeBuilder() - .circuitMeta(2) + .circuitMeta(2) .inputs(ore('dustStephanite')) .inputs(ore('dustSodiumCyanide') * 30) .fluidInputs(fluid('distilled_water') * 20000)