realizing unrealized changes

This commit is contained in:
Lily-129 2022-01-25 19:10:26 -05:00 committed by GitHub
parent e48bbd0406
commit f4cb2d771b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 539 additions and 211 deletions

View File

@ -1,3 +1,8 @@
//lava {
elements.magma.tempHigh = 3000
elements.magma.stateHigh = "vaporized_rock"
elements.vaporized_rock = { elements.vaporized_rock = {
color: ["#ffc94a", "#fcd34c", "#ffae36"], color: ["#ffc94a", "#fcd34c", "#ffae36"],
behavior: [ behavior: [
@ -17,10 +22,9 @@ elements.vaporized_rock = {
state: "gas", state: "gas",
hidden: true, hidden: true,
}, },
elements.magma.tempHigh = 3000
elements.magma.stateHigh = "vaporized_rock"
elements.lava_cloud = { elements.lava_cloud = {
color: ["#b57b2a", "#d47b15", "#cf7317", "#db830f"], color: ["#c58b2a", "#e48b15", "#df8317", "#eb930f"],
behavior: [ behavior: [
"XX|XX|XX", "XX|XX|XX",
"M1%7|CH:magma%0.05|M1%7", "M1%7|CH:magma%0.05|M1%7",
@ -33,6 +37,7 @@ elements.lava_cloud = {
category: "gases", category: "gases",
state: "gas", state: "gas",
}, },
elements.rock_cloud = { elements.rock_cloud = {
color: ["#ba8843", "#c28a4a", "#bf8245", "#c4904b"], color: ["#ba8843", "#c28a4a", "#bf8245", "#c4904b"],
behavior: [ behavior: [
@ -48,6 +53,15 @@ elements.rock_cloud = {
state: "gas", state: "gas",
}, },
//}
//glass {
elements.molten_glass = {
tempHigh: 2200,
stateHigh: "vaporized_glass",
}
elements.vaporized_glass = { elements.vaporized_glass = {
color: ["#D6B049","#E8D957","#E8AE57"], color: ["#D6B049","#E8D957","#E8AE57"],
behavior: [ behavior: [
@ -57,7 +71,7 @@ elements.vaporized_glass = {
], ],
reactions: { reactions: {
"vaporized_glass": { "elem1": null, "elem2": "hot_glass_cloud", "chance":0.3, "y":[0,15] }, "vaporized_glass": { "elem1": null, "elem2": "hot_glass_cloud", "chance":0.3, "y":[0,15] },
"hot_glass_cloud": { "elem1": "glass_cloud", "chance":0.4, "y":[0,15] }, "hot_glass_cloud": { "elem1": "hot_glass_cloud", "chance":0.4, "y":[0,15] },
}, },
density: 2, //very rough approximation based on https://nvlpubs.nist.gov/nistpubs/jres/46/jresv46n3p176_A1b.pdf density: 2, //very rough approximation based on https://nvlpubs.nist.gov/nistpubs/jres/46/jresv46n3p176_A1b.pdf
temp: 2300, //https://www.sciencealert.com/did-this-piece-of-glass-really-break-a-law-of-thermodynamics temp: 2300, //https://www.sciencealert.com/did-this-piece-of-glass-really-break-a-law-of-thermodynamics
@ -67,6 +81,7 @@ elements.vaporized_glass = {
state: "gas", state: "gas",
hidden: true, hidden: true,
}, },
elements.hot_glass_cloud = { elements.hot_glass_cloud = {
color: ["#B69089","#C8B997","#C88E77"], color: ["#B69089","#C8B997","#C88E77"],
behavior: [ behavior: [
@ -81,6 +96,7 @@ elements.hot_glass_cloud = {
category: "gases", category: "gases",
state: "gas", state: "gas",
}, },
elements.cold_glass_cloud = { elements.cold_glass_cloud = {
color: ["#967089","#A89997","#A86E77"], color: ["#967089","#A89997","#A86E77"],
behavior: [ behavior: [
@ -96,10 +112,9 @@ elements.cold_glass_cloud = {
state: "gas", state: "gas",
}, },
elements.molten_glass = { //}
tempHigh: 2200,
stateHigh: "vaporized_glass", // ash {
}
elements.ash.tempHigh = 1200 //https://www.quora.com/Can-you-melt-ashes elements.ash.tempHigh = 1200 //https://www.quora.com/Can-you-melt-ashes
elements.ash.stateHigh = "molten_ash" //https://www.sciencedirect.com/science/article/pii/S1877705817326772 elements.ash.stateHigh = "molten_ash" //https://www.sciencedirect.com/science/article/pii/S1877705817326772
@ -126,18 +141,65 @@ elements.vaporized_ash = {
"M1|XX|M1", "M1|XX|M1",
"M2|M1|M2", "M2|M1|M2",
], ],
reactions: {
"vaporized_ash": { "elem1": null, "elem2": "hot_ash_cloud", "chance":0.3, "y":[0,15] },
"hot_ash_cloud": { "elem1": "hot_ash_cloud", "chance":0.4, "y":[0,15] },
},
temp: 1800, temp: 1800,
tempLow: 1700, tempLow: 1700,
stateLow: "molten_ash", stateLow: "molten_ash",
category: "gases", category: "gases",
state: "gas", state: "gas",
hidden: true, hidden: true,
density: 3, //bs density: 3,
}, },
elements.hot_ash_cloud = {
color: ["#bf8f50","#bfac50","#bf7d50"],
behavior: [
"XX|XX|XX",
"M1%7|CH:molten_ash%0.05|M1%7",
"XX|XX|XX",
],
density: 0.7,
temp: 1800,
tempLow: 1700,
stateLow: "cold_ash_cloud",
category: "gases",
state: "gas",
},
elements.cold_ash_cloud = {
color: ["#af8f50","#ab9c50","#af6d50"],
behavior: [
"XX|XX|XX",
"M1%7|CH:ash%0.05|M1%7",
"XX|XX|XX",
],
density: 0.7,
temp: 1600,
tempHigh: 1700,
stateHigh: "hot_ash_cloud",
category: "gases",
state: "gas",
},
//}
// charcoal {
elements.charcoal.tempHigh = 800 elements.charcoal.tempHigh = 800
elements.charcoal.stateHigh = "carbon_dioxide" elements.charcoal.stateHigh = "carbon_dioxide"
//}
// baking soda {
elements.baking_soda.tempHigh = 150,
elements.baking_soda.stateHigh = ["water","carbon_dioxide","calcined_soda"]
// decomposition result {
elements.calcined_soda = { //TODO: decomposition? elements.calcined_soda = { //TODO: decomposition?
color: "#ededed", color: "#ededed",
behavior: behaviors.POWDER, behavior: behaviors.POWDER,
@ -160,6 +222,60 @@ elements.molten_calcined_soda.tempHigh = 1600
elements.molten_calcined_soda.stateHigh = "vaporized_calcined_soda" elements.molten_calcined_soda.stateHigh = "vaporized_calcined_soda"
elements.molten_calcined_soda.density = 1920 elements.molten_calcined_soda.density = 1920
elements.vaporized_calcined_soda = {
color: ["#ffbf60","#ffdc60","#ff9d60"],
behavior: [
"M2|M1|M2",
"M1|XX|M1",
"M2|M1|M2",
],
reactions: {
"vaporized_calcined_soda": { "elem1": null, "elem2": "hot_calcined_soda_cloud", "chance":0.3, "y":[0,15] },
"hot_calcined_soda_cloud": { "elem1": "hot_calcined_soda_cloud", "chance":0.4, "y":[0,15] },
},
temp: 1700,
tempLow: 1600,
stateLow: "molten_calcined_soda",
category: "gases",
state: "gas",
hidden: true,
density: 1.5, //bs
},
elements.hot_calcined_soda_cloud = {
color: ["#cfbf70","#cfcc70","#cf9d70"],
behavior: [
"XX|XX|XX",
"M1%7|CH:molten_calcined_soda%0.05|M1%7",
"XX|XX|XX",
],
density: 0.7,
temp: 1700,
tempLow: 1600,
stateLow: "cold_calcined_soda_cloud",
category: "gases",
state: "gas",
},
elements.cold_calcined_soda_cloud = {
color: ["#afaf70","#afac70","#af8d70"],
behavior: [
"XX|XX|XX",
"M1%7|CH:calcined_soda%0.05|M1%7",
"XX|XX|XX",
],
density: 0.7,
temp: 1500,
tempHigh: 1600,
stateHigh: "hot_calcined_soda_cloud",
category: "gases",
state: "gas",
},
//}
// decomp hydrate {
elements.washing_soda = { elements.washing_soda = {
color: "#ededed", color: "#ededed",
behavior: behaviors.POWDER, behavior: behaviors.POWDER,
@ -171,28 +287,224 @@ elements.washing_soda = {
stateHigh: ["water","calcined_soda"], stateHigh: ["water","calcined_soda"],
} }
elements.vaporized_calcined_soda = { //}
color: ["#ffbf60","#ffdc60","#ff9d60"],
behavior: [ //alkalinities {
"M2|M1|M2",
"M1|XX|M1",
"M2|M1|M2",
],
temp: 1700,
tempLow: 1600,
stateLow: "molten_calcined_soda",
category: "gases",
state: "gas",
hidden: true,
density: 1.5, //bs
},
elements.acid.reactions.baking_soda = { "elem1":"neutral_acid", "elem2":null } elements.acid.reactions.baking_soda = { "elem1":"neutral_acid", "elem2":null }
elements.acid.reactions.calcined_soda = { "elem1":"neutral_acid", "elem2":null } elements.acid.reactions.calcined_soda = { "elem1":"neutral_acid", "elem2":null }
elements.acid.reactions.washing_soda = { "elem1":"neutral_acid", "elem2":null } elements.acid.reactions.washing_soda = { "elem1":"neutral_acid", "elem2":null }
elements.baking_soda.tempHigh = 150, //}
elements.baking_soda.stateHigh = ["water","carbon_dioxide","calcined_soda"]
//}
// dirt {
elements.molten_dirt = {
tempHigh: 3000,
stateHigh: "vaporized_rock",
}
//}
// calcium {
elements.molten_calcium = {
tempHigh: 2200,
stateHigh: "vaporized_calcium",
}
elements.vaporized_calcium = {
color: ["#ffc94a", "#fcd34c", "#ffae36", "#ff9c40","#ffcd90","#cf8d50"],
behavior: [
"M2|M1|M2",
"M1|XX|M1",
"M2|M1|M2",
],
reactions: {
"vaporized_calcium": { "elem1": null, "elem2": "hot_calcium_cloud", "chance":0.3, "y":[0,15] },
"hot_calcium_cloud": { "elem1": "hot_calcium_cloud", "chance":0.4, "y":[0,15] },
},
density: 1.5, //most of these density values are complete bullshit due to a lack of research
temp: 1550,
tempLow: 1484,
stateLow: "molten_calcium",
category: "gases",
state: "gas",
hidden: true,
},
elements.hot_calcium_cloud = {
color: ["#dfa98a", "#dcb38c", "#df8e76", "#ef8c60","#efbdb0","#af8d70"],
behavior: [
"XX|XX|XX",
"M1%7|CH:molten_calcium%0.05|M1%7",
"XX|XX|XX",
],
density: 1.5,
temp: 1550,
tempLow: 842,
stateLow: "cold_calcium_cloud",
category: "gases",
state: "gas",
},
elements.cold_calcium_cloud = {
color: ["#bf998a", "#bca38c", "#bf8e76", "#cf8c60","#cfadb0","#9f8d70"],
behavior: [
"XX|XX|XX",
"M1%7|CH:calcium%0.05|M1%7",
"XX|XX|XX",
],
density: 2,
temp: 800,
tempHigh: 842,
stateHigh: "hot_calcium_cloud",
category: "gases",
state: "gas",
}
//}
// clay {
if(!elements.baked_clay) {
elements.baked_clay = {}
}
elements.baked_clay.tempHigh = 1600 //the range of melting points online is so fucking wide
elements.baked_clay.stateHigh = "molten_clay"
elements.molten_clay = {
color: ["#ff6d23","#ff5723","#ff4100"],
behavior: [
"XX|CR:fire%2.5|XX",
"M2|XX|M2",
"M1|M1|M1",
],
temp: 1700,
tempLow: 1600,
stateLow: "baked_clay",
viscosity: 10000,
hidden: true,
state: "liquid",
density: 1800,
tempHigh: 2980,
stateHigh: "vaporized_clay",
category: "liquids",
}
elements.vaporized_clay = {
color: ["#ff8d43","#ff7743","#ff6120"],
behavior: [
"M2|M1|M2",
"M1|XX|M1",
"M2|M1|M2",
],
reactions: {
"vaporized_clay": { "elem1": null, "elem2": "hot_clay_cloud", "chance":0.3, "y":[0,15] },
"hot_clay_cloud": { "elem1": "hot_clay_cloud", "chance":0.4, "y":[0,15] },
},
density: 1.6,
temp: 1700,
tempLow: 1600,
stateLow: "molten_clay",
category: "gases",
state: "gas",
hidden: true,
},
elements.hot_clay_cloud = {
color: ["#ff9945", "#fca347", "#ff7e31"],
behavior: [
"XX|XX|XX",
"M1%7|CH:molten_clay%0.05|M1%7",
"XX|XX|XX",
],
density: 1.5,
temp: 1550,
tempLow: 842,
stateLow: "cold_clay_cloud",
category: "gases",
state: "gas",
},
elements.cold_clay_cloud = {
color: ["#ef7945", "#ec8347", "#ef5e31"],
behavior: [
"XX|XX|XX",
"M1%7|CH:baked_clay%0.05|M1%7",
"XX|XX|XX",
],
density: 2,
temp: 800,
tempHigh: 842,
stateHigh: "hot_clay_cloud",
category: "gases",
state: "gas",
},
//}
// salt {
elements.molten_salt = {
tempHigh: 1465,
stateHigh: "vaporized_salt",
}
elements.vaporized_salt = {
color: ["#ff9f60","#ffbc60","#ff7d60"],
behavior: [
"M2|M1|M2",
"M1|XX|M1",
"M2|M1|M2",
],
reactions: {
"vaporized_salt": { "elem1": null, "elem2": "hot_salt_cloud", "chance":0.3, "y":[0,15] },
"hot_salt_cloud": { "elem1": "hot_salt_cloud", "chance":0.4, "y":[0,15] },
},
density: 1946,
temp: 1550,
tempLow: 1465,
stateLow: "molten_salt",
category: "gases",
state: "gas",
hidden: true,
},
elements.hot_salt_cloud = {
color: ["#ef8f30","#efac60","#ef6d60"],
behavior: [
"XX|XX|XX",
"M1%7|CH:molten_salt%0.05|M1%7",
"XX|XX|XX",
],
density: 2.2,
temp: 1550,
tempLow: 801,
stateLow: "cold_salt_cloud",
category: "gases",
state: "gas",
},
elements.cold_salt_cloud = {
color: ["#cf7f60","#cf9c60","#cf7d60"],
behavior: [
"XX|XX|XX",
"M1%7|CH:salt%0.05|M1%7",
"XX|XX|XX",
],
density: 2.2,
temp: 700,
tempHigh: 801,
stateHigh: "hot_salt_cloud",
category: "gases",
state: "gas",
}
//}
runAfterLoad(function() { runAfterLoad(function() {
if(elements.acid_gas.tempHigh) { if(elements.acid_gas.tempHigh) {
@ -208,12 +520,8 @@ elements.yogurt.tempHigh = 400
elements.yogurt.stateHigh = "ash" elements.yogurt.stateHigh = "ash"
elements.dust.tempHigh = 400 elements.dust.tempHigh = 400
elements.dust.stateHigh = "fire" elements.dust.stateHigh = "fire"
elements.charcoal.tempHigh = 800
elements.charcoal.stateHigh = "carbon_dioxide"
if(enabledMods.includes("mods/fey_and_more.js")) {
elements.molten_glass.tempHigh = 2200
elements.molten_glass.stateHigh = "vaporized_glass"
if(enabledMods.includes("mods/fey_and_more.js")) {
//mistake //mistake
elements.concoction.reactions.vaporized_rock = { "elem1": "mistake", "elem2": null } elements.concoction.reactions.vaporized_rock = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.lava_cloud = { "elem1": "mistake", "elem2": null } elements.concoction.reactions.lava_cloud = { "elem1": "mistake", "elem2": null }
@ -221,5 +529,25 @@ elements.charcoal.stateHigh = "carbon_dioxide"
elements.concoction.reactions.vaporized_glass = { "elem1": "mistake", "elem2": null } elements.concoction.reactions.vaporized_glass = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.hot_glass_cloud = { "elem1": "mistake", "elem2": null } elements.concoction.reactions.hot_glass_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.cold_glass_cloud = { "elem1": "mistake", "elem2": null } elements.concoction.reactions.cold_glass_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.molten_ash = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.vaporized_ash = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.hot_ash_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.cold_ash_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.calcined_soda = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.molten_calcined_soda = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.vaporized_calcined_soda = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.hot_calcined_soda_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.cold_calcined_soda_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.washing_soda = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.vaporized_calcium = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.hot_calcium_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.cold_calcium_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.molten_clay = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.vaporized_clay = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.hot_clay_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.cold_clay_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.vaporized_salt = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.hot_salt_cloud = { "elem1": "mistake", "elem2": null }
elements.concoction.reactions.cold_salt_cloud = { "elem1": "mistake", "elem2": null }
}; };
}); });