This commit is contained in:
slweeb 2022-01-20 18:34:58 -05:00
commit c5dcd7d2a0
4 changed files with 172 additions and 37 deletions

View File

@ -530,6 +530,7 @@ behavior: behaviors.LIQUID,
category: "liquids",
density: 3922.5,
state: "liquid",
temp: 2000,
tempLow: 1975,
stateLow: "mithril_mythril_alloy"
},
@ -542,7 +543,7 @@ category: "solids",
density: 4425,
state: "solid",
tempHigh: 1975,
stateHigh: "molten_mithril_mithril_alloy"
stateHigh: "molten_mithril_mythril_alloy"
};
elements.berry_seed = {
color: ["#941260", "#752043"],

121
mods/chalcopyrite.js Normal file
View File

@ -0,0 +1,121 @@
//Mod by Sarperen
elements.chalcopyrite_ore = {
color: ["#8c7538","#4f4f4f","#949494"],
behavior: behaviors.POWDER,
reactions: {
steel: { "elem1": "chalcopyrite_dust", "elem2": "steel" },
},
tempHigh: 950,
stateHigh: "magma",
category: "refining",
state: "solid",
density: 2950,
},
elements.chalcopyrite_dust = {
color: ["#ac9558","#4f4f4f"],
behavior: behaviors.POWDER,
reactions: {
oil: { "elem1": "copper_concentrate", "elem2": "tailings" },
slag: { "elem1": "chalcopyrite_dust", "elem2": "chalcopyrite_dust" },
},
tempHigh: 950,
stateHigh: "magma",
state: "solid",
density: 3500,
hidden: true,
},
elements.copper_concentrate = {
color: ["#343c27","#4f4f4f"],
behavior: behaviors.POWDER,
reactions: {
borax: { "elem1": "fluxed_copper_concentrate", "elem2": "slag", "chance": 0.1 }, //doesn't fix infinite slag; hopefully we get arrays in reacts soon
},
tempHigh: 1000,
stateHigh: "magma",
state: "solid",
density: 7000,
hidden: true,
},
elements.fluxed_copper_concentrate = {
color: ["#444c37","#5f5f5f"],
behavior: behaviors.POWDER,
tempHigh: 1050,
stateHigh: "molten_matte_copper",
state: "solid",
density: 7000,
hidden: true,
},
elements.molten_matte_copper = {
color: "#b6988d",
behavior: behaviors.LIQUID,
tempLow: 1000,
stateLow: "matte_copper",
state: "liquid",
density: 6000,
hidden: true,
},
elements.matte_copper = {
color: "#96786d",
behavior: behaviors.WALL,
reactions: {
borax: { "elem1": "fluxed_matte_copper", "elem2": "slag", chance: 0.1 }, //see last comment
},
tempHigh: 1050,
stateHigh: "molten_matte_copper",
state: "solid",
density: 7500,
hidden: true,
},
elements.fluxed_matte_copper = {
color: "#a6887d",
behavior: behaviors.WALL,
tempHigh: 1070,
stateHigh: "molten_blister_copper",
state: "solid",
density: 7200,
hidden: true,
},
elements.molten_blister_copper = {
color: "#b6887d",
behavior: behaviors.LIQUID,
tempLow: 1020,
stateLow: "blister_copper",
state: "liquid",
density: 6050,
hidden: true,
},
elements.blister_copper = {
color: "#96786d",
behavior: behaviors.WALL,
reactions: {
fire: { "elem1": "copper", "elem2": null },
},
tempHigh: 1050,
stateHigh: "molten_blister_copper",
state: "solid",
density: 7500,
hidden: true,
conduct: 0.8,
},
elements.slag = {
color: ["#b3907d","#949494"],
behavior: behaviors.POWDER,
tempHigh: 950,
stateHigh: "magma",
category: "refining",
state: "solid",
density: 4000,
},
elements.tailings = {
color: "#200000",
behavior: behaviors.LIQUID,
category: "liquids",
tempHigh: 1000,
stateHigh: "fire",
burn: 100,
burnTime: 30,
viscosity: 300,
state: "liquid",
density: 1300,
hidden: true,
}

View File

@ -4,7 +4,7 @@ elements.cum = {
behavior: [
"ST%50 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15|ST%50 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15|XX AND ST%50 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15",
"M2 AND ST%65 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15|XX|M2 AND ST%65 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15",
"M1 AND ST%80 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15|M1 AND ST%80 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15|M1 AND ST%80 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15",cu
"M1 AND ST%80 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15|M1 AND ST%80 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15|M1 AND ST%80 AND SW:water,cum_water,dead_cum,dead_cum_water,slime%15",
],
density: 997,
tempHigh: 35,
@ -362,7 +362,8 @@ elements.fish.reactions.cum_water = { "elem1":"fish", "elem2":"water" }
elements.fish.reactions.dead_cum = { "elem1":"fish", "elem2":"dead_cum_water" }
elements.fish.reactions.dead_cum_water = { "elem1":"fish", "elem2":"water" }
/*if(enabledMods.includes("mods/fey_and_more.js")) {
runAfterLoad(function() {
if(enabledMods.includes("mods/fey_and_more.js")) {
eLists.IMPURITY.push("cum");
eLists.IMPURITY.push("cum_water");
eLists.IMPURITY.push("cum_ice");
@ -379,4 +380,15 @@ elements.fish.reactions.dead_cum_water = { "elem1":"fish", "elem2":"water" }
eLists.IMPURITY.push("cummy_snake");
eLists.IMPURITY.push("cum_slime");
eLists.IMPURITY.push("burnt_cum");
};*/
elements.pure_water.behavior = [
"DL:"+eLists.IMPURITY+"|DL:"+eLists.IMPURITY+"|DL:"+eLists.IMPURITY+"",
"DL:"+eLists.IMPURITY+" AND M2|XX|DL:"+eLists.IMPURITY+" AND M2",
"DL:"+eLists.IMPURITY+" AND M1|DL:"+eLists.IMPURITY+" AND M1|DL:"+eLists.IMPURITY+" AND M1",
],
elements.pure_steam.behavior = [
"M2 AND DL:"+eLists.IMPURITY+"|M1 AND DL:"+eLists.IMPURITY+"|M2 AND DL:"+eLists.IMPURITY+"",
"M1 AND DL:"+eLists.IMPURITY+"|XX|M1 AND DL:"+eLists.IMPURITY+"",
"M2 AND DL:"+eLists.IMPURITY+"|M1 AND DL:"+eLists.IMPURITY+"|M2 AND DL:"+eLists.IMPURITY+"",
]
};
});

