From ad00e41f9c4d7ad80373b9a79d32e2f616cd8a78 Mon Sep 17 00:00:00 2001 From: O-01-67 <68935009+O-01-67@users.noreply.github.com> Date: Mon, 18 Jul 2022 01:00:15 -0400 Subject: [PATCH 1/5] more gems --- mods/gems.js | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 mods/gems.js diff --git a/mods/gems.js b/mods/gems.js new file mode 100644 index 00000000..583083a8 --- /dev/null +++ b/mods/gems.js @@ -0,0 +1,81 @@ +//We're assuming that the crystal structures reform properly because I don't want to have to research and implement refrozen amorphous forms. + +elements.emerald = { + color: ["#31e31e", "#88fa5a", "#28d419", "#54e823", "#64f235"], + tempHigh: 1287, + //1: I can't be arsed to find out what happens to emerald in extreme heat. Apparently, neither can anyone else because Google is f***ing useless for this. + //2: So I'm just assuming that the chromium impurities are polite and remain in solution with the molten beryl. + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2710, //within natural variation + hardness: 0.8, //Mohs scaled to diamond +}; + +elements.amethyst = { + color: ["#c569e0", "#bd43e0", "#e37aeb", "#ab2fe0", "#b05bd4", "#9b2cdb"], + tempHigh: 1650, + //1: Gee, another quartz-like... + //2: Like with emerald, I'm trusting the impurities to stay dissolved because I don't exactly have any amethyst laying around to melt. + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2650, + hardness: 0.7, +}; + +elements.sapphire = { + color: ["#2d43e3", "#4d5fe3", "#1f30cc", "#375fdb", "#2d39e3"], + tempHigh: 2040, + //1: You can actually grow corundum-based gems through the Verneuil process + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 3980, + hardness: 0.9, +} + +elements.ruby = { + //Corundum with different impurities, so I can copy/paste everything but the color + color: ["#ff1222", "#ff4545", "#e30b13", "#fa253b", "#f2120f"], + tempHigh: 2040, + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 3980, + hardness: 0.9, +} + +elements.topaz = { + //Terraria + color: ["#f7f431", "#ffff5c", "#f7e048", "#fae43e", "#fff86e", "#ede321"], + tempHigh: 1340, //yay, more thermal decomposition elements + stateHigh: "mullite", + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 3500, + hardness: 0.8, +}; + +elements.mullite = { + color: ["#f2dfcf", "#fadee9", "#edd8ca"], //hardly a gemstone, but i will color it like the others regardless + tempHigh: 1840, + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 3110, + hardness: 0.7, +}; + +elements.onyx = { //Thorium + color: ["#1a1919", "#070605", "#111313"], + tempHigh: 1650, //another silicate mineral + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2650, + hardness: 0.7, +}; + +//todo: opal (pain), pearl \ No newline at end of file From 66801308dd4fdca88deae8b3f9d12f0a359f7768 Mon Sep 17 00:00:00 2001 From: O-01-67 <68935009+O-01-67@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:40:15 -0400 Subject: [PATCH 2/5] More gems Yes, pearl melting is inaccurate. Cry about it. --- mods/gems.js | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/mods/gems.js b/mods/gems.js index 583083a8..a37d84e4 100644 --- a/mods/gems.js +++ b/mods/gems.js @@ -59,7 +59,7 @@ elements.topaz = { }; elements.mullite = { - color: ["#f2dfcf", "#fadee9", "#edd8ca"], //hardly a gemstone, but i will color it like the others regardless + color: ["#f2d7bf", "#f5cbdc", "#f2dfd3"], //hardly a gemstone, but i will color it like the others regardless tempHigh: 1840, behavior: behaviors.POWDER, category: "powders", @@ -78,4 +78,54 @@ elements.onyx = { //Thorium hardness: 0.7, }; -//todo: opal (pain), pearl \ No newline at end of file +elements.opal = { + color: ["#ffcfcf", "#fff0d9", "#fcf7c5", "#e4ffd4", "#d1fff5", "#dcecfa", "#dfdbff", "#f5e0ff", "#f7d0f1"], + tempHigh: 100, + stateHigh: ["broken_opal", "broken_opal", "broken_opal", "broken_opal", "broken_opal", "broken_opal", "broken_opal", "broken_opal", "broken_opal", "steam"], + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2090, + hardness: 0.6, + breakInto: ["quartz", "quartz", "quartz", "quartz", "quartz", "quartz", "quartz", "quartz", "quartz", "water"], +}; + +elements.broken_opal = { + color: ["#f5e6e6", "#ebe2d5", "#f7f6ed", "#e4eddf", "#d8ebe7", "#d8e0e8", "#e4e3e8", "#f4edf7", "#ebebeb"], + tempHigh: 1650, + stateHigh: "molten_quartz", + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2322, + hardness: 0.55, //it cracks +}; + +elements.quartz = { //silicates, silicates, and more silicates + color: ["#f0f0f0", "#e3e3e3", "#f7f7f7"], + tempHigh: 1650, + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2650, + hardness: 0.7, +}; + +elements.molten_quartz.reactions = { + quicklime: { elem1: "molten_glass", elem2: ["quicklime", "quicklime", "quicklime", "quicklime", "quicklime", "quicklime", "quicklime", "quicklime", "quicklime", null]} //lack of vanilla baking soda, lack of tripartite reactions +}; +/* +elements.elem1.reactions = { + elem2: { elem1: "elem1_becomes", elem2: "elem2_becomes"} +}; +*/ + +elements.pearl = { + color: ["#e3e3e3", "#e3e0d1", "#eddbce", "#eef2c9", "#d5f5dc", "#d8f2ec", "#fadcf9", "#e3d1c1", "#f2edc9", "#e0f5d7", "#e2beeb", "#e3e3e3", "#e3e0d1", "#eddbce", "#eef2c9", "#d5f5dc", "#d8f2ec", "#fadcf9", "#e3d1c1", "#f2edc9", "#e0f5d7", "#e2beeb", "#38332e"], + tempHigh: 1340, //yay, more thermal decomposition elements + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 772, //It is partly made of proteins and is said to burn, but I can't find an ignition point, so here it melts. + hardness: 0.45, +}; From 3c40d378642e4d15622db42011737f60cc455c76 Mon Sep 17 00:00:00 2001 From: O-01-67 <68935009+O-01-67@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:53:11 -0400 Subject: [PATCH 3/5] liquid void yum --- mods/liquid_void.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 mods/liquid_void.js diff --git a/mods/liquid_void.js b/mods/liquid_void.js new file mode 100644 index 00000000..f10e87a0 --- /dev/null +++ b/mods/liquid_void.js @@ -0,0 +1,23 @@ +elements.liquid_void = { + color: "#262626", + behavior: [ + "XX|DL|XX", + "DL AND M2|XX|DL AND M2", + "M1|DL AND M1|M1", + ], + ignore: ["liquid_void", "wall", "cloner", "ecloner", "slow_cloner", "clone_powder", "floating_cloner", "clone_liquid", "liquid_cloner", "fire_cloner", "antigravity_powder_cloner", "floating_cloner_spout", "clone_liquid_spout", "liquid_cloner_spout", "fire_cloner_spout", "converter", "liquid_void_spout"], + /*The hardcoded array of cloners is used because I don't know how to detect them. + Generation code: + elementArray = Object.keys(elements); + for (let i = 0; i < elementArray.length; i++) { + var elementName = elementArray[i]; + if(elementName.indexOf("lone") !== -1) { + console.log(elementName); + }; + }; + */ + category: "liquids", + state: "liquid", + density: 6969, + excludeRandom: true, +} \ No newline at end of file From 3babbfb0e4807754dcf85ddedc5271bea59f020c Mon Sep 17 00:00:00 2001 From: O-01-67 <68935009+O-01-67@users.noreply.github.com> Date: Tue, 19 Jul 2022 20:55:04 -0400 Subject: [PATCH 4/5] mutual exclusions --- mods/liquid_void.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mods/liquid_void.js b/mods/liquid_void.js index f10e87a0..e11486c7 100644 --- a/mods/liquid_void.js +++ b/mods/liquid_void.js @@ -5,7 +5,7 @@ elements.liquid_void = { "DL AND M2|XX|DL AND M2", "M1|DL AND M1|M1", ], - ignore: ["liquid_void", "wall", "cloner", "ecloner", "slow_cloner", "clone_powder", "floating_cloner", "clone_liquid", "liquid_cloner", "fire_cloner", "antigravity_powder_cloner", "floating_cloner_spout", "clone_liquid_spout", "liquid_cloner_spout", "fire_cloner_spout", "converter", "liquid_void_spout"], + ignore: ["liquid_void", "void", "wall", "cloner", "ecloner", "slow_cloner", "clone_powder", "floating_cloner", "clone_liquid", "liquid_cloner", "fire_cloner", "antigravity_powder_cloner", "floating_cloner_spout", "clone_liquid_spout", "liquid_cloner_spout", "fire_cloner_spout", "converter", "liquid_void_spout"], /*The hardcoded array of cloners is used because I don't know how to detect them. Generation code: elementArray = Object.keys(elements); @@ -20,4 +20,10 @@ elements.liquid_void = { state: "liquid", density: 6969, excludeRandom: true, -} \ No newline at end of file +} + +if(!elements.void.ignore) { + elements.void.ignore = []; +}; + +elements.void.ignore.push("liquid_void"); From c85d8fefc0b46fc74dd9d490c44fd65fe9d6fee1 Mon Sep 17 00:00:00 2001 From: O-01-67 <68935009+O-01-67@users.noreply.github.com> Date: Sun, 24 Jul 2022 17:40:26 -0400 Subject: [PATCH 5/5] clarify comment numbers --- mods/adjustablepixelsize.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mods/adjustablepixelsize.js b/mods/adjustablepixelsize.js index 17b5a655..daf039cf 100644 --- a/mods/adjustablepixelsize.js +++ b/mods/adjustablepixelsize.js @@ -7,7 +7,8 @@ urlParams = new URLSearchParams(window.location.search); if(urlParams.get('pixelSize') != null) { //null check pixelSize = urlParams.get('pixelSize') if(isNaN(pixelSize) || pixelSize === "" || pixelSize === null) { //NaN check - // Vanilla code: If the screen size is under 768px, set pixelSize to 5, otherwise 6 + //Vanilla code + //[Vanilla comment] If the screen size is under 768px, set pixelSize to 5, otherwise 6 if (window.innerWidth < 700) { pixelSize = 5; } else { @@ -17,7 +18,8 @@ if(urlParams.get('pixelSize') != null) { //null check pixelSize = parseFloat(pixelSize) pixelSize = Math.min(194.73749999999999,Math.max(pixelSize,0.05)) } else { - // Vanilla code: If the screen size is under 768px, set pixelSize to 5, otherwise 6 + //Vanilla code + //[Vanilla comment] If the screen size is under 768px, set pixelSize to 5, otherwise 6 if (window.innerWidth < 700) { pixelSize = 5; } else {