This commit is contained in:
slweeb 2023-12-18 18:54:16 -05:00
commit 8fbb601ad0
2 changed files with 63 additions and 5 deletions

View File

@ -36,6 +36,9 @@ eLists.metals.forEach(metal => {
};
elements[metal].tick = modfunc;
}
if (elements[metal].behavior == behaviors.WALL){
elements[metal].movable = false;
}
});
elements.color_baker = {
color: "#F61212",
@ -48,3 +51,53 @@ elements.color_baker = {
excludeRandom: true,
desc: "Use to bake a metals paint color into its 'true' color, for heating purposes.",
}
//const plantfunc = function(pixel){
// if (pixel.ogR == null || pixel.ogG == null || pixel.ogB == null){
// pixel.ogR = parseInt(pixel.color.slice(4, pixel.color.indexOf(',')), 10)
// pixel.ogG = parseInt(pixel.color.slice(pixel.color.indexOf(',') + 1, pixel.color.lastIndexOf(',')), 10)
// pixel.ogB = parseInt(pixel.color.slice(pixel.color.lastIndexOf(',') + 1, -1), 10)
// pixel.deadR = 130;
// pixel.deadG = 103;
// pixel.deadB = 40;
// pixel.burnR = 30;
// pixel.burnG = 30;
// pixel.burnB = 30;
// }else{
// pixel.gethigh = (elements[pixel.element].tempHigh)
// pixel.halftemp = ((20+pixel.gethigh)/2)
// if (pixel.temp <= (pixel.gethigh) - pixel.halftemp){
// pixel.ctemp = 0;
// pixel.twoctemp = 0,
// pixel.littlectemp = 1;
// } else if (pixel.temp > (pixel.gethigh)-pixel.halftemp && pixel.temp <= pixel.gethigh){
// pixel.ctemp = ((1/pixel.halftemp)*pixel.temp)-(((pixel.gethigh)-pixel.halftemp)/pixel.halftemp);
// pixel.twoctemp = pixel.ctemp*2;
// pixel.littlectemp = 2*(1-(pixel.ctemp));
// }
// if (pixel.ctemp <= 0.5){
// pixel.newR = ((pixel.twoctemp*pixel.deadR)+(pixel.littlectemp*pixel.ogR)/(pixel.twoctemp+pixel.littlectemp));
// pixel.newG = ((pixel.twoctemp*pixel.deadG)+(pixel.littlectemp*pixel.ogG)/(pixel.twoctemp+pixel.littlectemp));
// pixel.newB = ((pixel.twoctemp*pixel.deadB)+(pixel.littlectemp*pixel.ogB)/(pixel.twoctemp+pixel.littlectemp));
// }else if (pixel.ctemp > 0.5){
// pixel.newR = (((pixel.twoctemp*pixel.deadR)+(pixel.littlectemp*pixel.burnR))/(pixel.twoctemp*pixel.littlectemp));
// pixel.newG = (((pixel.twoctemp*pixel.deadG)+(pixel.littlectemp*pixel.burnG))/(pixel.twoctemp*pixel.littlectemp));
// pixel.newB= (((pixel.twoctemp*pixel.deadB)+(pixel.littlectemp*pixel.burnB))/(pixel.twoctemp*pixel.littlectemp));
// }
// pixel.color = "rgb(" + pixel.newR + "," + pixel.newG + "," + pixel.newB + ")";
// }
// };
// if (!eLists.burnplants) { eLists.burnplants = [] }
// eLists.burnplants = eLists.burnplants.concat(["plant","dead_plant","grass","algae","sapling","evergreen","cactus","seeds","grass_seed","wheat_seed","flower_seed","pistil","petal","tree_branch","bamboo_plant","mushroom_spore","mushroom_stalk","mushroom_gill","mushroom_cap","hyphae","pumpkin_seed","pumpkin","corn","corn_seed","potato","potato_seed","root"])
//eLists.burnplants.forEach(plant => {
// const prefunc = elements[plant].tick;
// if (!prefunc){
// elements[plant].tick = plantfunc;
// }else{
// const modfunc = function(pixel){
// prefunc(pixel);
// plantfunc(pixel);
// };
// elements[plant].tick = modfunc;
// }
//});

View File

@ -319,7 +319,8 @@ elements.roomtemper = {
category:"machines",
state:"solid",
insulate: true,
noMix: true,
noMix: true,
movable: false,
},
elements.destroyable_roomtemper = {
color: "#18401a",
@ -349,7 +350,8 @@ elements.destroyable_roomtemper = {
tempLow: -200,
stateLow: ["ice", "iron"],
breakInto: ["snow","metal_scrap"],
noMix: true,
noMix: true,
movable: false,
},
elements.customtemper = {
color: "#421b6b",
@ -375,7 +377,8 @@ elements.customtemper = {
category:"machines",
state:"solid",
insulate: true,
noMix: true,
noMix: true,
movable: false,
},
elements.destroyable_customtemper = {
color: "#261047",
@ -402,7 +405,8 @@ elements.destroyable_customtemper = {
state:"solid",
insulate: true,
breakInto: ["snow","metal_scrap","oxidized_copper","wire"],
noMix: true,
noMix: true,
movable: false,
},
elements.e_pipe = {
color: "#414c4f",
@ -886,7 +890,7 @@ elements.destroyable_channel_pipe = {
movable: false,
canContain: true,
},
listPipes = ["pipe", "destroyable_pipe", "destroyable_e_pipe","channel_pipe","destroyable_channel_pipe","bridge_pipe"];
listPipes = ["pipe", "destroyable_pipe", "destroyable_e_pipe","channel_pipe","destroyable_channel_pipe","bridge_pipe","e_pipe"];
elements.bridge_pipe = {
color: "#414c4f",
onSelect: function() {
@ -1243,6 +1247,7 @@ elements.heat_test = {
state: "solid",
tempHigh: 1538,
stateHigh: "molten_iron",
movable: false,
tick: function(pixel){
if (pixel.start == pixelTicks){
pixel.ogR = parseInt(pixel.color.slice(4, pixel.color.indexOf(',')), 10)