Skip to content

Commit

Permalink
Unshift IDs
Browse files Browse the repository at this point in the history
  • Loading branch information
@bruberu
bruberu committed Jan 22, 2024
1 parent 253da47 commit 220ff2f
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 20 deletions.
10 changes: 7 additions & 3 deletions groovy/material/FirstDegreeMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2158,6 +2158,8 @@ public class FirstDegreeMaterials {
.colorAverage()
.build();

// 8424 is not free.

Oleum = new Material.Builder(8425, SuSyUtility.susyId('oleum'))
.liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
.components(SulfuricAcid, 10, SulfurTrioxide, 1)
Expand Down Expand Up @@ -2518,7 +2520,8 @@ public class FirstDegreeMaterials {
.colorAverage()
.build();

//FREE IDs: 8480-8485
// IDs 8480-8484 are not free.
// FREE ID: 8485

UltramaficTailingSlurry = new Material.Builder(8486, SuSyUtility.susyId('ultramafic_tailing_slurry'))
.liquid()
Expand Down Expand Up @@ -2594,7 +2597,8 @@ public class FirstDegreeMaterials {
.colorAverage()
.build();

//FREE IDs: 8497-8498
//FREE IDs: 8497
// ID 8498 is not

SodiumNitrite = new Material.Builder(8499, SuSyUtility.susyId('sodium_nitrite'))
.dust().liquid(new FluidBuilder().temperature(544))
Expand Down Expand Up @@ -2690,7 +2694,7 @@ public class FirstDegreeMaterials {
.colorAverage()
.build();

//FREE IDs: 8513-8516
// IDs 8513-8516 are not free.

MolybdenumTrisulfide = new Material.Builder(8517, SuSyUtility.susyId('molybdenum_trisulfide'))
.dust()
Expand Down
25 changes: 13 additions & 12 deletions groovy/material/OrganicChemistryMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,8 @@ public class OrganicChemistryMaterials {
.build()
.setFormula('(C15H10N2O2)(C2H6O2)', true);

DiethylEther = new Material.Builder(15125, SuSyUtility.susyId('diethyl_ether'))
// Free ID: 15125
DiethylEther = new Material.Builder(8424, SuSyUtility.susyId('diethyl_ether'))
.liquid()
.components(Carbon, 4, Hydrogen, 10, Oxygen, 1)
.color(0x2177ff)
Expand Down Expand Up @@ -2406,49 +2407,49 @@ public class OrganicChemistryMaterials {

AbsorbedMethacrolein.setFormula("(C4H6O)(CH3COOH)4(H2O)5", true)

Tetraethyllead = new Material.Builder(15391, SuSyUtility.susyId('tetraethyllead'))
Tetraethyllead = new Material.Builder(8480, SuSyUtility.susyId('tetraethyllead'))
.liquid()
.components(Carbon, 8, Hydrogen, 20, Lead, 1)
.colorAverage()
.build();

Tetraethyllead.setFormula("Pb(CH3CH2)4", true)

TertButylHydroperoxide = new Material.Builder(15392, SuSyUtility.susyId('tert_butyl_hydroperoxide'))
TertButylHydroperoxide = new Material.Builder(8481, SuSyUtility.susyId('tert_butyl_hydroperoxide'))
.liquid()
.components(Carbon, 4, Hydrogen, 10, Oxygen, 2)
.colorAverage()
.build();

TertButylHydroperoxide.setFormula("(CH3)3COOH", true)

DiTertButylPeroxide = new Material.Builder(15393, SuSyUtility.susyId('di_tert_butyl_peroxide'))
DiTertButylPeroxide = new Material.Builder(8482, SuSyUtility.susyId('di_tert_butyl_peroxide'))
.liquid()
.components(Carbon, 8, Hydrogen, 18, Oxygen, 2)
.colorAverage()
.build();

DiTertButylPeroxide.setFormula("(CH3)3COOC(CH3)3", true)

TwoEthylhexylNitrate = new Material.Builder(15394, SuSyUtility.susyId('two_ethylhexyl_nitrate'))
TwoEthylhexylNitrate = new Material.Builder(8483, SuSyUtility.susyId('two_ethylhexyl_nitrate'))
.liquid()
.components(Carbon, 8, Hydrogen, 17, Nitrogen, 1, Oxygen, 3)
.colorAverage()
.build();

Nitromethane = new Material.Builder(15395, SuSyUtility.susyId('nitromethane'))
Nitromethane = new Material.Builder(8484, SuSyUtility.susyId('nitromethane'))
.liquid()
.components(Carbon, 1, Hydrogen, 3, Nitrogen, 1, Oxygen, 2)
.colorAverage()
.build();

SodiumBisphenolateSolution = new Material.Builder(15396, SuSyUtility.susyId('sodium_bisphenolate_solution'))
SodiumBisphenolateSolution = new Material.Builder(8497, SuSyUtility.susyId('sodium_bisphenolate_solution'))
.liquid()
.components(SodiumHydroxide, 2, BisphenolA, 1, Water, 2)
.colorAverage()
.build();

Polycarbonate = new Material.Builder(15397, SuSyUtility.susyId('polycarbonate'))
Polycarbonate = new Material.Builder(8498, SuSyUtility.susyId('polycarbonate'))
.polymer()
.flags(GENERATE_PLATE)
.components(Carbon, 16, Hydrogen, 14, Oxygen, 3)
Expand All @@ -2458,25 +2459,25 @@ public class OrganicChemistryMaterials {

Polycarbonate.setFormula("C16H14O3", true)

Trichlorofluoromethane = new Material.Builder(15398, SuSyUtility.susyId('trichlorofluoromethane'))
Trichlorofluoromethane = new Material.Builder(8513, SuSyUtility.susyId('trichlorofluoromethane'))
.gas()
.components(Carbon, 1, Chlorine, 3, Fluorine, 1)
.color(0xeb6a6a)
.build();

Dichlorodifluoromethane = new Material.Builder(15399, SuSyUtility.susyId('dichlorodifluoromethane'))
Dichlorodifluoromethane = new Material.Builder(8514, SuSyUtility.susyId('dichlorodifluoromethane'))
.gas()
.components(Carbon, 1, Chlorine, 2, Fluorine, 2)
.color(0xd14d4d)
.build();

Chlorotrifluoromethane = new Material.Builder(15400, SuSyUtility.susyId('chlorotrifluoromethane'))
Chlorotrifluoromethane = new Material.Builder(8515, SuSyUtility.susyId('chlorotrifluoromethane'))
.gas()
.components(Carbon, 1, Chlorine, 1, Fluorine, 3)
.color(0xbf3232)
.build();

Chlorodifluoromethane = new Material.Builder(15401, SuSyUtility.susyId('chlorodifluoromethane'))
Chlorodifluoromethane = new Material.Builder(8516, SuSyUtility.susyId('chlorodifluoromethane'))
.gas()
.components(Carbon, 1, Hydrogen, 1, Chlorine, 1, Fluorine, 2)
.color(0x8c5a99)
Expand Down
4 changes: 2 additions & 2 deletions groovy/material/SecondDegreeMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ public class SecondDegreeMaterials {
.color(0x70cc6e)
.build();

//FREE IDs: 13072-13074
// IDs 13072-13074 are not free.

DilutedAmmoniumSulfateSolution = new Material.Builder(13075, SuSyUtility.susyId('diluted_ammonium_sulfate_solution'))
.liquid()
Expand Down Expand Up @@ -641,7 +641,7 @@ public class SecondDegreeMaterials {

MixedCyanideSolution.setFormula("(NaCN)2(HCN)2(H2O)", true)

ChlorinatedBeryl = new Material.Builder(13106, SuSyUtility.susyId('chlorinated_beryl'))
ChlorinatedBeryl = new Material.Builder(24027, SuSyUtility.susyId('chlorinated_beryl'))
.gas(new FluidBuilder().temperature(1100))
.components(BerylliumChloride, 3, AluminiumChloride, 2, SiliconTetrachloride, 6, CarbonMonoxide, 18)
.colorAverage()
Expand Down
9 changes: 6 additions & 3 deletions groovy/material/ThirdDegreeMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ public class ThirdDegreeMaterials {
.colorAverage()
.build();

DilutedDiTertButylPeroxide = new Material.Builder(24010, SuSyUtility.susyId('diluted_di_tert_butyl_peroxide'))
//FREE ID: 24010
DilutedDiTertButylPeroxide = new Material.Builder(13072, SuSyUtility.susyId('diluted_di_tert_butyl_peroxide'))
.liquid()
.components(DiTertButylPeroxide, 1, Water, 1)
.colorAverage()
Expand Down Expand Up @@ -181,7 +182,8 @@ public class ThirdDegreeMaterials {
.colorAverage()
.build()

DilutedTwoEthylhexylNitrate = new Material.Builder(24027, SuSyUtility.susyId('diluted_two_ethylhexyl_nitrate'))
// ID 24027 is not free.
DilutedTwoEthylhexylNitrate = new Material.Builder(13073, SuSyUtility.susyId('diluted_two_ethylhexyl_nitrate'))
.liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
.components(TwoEthylhexylNitrate, 1, Water, 1, SulfuricAcid, 1)
.colorAverage()
Expand Down Expand Up @@ -472,7 +474,8 @@ public class ThirdDegreeMaterials {
.colorAverage()
.build();

DilutedNitromethane = new Material.Builder(24074, SuSyUtility.susyId('diluted_nitromethane'))
//FREE ID: 24074
DilutedNitromethane = new Material.Builder(13074, SuSyUtility.susyId('diluted_nitromethane'))
.liquid()
.components(Nitromethane, 3, Water, 1)
.colorAverage()
Expand Down

0 comments on commit 220ff2f

Please sign in to comment.