diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy index 0e4513cb5..d64a71450 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)3(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 b67fcac29..f34f0df3a 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]) @@ -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() @@ -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]) @@ -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) @@ -145,7 +156,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]) @@ -157,24 +168,25 @@ BATCH_REACTOR.recipeBuilder() .inputs(ore('dustPyrargyrite') * 1) .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) + .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]) @@ -203,24 +215,25 @@ BATCH_REACTOR.recipeBuilder() .inputs(ore('dustProustite') * 1) .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) + .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 ebc9dfac1..889b12d43 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') * 1) .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)