Merge pull request #806 from DBNekonico/main

bugfixes and beginning of new mod
This commit is contained in:
slweeb 2024-09-20 21:14:13 -04:00 committed by GitHub
commit dd3b112924
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 161 additions and 103 deletions

View File

@ -1,15 +1,15 @@
elements.beautiful_sun = {
color: "#c12600BB",
color: "#c12600",
tick: function(pixel) {
// minimum 1726
// maximum 7726
if (pixel.eclipse) { pixel.color = pixelColorPick(pixel,"#f68656"); var c=0.01}
else if (pixel.temp < 1500) { pixel.color = pixelColorPick(pixel,"#7a4e43BB"); }
else if (pixel.temp < 3600) { pixel.color = pixelColorPick(pixel,"#ffbdbdBB"); var c=0.05 }
else if (pixel.temp < 7000) { pixel.color = pixelColorPick(pixel,"#c12600BB"); var c=0.1 }
else if (pixel.temp < 11000) { pixel.color = pixelColorPick(pixel,"#ffb09cBB"); var c=0.25 }
else if (pixel.temp < 28000) { pixel.color = pixelColorPick(pixel,"#f7fff5BB"); var c=0.5 }
else { pixel.color = pixelColorPick(pixel,"#c3bdffBB"); var c=0.4 }
else if (pixel.temp < 1500) { pixel.color = pixelColorPick(pixel,"#7a4e43"); }
else if (pixel.temp < 3600) { pixel.color = pixelColorPick(pixel,"#ffbdbd"); var c=0.05 }
else if (pixel.temp < 7000) { pixel.color = pixelColorPick(pixel,"#c12600"); var c=0.1 }
else if (pixel.temp < 11000) { pixel.color = pixelColorPick(pixel,"#ffb09c"); var c=0.25 }
else if (pixel.temp < 28000) { pixel.color = pixelColorPick(pixel,"#f7fff5"); var c=0.5 }
else { pixel.color = pixelColorPick(pixel,"#c3bdff"); var c=0.4 }
if (pixel.temp < 1500) { var c=0 }
for (var i = 0; i < adjacentCoords.length; i++) {
var x = pixel.x+adjacentCoords[i][0];
@ -68,7 +68,7 @@ elements.beautiful_sun = {
elements.beautiful_light = {
hidden: true,
name: "light",
color: "#c12600BB",
color: "#c12600",
tick: function(pixel) {
if (Math.random() < 0.01) {
deletePixel(pixel.x,pixel.y);
@ -146,7 +146,7 @@ elements.beautiful_light = {
"body": { elem2:"melted_human" },
"dead_bug": { elem2:"melted_insect" },
"worm": { elem2:"melted_insect" },
"ant": { elem2:"melted_insect" },
"ant": { color2:"#5E0B04", elem2:"melted_insect" },
"bee": { elem2:"melted_insect" },
"fly": { elem2:"melted_insect" },
"firefly": { elem2:"melted_insect" },
@ -170,8 +170,8 @@ elements.beautiful_light = {
"bird": { color2:"#997457", elem2:"melted_animal" },
"rat": { color2:["#a698a9","#8c7d82","#ccc3cf"], elem2:"melted_animal" },
"fish": { elem2:"melted_fish", chance:0.2 },
"tadpole": { elem2:"melted_fish", chance:0.2 },
"frog": { elem2:"melted_fish", chance:0.2 },
"tadpole": { color2:"#87b574", elem2:"melted_fish", chance:0.2 },
"frog": { color2:"#607300", elem2:"melted_fish", chance:0.2 },
},
temp: 35,
tempLow: -273,
@ -185,7 +185,7 @@ elements.beautiful_light = {
},
elements.melted_human = {
color: ["#f3e7db","#f7ead0","#eadaba","#d7bd96","#a07e56","#825c43"],
color: ["#f3e7db","#eadaba","#d7bd96","#a07e56"],
behavior: behaviors.LIQUID,
viscosity: 7500,
reactions: {
@ -194,24 +194,24 @@ elements.melted_human = {
"cooked_meat": { elem2:null, chance:0.1 },
"sun": { elem2:"beautiful_sun", elem1:"cooked_meat" },
"light": { elem2:"beautiful_light" },
"dead_bug": { elem2:"fused_organism", chance:0.1 },
"ant": { elem2:"fused_organism", chance:0.2 },
"bee": { elem2:"fused_organism", chance:0.2 },
"fly": { elem2:"fused_organism", chance:0.2 },
"firefly": { elem2:"fused_organism", chance:0.2 },
"stinkbug": { elem2:"fused_organism", chance:0.2 },
"slug": { elem2:"fused_organism", chance:0.2 },
"snail": { elem2:"fused_organism", chance:0.15 },
"dead_bug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
"ant": { color2:"#D2B6AB", elem2:"fused_organism", chance:0.2 },
"bee": { color2:"#E9DBAA", elem2:"fused_organism", chance:0.2 },
"fly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"firefly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"stinkbug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"slug": { color2:["#DFD0AE","#E5D6C7"], elem2:"fused_organism", chance:0.2 },
"snail": { color2:"#E5D6C7", elem2:"fused_organism", chance:0.15 },
"head": { elem2:"melted_human", chance:0.1 },
"body": { elem2:"melted_human", chance:0.1 },
"bird": { elem2:"fused_organism", chance:0.1 },
"rat": { color2:["#a698a9","#8c7d82","#ccc3cf"], elem2:"fused_organism", chance:0.1 },
"fish": { elem2:"fused_organism", chance:0.2 },
"tadpole": { elem2:"fused_organism", chance:0.2 },
"frog": { elem2:"fused_organism", chance:0.2 },
"melted_fish": { elem2:"fused_organism", chance:0.1 },
"melted_animal": { elem2:"fused_organism", chance:0.1 },
"melted_insect": { elem2:"fused_organism", chance:0.1 },
"bird": { color2:"#DAC8B7", elem2:"fused_organism", chance:0.1 },
"rat": { color2:["#E2D5D0","#EADFD8"], elem2:"fused_organism", chance:0.1 },
"fish": { color2:"#E3D1BC", elem2:"fused_organism", chance:0.2 },
"tadpole": { color2:"#DBDCC4", elem2:"fused_organism", chance:0.2 },
"frog": { color2:"#D2CDAA", elem2:"fused_organism", chance:0.2 },
"melted_fish": { color2:"#E3D1BC",elem2:"fused_organism", chance:0.1 },
"melted_animal": { color2:["#E2D5D0","#EADFD8","#DAC8B7"], elem2:"fused_organism", chance:0.1 },
"melted_insect": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
},
tempHigh: 300,
stateHigh: "cooked_meat",
@ -221,7 +221,7 @@ elements.melted_human = {
burnTime: 300,
burnInto: "cooked_meat",
state: "liquid",
density: 2000,
density: 1900,
category: "brokenday",
},
@ -231,28 +231,27 @@ elements.melted_animal = {
viscosity: 7500,
reactions: {
"oxygen": { elem2:"carbon_dioxide", chance:0.5 },
"meat": { elem2:null, chance:0.1 },
"cooked_meat": { elem2:null, chance:0.1 },
"meat": { elem2:"fused_organism", chance:0.1 },
"sun": { elem2:"beautiful_sun", elem1:"cooked_meat" },
"light": { elem2:"beautiful_light" },
"dead_bug": { elem2:"fused_organism", chance:0.1 },
"ant": { elem2:"fused_organism", chance:0.2 },
"bee": { elem2:"fused_organism", chance:0.2 },
"fly": { elem2:"fused_organism", chance:0.2 },
"firefly": { elem2:"fused_organism", chance:0.2 },
"stinkbug": { elem2:"fused_organism", chance:0.2 },
"slug": { elem2:"fused_organism", chance:0.2 },
"snail": { elem2:"fused_organism", chance:0.15 },
"head": { elem2:"fused_organism", chance:0.1 },
"body": { elem2:"fused_organism", chance:0.1 },
"dead_bug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
"ant": { color2:"#D2B6AB", elem2:"fused_organism", chance:0.2 },
"bee": { color2:"#E9DBAA", elem2:"fused_organism", chance:0.2 },
"fly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"firefly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"stinkbug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"slug": { color2:["#DFD0AE","#E5D6C7"], elem2:"fused_organism", chance:0.2 },
"snail": { color2:"#E5D6C7", elem2:"fused_organism", chance:0.15 },
"head": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"body": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"bird": { color2:"#997457", elem2:"melted_animal", chance:0.2 },
"rat": { color2:["#a698a9","#8c7d82","#ccc3cf"], elem2:"melted_animal", chance:0.2 },
"fish": { elem2:"fused_organism", chance:0.2 },
"tadpole": { elem2:"fused_organism", chance:0.2 },
"frog": { elem2:"fused_organism", chance:0.2 },
"melted_fish": { elem2:"fused_organism", chance:0.1 },
"melted_human": { elem2:"fused_organism", chance:0.1 },
"melted_insect": { elem2:"fused_organism", chance:0.1 },
"fish": { color2:"#E3D1BC", elem2:"fused_organism", chance:0.2 },
"tadpole": { color2:"#DBDCC4", elem2:"fused_organism", chance:0.2 },
"frog": { color2:"#D2CDAA", elem2:"fused_organism", chance:0.2 },
"melted_fish": { color2:"#E3D1BC",elem2:"fused_organism", chance:0.1 },
"melted_human": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"melted_insect": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
},
tempHigh: 275,
stateHigh: "cooked_meat",
@ -262,38 +261,39 @@ elements.melted_animal = {
burnTime: 300,
burnInto: "cooked_meat",
state: "liquid",
density: 2000,
density: 900,
category: "brokenday",
},
elements.melted_fish = {
color: "#ac8650",
behavior: behaviors.LIQUID,
viscosity: 7500,
behavior: [
"XX|XX|SW:water,salt_water,sugar_water,dirty_water,seltzer,pool_water,primordial_soup%5",
"M2%0.5|FX%0.5|M2%0.5 AND BO",
"M2%10|M1|M2%10 AND SW:water,salt_water,sugar_water,dirty_water,seltzer,pool_water,primordial_soup%14",
],
reactions: {
"oxygen": { elem2:"carbon_dioxide", chance:0.5 },
"meat": { elem2:null, chance:0.1 },
"cooked_meat": { elem2:null, chance:0.1 },
"sun": { elem2:"beautiful_sun", elem1:"cooked_meat" },
"light": { elem2:"beautiful_light" },
"dead_bug": { elem2:"fused_organism", chance:0.1 },
"ant": { elem2:"fused_organism", chance:0.2 },
"bee": { elem2:"fused_organism", chance:0.2 },
"fly": { elem2:"fused_organism", chance:0.2 },
"firefly": { elem2:"fused_organism", chance:0.2 },
"stinkbug": { elem2:"fused_organism", chance:0.2 },
"head": { elem2:"fused_organism", chance:0.1 },
"body": { elem2:"fused_organism", chance:0.1 },
"bird": { elem2:"fused_organism", chance:0.2 },
"rat": { elem2:"fused_organism", chance:0.2 },
"slug": { elem2:"fused_organism", chance:0.2 },
"snail": { elem2:"fused_organism", chance:0.15 },
"dead_bug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
"ant": { color2:"#D2B6AB", elem2:"fused_organism", chance:0.2 },
"bee": { color2:"#E9DBAA", elem2:"fused_organism", chance:0.2 },
"fly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"firefly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"stinkbug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"head": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"body": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"bird": { color2:"#DAC8B7", elem2:"fused_organism", chance:0.2 },
"rat": { color2:["#E2D5D0","#EADFD8"], elem2:"fused_organism", chance:0.2 },
"slug": { color2:["#DFD0AE","#E5D6C7"], elem2:"fused_organism", chance:0.2 },
"snail": { color2:"#E5D6C7", elem2:"fused_organism", chance:0.15 },
"fish": { elem2:"melted_fish", chance:0.2 },
"tadpole": { color2:"#87b574", elem2:"melted_fish", chance:0.2 },
"frog": { color2:"#607300", elem2:"melted_fish", chance:0.2 },
"melted_animal": { elem2:"fused_organism", chance:0.1 },
"melted_human": { elem2:"fused_organism", chance:0.1 },
"melted_insect": { elem2:"fused_organism", chance:0.1 },
"melted_animal": { color2:["#E2D5D0","#EADFD8","#DAC8B7"], elem2:"fused_organism", chance:0.1 },
"melted_human": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"melted_insect": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
},
tempHigh: 275,
stateHigh: "cooked_meat",
@ -303,7 +303,7 @@ elements.melted_fish = {
burnTime: 300,
burnInto: "cooked_meat",
state: "liquid",
density: 2000,
density: 800,
category: "brokenday",
},
@ -317,23 +317,23 @@ elements.melted_insect = {
"sun": { elem2:"beautiful_sun", elem1:"cooked_meat" },
"light": { elem2:"beautiful_light" },
"dead_bug": { elem2:"melted_insect", chance:0.1 },
"ant": { elem2:"melted_insect", chance:0.2 },
"ant": { color2:"#5E0B04", elem2:"melted_insect", chance:0.2 },
"bee": { color2:"#c4b100", elem2:"melted_insect", chance:0.2 },
"fly": { elem2:"melted_insect", chance:0.2 },
"firefly": { elem2:"melted_insect", chance:0.2 },
"stinkbug": { elem2:"melted_insect", chance:0.2 },
"slug": { color2:["#997e12","#997e12","#997e12","#997e12","#997e12","#997e12","#403314","#403314","#403314","#403314","#403314","#403314","#124a44"], elem2:"melted_insect", chance:0.2 },
"snail": { color2:"#5c3104", elem2:"melted_insect", chance:0.15 },
"fish": { elem2:"fused_organism", chance:0.2 },
"tadpole": { elem2:"fused_organism", chance:0.2 },
"frog": { elem2:"fused_organism", chance:0.2 },
"head": { elem2:"fused_organism", chance:0.1 },
"body": { elem2:"fused_organism", chance:0.1 },
"melted_human": { elem2:"fused_organism", chance:0.1 },
"bird": { elem2:"fused_organism", chance:0.1 },
"rat": { elem2:"fused_organism", chance:0.1 },
"melted_animal": { elem2:"fused_organism", chance:0.1 },
"melted_fish": { elem2:"fused_organism", chance:0.1 },
"fish": { color2:"#E3D1BC", elem2:"fused_organism", chance:0.2 },
"tadpole": { color2:"#DBDCC4", elem2:"fused_organism", chance:0.2 },
"frog": { color2:"#D2CDAA", elem2:"fused_organism", chance:0.2 },
"head": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"body": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"melted_human": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"bird": { color2:"#DAC8B7", elem2:"fused_organism", chance:0.1 },
"rat": { color2:["#E2D5D0","#EADFD8"], elem2:"fused_organism", chance:0.1 },
"melted_animal": { color2:["#E2D5D0","#EADFD8","#DAC8B7"], elem2:"fused_organism", chance:0.1 },
"melted_fish": { color2:"#E3D1BC",elem2:"fused_organism", chance:0.1 },
},
tempHigh: 100,
stateHigh: "dead_bug",
@ -343,7 +343,7 @@ elements.melted_insect = {
burnTime: 150,
burnInto: "ash",
state: "liquid",
density: 2000,
density: 500,
category: "brokenday",
},
@ -378,40 +378,40 @@ elements.melted_plant = {
burnTime: 200,
burnInto: ["dead_plant","fire","fire","fire","ash"],
state: "liquid",
density: 2000,
density: 1200,
category: "brokenday",
};
elements.fused_organism = {
color: ["#f3e7db","#f7ead0"],
color: ["#E5D6C7","#f7ead0"],
behavior: behaviors.LIQUID,
viscosity: 4000,
viscosity: 6000,
reactions: {
"meat": { elem2:"fused_organism", chance:0.1 },
"cooked_meat": { elem2:"fused_organism", chance:0.1 },
"sun": { elem2:"beautiful_sun", elem1:"cooked_meat" },
"light": { elem2:"beautiful_light" },
"dead_bug": { elem2:"fused_organism", chance:0.1 },
"ant": { elem2:"fused_organism", chance:0.2 },
"bee": { elem2:"fused_organism", chance:0.2 },
"fly": { elem2:"fused_organism", chance:0.2 },
"firefly": { elem2:"fused_organism", chance:0.2 },
"stinkbug": { elem2:"fused_organism", chance:0.2 },
"slug": { elem2:"fused_organism", chance:0.2 },
"snail": { elem2:"fused_organism", chance:0.15 },
"head": { elem2:"fused_organism", chance:0.1 },
"body": { elem2:"fused_organism", chance:0.1 },
"melted_human": { elem2:"fused_organism", chance:0.1 },
"melted_insect": { elem2:"fused_organism", chance:0.1 },
"bird": { elem2:"fused_organism", chance:0.1 },
"rat": { elem2:"fused_organism", chance:0.1 },
"fish": { elem2:"fused_organism", chance:0.2 },
"tadpole": { elem2:"fused_organism", chance:0.2 },
"frog": { elem2:"fused_organism", chance:0.2 },
"melted_animal": { elem2:"fused_organism", chance:0.1 },
"melted_fish": { elem2:"fused_organism", chance:0.1 },
"dead_bug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
"ant": { color2:"#D2B6AB", elem2:"fused_organism", chance:0.2 },
"bee": { color2:"#E9DBAA", elem2:"fused_organism", chance:0.2 },
"fly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"firefly": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"stinkbug": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.2 },
"slug": { color2:["#DFD0AE","#E5D6C7"], elem2:"fused_organism", chance:0.2 },
"snail": { color2:"#E5D6C7", elem2:"fused_organism", chance:0.15 },
"head": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"body": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"melted_human": { color2:["#F1E4D4","#EDDECC"], elem2:"fused_organism", chance:0.1 },
"melted_insect": { color2:"#CEC5B9", elem2:"fused_organism", chance:0.1 },
"bird": { color2:"#DAC8B7", elem2:"fused_organism", chance:0.1 },
"rat": { color2:["#E2D5D0","#EADFD8"], elem2:"fused_organism", chance:0.1 },
"fish": { color2:"#E3D1BC", elem2:"fused_organism", chance:0.2 },
"tadpole": { color2:"#DBDCC4", elem2:"fused_organism", chance:0.2 },
"frog": { color2:"#D2CDAA", elem2:"fused_organism", chance:0.2 },
"melted_animal": { color2:["#E2D5D0","#EADFD8","#DAC8B7"], elem2:"fused_organism", chance:0.1 },
"melted_fish": { color2:"#E3D1BC", elem2:"fused_organism", chance:0.1 },
},
tempHigh: 250,
tempHigh: 300,
stateHigh: "cooked_meat",
tempLow: -20,
stateLow: "frozen_meat",

58
mods/sandboxels.js Normal file
View File

@ -0,0 +1,58 @@
elements.sandboxels_screen_off = {
name:"screen",
color: "#454545",
behavior: behaviors.WALL,
behaviorOn: [
"XX|XX|XX",
"XX|CH:sandboxels_screen|XX",
"XX|XX|XX",
],
tempHigh: 1500,
stateHigh: ["molten_glass","molten_glass","molten_glass","molten_gallium"],
conduct: 1,
breakInto: "glass_shard",
tempLow: -50,
stateLow: "glass_shard",
category: "digital",
state: "solid",
density: 1200,
},
elements.sandboxels_screen = {
name:"screen",
color: "#1D1D1D",
behavior: [
"XX|XX|XX",
"XX|XX|XX",
"XX|XX|XX",
],
tempHigh: 1500,
stateHigh: ["molten_glass","molten_glass","molten_glass","molten_gallium"],
conduct: 1,
breakInto: ["glass_shard","glass_shard","glass_shard","glass_shard","glass_shard","glass_shard","sand"],
tempLow: -45,
stateLow: "sandboxels_screen_off",
category: "digital",
state: "solid",
density: 1200,
},
elements.sand_screen = {
name:"screen",
color: "#e6d577",
behavior: [
"XX|XX|XX",
"XX|XX|XX",
"SW:sandboxels_screen|SW:sandboxels_screen|SW:sandboxels_screen",
],
tempHigh: 1500,
stateHigh: ["molten_glass","molten_glass","molten_glass","molten_gallium"],
conduct: 1,
breakInto: ["glass_shard","glass_shard","glass_shard","glass_shard","glass_shard","glass_shard","sand"],
tempLow: -45,
stateLow: "sandboxels_screen_off",
category: "digital",
state: "solid",
density: 1200,
};