Merge branch 'R74nCom:main' into main

This commit is contained in:
HACKERPRO908 2024-02-28 08:12:49 +00:00 committed by GitHub
commit 486351b785
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 473 additions and 27 deletions

File diff suppressed because one or more lines are too long

View File

@ -5,17 +5,18 @@ Also checkout sbstuff.js by sb! Without it, this mod wouldn't be possible!
Discords of people that helped me:
usecit - UseCit.psd
nousernamefound - nousernamefound
pixelegend4 - pixelegend4
Credits:
Saschas - Waterpowder idea
Fantasy Elements - Phoenix idea
*/
elements.sweetwater = {
color: "#8ae7eb",
behavior: behaviors.LIQUID,
category: "liquids",
category: "kopal",
state: "liquid",
tempHigh: 100,
stateHigh: "water",
@ -27,7 +28,7 @@ elements.sweetwater = {
elements.syrup = {
color: "#d9d2c3",
behavior: behaviors.LIQUID,
category: "food",
category: "kopal",
state: "liquid",
tempHigh: 100,
stateHigh: "fire",
@ -39,7 +40,7 @@ elements.syrup = {
elements.orangesoda = {
color: "#b8820d",
behavior: behaviors.LIQUID,
category: "food",
category: "kopal",
state: "liquid",
tempHigh: 100,
stateHigh: "water",
@ -55,7 +56,7 @@ elements.orangesoda = {
elements.dirty_orangesoda = {
color: "#20991a",
behavior: behaviors.LIQUID,
category: null,
category: "kopal",
state: "liquid",
tempHigh: 80,
stateHigh: "orangesoda",
@ -64,7 +65,7 @@ elements.dirty_orangesoda = {
elements.orange = {
color: "#eda813",
behavior: behaviors.POWDER,
category: "food",
category: "kopal",
state: "powder",
breakInto: "juice",
tempHigh: 100,
@ -78,12 +79,13 @@ elements.orange = {
elements.incubationjuice = {
color: "#daf5ef",
behavior: behaviors.LIQUID,
category: "life",
category: "kopal",
state: "liquid",
breakInto: "blood",
reactions: {
"flydna": { elem1: "blood", elem2: "flyingcreature"},
"antdna": { elem1: "blood", elem2: "creature"},
"phoenixdna": { elem1: "blood", elem2: "artificialphoenix"},
"alcohol": { elem1: "cancer", elem2: "antiartificialjuice"}
},
};
@ -91,7 +93,7 @@ elements.incubationjuice = {
elements.creature = {
color: "#d073d9",
behavior: behaviors.CRAWLER,
category: "life",
category: "kopal",
state: "crawler",
tempHigh: 175,
stateHigh: "deadcreature",
@ -108,13 +110,12 @@ elements.creature = {
elements.flyingcreature = {
color: "#d073d9",
behavior: behaviors.FLY,
category: "life",
category: "kopal",
state: "fly",
tempHigh: 175,
stateHigh: "deadflyingcreature",
breakInto: "deadflyingcreature",
reactions: {
"antiartificialjuice": { elem1: "deadflyingcreature", elem2: null },
"fly": { elem2: "meat" },
"meat": { elem2: "flyingcreature" },
"artificialmeat": { elem2: "cell" },
@ -123,10 +124,40 @@ elements.flyingcreature = {
},
};
elements.artificialphoenix = {
color: "#c40052",
behavior: behaviors.FLY,
category: "kopal",
state: "fly",
temp: 149,
breakInto: "deadflyingcreature",
reactions: {
"fly": { elem2: "artificialphoenix" },
"flyingcreature": { elem2: "artificialphoenix" },
"meat": { elem2: "artificialphoenix" },
"artificialmeat": { elem2: "artificialphoenix" },
"syrup": { elem2: "artificialphoenix" },
},
};
elements.phoenix = {
color: "#ff0000",
behavior: behaviors.FLY,
category: "kopal",
state: "fly",
temp: 999,
breakInto: "phoenixdna",
reactions: {
"fly": { elem2: "meat" },
"meat": { elem2: "phoenix" },
"alcohol": { elem1: "blood" , elem2: "phoenixdna" },
},
};
elements.deadcreature = {
color: "#86428c",
behavior: behaviors.POWDER,
category: null,
category: "kopal",
state: "powder",
tempHigh: 225,
stateHigh: "smoke",
@ -140,7 +171,7 @@ elements.deadcreature = {
elements.deadflyingcreature = {
color: "#86428c",
behavior: behaviors.POWDER,
category: null,
category: "kopal",
state: "powder",
tempHigh: 225,
stateHigh: "smoke",
@ -154,7 +185,7 @@ elements.deadflyingcreature = {
elements.artificialmeat = {
color: "#b38a5f",
behavior: behaviors.POWDER,
category: "food",
category: "kopal",
state: "powder",
tempHigh: 215,
stateHigh: "smoke",
@ -168,20 +199,21 @@ elements.artificialmeat = {
elements.antiartificialjuice = {
color: "#b38a5f",
behavior: behaviors.LIQUID,
category: "life",
category: "kopal",
state: "liquid",
tempHigh: 215,
stateHigh: "smoke",
reactions: {
"flyingcreature": { elem1: "alcohol", elem2: "deadflyingcreature" },
"creature": { elem1: "alcohol", elem2: "deadcreature" },
"artificialphoenix": { elem1: "alcohol", elem2: "deadflyingcreature" },
},
};
elements.antiartificialspray = {
color: "#b38a5f",
behavior: behaviors.DGAS,
category: "life",
category: "kopal",
state: "gas",
tempHigh: 215,
density: 4000,
@ -189,22 +221,30 @@ elements.antiartificialspray = {
reactions: {
"flyingcreature": { elem1: "alcohol", elem2: "deadflyingcreature" },
"creature": { elem1: "alcohol", elem2: "deadcreature" },
"artificialphoenix": { elem1: "alcohol", elem2: "deadflyingcreature" },
},
};
elements.antdna = {
color: "#b38a5f",
behavior: behaviors.POWDER,
category: "life",
category: "kopal",
state: "powder",
tempHigh: 215,
stateHigh: "smoke",
};
elements.phoenixdna = {
color: "#a82a2a",
behavior: behaviors.POWDER,
category: "kopal",
state: "powder",
};
elements.flydna = {
color: "#b38a5f",
behavior: behaviors.POWDER,
category: "life",
category: "kopal",
state: "powder",
tempHigh: 215,
stateHigh: "smoke",
@ -213,7 +253,7 @@ elements.flydna = {
elements.waterpowder = {
color: elements.water.color,
behavior: behaviors.POWDER,
category: "powders",
category: "kopal",
state: "powder",
tempHigh: 40,
stateHigh: "water",
@ -222,16 +262,280 @@ elements.waterpowder = {
elements.waterpowderer = {
color: "#e3e1dc",
behavior: behaviors.POWDER,
category: "powders",
category: "kopal",
state: "powder",
reactions: {
"water": { elem1: null, elem2: "waterpowder" }
}
};
elements.antiartificialcancer = {
color: "#b38a5f",
behavior: [
"XX|CL%1|XX",
"CL%1|XX|CL%1",
"M2%2|M1|M2%2",
],
reactions: {
"artificialmeat": { elem2:"antiartificialcancer", chance:0.05 },
"creature": { elem2:"antiartificialcancer", chance:0.05 },
"flyingcreature": { elem2:"antiartificialcancer", chance:0.05 },
"artificialphoenix": { elem2:"antiartificialcancer", chance:0.05 },
"cancer": { elem2:"antiartificialcancer", chance:0.5 },
},
tempHigh: 185,
stateHigh: "smoke",
tempLow: -10,
stateLow: "syrup",
state: "solid",
density: 1000.2,
category: "kopal",
};
elements.anticancer = {
color: "#e3e1dc",
behavior: behaviors.LIQUID,
category: "kopal",
state: "liquid",
tempLow: -10,
stateLow: "syrup",
reactions: {
"cancer": { elem1: null, elem2: "anticancer" },
"antiartificialcancer": { elem1: null, elem2: "anticancer" }
}
};
elements.fire_spirit = {
color: ["#fc5a03", "#fc2803", "#fc9d03"],
behavior: behaviors.FLY,
category: "spirits",
state: "solid",
temp: 50,
reactions: {
"air_spirit": { elem2: null},
"cursed_spirit": { elem1: null},
"earth_spirit": { elem1: null},
"water_spirit": { elem2: null},
}
};
elements.water_spirit = {
color: ["#0390fc", "#035afc", "#0318fc"],
behavior: behaviors.FLY,
category: "spirits",
state: "solid",
reactions: {
"fire_spirit": { elem1: null},
"cursed_spirit": { elem1: null},
"earth_spirit": { elem2: null},
}
};
elements.earth_spirit = {
color: ["#915a00", "#784b02", "#573602"],
behavior: behaviors.FLY,
category: "spirits",
state: "solid",
reactions: {
"fire_spirit": { elem2: null},
"cursed_spirit": { elem1: null},
"water_spirit": { elem1: null},
}
};
elements.air_spirit = {
color: ["#c7eded", "#99bdbd", "#6a9494"],
behavior: behaviors.FLY,
category: "spirits",
state: "solid",
reactions: {
"fire_spirit": { elem1: null},
"cursed_spirit": { elem2: null},
"water_spirit": { elem1: null},
"earth_spirit": { elem1: null},
}
};
elements.cursed_spirit = {
color: ["#c404ae", "#aa04c4", "#7e04c4"],
behavior: behaviors.FLY,
category: "spirits",
state: "solid",
reactions: {
"fire_spirit": { elem2: null},
"air_spirit": { elem1: null},
"water_spirit": { elem2: null},
"earth_spirit": { elem2: null},
}
};
elements.cursed_powder_lvl1 = {
color: ["#c404ae", "#aa04c4", "#7e04c4"],
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"cursed_spirit": { elem1: null},
}
};
elements.cursed_powder_lvl2 = {
color: ["#c404ae", "#aa04c4", "#7e04c4"],
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"cursed_spirit": { elem2: null},
}
};
elements.soul_spirit = {
color: ["#0af7e0", "#0ac8f7", "#0a9cf7"],
behavior: behaviors.FLY,
category: "spirits",
state: "solid",
reactions: {
"fire_spirit": { elem2: null},
"cursed_spirit": { elem2: null},
"water_spirit": { elem2: null},
"earth_spirit": { elem2: null},
"air_spirit": { elem2: null},
}
};
elements.soul_powder = {
color: "#2e363b",
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"awakening_powder": { elem1: "soul_spirit", elem2: null},
}
};
elements.cursed_powder = {
color: "#2e363b",
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"awakening_powder": { elem1: "cursed_spirit", elem2: null},
}
};
elements.air_powder = {
color: "#2e363b",
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
temp: -10,
reactions: {
"awakening_powder": { elem1: "air_spirit", elem2: null},
}
};
elements.water_powder = {
color: "#2e363b",
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"awakening_powder": { elem1: "water_spirit", elem2: null},
}
};
elements.fire_powder = {
color: "#2e363b",
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"awakening_powder": { elem1: "fire_spirit", elem2: null},
}
};
elements.wandering_spirit = {
color: "#b1b7ba",
behavior: behaviors.FLY,
category: "spirits",
state: "solid",
reactions: {
"fire_spirit": { elem1: null},
"cursed_spirit": { elem1: null},
"water_spirit": { elem1: null},
"earth_spirit": { elem1: null},
"air_spirit": { elem1: null},
"soul_spirit": { elem1: null},
}
};
elements.unawaken_powder = {
color: "#696b6b",
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"fire_spirit": { elem1: null, elem2: "fire_powder" },
"cursed_spirit": { elem1: null, elem2: "cursed_powder" },
"water_spirit": { elem1: null, elem2: "water_powder" },
"earth_spirit": { elem1: null, elem2: "earth_powder" },
"air_spirit": { elem1: null, elem2: "air_powder" },
"soul_spirit": { elem1: null, elem2: "soul_powder" },
}
};
elements.awakening_powder = {
color: "#696b6b",
behavior: behaviors.POWDER,
category: "spirits",
state: "solid",
reactions: {
"fire_powder": { elem1: null, elem2: "fire_spirit" },
"cursed_powder": { elem1: null, elem2: "cursed_spirit" },
"water_powder": { elem1: null, elem2: "water_spirit" },
"earth_powder": { elem1: null, elem2: "earth_spirit" },
"air_powder": { elem1: null, elem2: "air_spirit" },
"soul_powder": { elem1: null, elem2: "soul_spirit" },
}
};
elements.ant.breakInto = "antdna"
elements.fly.breakInto = "flydna"
elements.water.reactions["sugar"] = { elem1: null, elem2: "sweetwater" };
elements.water.reactions["deadflyingcreature"] = { elem1: "dirty_water"};
elements.water.reactions["deadcreature"] = { elem1: "dirty_water"};
elements.water.reactions["dirty_water"] = { elem1: "dirty_water"};
elements.water.reactions["dirty_water"] = { elem1: "dirty_water"};
elements.ant.reactions["alcohol"] = { elem1: "antdna", elem2: null };
elements.fly.reactions["alcohol"] = { elem1: "flydna", elem2: null };

View File

@ -75,7 +75,7 @@ elements.left_missile = {
"M1 AND EX:10|XX|EX:10",
"M2|EX:10|XX",
],
category:"weapons",
category:"ammunition",
},
elements.right_missile = {
color: "#4c4e42",
@ -84,7 +84,7 @@ elements.right_missile = {
"EX:10|XX|M1 AND EX:10",
"XX|EX:10|M2",
],
category:"weapons",
category:"ammunition",
},
elements.cluster_munition = {
color: "#444444",
@ -115,7 +115,7 @@ elements.right_missile = {
"XX|XX|XX",
"M2|M1 AND EX:10%10|M2",
],
category: "weapons",
category: "ammunition",
state: "solid",
density: 1300,
hidden: true,
@ -149,7 +149,7 @@ elements.left_bullet = {
"M1 AND EX:5|XX|XX",
"M2|XX|XX",
],
category:"weapons",
category:"ammunition",
},
elements.right_bullet = {
color: "#4c4e42",
@ -158,7 +158,7 @@ elements.left_bullet = {
"XX|XX|M1 AND EX:5",
"XX|XX|M2",
],
category:"weapons",
category:"ammunition",
},
elements.e_gun_left = {
color: "#C0C0C0",
@ -215,7 +215,7 @@ elements.left_rocket = {
"M1 AND EX:10|XX|XX",
"XX|XX|XX",
],
category:"weapons",
category:"ammunition",
},
elements.right_rocket = {
color: "#4c4e42",
@ -224,7 +224,7 @@ elements.left_rocket = {
"XX|XX|M1 AND EX:10",
"XX|XX|XX",
],
category:"weapons",
category:"ammunition",
},
elements.e_rocket_launcher_left = {
color: "#C0C0C0",
@ -251,4 +251,140 @@ elements.left_rocket = {
state: "solid",
conduct: 1,
density: 1300,
},
elements.gaster_blast_left = {
color: "#c5e9f0",
behavior: [
"DL|DL|XX",
"DL AND CR:gaster_blast_left%5|XX|XX",
"DL|DL|XX",
],
tick: function(pixel) {
for (var i=0; i<3; i++) {
if (!tryMove(pixel, pixel.x-2, pixel.y)) {
if (!isEmpty(pixel.x-2, pixel.y,true)) {
var newPixel = pixelMap[pixel.x-2][pixel.y];
if (newPixel.element === "gaster_blast_left") { break; }
if (elements[newPixel.element].state == "gas") {
if (Math.random() > (elements[newPixel.element].hardness || 0)) {
if (elements[newPixel.element].breakInto) {
breakPixel(newPixel);
}
else {
deletePixel(newPixel.x, newPixel.y);
}}}}
deletePixel(pixel.x,pixel.y);
break;
}}},
category: "energy",
state: "gas",
insulate: true,
},
elements.gaster_blast_right = {
color: "#c5e9f0",
behavior: [
"XX|DL|DL",
"XX|XX|DL AND CR:gaster_blast_right%5",
"XX|DL|DL",
],
tick: function(pixel) {
for (var i=0; i<3; i++) {
if (!tryMove(pixel, pixel.x+2, pixel.y)) {
if (!isEmpty(pixel.x+2, pixel.y,true)) {
var newPixel = pixelMap[pixel.x+2][pixel.y];
if (newPixel.element === "gaster_blast_right") { break; }
if (elements[newPixel.element].state == "gas") {
if (Math.random() > (elements[newPixel.element].hardness || 0)) {
if (elements[newPixel.element].breakInto) {
breakPixel(newPixel);
}
else {
deletePixel(newPixel.x, newPixel.y);
}}}}
deletePixel(pixel.x,pixel.y);
break;
}}},
category: "energy",
state: "gas",
insulate: true,
},
elements.gaster_blaster_left = {
color: "#ffffff",
behavior: behaviors.WALL,
behaviorOn: [
"XX|XX|XX",
"CR:gaster_blast_left|XX|XX",
"XX|XX|XX",
],
category: "weapons",
state: "solid",
conduct: 20,
},
elements.gaster_blaster_right = {
color: "#ffffff",
behavior: behaviors.WALL,
behaviorOn: [
"XX|XX|XX",
"XX|XX|CR:gaster_blast_right",
"XX|XX|XX",
],
category: "weapons",
state: "solid",
conduct: 20,
},
elements.fast_bullet_left = {
color: "#4c4e42",
behavior: [
"DL|DL|XX",
"DL|XX|XX",
"DL|DL|XX",
],
tick: function(pixel) {
for (var i=0; i<3; i++) {
if (!tryMove(pixel, pixel.x-3, pixel.y)) {
if (!isEmpty(pixel.x-3, pixel.y,true)) {
var newPixel = pixelMap[pixel.x-3][pixel.y];
if (newPixel.element === "fast_bullet_left") { break; }
if (elements[newPixel.element].state == "solid") {
if (Math.random() > (elements[newPixel.element].hardness || 0)) {
if (elements[newPixel.element].breakInto) {
breakPixel(newPixel);
}
else {
deletePixel(newPixel.x, newPixel.y);
}}}}
deletePixel(pixel.x,pixel.y);
break;
}}},
category: "ammunition",
state: "solid",
insulate: true,
},
elements.fast_bullet_right = {
color: "#4c4e42",
behavior: [
"XX|DL|DL",
"XX|XX|DL",
"XX|DL|DL",
],
tick: function(pixel) {
for (var i=0; i<3; i++) {
if (!tryMove(pixel, pixel.x+3, pixel.y)) {
if (!isEmpty(pixel.x+3, pixel.y,true)) {
var newPixel = pixelMap[pixel.x+3][pixel.y];
if (newPixel.element === "fast_bullet_right") { break; }
if (elements[newPixel.element].state == "solid") {
if (Math.random() > (elements[newPixel.element].hardness || 0)) {
if (elements[newPixel.element].breakInto) {
breakPixel(newPixel);
}
else {
deletePixel(newPixel.x, newPixel.y);
}}}}
deletePixel(pixel.x,pixel.y);
break;
}}},
category: "ammunition",
state: "solid",
insulate: true,
};