Merge pull request #782 from JustAGenericUsername/main

This commit is contained in:
slweeb 2024-08-24 16:05:26 -04:00 committed by GitHub
commit d238269606
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 20 deletions

View File

@ -303,43 +303,37 @@ elements.E2L_button = {
state: "solid", state: "solid",
category: "logic", category: "logic",
tick: function(pixel){ tick: function(pixel){
if (pixel.start === pixelTicks){
pixel.cooldown = 0;
pixel.toggleMode = 1;
}
for (var i = 0; i < adjacentCoords.length; i++) { for (var i = 0; i < adjacentCoords.length; i++) {
var coord = adjacentCoords[i]; var coord = adjacentCoords[i];
var x = pixel.x+coord[0]; var x = pixel.x+coord[0];
var y = pixel.y+coord[1]; var y = pixel.y+coord[1];
if (!isEmpty(x,y,true)) { if (!isEmpty(x,y,true)) {
if ((pixelMap[x][y].charge || pixelMap[x][y].chargeCD) && pixel.cooldown == 0){ if ((pixelMap[x][y].charge || pixelMap[x][y].chargeCD)){
for (var i = 0; i < adjacentCoords.length; i++) { for (var j = 0; j < adjacentCoords.length; j++) {
var coord = adjacentCoords[i]; var coord = adjacentCoords[j];
var x = pixel.x+coord[0]; var x = pixel.x+coord[0];
var y = pixel.y+coord[1]; var y = pixel.y+coord[1];
if (!isEmpty(x,y,true)) { if (!isEmpty(x,y,true)) {
if (pixelMap[x][y].element == "logic_wire"){ if (pixelMap[x][y].element == "logic_wire"){
if (pixel.toggleMode == 1){
pixelMap[x][y].lstate = 2 pixelMap[x][y].lstate = 2
pixelMap[x][y].color = pixelColorPick(pixel, "#ffe49c"); pixelMap[x][y].color = pixelColorPick(pixel, "#ffe49c");
} else {
pixelMap[x][y].lstate = -2
pixelMap[x][y].color = pixelColorPick(pixel, "#3d4d2c");
}
} }
} }
} }
pixel.cooldown = 5 return;
if (pixel.toggleMode){
pixel.toggleMode = 0;
} else {
pixel.toggleMode = 1;
}
} }
} }
} }
if (pixel.cooldown){ for (var i = 0; i < adjacentCoords.length; i++) {
pixel.cooldown = pixel.cooldown - 1 var coord = adjacentCoords[i];
var x = pixel.x+coord[0];
var y = pixel.y+coord[1];
if (!isEmpty(x,y,true)) {
if (pixelMap[x][y].element == "logic_wire" && pixelMap[x][y].lstate > 0){
pixelMap[x][y].lstate = -2
pixelMap[x][y].color = pixelColorPick(pixel, "#3d4d2c");
}
}
} }
} }
} }