From c84ecf3ba5b042d8845926d3ea50a3182851a3f3 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:42:41 +0800 Subject: [PATCH 1/5] coral gone :sad: :emoji: --- mods/aChefsDream.js | 77 ++++----------------------------------------- 1 file changed, 6 insertions(+), 71 deletions(-) diff --git a/mods/aChefsDream.js b/mods/aChefsDream.js index 4f9c32e6..cef3157b 100644 --- a/mods/aChefsDream.js +++ b/mods/aChefsDream.js @@ -393,6 +393,12 @@ Changelog (v1.12) +Changelog (v1.12.1) + - removed coral, can still be found in ocean.js + + + + */ /* @@ -1768,77 +1774,6 @@ elements.salmon = { cutInto: "raw_salmon" } -elements.coral_stem = { - color: "#4a5e49", - behavior: [ - "CR:coral_stem,coral%2|CR:coral,coral_stem,coral,coral%2|CR:coral_stem,coral%2", - "XX|XX|XX", - "XX|XX|XX", - ], - tick: function(pixel) { - if (!pixel.fColor) { - pixel.fColor = "hsl(" + Math.floor(Math.random()*360) + ",100%,50%)"; - } - var coordsToCheck = [ - [pixel.x-1,pixel.y], - [pixel.x+1,pixel.y], - [pixel.x,pixel.y-1], - [pixel.x,pixel.y+1], - ] - for (var i = 0; i < coordsToCheck.length; i++) { - var coord = coordsToCheck[i]; - if (isEmpty(coord[0],coord[1])) { - createPixel("coral",coord[0],coord[1]); - pixelMap[coord[0]][coord[1]].color = pixel.fColor; - } - } - doDefaults(pixel) - }, - tempHigh: 100, - stateHigh: "dead_coral", - tempLow: -30, - stateLow: "dead_coral", - category: "life", - burn: 40, - burnTime: 50, - burnInto: [,"ember","charcoal"], - hidden: true, - state: "solid", - density: 1500, - hardness: 0.15, - hidden: true, -} - -elements.coral = { - color: ["#ff0000","#ff8800","#ffff00","#88ff00","#00ff00","#00ff88","#00ffff","#0088ff","#0000ff","#8800ff","#ff00ff"], - behavior: [ - "XX|XX|XX", - "XX|XX|XX", - "XX|XX|XX", - ], - reactions: { - "vinegar": { elem1:"dead_plant", elem2:null, chance:0.035 }, - "baking_soda": { elem1:"dead_plant", elem2:null, chance:0.01 }, - "bleach": { elem1:"dead_plant", elem2:null, chance:0.05 }, - "alcohol": { elem1:"dead_plant", elem2:null, chance:0.035} - }, - category:"life", - tempHigh: 100, - stateHigh: "dead_plant", - tempLow: -1.66, - stateLow: "frozen_plant", - burn:65, - burnTime:60, - burnInto: "dead_plant", - breakInto: "dead_plant", - state: "solid", - density: 1050, - hidden: true, - properties:{ - "colored": false - } -} - elements.raw_salmon = { color: ["#FD7E19", "#FE842F", "#FD8F45"], behavior: behaviors.STURDYPOWDER, From 3cc9071013e7b506882450aa2bd4b9a013a5cb2d Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:43:58 +0800 Subject: [PATCH 2/5] meat behavior --- mods/aChefsDream.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/aChefsDream.js b/mods/aChefsDream.js index cef3157b..0caf9a50 100644 --- a/mods/aChefsDream.js +++ b/mods/aChefsDream.js @@ -7095,3 +7095,5 @@ elements.food_coloring = { logMessage("Food Coloring May Fade when diluted with water."); }, } + +elements.cooked_meat.behavior = behaviors.STURDYPOWDER; From e07ff23b65901d4c3e23db9f69bebfd179676a26 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 2 Apr 2024 09:50:31 +0800 Subject: [PATCH 3/5] Update aChefsDream.js --- mods/aChefsDream.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/aChefsDream.js b/mods/aChefsDream.js index 0caf9a50..abe3225a 100644 --- a/mods/aChefsDream.js +++ b/mods/aChefsDream.js @@ -395,6 +395,7 @@ Changelog (v1.12) Changelog (v1.12.1) - removed coral, can still be found in ocean.js + - updated food coloring @@ -7078,11 +7079,10 @@ elements.food_coloring = { if (!isEmpty(x, y, true)) { if (pixelMap[x][y].element === "water" || pixelMap[x][y].element === "salt_water" || pixelMap[x][y].element === "sugar_water" || pixelMap[x][y].element === "seltzer" || pixelMap[x][y].element === "dirty_water" || pixelMap[x][y].element === "pool_water") { changePixel(pixelMap[x][y], "food_coloring"); - let newrgb = interpolateRgb(getRGB(pixel.color), getRGB(pixelMap[x][y].color), 0.5); - pixel.color = `rgb(${parseInt(newrgb.r)},${parseInt(newrgb.g)},${parseInt(newrgb.b)})`; - pixelMap[x][y].color = `rgb(${parseInt(newrgb.r)},${parseInt(newrgb.g)},${parseInt(newrgb.b)})`; + pixelMap[x][y].color = pixel.color } else { + if (pixelMap[x][y].element !== "food_coloring" || pixelMap[x][y].element !== "water" || pixelMap[x][y].element !== "salt_water" || pixelMap[x][y].element !== "sugar_water" || pixelMap[x][y].element !== "seltzer" || pixelMap[x][y].element !== "dirty_water" || pixelMap[x][y].element !== "pool_water") pixelMap[x][y].color = pixel.color; if (Math.random < 0.02) { deletePixel(pixel.x,pixel.y) @@ -7092,7 +7092,7 @@ elements.food_coloring = { } }, onSelect: function () { - logMessage("Food Coloring May Fade when diluted with water."); + logMessage("Tip: You can spread food coloring using water."); }, } From 91479a3507f2c3326dc6d89b39318ef76e208eb0 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:02:47 +0800 Subject: [PATCH 4/5] Update aChefsDream.js --- mods/aChefsDream.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/mods/aChefsDream.js b/mods/aChefsDream.js index abe3225a..765e8b44 100644 --- a/mods/aChefsDream.js +++ b/mods/aChefsDream.js @@ -7081,13 +7081,6 @@ elements.food_coloring = { changePixel(pixelMap[x][y], "food_coloring"); pixelMap[x][y].color = pixel.color } - else { - if (pixelMap[x][y].element !== "food_coloring" || pixelMap[x][y].element !== "water" || pixelMap[x][y].element !== "salt_water" || pixelMap[x][y].element !== "sugar_water" || pixelMap[x][y].element !== "seltzer" || pixelMap[x][y].element !== "dirty_water" || pixelMap[x][y].element !== "pool_water") - pixelMap[x][y].color = pixel.color; - if (Math.random < 0.02) { - deletePixel(pixel.x,pixel.y) - } - } } } }, From 2137a54fc43347a6f325c290f765239b34905647 Mon Sep 17 00:00:00 2001 From: SquareScreamYT <134925668+SquareScreamYT@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:05:59 +0800 Subject: [PATCH 5/5] Update aChefsDream.js --- mods/aChefsDream.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/aChefsDream.js b/mods/aChefsDream.js index 765e8b44..f146f4c1 100644 --- a/mods/aChefsDream.js +++ b/mods/aChefsDream.js @@ -7071,7 +7071,7 @@ elements.food_coloring = { stainSelf: true, ignore: ["glass", "porcelain", "wall"], desc: "coloring for food. color may fade when diluting with water.", - tick: function (pixel) { + /*tick: function (pixel) { for (var i = 0; i < squareCoords.length; i++) { var coord = squareCoords[i]; var x = pixel.x + coord[0]; @@ -7086,7 +7086,7 @@ elements.food_coloring = { }, onSelect: function () { logMessage("Tip: You can spread food coloring using water."); - }, + },*/ } elements.cooked_meat.behavior = behaviors.STURDYPOWDER;