Merge pull request #480 from SquareScreamYT/main

bugge fix
This commit is contained in:
slweeb 2024-04-01 22:11:30 -04:00 committed by GitHub
commit f7a9512556
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 83 deletions

View File

@ -393,6 +393,13 @@ Changelog (v1.12)
Changelog (v1.12.1)
- removed coral, can still be found in ocean.js
- updated food coloring
*/
/*
@ -1768,77 +1775,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,
@ -7135,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];
@ -7143,20 +7079,14 @@ 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)})`;
}
else {
pixelMap[x][y].color = pixel.color;
if (Math.random < 0.02) {
deletePixel(pixel.x,pixel.y)
}
pixelMap[x][y].color = pixel.color
}
}
}
},
onSelect: function () {
logMessage("Food Coloring May Fade when diluted with water.");
},
logMessage("Tip: You can spread food coloring using water.");
},*/
}
elements.cooked_meat.behavior = behaviors.STURDYPOWDER;