Merge branch 'R74nCom:main' into main

This commit is contained in:
JustAGenericUsername 2024-05-03 18:03:18 -04:00 committed by GitHub
commit 5b911e59e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 580 additions and 17 deletions

517
mods/Quicksand_one.js Normal file
View File

@ -0,0 +1,517 @@
elements.peat_bog = {
color: "#483C32",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1200,
stain: 0.2
};
elements.marsh_muck = {
color: "#6B8E23",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 50,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1000,
stain: 0.25
};
elements.quagmire = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1000,
stain: 0.3
};
elements.slime_mold = {
color: "#00FF00",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 30,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1000,
stain: 0.2
};
elements.mangrove_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1089,
stain: 0.25
};
peat_slurry = {
color: "#556B2F",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 50,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1452,
stain: 0.28
};
elements.bog_ooze = {
color: "#2E8B57",
behavior:elements.slime.behavior,
viscosity: 10000,
tempHigh: 100,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1350,
stain: 0.3
};
elements.fen_mud = {
color: "#556B2F",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 100,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1550,
stain: 0.28
};
elements.swamp_sludge = {
color: "#6B8E23",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 52,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1450,
stain: 0.25
};
elements.marsh_slime = {
color: "#00FF00",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 32,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1050,
stain: 0.16
};
elements.peat_paste = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 57,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1600,
stain: 0.1
};
elements.mudflat_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1700,
stain: 0.25
};
elements.swamp_ooze = {
color: "#556B2F",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 54,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1400,
stain: 0.20
};
elements.peat_pudding = {
color: "#8B4513",
behavior: elements.sap.behavior,
viscosity: 10000,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1600,
stain: 0.21
};
elements.mudflow = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1700,
stain: 0.2
};
elements.marsh_mire = {
color: "#6B8E23",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1500,
stain: 0.12
};
elements.moor = {
color: "#556B2F",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 57,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1600,
stain: 0.18
};
elements.quicksand_fen = {
color: "#DAA520",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 62,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1550,
stain: 0.15
};
elements.marsh_mudslide = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1600,
stain: 0.1
};
elements.swamp_slime = {
color: "#00FF00",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 35,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1100,
stain: 0.15
};
elements.mire_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1700,
stain: 0.17
};
elements.peat_quicksand = {
color: "#DAA520",
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 65,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1800,
stain: 0.15
};
elements.dense_quicksand = {
color: "#DAA520",
behavior: elements.slime.behavior,
viscosity: 1000,
tempHigh: 65,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1900,
stain: 0.2
};
elements.swamp_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1700,
stain: 0.25
};
elements.wet_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1200,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1600,
stain: 0.3
};
elements.wet_quicksand = {
color: "#DAA520",
behavior: elements.slime.behavior,
viscosity: 700,
tempHigh: 70,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1080,
stain: 0.25
};
elements.slimy_mud = {
color: "#008000",
behavior: elements.slime.behavior,
viscosity: 900,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1550,
stain: 0.3
};
elements.sticky_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1100,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1321,
stain: 0.25
};
elements.sloppy_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1700,
stain: 0.3
};
elements.thick_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1300,
tempHigh: 50,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1800,
stain: 0.35
};
elements.gloopy_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosit: 1950,
tempHigh: 56,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1000,
stain: 0.28
};
elements.squelchy_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1050,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1050,
stain: 0.3
};
elements.mucky_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 950,
tempHigh: 57,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1200,
stain: 0.28
};
elements.soggy_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1050,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1090,
stain: 0.3
};
elements.gunky_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 900,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1550,
stain: 0.28
};
elements.oozy_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 950,
tempHigh: 56,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1000,
stain: 0.3
};
elements.gooey_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1300,
stain: 0.3
};
elements.goopy_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1100,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1080,
stain: 0.3
};
elements.mushy_mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1200,
stain: 0.3
};
elements.mud = {
color: "#8B4513",
behavior: elements.slime.behavior,
viscosity: 1050,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1000,
stain: 0.3
};
elements.quicksand = {
color: "#DAA520",
behavior: elements.slime.behavior,
viscosity: 1750,
tempHigh: 70,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1300,
stain: 0.25
};
elements.sandy_mud = {
color: "#8B4513",
behavior: elements.sap.behavior,
viscosity: 1600,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1100,
stain: 0.3
};
elements.sticky_quicksand = {
color: "#DAA520",
behavior:elements.sap.behavior,
viscosity: 1700,
tempHigh: 65,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 1100,
stain: 0.25
};

View File

