From dc2700d9293da5bdfbd2f1f3ce17da75e6db9ef5 Mon Sep 17 00:00:00 2001 From: An Orbit <68935009+orbit-loona@users.noreply.github.com> Date: Sun, 7 May 2023 15:45:24 -0400 Subject: [PATCH] merge delete noConduct.js incompatible with doElectricity changes.js --- mods/noConduct.js | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 mods/noConduct.js diff --git a/mods/noConduct.js b/mods/noConduct.js deleted file mode 100644 index 5c6535bb..00000000 --- a/mods/noConduct.js +++ /dev/null @@ -1,43 +0,0 @@ -function doElectricity(pixel) { - var info = elements[pixel.element]; - if (pixel.charge) { - // Check each adjacent pixel, if that pixel's charge is false, set it to the same charge - for (var i = 0; i < adjacentCoords.length; i++) { - var x = pixel.x+adjacentCoords[i][0]; - var y = pixel.y+adjacentCoords[i][1]; - if (!isEmpty(x,y,true)) { - var newPixel = pixelMap[x][y]; - var con = elements[newPixel.element].conduct; - if (con == undefined) {continue} - if (info.noConduct?.length && info.noConduct.includes(newPixel.element)) {continue}; - if (Math.random() < con) { // If random number is less than conductivity - if (!newPixel.charge && !newPixel.chargeCD) { - newPixel.charge = 1; - if (elements[newPixel.element].colorOn) { - newPixel.color = pixelColorPick(newPixel); - } - } - } - else if (elements[newPixel.element].insulate != true) { // Otherwise heat the pixel (Resistance simulation) - newPixel.temp += pixel.charge/4; - pixelTempCheck(newPixel); - } - } - } - pixel.charge -= 0.25; - if (pixel.charge <= 0) { - delete pixel.charge; - pixel.chargeCD = 4; - } - } - // Lower charge cooldown - else if (pixel.chargeCD) { - pixel.chargeCD -= 1; - if (pixel.chargeCD <= 0) { - delete pixel.chargeCD; - if (info.colorOn) { - pixel.color = pixelColorPick(pixel); - } - } - } -}