commodore
/
sandboxels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'R74nCom:main' into main

This commit is contained in:
Nekonico 2024-11-26 19:47:44 -08:00 committed by GitHub
parent 5faa6a77d4 5337cf1af1
commit aa254fd498
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mods/survival.js
View File

@ -397,28 +397,6 @@ runAfterLoad(function(){
}
}
}
else if (currentElement === "shock") {
if (!isEmpty(x,y,true)) {
// One loop that repeats 5 times if shiftDown else 1 time
for (var j = 0; j < (shiftDown ? 5 : 1); j++) {
var pixel = pixelMap[x][y];
var con = elements[pixel.element].conduct;
if (con == undefined) {continue}
if (Math.random() < con) { // If random number is less than conductivity
if (!pixel.charge && !pixel.chargeCD) {
pixel.charge = 1;
if (elements[pixel.element].colorOn) {
pixel.color = pixelColorPick(pixel);
}
}
}
else if (elements[pixel.element].insulate != true) { // Otherwise heat the pixel (Resistance simulation)
pixel.temp += 0.25;
pixelTempCheck(pixel);
}
}
}
}
else if (elements[currentElement].tool && !(elements[currentElement].canPlace && isEmpty(x,y))) {
// run the tool function on the pixel
if (!isEmpty(x,y,true)) {
@ -434,7 +412,7 @@ runAfterLoad(function(){
if (survivalCount(currentElement) < 1 && elements[currentElement].category !== "tools") {
return;
}
currentPixels.push(new Pixel(x, y, currentElement));
createPixel(currentElement,x,y);
if (elements[currentElement].customColor || elements[currentElement].singleColor) {
pixelMap[x][y].color = pixelColorPick(currentElement,currentColor);
}