Skip to content

Commit 56792ea

Browse files
Fiery36Fiery36
committed
tweaks2
1 parent dad25dd commit 56792ea

13 files changed

Lines changed: 112 additions & 70 deletions

File tree

‎groovy/material/FirstDegreeMaterialsA.groovy‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,13 @@ class FirstDegreeMaterialsA {
749749
.colorAverage()
750750
.build()
751751

752-
//FREE ID: 8197
752+
HexachloroiridicIVAcidSolution = new Material.Builder(8197, SuSyUtility.susyId('hexachloroiridic_iv_acid_solution'))
753+
.liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
754+
.components(Hydrogen * 2, Rhodium * 1, Chlorine * 6, Water * 18)
755+
.colorAverage()
756+
.build()
757+
758+
HexachloroiridicIVAcidSolution.setFormula("(H2ICl6)(H2O)2", true)
753759

754760
PotassiumIodide = new Material.Builder(8198, SuSyUtility.susyId('potassium_iodide'))
755761
.dust()
@@ -3093,7 +3099,7 @@ class FirstDegreeMaterialsA {
30933099
.colorAverage()
30943100
.build()
30953101

3096-
NiobiumOxideDihydrate.setFormula("Nb2O5 * (H2O)2", true)
3102+
NiobiumOxideDihydrate.setFormula("Nb2O5*(H2O)2", true)
30973103

30983104
PurifiedFluoroniobicAcidSolution = new Material.Builder(8556, SuSyUtility.susyId('purified_fluoroniobic_acid_solution'))
30993105
.liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
@@ -3384,6 +3390,8 @@ class FirstDegreeMaterialsA {
33843390
.colorAverage()
33853391
.build()
33863392

3393+
IronOxalateDihydrate.setFormula("FeC2O4*(H2O)2", true)
3394+
33873395
IndiumIIISulfateSolution = new Material.Builder(8603, SuSyUtility.susyId('indium_iii_sulfate_solution'))
33883396
.liquid()
33893397
.components(Indium * 2, Sulfur * 3, Oxygen * 12, Water * 6)

‎groovy/material/FirstDegreeMaterialsB.groovy‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,14 @@ class FirstDegreeMaterialsB {
698698
.color(0x353535)
699699
.build()
700700

701-
MercuryIISulfate = new Material.Builder(8769, SuSyUtility.susyId('mercury_ii_sulfate'))
702-
.dust()
703-
.components(Mercury * 1, Sulfur * 1, Oxygen * 4)
701+
MercuryIISulfateSolution = new Material.Builder(13182, SuSyUtility.susyId('mercury_ii_sulfate_solution'))
702+
.liquid()
703+
.components(Mercury * 1, Sulfur * 1, Oxygen * 4, SulfuricAcid * 1, Water * 2)
704704
.colorAverage()
705705
.build()
706706

707+
MercuryIISulfateSolution.setFormula("(HgSO4)(H2SO4)", true)
708+
707709
CopperIIAcetateMonohydrate = new Material.Builder(8770, SuSyUtility.susyId("copper_ii_acetate_monohydrate"))
708710
.dust()
709711
.components(Copper * 2, Carbon * 8, Hydrogen * 12, Oxygen * 8, Water * 2)
@@ -718,7 +720,7 @@ class FirstDegreeMaterialsB {
718720
.colorAverage()
719721
.build()
720722

721-
CopperIIAcetateMonohydrate.setFormula("RhCl3*(H2O)3", true)
723+
RhodiumIIIChlorideTrihydrate.setFormula("RhCl3*(H2O)3", true)
722724

723725
LithiumIodideSolution = new Material.Builder(8772, SuSyUtility.susyId("lithium_iodide_solution"))
724726
.liquid()
@@ -734,12 +736,15 @@ class FirstDegreeMaterialsB {
734736
.colorAverage()
735737
.build()
736738

737-
HexachloroiridicIIIAcidSolution.setFormula("(H3ICl6)(H2O)2", true)
739+
HexachloroiridicIIIAcidSolution.setFormula("(H3IrCl6)(H2O)2", true)
738740

739741
IridiumIIIChlorideTrihydrate = new Material.Builder(8774, SuSyUtility.susyId("iridium_iii_chloride_trihydrate"))
740742
.dust()
741743
.components(Iridium, Chlorine * 3, Water * 3)
742744
.colorAverage()
743745
.build()
746+
747+
IridiumIIIChlorideTrihydrate.setFormula("IrCl3*(H2O)3", true)
748+
744749
}
745750
}

‎groovy/material/SecondDegreeMaterials.groovy‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -803,13 +803,7 @@ class SecondDegreeMaterials {
803803
.colorAverage()
804804
.build()
805805

806-
// FREE ID: 13125-13129
807-
808-
HexachloroiridicAcidSolution = new Material.Builder(13130, SuSyUtility.susyId('hexachloroiridic_acid_solution'))
809-
.liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
810-
.components(HexachloroiridicAcid * 1, Water * 2)
811-
.colorAverage()
812-
.build()
806+
// FREE ID: 13125-13130
813807

814808
HexachlororhodicAcidSolution = new Material.Builder(13131, SuSyUtility.susyId('hexachlororhodic_acid_solution'))
815809
.liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
@@ -879,10 +873,12 @@ class SecondDegreeMaterials {
879873

880874
CopperIIChlorideSolution = new Material.Builder(13142, SuSyUtility.susyId('copper_ii_chloride_solution'))
881875
.liquid()
882-
.components(CopperIIChloride, Water)
876+
.components(CopperIIChloride * 2, Water * 7)
883877
.colorAverage()
884878
.build()
885879

880+
CopperIIChlorideSolution.setFormula("(CuCl2)2(H2O)7", true)
881+
886882
AmmoniumCarbonateSolution = new Material.Builder(13143, SuSyUtility.susyId('ammonium_carbonate_solution'))
887883
.liquid()
888884
.components(AmmoniumCarbonate, Water)
@@ -1029,6 +1025,8 @@ class SecondDegreeMaterials {
10291025
.colorAverage()
10301026
.build()
10311027

1028+
LithiumHydroxideMonohydrate.setFormula("LiOH*H2O", true)
1029+
10321030
AmmoniumDihydrogenPhosphateSolution = new Material.Builder(13167, SuSyUtility.susyId('ammonium_dihydrogen_phosphate_solution'))
10331031
.liquid()
10341032
.components(AmmoniumDihydrogenPhosphate * 2, Water)
@@ -1095,15 +1093,7 @@ class SecondDegreeMaterials {
10951093
.colorAverage()
10961094
.build()
10971095

1098-
MercuryIISulfateSolution = new Material.Builder(13182, SuSyUtility.susyId('mercury_ii_sulfate_solution'))
1099-
.liquid()
1100-
.components(MercuryIISulfate * 1, SulfuricAcid * 1)
1101-
.colorAverage()
1102-
.build()
1103-
1104-
MercuryIISulfateSolution.setFormula("(HgSO4)(H2SO4)", true)
1105-
1106-
CopperIIAcetateSolution = new Material.Builder(13183, SuSyUtility.susyId('copper_ii_acetate_solution'))
1096+
CopperIIAcetateSolution = new Material.Builder(13182, SuSyUtility.susyId('copper_ii_acetate_solution'))
11071097
.liquid()
11081098
.components(CopperIIAcetateMonohydrate * 1, Water * 2)
11091099
.colorAverage()

‎groovy/material/SuSyMaterials.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,6 +1091,7 @@ class SuSyMaterials {
10911091
public static Material CopperSulfate
10921092
public static Material WustiteCatalyst
10931093
public static Material PalladiumChloride
1094+
public static Material HexachloroiridicIVAcidSolution
10941095
public static Material AmmoniumBisulfateSolution
10951096
public static Material PotassiumIodide
10961097
public static Material PhosphorusTrichloride
@@ -1644,7 +1645,7 @@ class SuSyMaterials {
16441645
public static Material BariumFluoride
16451646
public static Material GreenCarbon
16461647
public static Material BakedCarbon
1647-
public static Material MercuryIISulfate
1648+
public static Material MercuryIISulfateSolution
16481649
public static Material CopperIIAcetateMonohydrate
16491650
public static Material RhodiumIIIChlorideTrihydrate
16501651
public static Material LithiumIodideSolution
@@ -1885,7 +1886,6 @@ class SuSyMaterials {
18851886
public static Material ReactiveAlumina
18861887
public static Material SodiumDithioniteSolution
18871888
public static Material HoopesElectrolyte
1888-
public static Material MercuryIISulfateSolution
18891889
public static Material CopperIIAcetateSolution
18901890

18911891
// Organic Chemistry Materials

‎groovy/postInit/chemistry/ChemistryOverhaul.groovy‎

Lines changed: 65 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,7 @@ ROASTER.recipeBuilder()
17251725

17261726
// Oxidation of Acetaldehyde
17271727
// Cu2(OH)2CO3 + 4C2H4O2 + 3H2O -> 2Cu(C2H3O2)2*H2O + 4H2O + CO2
1728-
BR.recipeBuilder()
1728+
BR.recipeBuilder() // Source: Copper Compounds Chapter in Ullmann's Encyclopedia of Industrial Chemistry https://doi.org/10.1002/14356007.a07_567
17291729
.inputs(ore('dustCopperCarbonate') * 10)
17301730
.fluidInputs(fluid('acetic_acid') * 4000)
17311731
.fluidInputs(fluid('distilled_water') * 3000)
@@ -1737,27 +1737,27 @@ BR.recipeBuilder()
17371737

17381738
MIXER.recipeBuilder()
17391739
.fluidInputs(fluid('water') * 1000)
1740-
.fluidInputs(fluid('acetic_acid') * 2000)
1740+
.fluidInputs(fluid('acetic_acid') * 1000)
17411741
.fluidOutputs(fluid('diluted_acetic_acid') * 2000)
17421742
.EUt(VA[LV])
17431743
.duration(120)
17441744
.buildAndRegister()
17451745

17461746
// CuO + 2C2H4O2(H2O) -> Cu(C2H3O2)*H2O + 2H2O
1747-
BR.recipeBuilder()
1747+
BR.recipeBuilder() // Source: Copper Compounds Chapter in Ullmann's Encyclopedia of Industrial Chemistry https://doi.org/10.1002/14356007.a07_567
17481748
.inputs(ore('dustCupricOxide') * 2)
17491749
.fluidInputs(fluid('diluted_acetic_acid') * 4000)
17501750
.fluidOutputs(fluid('copper_ii_acetate_solution') * 2000) // Cu(C2H3O2)2(H2O)3
17511751
.EUt(VA[MV])
1752-
.duration(160)
1752+
.duration(200)
17531753
.buildAndRegister()
17541754

1755-
DT.recipeBuilder()
1755+
CRYSTALLIZER.recipeBuilder()
17561756
.fluidInputs(fluid('copper_ii_acetate_solution') * 2000)
1757-
.outputs(metaitem('dustCopperIiAcetateMonohydrate') * 16) // Cu(C2H3O2)2(H2O)
1757+
.outputs(metaitem('dustCopperIiAcetateMonohydrate') * 16) // Cu(C2H3O2)2*H2O
17581758
.fluidOutputs(fluid('water') * 2000)
17591759
.EUt(VA[LV])
1760-
.duration(300)
1760+
.duration(200)
17611761
.buildAndRegister()
17621762

17631763
// 2CH3CHO + O2 -> C4H6O3 + H2O
@@ -1803,7 +1803,7 @@ LCR.recipeBuilder()
18031803
.fluidInputs(fluid('methyl_acetate') * 1000)
18041804
.fluidInputs(fluid('carbon_monoxide') * 1000)
18051805
.fluidOutputs(fluid('gtfo_acetic_anhydride') * 1000)
1806-
.duration(4)
1806+
.duration(40)
18071807
.EUt(VA[IV])
18081808
.buildAndRegister()
18091809

@@ -1955,20 +1955,11 @@ FLUIDIZED_BR.recipeBuilder()
19551955
.buildAndRegister()
19561956

19571957
// Oxidation of Acetylene
1958-
BR.recipeBuilder()
1958+
BR.recipeBuilder() // Source: Mercury, Mercury Alloys, and Mercury Compounds Chapter in Ullmann's Encyclopedia of Industrial Chemistry https://doi.org/10.1002/14356007.a16_269
19591959
.fluidInputs(fluid('mercury') * 1000)
1960-
.fluidInputs(fluid('hot_sulfuric_acid') * 2000)
1961-
.outputs(metaitem('dustMercuryIiSulfate') * 6)
1960+
.fluidInputs(fluid('hot_sulfuric_acid') * 3000)
19621961
.fluidOutputs(fluid('sulfur_dioxide') * 1000)
1963-
.fluidOutputs(fluid('water') * 2000)
1964-
.duration(100)
1965-
.EUt(VA[LV])
1966-
.buildAndRegister()
1967-
1968-
MIXER.recipeBuilder()
1969-
.fluidInputs(fluid('sulfuric_acid') * 1000)
1970-
.inputs(ore('dustMercuryIiSulfate') * 6)
1971-
.fluidOutputs(fluid('mercury_ii_sulfate_solution') * 1000)
1962+
.fluidOutputs(fluid('mercury_ii_sulfate_solution') * 3000)
19721963
.duration(100)
19731964
.EUt(VA[LV])
19741965
.buildAndRegister()
@@ -1991,13 +1982,39 @@ ROASTER.recipeBuilder()
19911982
.EUt(VA[MV])
19921983
.buildAndRegister()
19931984

1994-
ROASTER.recipeBuilder()
1995-
.fluidInputs(fluid('chlorine') * 2000)
1996-
.inputs(ore('dustAnyPurityCopper'))
1997-
.outputs(metaitem('dustCopperIiChloride') * 3)
1998-
.duration(280)
1999-
.EUt(VA[MV])
2000-
.buildAndRegister()
1985+
BR.recipeBuilder() // Source: Copper Compounds Chapter in Ullmann's Encyclopedia of Industrial Chemistry https://doi.org/10.1002/14356007.a07_567
1986+
.inputs(ore('dustCopperCarbonate') * 10)
1987+
.fluidInputs(fluid('hydrochloric_acid') * 4000)
1988+
.fluidOutputs(fluid('copper_ii_chloride_solution') * 7000) //(CuCl2)2(H2O)7
1989+
.fluidOutputs(fluid('carbon_dioxide') * 1000)
1990+
.EUt(VA[MV])
1991+
.duration(160)
1992+
.buildAndRegister()
1993+
1994+
MIXER.recipeBuilder()
1995+
.fluidInputs(fluid('water') * 1000)
1996+
.fluidInputs(fluid('acetic_acid') * 1000)
1997+
.fluidOutputs(fluid('diluted_acetic_acid') * 2000)
1998+
.EUt(VA[LV])
1999+
.duration(120)
2000+
.buildAndRegister()
2001+
2002+
BR.recipeBuilder() // Source: Copper Compounds Chapter in Ullmann's Encyclopedia of Industrial Chemistry https://doi.org/10.1002/14356007.a07_567
2003+
.inputs(ore('dustCupricOxide') * 4)
2004+
.fluidInputs(fluid('hydrochloric_acid') * 4000)
2005+
.fluidInputs(fluid('distilled_water') * 1000)
2006+
.fluidOutputs(fluid('copper_ii_chloride_solution') * 7000) //(CuCl2)2(H2O)7
2007+
.EUt(VA[MV])
2008+
.duration(200)
2009+
.buildAndRegister()
2010+
2011+
CRYSTALLIZER.recipeBuilder()
2012+
.fluidInputs(fluid('copper_ii_chloride_solution') * 7000)
2013+
.outputs(metaitem('dustCopperIiChloride') * 6)
2014+
.fluidOutputs(fluid('water') * 7000)
2015+
.EUt(VA[LV])
2016+
.duration(200)
2017+
.buildAndRegister()
20012018

20022019
MIXER.recipeBuilder()
20032020
.fluidInputs(fluid('water') * 1000)
@@ -3825,9 +3842,9 @@ BR.recipeBuilder()
38253842
// Copper Chloride Solution
38263843

38273844
MIXER.recipeBuilder()
3828-
.inputs(ore('dustCopperIiChloride') * 3)
3829-
.fluidInputs(fluid('water') * 1000)
3830-
.fluidOutputs(fluid('copper_ii_chloride_solution') * 1000)
3845+
.inputs(ore('dustCopperIiChloride') * 6)
3846+
.fluidInputs(fluid('water') * 7000)
3847+
.fluidOutputs(fluid('copper_ii_chloride_solution') * 7000)
38313848
.duration(80)
38323849
.EUt(VA[LV])
38333850
.buildAndRegister()
@@ -4039,3 +4056,21 @@ CSTR.recipeBuilder()
40394056
.duration(20)
40404057
.EUt(VA[LV])
40414058
.buildAndRegister()
4059+
4060+
BR.recipeBuilder()
4061+
.fluidInputs(fluid('phosphorus_trichloride') * 1000)
4062+
.fluidInputs(fluid('chlorobenzene') * 3000)
4063+
.inputs(ore('dustAnyPuritySodium') * 6)
4064+
.outputs(metaitem('dustTriphenylphosphine'))
4065+
.outputs(metaitem('dustSalt') * 12)
4066+
.duration(100)
4067+
.EUt(VA[LV])
4068+
.buildAndRegister()
4069+
4070+
ROASTER.recipeBuilder()
4071+
.inputs(ore('dustTriphenylphosphine'))
4072+
.fluidInputs(fluid('chlorine') * 2000)
4073+
.outputs(metaitem('dustTriphenylphosphineDichloride'))
4074+
.duration(100)
4075+
.EUt(VA[LV])
4076+
.buildAndRegister()

‎groovy/postInit/chemistry/inorganic_chemistry/elements/d_block/group10/PlatinumGroupChain.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ for (metal in metals) {
442442
MIXER_SETTLER.recipeBuilder()
443443
.fluidInputs(fluid('iridium_extract') * 10000)
444444
.fluidInputs(fluid('diluted_hydrochloric_acid') * 1000)
445-
.fluidOutputs(fluid('hexachloroiridic_acid_solution') * 2000)
445+
.fluidOutputs(fluid('hexachloroiridic_iv_acid_solution') * 2000)
446446
.fluidOutputs(fluid('tributyl_phosphate_extraction_mixture') * 10000)
447447
.duration(500)
448448
.EUt(VA[MV])
@@ -452,7 +452,7 @@ for (metal in metals) {
452452
//H2IrCl6 + 2NH4Cl -> (NH4)2(IrCl6) + 2HCl
453453

454454
CRYSTALLIZER.recipeBuilder()
455-
.fluidInputs(fluid('hexachloroiridic_acid_solution') * 2000)
455+
.fluidInputs(fluid('hexachloroiridic_iv_acid_solution') * 2000)
456456
.fluidInputs(fluid('ammonium_chloride_solution') * 2000)
457457
.outputs(metaitem('dustAmmoniumHexachloroiridate') * 17)
458458
.fluidOutputs(fluid('diluted_hydrochloric_acid') * 4000)

‎groovy/postInit/chemistry/organic_chemistry/CarboxylicAcids.groovy‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ CSTR.recipeBuilder()
127127

128128
// Monsanto Process
129129
DISTILLERY.recipeBuilder() // Source: Platinum Group Metals and Compounds Chapter in Ullmann's Encyclopedia of Industrial Chemistry https://doi.org/10.1002/14356007.a21_075
130+
.circuitMeta(3)
130131
.fluidInputs(fluid('hexachlororhodic_acid_solution') * 8950)
131132
.fluidInputs(fluid('hydrochloric_acid') * 4500)
132133
.chancedOutput(metaitem('dustRhodiumIiiChlorideTrihydrate') * 7, 5000, 0)
@@ -158,15 +159,14 @@ LCR.recipeBuilder()
158159
.fluidInputs(fluid('methanol') * 1000)
159160
.fluidInputs(fluid('carbon_monoxide') * 1000) // Possibly should be high-pressure? Currently unobtainable though
160161
.fluidOutputs(fluid('acetic_acid') * 1000)
161-
.duration(4)
162+
.duration(40)
162163
.EUt(VA[EV])
163164
.buildAndRegister()
164165

165166
// Cativa Process
166167

167-
// 2H2IrCl6 + H2C2O4 -> 2H3IrCl6 + 2CO2
168168
BR.recipeBuilder() // Source: https://patents.justia.com/patent/20190337819
169-
.fluidInputs(fluid('hexachloroiridic_acid_solution') * 4000)
169+
.fluidInputs(fluid('hexachloroiridic_iv_acid_solution') * 4000)
170170
.inputs(ore('dustOxalicAcid') * 8)
171171
.fluidOutputs(fluid('hexachloroiridic_iii_acid_solution') * 4000)
172172
.fluidOutputs(fluid('carbon_dioxide') * 2000)
@@ -175,10 +175,11 @@ BR.recipeBuilder() // Source: https://patents.justia.com/patent/20190337819
175175
.buildAndRegister()
176176

177177
DISTILLERY.recipeBuilder()
178+
.circuitMeta(4)
178179
.fluidInputs(fluid('hexachloroiridic_iii_acid_solution') * 2000)
179-
.fluidInputs(fluid('hydrochloric_acid') * 9000)
180+
.fluidInputs(fluid('hydrochloric_acid') * 1000)
180181
.outputs(metaitem('dustIridiumIiiChlorideTrihydrate') * 7)
181-
.fluidOutputs(fluid('diluted_hydrochloric_acid') * 12000)
182+
.fluidOutputs(fluid('hydrogen_chloride') * 4000)
182183
.duration(100)
183184
.EUt(VA[MV])
184185
.buildAndRegister()
@@ -189,7 +190,7 @@ LCR.recipeBuilder()
189190
.fluidInputs(fluid('methanol') * 1000)
190191
.fluidInputs(fluid('carbon_monoxide') * 1000)
191192
.fluidOutputs(fluid('acetic_acid') * 1000)
192-
.duration(2)
193+
.duration(20)
193194
.EUt(VA[IV])
194195
.buildAndRegister()
195196

‎groovy/postInit/materials/polymers/thermoplastics/PolyesterChain.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BR.recipeBuilder()
1616
.fluidInputs(fluid('distilled_water') * 3000)
1717
.outputs(metaitem('dustCobaltIiAcetate') * 19)
1818
.EUt(VA[MV])
19-
.duration(80)
19+
.duration(240)
2020
.buildAndRegister()
2121

2222
POLYMERIZATION_TANK.recipeBuilder()

‎resources/langfiles/lang/de_de.lang‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2159,7 +2159,7 @@ susy.material.iridium_extract=Iridiumextrakt
21592159
susy.material.os_ru_tetroxide_mixture=Osmium-Ruthenium-Tetroxidgemisch
21602160
susy.material.os_ru_solution=Osmium-Rutheniumlösung
21612161
susy.material.reduced_gold_free_pgm_solution=Reduzierte Gold-freie PGMlösung
2162-
susy.material.hexachloroiridic_acid_solution=Hexachloroiridium(IV)-Säurelösung
2162+
susy.material.hexachloroiridic_iv_acid_solution=Hexachloroiridium(IV)-Säurelösung
21632163
susy.material.hexachlororhodic_acid_solution=Hexachlororhodium(III)-Säurelösung
21642164
susy.material.hexachlororuthenic_acid_solution=Hexachlororuthenium(III)-Säurelösung
21652165
susy.material.ammonium_hexachlororuthenate=Ammoniumhexachlororuthenat(III)

0 commit comments

Comments
 (0)