From 681b8f9159fa4a3cd4f8900aa2687e489fa6b2c3 Mon Sep 17 00:00:00 2001 From: Nubo318 <69615769+Nubo318@users.noreply.github.com> Date: Thu, 20 Jan 2022 14:41:15 -0600 Subject: [PATCH 1/7] fixed mod --- mods/ketchup_mod.js | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/mods/ketchup_mod.js b/mods/ketchup_mod.js index 0553af6f..c0100c4f 100644 --- a/mods/ketchup_mod.js +++ b/mods/ketchup_mod.js @@ -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,7 +394,25 @@ elements.ketchup_gold = { } // f&m only elements - if (enabledMods.includes("mods/fey_and_more.js")) { +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", From 8708b07adce1c230d04d0df07f8cda4dc4b7c4ee Mon Sep 17 00:00:00 2001 From: Nubo318 <69615769+Nubo318@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:04:39 -0600 Subject: [PATCH 2/7] removed ketchup fairies' anomalous properties for some reason sometimes they loaded and sometimes they didn't, without me having to change anything. hopefully that should be fixed now --- mods/ketchup_mod.js | 60 +++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/mods/ketchup_mod.js b/mods/ketchup_mod.js index c0100c4f..447d70a5 100644 --- a/mods/ketchup_mod.js +++ b/mods/ketchup_mod.js @@ -394,36 +394,38 @@ elements.ketchup_gold = { } // f&m only elements -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"}, +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", + } }; - 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 From c4e8d6c10bb848c3eec83462d65b376ab2b69466 Mon Sep 17 00:00:00 2001 From: Lily-129 <68935009+Lily-129@users.noreply.github.com> Date: Thu, 20 Jan 2022 17:06:32 -0500 Subject: [PATCH 3/7] removed more stray letters --- mods/cum_mod.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/cum_mod.js b/mods/cum_mod.js index d48ddee1..221a7dfa 100644 --- a/mods/cum_mod.js +++ b/mods/cum_mod.js @@ -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, From 27337a2c2da44f0499e3b081f5d2aa5ca48e59a4 Mon Sep 17 00:00:00 2001 From: Nubo318 <69615769+Nubo318@users.noreply.github.com> Date: Thu, 20 Jan 2022 16:07:52 -0600 Subject: [PATCH 4/7] fix typo in changelog --- mods/ketchup_mod.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ketchup_mod.js b/mods/ketchup_mod.js index 447d70a5..69a198bd 100644 --- a/mods/ketchup_mod.js +++ b/mods/ketchup_mod.js @@ -429,7 +429,7 @@ runAfterLoad(function() { /* 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) @@ -486,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 -*/ \ No newline at end of file +*/ From d296b6d19c49a037a34e40952638ebfbd5128e98 Mon Sep 17 00:00:00 2001 From: Lily-129 <68935009+Lily-129@users.noreply.github.com> Date: Thu, 20 Jan 2022 17:23:23 -0500 Subject: [PATCH 5/7] Made cum an impurity Made pure_water and pure_steam behaviors be regenerated with eLists.IMPURITY after pushing cummy elements to it. --- mods/{cum_mod.js => cum.js} | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) rename mods/{cum_mod.js => cum.js} (92%) diff --git a/mods/cum_mod.js b/mods/cum.js similarity index 92% rename from mods/cum_mod.js rename to mods/cum.js index 221a7dfa..70e46a95 100644 --- a/mods/cum_mod.js +++ b/mods/cum.js @@ -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+"", + ] +}; +}); From 8bb657a8ba09128d85da834971be7770083e4745 Mon Sep 17 00:00:00 2001 From: Lily-129 <68935009+Lily-129@users.noreply.github.com> Date: Thu, 20 Jan 2022 18:03:18 -0500 Subject: [PATCH 6/7] Converted Sarperen's chalcopyrite mod chalc --- mods/chalcopyrite.js | 121 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 mods/chalcopyrite.js diff --git a/mods/chalcopyrite.js b/mods/chalcopyrite.js new file mode 100644 index 00000000..5e6e23ce --- /dev/null +++ b/mods/chalcopyrite.js @@ -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, +} \ No newline at end of file From e068e7924b745d183ac27de4328833c76b4402ae Mon Sep 17 00:00:00 2001 From: Lily-129 <68935009+Lily-129@users.noreply.github.com> Date: Thu, 20 Jan 2022 18:19:39 -0500 Subject: [PATCH 7/7] fixed MMA and MMMA fixed typo in tempHigh and added temp to MMMA so that it wouldn't solidify on contact --- mods/Neutronium_Mod.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/Neutronium_Mod.js b/mods/Neutronium_Mod.js index 0d33bdf6..86fc5635 100644 --- a/mods/Neutronium_Mod.js +++ b/mods/Neutronium_Mod.js @@ -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"],