Merge pull request #589 from guzzo86/main

Paint-able light bulbs
This commit is contained in:
slweeb 2024-05-05 19:39:35 -04:00 committed by GitHub
commit 5f89dd1d15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 102 additions and 7 deletions

View File

@ -226,18 +226,18 @@
<!----><tr><td class="modCat" colspan="3">Food & Cooking</td></tr><!---->
<tr><td>aChefsDream.js</td><td>Adds more foods, animals, tools and many other cooking related items. Updates can be found in <a href="https://www.youtube.com/watch?v=pQFTtlNPODQ&list=PLWHqGb75vC8o7CLv-pMoVb56JL9BY9F0t">this YouTube Playlist</a></td><td>SquareScreamYT</td></tr>
<tr><td>aChefsDream_beta.js</td><td>Beta testing for aChefsDream. The code can be found <a href="https://www.github.com/SquareScreamYT/aChefsDream.js">on GitHub</a></td><td>SquareScreamYT</td></tr>
<tr><td>bananas.js</td><td>Adds bananas and banana plants</td><td>Alice</td></tr>
<tr><td>bananas.js</td><td>Adds bananas and banana plants</td><td>Alice</td></tr>'
<tr><td>CherrySoda.js</td><td>Adds materials to make Cherry soda. Benzaldehyde + seltzer = Cherrysoda.</td><td>guzzo86</td></tr>
<tr><td>community_desserts.js</td><td>Adds various desserts from community suggestions</td><td>Tisquares</td></tr>
<tr><td>greenitemsandmore.js</td><td>Adds various green things, including apples and more food</td><td>zonneschijn7</td>
<tr><td>ketchup_mod.js</td><td>Adds a bunch of ketchup related stuff, plus a few other condiments</td><td>Nubo318 (main dev), Devi, Alice (contributors)</td></tr>
<tr><td>lemonade.js</td><td>Adds lemons and lemonade</td><td>personman / baconthemyth</td></tr>
<tr><td>morefoodsmod.js</td><td>Adds more foods</td><td>Clide4</td></tr>
<tr><td>pizzasstuff.js</td><td>New animals, foods, and plants</td><td>_ilikepizza_</td></tr>
<tr><td>potato_chips.js</td><td>Potato chips.</td><td>guzzo86</td></tr>
<tr><td>sbstuff.js</td><td>Adds many foods</td><td>stefanblox</td></tr>
<tr><td>soups.js</td><td>Adds seasoning and soup</td><td>pixelegend4</td></tr>
<tr><td>weAllScreamFor.js</td><td>Adds ice cream toppings</td><td>rottenEgghead</td></tr>
<tr><td>CherrySoda.js</td><td>Adds materials to make Cherry soda. Benzaldehyde + seltzer = Cherrysoda.</td><td>guzzo86</td></tr>
<tr><td>GrapeSoda.js</td><td>Adds materials to make Grape soda. Methylanthranilate + seltzer = Grapesoda.</td><td>guzzo86</td></tr>
<!----><tr><td class="modCat" colspan="3">Life & Nature</td></tr><!---->
<tr><td>advanced_colonies.js</td><td>Adds davlers, creatures with complex colonies</td><td>DaviStudios</td></tr>

View File