View File

@ -63,25 +63,6 @@ elements.smoke.reactions = {
"poisoned_ketchup_cloud": { "elem1": "pyrocumulus", "chance":0.08, "y":[0.15] },
};
// ketchup fairies
elements.ketchup_fairy.reactions = {
"fire": { "elem1": "fire_fairy"},
"magma": { "elem1": "fire_fairy"},
"snow": { "elem1": "ice_fairy"},
"ice": { "elem1": "ice_fairy"},
"petal": { "elem1": "nature_fairy"},
"dirt": { "elem1": "earth_fairy"},
"mud": { "elem1": "earth_fairy"},
"raincloud": { "elem1": "rain_fairy"},
"electric": { "elem1": "thunder_fairy"},
"little_star": { "elem1": "stellar_fairy"},
"moonrock": { "elem1": "lunar_fairy"},
"liquid_light": { "elem1": "light_fairy"},
"mushroom_cap": { "elem1": "mushroom_fairy"},
"magic": { "elem1": "magic_fairy"},
"ketchup": { "elem1": "ketchup_fairy"},
},
// elements
elements.frozen_ketchup = {
color: "#d44737",
@ -413,22 +394,42 @@ elements.ketchup_gold = {
}
// f&m only elements
if (enabledMods.includes("mods/fey_and_more.js")) {
elements.ketchup_fairy = {
color: ["#d4b0b0", "#e8c5c5", "#e89595"],
state: "solid",
behavior: [
"XX|M1|M1",
"XX|FX%5|XX",
"XX|CR:ketchup%0.1 AND CR:fairy_dust%0.005 AND M1|M1",
],
category: "fey",
}
};
runAfterLoad(function() {
if (enabledMods.includes("mods/fey_and_more.js")) {
// ketchup fairy reaction
elements.fairy.reactions = {
"fire": { "elem1": "fire_fairy"},
"magma": { "elem1": "fire_fairy"},
"snow": { "elem1": "ice_fairy"},
"ice": { "elem1": "ice_fairy"},
"petal": { "elem1": "nature_fairy"},
"dirt": { "elem1": "earth_fairy"},
"mud": { "elem1": "earth_fairy"},
"raincloud": { "elem1": "rain_fairy"},
"electric": { "elem1": "thunder_fairy"},
"little_star": { "elem1": "stellar_fairy"},
"moonrock": { "elem1": "lunar_fairy"},
"liquid_light": { "elem1": "light_fairy"},
"mushroom_cap": { "elem1": "mushroom_fairy"},
"magic": { "elem1": "magic_fairy"},
"ketchup": { "elem1": "ketchup_fairy"},
};
elements.ketchup_fairy = {
color: ["#d4b0b0", "#e8c5c5", "#e89595"],
state: "solid",
behavior: [
"XX|M1|M1",
"XX|FX%5|XX",
"XX|CR:ketchup%0.1 AND CR:fairy_dust%0.005 AND M1|M1",
],
category: "fey",
}
};
});
/*
Changelog
Mod made primarily by Nubo318. Contributors include deviantEquinox and Lily219.
Mod made primarily by Nubo318. Contributors include deviantEquinox and Lily129.
Version 1.3.0
Version 1.3.0 (20th of January 2022)
@ -485,4 +486,4 @@ Version 1.0.0 (technically not the first version, but I'm to lazy to see in whic
+ Frozen Poisoned Ketchup
+ Ketchup Cloud - Rain cloud but ketchup
+ Poisoned Ketchup Cloud
*/
*/