From 1886d25e6a87dd8877e619c7686f330b979b7269 Mon Sep 17 00:00:00 2001 From: BatteRaquette581 <84451047+BatteRaquette581@users.noreply.github.com> Date: Fri, 8 Mar 2024 21:00:27 +0100 Subject: [PATCH 1/6] Create lye.js --- mods/lye.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 mods/lye.js diff --git a/mods/lye.js b/mods/lye.js new file mode 100644 index 00000000..44735414 --- /dev/null +++ b/mods/lye.js @@ -0,0 +1,34 @@ +/* +MIT License + +Copyright (c) 2024 BatteRaquette58 (a.k.a BatteRaquette581) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +elements.lye = { + color: "#e5cccc", + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + tempHigh: 1388, + stateHigh: "caustic_potash", +} + +elements.water.reactions.ash.elem2 = "lye" From a2bbad7a8fca61b42db7d83b8a1a9a8b764a8342 Mon Sep 17 00:00:00 2001 From: BatteRaquette581 <84451047+BatteRaquette581@users.noreply.github.com> Date: Fri, 8 Mar 2024 21:04:46 +0100 Subject: [PATCH 2/6] Update mod-list.html --- mod-list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/mod-list.html b/mod-list.html index daa35cfe..1d2c4462 100644 --- a/mod-list.html +++ b/mod-list.html @@ -165,6 +165,7 @@ iocalfaeus_clones.jsAdds Iorefrius, Iolucius, and Ioradius gasAlice laetium.jsAdds several fictional elementsAlice liquid_energy.jsAdds liquid versions of the elements in the Energy categoryAlice +lye.jsAdds lyeBatteRaquette58 metals.jsAdds several metalsAlice mixture.jsAllows many chemicals to be mixedlllllllllwith10ls more_gold.jsAdds Green Goldpixelegend4 From b63e46a441b66e79021c55cdfb5a095aa5b4e2b7 Mon Sep 17 00:00:00 2001 From: BatteRaquette581 <84451047+BatteRaquette581@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:22:56 +0100 Subject: [PATCH 3/6] Create tps_counter.js --- mods/tps_counter.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 mods/tps_counter.js diff --git a/mods/tps_counter.js b/mods/tps_counter.js new file mode 100644 index 00000000..06764915 --- /dev/null +++ b/mods/tps_counter.js @@ -0,0 +1,44 @@ +/* +MIT License + +Copyright (c) 2024 BatteRaquette58 (a.k.a BatteRaquette581) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ + +const old_tick = tick + +let tps_counter = document.createElement("span") +tps_counter.id = "stat-tps-counter" +tps_counter.classList = ["stat",] +const total_wrapper = document.getElementById("totalWrapper") +const first_child = total_wrapper.childNodes[0] +total_wrapper.insertBefore(tps_counter, first_child) +total_wrapper.insertBefore(document.createElement("br"), first_child) + +tick = () => { + const t1 = Date.now() + old_tick() + const t2 = Date.now() + let time_elapsed = t2 - t1 + tps_counter.innerText = Math.min(tps, 1 / (time_elapsed / 1000)) +} + +window.clearInterval(tickInterval) +tickInterval = window.setInterval(tick, 1000 / tps) From 46afcaf72248abfeb525350439061d39ec1279bf Mon Sep 17 00:00:00 2001 From: BatteRaquette581 <84451047+BatteRaquette581@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:24:20 +0100 Subject: [PATCH 4/6] Update mod-list.html --- mod-list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/mod-list.html b/mod-list.html index 1d2c4462..75aa620a 100644 --- a/mod-list.html +++ b/mod-list.html @@ -146,6 +146,7 @@ save_loading.jsAdds the ability to save and load scenes from files (See the info page of the element)Alice stripe_paint.jsAdds a tool to paint with stripesAlice the_ground.jsAdds several rock types, worldgen settings, and gemstonesAlice +tps_counter.jsAdds an ingame TPS counter that counts the actual TPS and not the target TPS (counter in upper left corner)BatteRaquette58/td> Science & Chemistry alcohol.jsAdds methanol, (iso-)propanol, and butanolAlice From 377ca71487122cd172efd564555fd22092d28b66 Mon Sep 17 00:00:00 2001 From: BatteRaquette581 <84451047+BatteRaquette581@users.noreply.github.com> Date: Fri, 8 Mar 2024 21:32:47 +0000 Subject: [PATCH 5/6] Revert "Create tps_counter.js" This reverts commit b63e46a441b66e79021c55cdfb5a095aa5b4e2b7. --- mods/tps_counter.js | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 mods/tps_counter.js diff --git a/mods/tps_counter.js b/mods/tps_counter.js deleted file mode 100644 index 06764915..00000000 --- a/mods/tps_counter.js +++ /dev/null @@ -1,44 +0,0 @@ -/* -MIT License - -Copyright (c) 2024 BatteRaquette58 (a.k.a BatteRaquette581) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -const old_tick = tick - -let tps_counter = document.createElement("span") -tps_counter.id = "stat-tps-counter" -tps_counter.classList = ["stat",] -const total_wrapper = document.getElementById("totalWrapper") -const first_child = total_wrapper.childNodes[0] -total_wrapper.insertBefore(tps_counter, first_child) -total_wrapper.insertBefore(document.createElement("br"), first_child) - -tick = () => { - const t1 = Date.now() - old_tick() - const t2 = Date.now() - let time_elapsed = t2 - t1 - tps_counter.innerText = Math.min(tps, 1 / (time_elapsed / 1000)) -} - -window.clearInterval(tickInterval) -tickInterval = window.setInterval(tick, 1000 / tps) From c95f90473e4f655f61c1aacd9a92905ec08d70ef Mon Sep 17 00:00:00 2001 From: BatteRaquette581 <84451047+BatteRaquette581@users.noreply.github.com> Date: Fri, 8 Mar 2024 21:32:56 +0000 Subject: [PATCH 6/6] Revert "Update mod-list.html" This reverts commit 46afcaf72248abfeb525350439061d39ec1279bf. --- mod-list.html | 1 - 1 file changed, 1 deletion(-) diff --git a/mod-list.html b/mod-list.html index 75aa620a..1d2c4462 100644 --- a/mod-list.html +++ b/mod-list.html @@ -146,7 +146,6 @@ save_loading.jsAdds the ability to save and load scenes from files (See the info page of the element)Alice stripe_paint.jsAdds a tool to paint with stripesAlice the_ground.jsAdds several rock types, worldgen settings, and gemstonesAlice -tps_counter.jsAdds an ingame TPS counter that counts the actual TPS and not the target TPS (counter in upper left corner)BatteRaquette58/td> Science & Chemistry alcohol.jsAdds methanol, (iso-)propanol, and butanolAlice