@ -1,6 +1,6 @@
// Science mod for Sandboxels
// (Inspired by survival.js)
// Build 20
// Build 21
// If there is anything you want to suggest or there's a bug then just dm me on discord (@a_british_proto)
// Todo:
// - Make new substances that you can get after mixing different elements
@ -1376,7 +1376,7 @@ substance.Silver_Oxzide = {
substance.Silver_Sulfate = {
behavior: behaviors.WALL,
color: "FFFFFF",
category: "lands"
category: "lands",
state: "solid",
hidden:true
}
@ -1467,3 +1467,43 @@ substance.Aluminum_Tribromide = {
state: "powder",
hidden:true
}
substance.Aluminum_Bromide_Hexahydrate = {
behavior: behaviors.WALL,
color: "FFFFFF",
category: "lands",
state: "solid",
hidden:true
}
substance.Aluminum_Cerium_Oxide = {
behavior: behaviors.WALL,
color: "FF5E00",
category: "lands",
state: "solid",
hidden:true
}
substance.Aluminum_Chloride = {
behavior: behaviors.WALL,
color: "FFFFFF",
category: "lands",
state: "solid",
hidden:true
}
substance.Aluminum_Chlorohydrate = {
behavior: behaviors.POWDER,
color: "FFFFFF",
category: "lands",
state: "powder",
hidden:true
}
substance.Aluminum_Chloride_Hydrate = {
behavior: behaviors.WALL,
color: "FFFFFF",
category: "lands",
state: "solid",
hidden:true
}

View File

@ -253,7 +253,6 @@ elements.mask_head = {
burnTime: 250,
burnInto: "possessive_mask",
breakInto: "possessive_mask",
forceSaveColor: true,
reactions: {
"cancer": { elem1: "possessive_mask", chance:0.05 },
"tea": { elem2:null, chance:0.2 },
@ -429,6 +428,7 @@ elements.plague_doctor = {
createPixel("doc_head", pixel.x, pixel.y-1);
pixelMap[pixel.x][pixel.y-1].color = pixel.color;
pixel.element = "doc_body";
pixelMap[pixel.x][pixel.y].color = ["#11111f","#242424"];
}
else {
deletePixel(pixel.x, pixel.y);
@ -593,7 +593,6 @@ elements.doc_body = {
burn: .01,
burnTime: 300,
burnInto: "rotten_meat",
forceSaveColor: true,
reactions: {
"head": { elem2 : "z_head" , chance:0.3},
"body": { elem2 : "z_body" , chance:0.3},
@ -869,9 +868,11 @@ elements.shy_head = {
burnTime: 3000,
burnInto: "bone",
reactions: {
"homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] },
"head": { elem2 : ["blood","blood","blood","bone",null] },
"body": { elem2: ["blood","blood","meat","bone",null] },
"homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] },
"head": { elem2 : ["blood","blood","blood","bone",null] },
"body": { elem2: ["blood","blood","meat","bone",null] },
"z_head": { elem2 : ["infection","infection","infection","bone",null] },
"z_body": { elem2: ["infection","infection","rotten_meat","bone",null] },
"rat": { elem2: ["infection","rotten_meat",null]},
"frog": { elem2: ["slime",null] },
"cell": { elem2: ["dna","water",null] },
@ -986,10 +987,12 @@ elements.shy_body = {
burnInto: "bone",
forceSaveColor: true,
reactions: {
"homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] },
"head": { elem2 : ["blood","blood","blood","meat","bone",null] },
"body": { elem2: ["blood","blood","meat","bone",null] },
"rat": { elem2: ["infection","rotten_meat"]},
"homunculus": { elem2 : ["blood","slime","blood","slime","rotten_meat",null] },
"head": { elem2 : ["blood","blood","blood","bone",null] },
"body": { elem2: ["blood","blood","meat","bone",null] },
"z_head": { elem2 : ["infection","infection","infection","bone",null] },
"z_body": { elem2: ["infection","infection","rotten_meat","bone",null] },
"rat": { elem2: ["infection","infection","plague"] },
"frog": { elem2: "slime" },
"cell": { elem2: ["dna","water",null] },
"cancer": { elem2: ["dna","dirty_water"] },
@ -1007,11 +1010,12 @@ elements.SCP_682 = {
category: "scp",
density: 7500,
reactions: {
"head": { elem2 : ["bone","blood",null] , chance:10 },
"body": { elem1 : "mad_682" , elem2 : ["meat","blood",null] , chance:10 },
"z_head": { elem2 : ["bone","infection",null] , chance:10 },
"z_body": { elem1 : "mad_682" , elem2 : ["rotten_meat","infection",null] , chance:10 },
"homunculus": { elem2 : ["slime","blood",null] , chance:10 },
"head": { elem2 : ["bone","blood",null] , chance:50 },
"body": { elem1 : "mad_682" , elem2 : ["meat","blood",null] , chance:50 },
"z_head": { elem2 : ["infection","infection","infection","bone",null] , chance:50 },
"z_body": { elem1 : "mad_682" , elem2: ["infection","infection","rotten_meat","bone",null] , chance:50 },
"homunculus": { elem2 : ["slime","blood",null] , chance:10 },
"rat": { elem2: ["infection","infection","plague"] },
"frog": { elem2 : ["slime","blood",null] , chance:10 },
"bird": { elem2 : ["feather","blood",null] , chance:10 },
"meat": { elem2 : null , chance:0.2 },
@ -1072,6 +1076,8 @@ elements.mad_682 = {
reactions: {
"head": { elem2 : ["bone","blood",null] },
"body": { elem2 : ["meat","blood",null] },
"z_head": { elem2 : ["bone","infection",null] },
"z_body": { elem2 : ["meat","infection",null] },
"homunculus": { elem2 : ["slime","blood",null] },
"frog": { elem2 : ["slime","blood",null] },
"bird": { elem2 : ["feather","blood",null] },
@ -1223,4 +1229,4 @@ elements.hyper_tickle_monster = {
stain: 0.08,
};
// SCPs with ID over 999 here
// SCPs with ID over 999 here