-
-
Notifications
You must be signed in to change notification settings - Fork 355
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #802 from guzzo86/main
The fueled generators u just helped me fix Ryan. + some more tree and wood types!!!! WOO!
- Loading branch information
Showing
4 changed files
with
628 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,131 @@ | ||
| elements.gasoline = { | ||
| color: ["#FFFF66", "#FFFF66", "#FFFF66", "#FFFF66", "#FFFF66"], | ||
| burn: 15, | ||
| burnTime: 300, | ||
| viscosity: 0.6, | ||
| density: 750, | ||
| category: "fuels", | ||
| behavior: behaviors.LIQUID, | ||
| state: "liquid", | ||
| desc: "Used in Gas Generators!" | ||
| } | ||
|
|
||
| elements.diesel = { | ||
| color: "#EBFBB5", | ||
| burn: 10, | ||
| burnTime: 600, | ||
| viscosity: 3, | ||
| density: 860, | ||
| category: "fuels", | ||
| behavior: behaviors.LIQUID, | ||
| state: "liquid", | ||
| desc: "Used in Diesel Generators!" | ||
| } | ||
|
|
||
| elements.gasoline_generator = { | ||
| color: "#6d5f5d", | ||
| behavior: behaviors.WALL, | ||
| state: "solid", | ||
| density: 1000, | ||
| category: "machines", | ||
| properties: { | ||
| shocksToDo: 0 | ||
| }, | ||
| hoverStat: function(pixel){return (pixel.shocksToDo).toString() || 0}, | ||
| tick: function(pixel){ | ||
| if (pixel.shocksToDo <= 40){ | ||
| for (var i = 0; i < adjacentCoords.length; i++){ | ||
| var coord = adjacentCoords[i] | ||
| var x = pixel.x + coord[0] | ||
| var y = pixel.y + coord[1] | ||
| if (!isEmpty(x, y, true)){ | ||
| var otherPixel = pixelMap[x][y] | ||
| if (otherPixel.element == "gasoline"){ | ||
| deletePixel(x, y) | ||
| if(!pixel.shocksToDo){pixel.shocksToDo = 0} | ||
| pixel.shocksToDo += 10 | ||
| } | ||
| else if (otherPixel.element == "gasoline_generator"){ | ||
| var otherPixel = pixelMap[x][y] | ||
| var otherShock = otherPixel.shocksToDo || 0 | ||
| var currentShock = pixel.shocksToDo || 0 | ||
| if (otherShock > currentShock){ | ||
| otherPixel.shocksToDo -- | ||
| pixel.shocksToDo ++ | ||
| } else if (currentShock > otherShock) { | ||
| otherPixel.shocksToDo ++ | ||
| pixel.shocksToDo -- | ||
| } | ||
| } | ||
| } | ||
| }} | ||
| if (!pixel.charge && !pixel.chargeCD && pixel.shocksToDo){ | ||
| for (var i = 0; i < adjacentCoords.length; i++){ | ||
| var coord = adjacentCoords[i] | ||
| var x = pixel.x + coord[0] | ||
| var y = pixel.y + coord[1] | ||
| if (!isEmpty(x, y, true)){ | ||
| if (elements[pixelMap[x][y].element].conduct > 0){ | ||
| pixel.charge = 1 | ||
| pixel.shocksToDo -- | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| elements.diesel_generator = { | ||
| color: "#FF9C27", | ||
| behavior: behaviors.WALL, | ||
| state: "solid", | ||
| density: 1000, | ||
| category: "machines", | ||
| properties: { | ||
| shocksToDo: 0 | ||
| }, | ||
| hoverStat: function(pixel){return (pixel.shocksToDo).toString() || 0}, | ||
| tick: function(pixel){ | ||
| if (pixel.shocksToDo <= 80){ | ||
| for (var i = 0; i < adjacentCoords.length; i++){ | ||
| var coord = adjacentCoords[i] | ||
| var x = pixel.x + coord[0] | ||
| var y = pixel.y + coord[1] | ||
| if (!isEmpty(x, y, true)){ | ||
| var otherPixel = pixelMap[x][y] | ||
| if (otherPixel.element == "diesel"){ | ||
| deletePixel(x, y) | ||
| if(!pixel.shocksToDo){pixel.shocksToDo = 0} | ||
| pixel.shocksToDo += 20 | ||
| } | ||
| else if (otherPixel.element == "diesel_generator"){ | ||
| var otherPixel = pixelMap[x][y] | ||
| var otherShock = otherPixel.shocksToDo || 0 | ||
| var currentShock = pixel.shocksToDo || 0 | ||
| if (otherShock > currentShock){ | ||
| otherPixel.shocksToDo -- | ||
| pixel.shocksToDo ++ | ||
| } else if (currentShock > otherShock) { | ||
| otherPixel.shocksToDo ++ | ||
| pixel.shocksToDo -- | ||
| } | ||
| } | ||
| } | ||
| }} | ||
| if (!pixel.charge && !pixel.chargeCD && pixel.shocksToDo){ | ||
| for (var i = 0; i < adjacentCoords.length; i++){ | ||
| var coord = adjacentCoords[i] | ||
| var x = pixel.x + coord[0] | ||
| var y = pixel.y + coord[1] | ||
| if (!isEmpty(x, y, true)){ | ||
| if (elements[pixelMap[x][y].element].conduct > 0){ | ||
| pixel.charge = 1 | ||
| pixel.shocksToDo -- | ||
| break; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.