Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZombieZilla's Platinum Group elements processing chain #1000

Open
wants to merge 58 commits into
base: master-ceu
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
079f24f
Change GTFO's slicer recipe
trainvoi Jul 11, 2023
8cd9b3f
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Jul 15, 2023
8c71f2c
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Aug 16, 2023
22910bf
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Sep 14, 2023
3df26f4
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Sep 20, 2023
eccdf66
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Sep 27, 2023
b0306b5
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Oct 28, 2023
eaf7d13
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Dec 6, 2023
77d8026
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Jan 5, 2024
81fe8e9
Update theoneprobe.cfg
trainvoi Jan 6, 2024
a33df8d
Revert "Update theoneprobe.cfg"
trainvoi Jan 6, 2024
201b202
caracal mod update
trainvoi Jan 10, 2024
f4351cf
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Feb 4, 2024
74e2f41
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Feb 5, 2024
62f45c5
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Feb 12, 2024
1a9da8f
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Feb 14, 2024
400c4bf
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Mar 11, 2024
8efd2a3
Merge branch 'master-ceu' of https://github.com/trainvoi/Supersymmetr…
trainvoi Apr 8, 2024
1125eb8
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Apr 26, 2024
0681e27
commit
trainvoi Apr 30, 2024
4d77ee3
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi May 6, 2024
06816a2
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Jun 23, 2024
a1cc9df
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Jun 30, 2024
1f86063
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Aug 20, 2024
a0f6474
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Sep 7, 2024
c30104d
Merge branch 'SymmetricDevs:master-ceu' into master-ceu
trainvoi Sep 21, 2024
5f8218a
pgs
trainvoi Sep 21, 2024
c475f77
pgs
trainvoi Sep 21, 2024
fa8c387
Revert "sync blender change to groovy"
trainvoi Sep 21, 2024
5752081
Revert "Change GTFO's slicer recipe"
trainvoi Sep 21, 2024
94b8fdd
Merge branch 'ZombieZilla-pgm' of https://github.com/trainvoi/Supersy…
trainvoi Sep 21, 2024
6e892fc
Merge pull request #13 from trainvoi/master-ceu
trainvoi Sep 21, 2024
57d60e9
Update ChangeFlags.groovy
trainvoi Sep 21, 2024
349160e
Update ResinChain.groovy
trainvoi Sep 21, 2024
7669a68
Update AntimonyChain.groovy
trainvoi Sep 21, 2024
8ffc89b
Revert "Update AntimonyChain.groovy"
trainvoi Sep 21, 2024
01ea347
Revert "Update ResinChain.groovy"
trainvoi Sep 21, 2024
09531e7
Merge branch 'SymmetricDevs:master-ceu' into ZombieZilla-pgm
trainvoi Sep 21, 2024
866d82a
Merge branch 'ZombieZilla-pgm' of https://github.com/trainvoi/Supersy…
trainvoi Sep 21, 2024
00e6e68
batching random updates
trainvoi Sep 21, 2024
dc22bcc
Merge branch 'ZombieZilla-pgm' of https://github.com/trainvoi/Supersy…
trainvoi Sep 22, 2024
23dc95e
pgs
trainvoi Sep 22, 2024
a94ae8e
update
BLocky104 Sep 1, 2024
d16c43e
commit
trainvoi Sep 22, 2024
9f5ac90
commit
trainvoi Sep 22, 2024
0a05fbb
Merge branch 'ZombieZilla-pgm' of https://github.com/trainvoi/Supersy…
trainvoi Sep 22, 2024
482289c
commit
trainvoi Sep 22, 2024
0423477
Merge branch 'SymmetricDevs:master-ceu' into ZombieZilla-pgm
trainvoi Sep 23, 2024
70d3fc5
shift id
MCTian-mi Oct 6, 2024
2e34646
some missing materials
MCTian-mi Oct 6, 2024
3b0e905
Merge branch 'master-ceu' into ZombieZilla-pgm
bruberu Oct 15, 2024
b3c1546
Merge remote-tracking branch 'origin/master-ceu' into ZombieZilla-pgm
bruberu Dec 21, 2024
6e7d4dd
feat: planet's ruthenium requests
bruberu Dec 22, 2024
99909e0
feat: most of the rest balanced
bruberu Dec 22, 2024
3449d8a
feat: finish chain! does planet like it tho
bruberu Dec 22, 2024
8d7579d
fix: better lle
bruberu Dec 22, 2024
bae41b9
feat: start material registration
bruberu Dec 25, 2024
8237e52
Merge remote-tracking branch 'origin/master-ceu' into ZombieZilla-pgm
bruberu Dec 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,7 @@ jarmods/
visualores/