@ -65,7 +65,7 @@ elements.cherrysoda_gas = {
temp: 169,
}
elements.cherrysoda_ice = {
color: "BF4F9C",
color: "#BF4F9C",
behavior: behaviors.wALL,
category: "solids",
state: "solid",

View File

@ -45,7 +45,6 @@ elements.anthranilicacid = {
tempLow: -98,
burn: 100,
burnTime: 100,
burnInto: "carbondioxide"
}
elements.methanolice = {
@ -68,6 +67,8 @@ elements.anthranilicacid = {
stateLow: "methanol",
tempLow: 64,
temp: 84,
burn: 100,
burnTime: 100,
}
elements.methylanthranilate = {
color: "#FFFBBA",

View File

@ -0,0 +1,44 @@
elements.colored_light_bulb = {
color: "#666666",
colorOn: "#ffffff",
behavior: behaviors.WALL,
category: "machines",
tempHigh: 1500,
stateHigh: ["molten_glass","molten_glass","molten_copper"],
conduct: 1,
breakInto: "glass_shard",
tick: function(pixel) {
if (pixel.start == pixelTicks) {
pixel.normalColor = pixel.color;
pixel.chargeColor = `rgb(${pixel.color.replace(/[rgb\(\)]/g, "").split(",").map(a => parseInt(a.trim()) + 150).join(", ")})`;
}
if (pixel.color != pixel.normalColor && !pixel.charge && !pixel.chargeCD) {
pixel.normalColor = pixel.color;
pixel.chargeColor = `rgb(${pixel.color.replace(/[rgb\(\)]/g, "").split(",").map(a => parseInt(a.trim()) + 150).join(", ")})`;
}
if (pixel.charge) {
pixel.color = pixel.chargeColor;
} else {
pixel.color = pixel.normalColor;
}
if (pixel.charge > 0) {
for (let i = 0; i < adjacentCoords.length; i++){
let coord = adjacentCoords[i]
let x = coord[0]+pixel.x
let y = coord[1]+pixel.y
if (isEmpty(x, y)){
//do crap to the pixel
createPixel("light", x, y,),
pixelMap[x][y].color = pixel.chargeColor
}
}
}}
}
pixelColorPick = (function() {
const oldPixelColorPick = pixelColorPick;
return function(pixel, customColor = null) {
if (pixel.element == "colored_light_bulb" && pixel.color && !customColor) return pixel.color;
return oldPixelColorPick.apply(this, arguments);
}
})()

50
mods/customtemptools.js Normal file
View File

@ -0,0 +1,50 @@
var ct = 100
elements.customtemp = {
color: ["#FF0000", "#FF6600", "#FFCC00", "#FFFF00", "#CCFF00", "#66FF00", "#00FF00", "#00FF66", "#00FFCC", "#00FFFF"],
onSelect: function() {
var answer4 = parseInt(prompt("Please input the desired temperature to reach.",(ct||undefined)));
if (!answer4) { return }
ct = answer4;
if (isNaN(answer4)) {
ct = 100
}
},
tool: function(pixel) {
pixel.temp = ct,
pixelTempCheck(pixel)
},
category: "tools",
};
elements.customheat = {
color: ["#FF0000", "#FFFFFF", "#FF0000"],
onSelect: function() {
var answer4 = parseInt(prompt("Please input the desired temperature increase per tick. (In celsius)",(ct||undefined)));
if (!answer4) { return }
ct = answer4;
if (isNaN(answer4)) {
ct = 100
}
},
tool: function(pixel) {
pixel.temp = pixel.temp + ct,
pixelTempCheck(pixel)
},
category: "tools",
};
elements.customcool = {
color: ["#0000FF", "#FFFFFF", "#0000FF"],
onSelect: function() {
var answer4 = parseInt(prompt("Please input the desired temperature decrease per tick. (In celsius)",(ct||undefined)));
if (!answer4) { return }
ct = answer4;
if (isNaN(answer4)) {
ct = 100
}
},
tool: function(pixel) {
pixel.temp = pixel.temp - ct,
pixelTempCheck(pixel)
},
category: "tools",
};

View File

@ -4,10 +4,10 @@ elements.potato_chip = {
density: 1350,
color: ["#F7DD93", "#D8A44B"],
category: "food",
desc: "Potato chip. Turns potato next to it into potato chip if temp is >= 104.",
desc: "Potato chip. Turns potato next to it into potato chip if temp is >= 104 - 180.",
tick: function(pixel) {
if(pixelTicks - pixel.start >= 15) {
if(pixelTicks - pixel.start >= 10) {
if (!isEmpty(pixel.x, pixel.y - 1, true)) {
if (pixel.temp >= 104 && pixelMap[pixel.x][pixel.y - 1].element === "potato") {
changePixel(pixelMap[pixel.x][pixel.y - 1], "potato_chip");