From f2d2ec023345183dc4c06ac0523cc59dc9dd5a2e Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:06:44 -0400 Subject: [PATCH 01/13] Update mod-list.html --- mod-list.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mod-list.html b/mod-list.html index fed60b74..f454de11 100644 --- a/mod-list.html +++ b/mod-list.html @@ -225,18 +225,19 @@ Food & Cooking aChefsDream.jsAdds more foods, animals, tools and many other cooking related items. Updates can be found in this YouTube PlaylistSquareScreamYT aChefsDream_beta.jsBeta testing for aChefsDream. The code can be found on GitHubSquareScreamYT -bananas.jsAdds bananas and banana plantsAlice +bananas.jsAdds bananas and banana plantsAlice' +CherrySoda.jsAdds materials to make Cherry soda. Benzaldehyde + seltzer = Cherrysoda.guzzo86 community_desserts.jsAdds various desserts from community suggestionsTisquares +GrapeSoda.jsAdds materials to make Grape soda. Methylanthranilate + seltzer = Grapesoda.guzzo86 greenitemsandmore.jsAdds various green things, including apples and more foodzonneschijn7 ketchup_mod.jsAdds a bunch of ketchup related stuff, plus a few other condimentsNubo318 (main dev), Devi, Alice (contributors) lemonade.jsAdds lemons and lemonadepersonman / baconthemyth morefoodsmod.jsAdds more foodsClide4 pizzasstuff.jsNew animals, foods, and plants_ilikepizza_ +potato_chips.jsPotato chips.guzzo86 sbstuff.jsAdds many foodsstefanblox soups.jsAdds seasoning and souppixelegend4 weAllScreamFor.jsAdds ice cream toppingsrottenEgghead -CherrySoda.jsAdds materials to make Cherry soda. Benzaldehyde + seltzer = Cherrysoda.guzzo86 -GrapeSoda.jsAdds materials to make Grape soda. Methylanthranilate + seltzer = Grapesoda.guzzo86 Life & Nature advanced_colonies.jsAdds davlers, creatures with complex coloniesDaviStudios From 63c011b3916932a23b87599c878e48c01c2f0289 Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:08:05 -0400 Subject: [PATCH 02/13] Create potato_chips.js --- mods/potato_chips.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/potato_chips.js b/mods/potato_chips.js index e0de48f1..816ad59b 100644 --- a/mods/potato_chips.js +++ b/mods/potato_chips.js @@ -4,7 +4,7 @@ elements.potato_chip = { density: 1350, color: ["#F7DD93", "#D8A44B"], category: "food", - desc: "Potato chip. Turns potato next to it into potato chip if temp is >= 104.", + desc: "Potato chip. Turns potato next to it into potato chip if temp is >= 104 - 180.", tick: function(pixel) { if(pixelTicks - pixel.start >= 15) { From 4af97a7201f158edaf92c8f5146cf7c2099f39cd Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:14:55 -0400 Subject: [PATCH 03/13] Update CherrySoda.js --- mods/CherrySoda.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/CherrySoda.js b/mods/CherrySoda.js index 98475765..2561b7e7 100644 --- a/mods/CherrySoda.js +++ b/mods/CherrySoda.js @@ -65,7 +65,7 @@ elements.cherrysoda_gas = { temp: 169, } elements.cherrysoda_ice = { - color: "BF4F9C", + color: "#BF4F9C", behavior: behaviors.wALL, category: "solids", state: "solid", From 329b7f61f8de86724869b065dd988394db88fc39 Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:52:44 -0400 Subject: [PATCH 04/13] Update GrapeSoda.js --- mods/GrapeSoda.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/GrapeSoda.js b/mods/GrapeSoda.js index 5716aeac..1d67b1db 100644 --- a/mods/GrapeSoda.js +++ b/mods/GrapeSoda.js @@ -45,7 +45,6 @@ elements.anthranilicacid = { tempLow: -98, burn: 100, burnTime: 100, - burnInto: "carbondioxide" } elements.methanolice = { @@ -68,6 +67,8 @@ elements.anthranilicacid = { stateLow: "methanol", tempLow: 64, temp: 84, + burn: 100, + burnTime: 100, } elements.methylanthranilate = { color: "#FFFBBA", From 403ebbb15cfbdc24ee1092b5f2819f5890458b62 Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:16:36 -0400 Subject: [PATCH 05/13] Create customtemptools.js --- mods/customtemptools.js | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 mods/customtemptools.js diff --git a/mods/customtemptools.js b/mods/customtemptools.js new file mode 100644 index 00000000..00dbcb8f --- /dev/null +++ b/mods/customtemptools.js @@ -0,0 +1,50 @@ +var ct = 100 + +elements.customtemp = { + color: ["#FF0000", "#FF6600", "#FFCC00", "#FFFF00", "#CCFF00", "#66FF00", "#00FF00", "#00FF66", "#00FFCC", "#00FFFF"], + onSelect: function() { + var answer4 = parseInt(prompt("Please input the desired temperature to reach.",(ct||undefined))); + if (!answer4) { return } + ct = answer4; + if (isNaN(answer4)) { + ct = 100 + } + }, + tool: function(pixel) { + pixel.temp = ct, + pixelTempCheck(pixel) + }, + category: "tools", +}; +elements.customheat = { + color: ["#FF0000", "#FFFFFF", "#FF0000"], + onSelect: function() { + var answer4 = parseInt(prompt("Please input the desired temperature increase per tick. (In celsius)",(ct|undefined))); + if (!answer4) { return } + ct = answer4; + if (isNaN(answer4)) { + ct = 100 + } + }, + tool: function(pixel) { + pixel.temp = pixel.temp + ct, + pixelTempCheck(pixel) + }, + category: "tools", +}; +elements.customcool = { + color: ["#0000FF", "#FFFFFF", "#0000FF"], + onSelect: function() { + var answer4 = parseInt(prompt("Please input the desired temperature decrease per tick. (In celsius)",(cc|undefined))); + if (!answer4) { return } + ct = answer4; + if (isNaN(answer4)) { + ct = 100 + } + }, + tool: function(pixel) { + pixel.temp = pixel.temp - ct, + pixelTempCheck(pixel) + }, + category: "tools", +}; From 6b6290401d3ae69dc2f03b4c0dc657f0c20f0b83 Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:18:15 -0400 Subject: [PATCH 06/13] Update mod-list.html --- mod-list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/mod-list.html b/mod-list.html index f454de11..41780ac0 100644 --- a/mod-list.html +++ b/mod-list.html @@ -127,6 +127,7 @@ color_tools.jsAdds tools that manipulate colorsAlice controllable_pixel_test.jsAdds a pixel that can be controlled with the keyboard keys. Read the commit description for more info. [PC ONLY]Alice cpt_alt.jsAdds a more destructive variant of the controllable pixelAlice +customtemptools.jsAdds custom input temp tools.guzzo86 debugRework.jsRevamps the Debug toolFioushemastor delete_all_of_element.jsAdds a tool that deletes every pixel of the element(s) the user clicks onAlice descriptions.jsAdds descriptions to the info page and tooltips of elementsmollthecoder From 5b381748f7724891162a18555236d0840f2b0c97 Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:25:44 -0400 Subject: [PATCH 07/13] Update customtemptools.js --- mods/customtemptools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/customtemptools.js b/mods/customtemptools.js index 00dbcb8f..62c8b239 100644 --- a/mods/customtemptools.js +++ b/mods/customtemptools.js @@ -19,7 +19,7 @@ elements.customtemp = { elements.customheat = { color: ["#FF0000", "#FFFFFF", "#FF0000"], onSelect: function() { - var answer4 = parseInt(prompt("Please input the desired temperature increase per tick. (In celsius)",(ct|undefined))); + var answer4 = parseInt(prompt("Please input the desired temperature increase per tick. (In celsius)",(ct||undefined))); if (!answer4) { return } ct = answer4; if (isNaN(answer4)) { @@ -35,7 +35,7 @@ elements.customheat = { elements.customcool = { color: ["#0000FF", "#FFFFFF", "#0000FF"], onSelect: function() { - var answer4 = parseInt(prompt("Please input the desired temperature decrease per tick. (In celsius)",(cc|undefined))); + var answer4 = parseInt(prompt("Please input the desired temperature decrease per tick. (In celsius)",(ct||undefined))); if (!answer4) { return } ct = answer4; if (isNaN(answer4)) { From 165053097161e67de3d8f10adce0ddeacc4e0bfb Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Tue, 30 Apr 2024 18:28:17 -0400 Subject: [PATCH 08/13] Update potato_chips.js --- mods/potato_chips.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/potato_chips.js b/mods/potato_chips.js index 816ad59b..c1beeb75 100644 --- a/mods/potato_chips.js +++ b/mods/potato_chips.js @@ -7,7 +7,7 @@ elements.potato_chip = { desc: "Potato chip. Turns potato next to it into potato chip if temp is >= 104 - 180.", tick: function(pixel) { - if(pixelTicks - pixel.start >= 15) { + if(pixelTicks - pixel.start >= 10) { if (!isEmpty(pixel.x, pixel.y - 1, true)) { if (pixel.temp >= 104 && pixelMap[pixel.x][pixel.y - 1].element === "potato") { changePixel(pixelMap[pixel.x][pixel.y - 1], "potato_chip"); From efe36412dce9862360c2b184f752ab0ea500b8f3 Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Thu, 2 May 2024 21:45:40 -0400 Subject: [PATCH 09/13] Update mod-list.html --- mod-list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/mod-list.html b/mod-list.html index 41780ac0..c6a76044 100644 --- a/mod-list.html +++ b/mod-list.html @@ -199,6 +199,7 @@ fine_tuned_cloner.jsAdds a cloner that can spawn at different rates and prevent unwated cloningBatteRaquette58 flipflop.jsToggleable switches; ExplanationFlix gameOfLife.jsConway's Game of Life on a screenggod +fuel_generators.jsAdds diesel and gasoline powered generatorsguzzo86, nousernamefound/td> logicgates.jsAdds predictable electricity and logic gatesnousernamefound note_block.jsAdds musical Note BlocksAlice nousersthings.jsDestroyable machines, pipe variants, filters, and morenousernamefound From 6c89141f7b2d580ee91a79c065b77316fc41bc80 Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Fri, 3 May 2024 07:31:58 -0400 Subject: [PATCH 10/13] Update mod-list.html --- mod-list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod-list.html b/mod-list.html index c6a76044..81b7e719 100644 --- a/mod-list.html +++ b/mod-list.html @@ -199,7 +199,7 @@ fine_tuned_cloner.jsAdds a cloner that can spawn at different rates and prevent unwated cloningBatteRaquette58 flipflop.jsToggleable switches; ExplanationFlix gameOfLife.jsConway's Game of Life on a screenggod -fuel_generators.jsAdds diesel and gasoline powered generatorsguzzo86, nousernamefound/td> +fuel_generators.jsAdds diesel and gasoline powered generatorsguzzo86 logicgates.jsAdds predictable electricity and logic gatesnousernamefound note_block.jsAdds musical Note BlocksAlice nousersthings.jsDestroyable machines, pipe variants, filters, and morenousernamefound From 10f3ba326b2499005b23bbe5326396319daccf9c Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Sun, 5 May 2024 19:31:58 -0400 Subject: [PATCH 11/13] Create colored_lightbulbs.js --- mods/colored_lightbulbs.js | 44 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 mods/colored_lightbulbs.js diff --git a/mods/colored_lightbulbs.js b/mods/colored_lightbulbs.js new file mode 100644 index 00000000..84f8ad85 --- /dev/null +++ b/mods/colored_lightbulbs.js @@ -0,0 +1,44 @@ +elements.colored_light_bulb = { + color: "#666666", + colorOn: "#ffffff", + behavior: behaviors.WALL, + category: "machines", + tempHigh: 1500, + stateHigh: ["molten_glass","molten_glass","molten_copper"], + conduct: 1, + breakInto: "glass_shard", + tick: function(pixel) { + if (pixel.start == pixelTicks) { + pixel.normalColor = pixel.color; + pixel.chargeColor = `rgb(${pixel.color.replace(/[rgb\(\)]/g, "").split(",").map(a => parseInt(a.trim()) + 150).join(", ")})`; + } + if (pixel.color != pixel.normalColor && !pixel.charge && !pixel.chargeCD) { + pixel.normalColor = pixel.color; + pixel.chargeColor = `rgb(${pixel.color.replace(/[rgb\(\)]/g, "").split(",").map(a => parseInt(a.trim()) + 150).join(", ")})`; + } + if (pixel.charge) { + pixel.color = pixel.chargeColor; + } else { + pixel.color = pixel.normalColor; + } + if (pixel.charge > 0) { + for (let i = 0; i < adjacentCoords.length; i++){ + let coord = adjacentCoords[i] + let x = coord[0]+pixel.x + let y = coord[1]+pixel.y + if (isEmpty(x, y)){ + //do crap to the pixel + createPixel("light", x, y,), + pixelMap[x][y].color = pixel.chargeColor + } + } + }} +} +pixelColorPick = (function() { + const oldPixelColorPick = pixelColorPick; + + return function(pixel, customColor = null) { + if (pixel.element == "colored_light_bulb" && pixel.color && !customColor) return pixel.color; + return oldPixelColorPick.apply(this, arguments); + } +})() From d6796c7ea6d1562d4228b40c14869221ae533bcd Mon Sep 17 00:00:00 2001 From: guzzo86 <126430018+guzzo86@users.noreply.github.com> Date: Sun, 5 May 2024 19:33:38 -0400 Subject: [PATCH 12/13] Update mod-list.html --- mod-list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/mod-list.html b/mod-list.html index 81b7e719..e273ce68 100644 --- a/mod-list.html +++ b/mod-list.html @@ -203,6 +203,7 @@ logicgates.jsAdds predictable electricity and logic gatesnousernamefound note_block.jsAdds musical Note BlocksAlice nousersthings.jsDestroyable machines, pipe variants, filters, and morenousernamefound +colored_lightbulbs.jsAdds a light bulb that can be painted.guzzo86, ggod portal.jsAdds portals that can teleport pixelsAlice pullers.jsAdds pixels that pull pixels towards themvoidapex11 pushers.jsAdds pixels that push elements away from themAlice From 32f8ac5d896bc4722248f212df5810123d943d1d Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Sun, 5 May 2024 19:39:20 -0400 Subject: [PATCH 13/13] Update mod-list.html --- mod-list.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mod-list.html b/mod-list.html index 07d08604..fe276e5f 100644 --- a/mod-list.html +++ b/mod-list.html @@ -127,7 +127,6 @@ color_tools.jsAdds tools that manipulate colorsAlice controllable_pixel_test.jsAdds a pixel that can be controlled with the keyboard keys. Read the commit description for more info. [PC ONLY]Alice cpt_alt.jsAdds a more destructive variant of the controllable pixelAlice -customtemptools.jsAdds custom input temp tools.guzzo86 debugRework.jsRevamps the Debug toolFioushemastor delete_all_of_element.jsAdds a tool that deletes every pixel of the element(s) the user clicks onAlice descriptions.jsAdds descriptions to the info page and tooltips of elementsmollthecoder @@ -199,11 +198,9 @@ fine_tuned_cloner.jsAdds a cloner that can spawn at different rates and prevent unwated cloningBatteRaquette58 flipflop.jsToggleable switches; ExplanationFlix gameOfLife.jsConway's Game of Life on a screenggod -fuel_generators.jsAdds diesel and gasoline powered generatorsguzzo86 logicgates.jsAdds predictable electricity and logic gatesnousernamefound note_block.jsAdds musical Note BlocksAlice nousersthings.jsDestroyable machines, pipe variants, filters, and morenousernamefound -colored_lightbulbs.jsAdds a light bulb that can be painted.guzzo86, ggod portal.jsAdds portals that can teleport pixelsAlice pullers.jsAdds pixels that pull pixels towards themvoidapex11 pushers.jsAdds pixels that push elements away from themAlice @@ -231,7 +228,6 @@ bananas.jsAdds bananas and banana plantsAlice' CherrySoda.jsAdds materials to make Cherry soda. Benzaldehyde + seltzer = Cherrysoda.guzzo86 community_desserts.jsAdds various desserts from community suggestionsTisquares -GrapeSoda.jsAdds materials to make Grape soda. Methylanthranilate + seltzer = Grapesoda.guzzo86 greenitemsandmore.jsAdds various green things, including apples and more foodzonneschijn7 ketchup_mod.jsAdds a bunch of ketchup related stuff, plus a few other condimentsNubo318 (main dev), Devi, Alice (contributors) lemonade.jsAdds lemons and lemonadepersonman / baconthemyth