*__pycache__*

.idea/material_theme_project_new.xml
.idea/discord.xml
.idea/workspace.xml
4 changes: 4 additions & 0 deletions groovy/classes/ChangeFlags.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ class ChangeFlags {
setupFluidType(Iodine, FluidStorageKeys.GAS, 460)
setupFluidType(Chlorine, FluidStorageKeys.PLASMA)
setupFluidType(Selenium, FluidStorageKeys.LIQUID, 494)
setupFluidType(OsmiumTetroxide, FluidStorageKeys.LIQUID, 404)
OsmiumTetroxide.addFlags("NO_UNIFICATION")
//setupFluidType(Iron3Chloride, FluidStorageKeys.GAS, 590)

Polybenzimidazole.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true, true))
Expand Down Expand Up @@ -200,6 +202,8 @@ class ChangeFlags {
setupSlurries(Sphalerite)
setupSlurries(Pollucite)
setupSlurries(Arsenopyrite)
Pentlandite.addFlags("generate_sifted", "generate_flotated");
setupSlurries(Pentlandite)

setupFluidType(PolyvinylAcetate, FluidStorageKeys.LIQUID, 385)

Expand Down
14 changes: 12 additions & 2 deletions groovy/material/FirstDegreeMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,11 @@ public class FirstDegreeMaterials {
.colorAverage()
.build();

//FREE ID: 8360
SeleniumDioxide = new Material.Builder(8360, SuSyUtility.susyId("selenium_dioxide"))
.dust()
.components(Selenium * 1, Oxygen * 2)
.colorAverage()
.build();

CrudeTin = new Material.Builder(8361, SuSyUtility.susyId('crude_tin'))
.liquid(new FluidBuilder().temperature(600))
Expand Down Expand Up @@ -2083,7 +2087,13 @@ public class FirstDegreeMaterials {

TreatedSamariumAlloy.getProperty(PropertyKey.INGOT).setMagneticMaterial(SamariumAlloyMagnetic);

//FREE ID: 8406
CobaltSulfateSolution = new Material.Builder(8406, SuSyUtility.susyId("cobalt_sulfate_solution"))
.fluid()
.components(Cobalt * 1, Sulfur * 1, Oxygen * 4)
.colorAverage()
.build();

CobaltSulfateSolution.setFormula("(CoSO4)(H2O)", true)

Dichlorosilane = new Material.Builder(8407, SuSyUtility.susyId('dichlorosilane'))
.gas()
Expand Down
46 changes: 38 additions & 8 deletions groovy/material/OrganicChemistryMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,12 @@ public class OrganicChemistryMaterials {
.components(Chloromethane * 1, Water * 1)
.colorAverage()
.build();

//FREE ID: 15025

TrimethylpentylphosphinicAcid = new Material.Builder(15025, SuSyUtility.susyId('trimethylpentylphosphinic_acid'))
.fluid()
.components(Carbon * 16, Hydrogen * 35, Oxygen * 2, Phosphorus * 1)
.colorAverage()
.build();

AcidicTetrafluoroethylene = new Material.Builder(15026, SuSyUtility.susyId('acidic_tetrafluoroethylene'))
.gas(new FluidBuilder().attribute(FluidAttributes.ACID))
Expand Down Expand Up @@ -245,7 +249,11 @@ public class OrganicChemistryMaterials {
.colorAverage()
.build();

//FREE ID: 15038
DiIsobutylene = new Material.Builder(15038, SuSyUtility.susyId('diisobutylene'))
.fluid()
.components(Carbon * 8, Hydrogen * 16)
.color(0xa79781)
.build();

MethylAcetateSolution = new Material.Builder(15039, SuSyUtility.susyId('methyl_acetate_solution'))
.liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
Expand Down Expand Up @@ -276,7 +284,11 @@ public class OrganicChemistryMaterials {
.colorAverage()
.build();

//FREE ID: 15044
SodiumHypophosphiteSolution = new Material.Builder(15044, SuSyUtility.susyId('sodium_hypophosphite_solution'))
.fluid()
.components(SodiumHypophosphite * 1, AceticAcid * 1)
.colorAverage()
.build();

DichlorobenzidineSolution = new Material.Builder(15045, SuSyUtility.susyId('dichlorobenzidine_solution'))
.liquid()
Expand Down Expand Up @@ -326,7 +338,11 @@ public class OrganicChemistryMaterials {
.colorAverage()
.build();

//FREE ID: 15053
OneHexanethiol = new Material.Builder(15053, SuSyUtility.susyId('one_hexanethiol'))
.fluid()
.components(Carbon * 6, Hydrogen * 14, Sulfur * 1)
.colorAverage()
.build();

PBIFoam = new Material.Builder(15054, SuSyUtility.susyId('pbi_foam'))
.dust()
Expand Down Expand Up @@ -403,7 +419,11 @@ public class OrganicChemistryMaterials {

Methyltrichlorosilane.setFormula("CH3SiCl3", true)

//FREE ID: 15066
OneBromohexane = new Material.Builder(15066, SuSyUtility.susyId('one_bromohexane'))
.fluid()
.components(Carbon * 6, Hydrogen * 13, Bromine * 1)
.colorAverage()
.build();

VinylChlorideSuspension = new Material.Builder(15067, SuSyUtility.susyId('vinyl_chloride_suspension'))
.liquid()
Expand Down Expand Up @@ -477,7 +497,11 @@ public class OrganicChemistryMaterials {
.colorAverage()
.build();

//FREE ID: 15080
DiNHexylsulfide = new Material.Builder(15080, SuSyUtility.susyId('di_n_hexyl_sulfide'))
.fluid()
.components(Carbon * 12, Hydrogen * 26, Sulfur * 1)
.colorAverage()
.build();

Butyllithium = new Material.Builder(15081, SuSyUtility.susyId('butyllithium'))
.liquid()
Expand All @@ -490,7 +514,13 @@ public class OrganicChemistryMaterials {
.color(0x332e2c)
.build();

//FREE ID: 15084-15085
TriIsobutylene = new Material.Builder(15084, SuSyUtility.susyId('triisobutylene'))
.fluid()
.components(Carbon * 12, Hydrogen * 24)
.color(0xb9ac9a)
.build();

// FREE ID: 15085

Acetylene = new Material.Builder(15086, SuSyUtility.susyId('acetylene'))
.gas()
Expand Down
26 changes: 25 additions & 1 deletion groovy/material/SecondDegreeMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,23 @@ public class SecondDegreeMaterials {
.color(0x70cc6e)
.build();

//FREE IDs: 13072-13074
//FREE IDs: 13072

PotassiumPersulfateSolution = new Material.Builder(13073, SuSyUtility.susyId('potassium_persulfate_solution'))
.fluid()
.components(PotassiumPersulfate * 1, Water * 1)
.colorAverage()
.build();

PotassiumPersulfateSolution.setFormula("(K2S2O8)(H2O)", true)

PotassiumOsmateSolution = new Material.Builder(13074, SuSyUtility.susyId('potassium_osmate_solution'))
.fluid()
.components(Potassium * 2, Osmium * 1, Oxygen * 7, Hydrogen * 6)
.color(0xbf21a0)
.build();

PotassiumOsmateSolution.setFormula("(K2[OsO2(OH)4])(H2O)", true)

DilutedAmmoniumSulfateSolution = new Material.Builder(13075, SuSyUtility.susyId('diluted_ammonium_sulfate_solution'))
.liquid()
Expand Down Expand Up @@ -699,5 +715,13 @@ public class SecondDegreeMaterials {
.components(Iron * 8, Zinc * 1)
.colorAverage()
.build();

TetraamminepalladiumDichloride = new Material.Builder(13115, SuSyUtility.susyId("tetraamminepalladium_dichloride"))
.fluid()
.components(Chlorine * 2, Hydrogen * 12, Nitrogen * 4, Palladium * 1)
.colorAverage()
.build();

TetraamminepalladiumDichloride.setFormula("[Pd(NH3)4]Cl2", true)
}
}
48 changes: 47 additions & 1 deletion groovy/material/SuSyMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,41 @@ class SuSyMaterials {
public static Material PolluciteLeach;
public static Material CaesiumRubidiumAlumMixture;
public static Material NetherMolecularSieve;
public static Material GreenMatte;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before I can hope to put this in-game, these have to be all localized.

public static Material WhiteMatte;
public static Material AcidicNickelCopperSulfateSolution;
public static Material OxidizedPGMLeach;
public static Material ImpureNickelSulfate;
public static Material CopperRichPGMSolids;
public static Material PGMCopperLeachSlurry;
public static Material PGMFreeCopperLeach;
public static Material PGMConcentrate;
public static Material SulfidicCopperLeach;
public static Material SeleniumFreeCopperLeach;
public static Material CopperSelenidePrecipitate;
public static Material SeleniumFreeCalcine;
public static Material NickelExtractionMixture;
public static Material NickelCobaltSulfate;
public static Material IronSulfateMotherLiquor;
public static Material NickelCobaltSulfateSolution;
public static Material CobaltExtractionMixture;
public static Material CobaltExtract;
public static Material CrudeTrimethylpentylphosphinicAcid;
public static Material AlkalineTrimethylpentylphosphinicAcid;
public static Material AcidifiedTrimethylpentylphosphinicAcid;
public static Material DehydratedTrimethylpentylphosphinicAcid;
public static Material OsmiumFreePGMSolution;
public static Material SilverFreePGMSolution;
public static Material GoldFreePGMSolution;
public static Material GoldExtract;
public static Material PlatinumFreePGMSolution;
public static Material ChlorinatedPGMSolution;
public static Material PersulfateTreatedPGMSolution;
public static Material ScrubbedGoldExtract;
public static Material ChlorinatedPGMConcentrate;
public static Material PalladiumExtract;
public static Material PalladiumFreePGMSolution;
public static Material CobaltMatte;

// Petrochem Materials

public static Material DilutedOil;
Expand Down Expand Up @@ -1071,6 +1104,8 @@ class SuSyMaterials {
public static Material PotassiumPermanganate;
public static Material LeadFreeSolder;
public static Material CryogenicSolder;
public static Material SeleniumDioxide;
public static Material CobaltSulfateSolution;
public static Material Kovar;

// HP Materials
Expand Down Expand Up @@ -1258,6 +1293,9 @@ class SuSyMaterials {
public static Material SodiumAlumSolution;
public static Material OxidizedManganateSolution;
public static Material GalvanizedSteel;
public static Material PotassiumPersulfateSolution;
public static Material PotassiumOsmateSolution;
public static Material TetraamminepalladiumDichloride;

// Organic Chemistry Materials

Expand Down Expand Up @@ -1658,6 +1696,14 @@ class SuSyMaterials {
public static Material HydrolyzedMethylFormateSolution;
public static Material FormicAcid;
public static Material MethylFormateSolution;
public static Material TrimethylpentylphosphinicAcid;
public static Material DiIsobutylene;
public static Material TriIsobutylene;
public static Material DiIsobutyleneMixture;
public static Material SodiumHypophosphiteSolution;
public static Material OneHexanethiol;
public static Material OneBromohexane;
public static Material DiNHexylsulfide;

// Third Degree Materials

Expand Down
Loading