Merge branch 'R74nCom:main' into main

This commit is contained in:
JustAGenericUsername 2024-04-30 18:35:01 -04:00 committed by GitHub
commit e84da6b620
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 232 additions and 24 deletions

View File

@ -235,6 +235,8 @@
<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

@ -29,7 +29,8 @@ elements.tolulene = {
burnInto: ["steam", "smoke", "fire", "fire",],
reactions: {
"potassiumpermanganate": {elem1: "benzaldehyde", elem2: "benzaldehyde"},
}
},
tempHigh: 111,
}
elements.benzaldehyde = {
color: "#F5F5F5",
@ -40,7 +41,7 @@ elements.benzaldehyde = {
desc: "Benzaldehyde is cherry flavor. It is also clear like tolulene.",
reactions: {
"seltzer": {elem1: "cherrysoda", elem2: "cherrysoda"},
}
},
}
elements.cherrysoda = {
color: "#D2042D",
@ -48,5 +49,29 @@ elements.cherrysoda = {
category: "food",
state: "liquid",
density: 1045,
desc: "Cherry soda."
desc: "Cherry soda.",
tempHigh: 150,
stateHigh: "cherrysoda_gas",
}
elements.cherrysoda_gas = {
color: "#D20459",
behavior: behaviors.GAS,
category: "gases",
state: "gas",
density: 1025,
desc: "Cherry soda gas.",
tempLow: 149,
stateLow: "cherrysoda",
temp: 169,
}
elements.cherrysoda_ice = {
color: "BF4F9C",
behavior: behaviors.wALL,
category: "solids",
state: "solid",
density: 1065,
desc: "Cherry soda gas.",
tempHigh: -27,
stateHigh: "cherrysoda",
temp: -47,
}

140
mods/GrapeSoda.js Normal file
View File

@ -0,0 +1,140 @@
elements.anthranilicacid = {
color: "#FFFFFF",
behavior: behaviors.POWDER,
category: "powders",
state: "solid",
tempHigh: 145,
stateHigh: "moltenanthranilicacid",
reactions: {
"methanol": {elem1: "methylanthranilate", elem2: "methylanthranilate"},
},
}
elements.moltenanthranilicacid = {
color: ["#FFFF99", "#FFFF66", "#FFFF00"],
behavior: behaviors.LIQUID,
category: "states",
state: "liquid",
tempLow: 144,
stateLow: "anthranilicacid",
tempHigh: 340,
stateHigh: "anthranilicacidgas",
temp: 155,
viscosity: 10,
}
elements.anthranilicacidgas = {
color: "#FEDEFF",
behavior: behaviors.GAS,
category: "gases",
state: "gas",
tempLow: 339,
stateLow: "moltenanthranilicacid",
temp: 350,
}
elements.methanol = {
color: "#FFE4FF",
behavior: behaviors.LIQUID,
category: "liquids",
state: "liquid",
density: 792,
stateHigh: "methanolgas",
tempHigh: 65,
stateLow: "methanolice",
tempLow: -98,
burn: 100,
burnTime: 100,
burnInto: "carbondioxide"
}
elements.methanolice = {
color: "#FFFFFF",
behavior: behaviors.SOLID,
category: "solids",
state: "solid",
density: 822,
stateHigh: "methanol",
temp: -117,
tempHigh: -97,
}
elements.methanolgas = {
color: "#E1E4FF",
behavior: behaviors.GAS,
category: "gases",
state: "gas",
density: 942,
stateLow: "methanol",
tempLow: 64,
temp: 84,
}
elements.methylanthranilate = {
color: "#FFFBBA",
behavior: behaviors.LIQUID,
category: "liquids",
state: "liquid",
density: 1120,
stateHigh: "methylanthranilategas",
tempHigh: 257,
stateLow: "methylanthranilateice",
tempLow: -20,
reactions: {
"seltzer": {elem1: "grapesoda", elem2: "grapesoda",}
}
}
elements.methylanthranilategas = {
color: "#FFFBBA",
behavior: behaviors.GAS,
category: "gases",
state: "gas",
density: 1120,
stateLow: "methylanthranilate",
tempLow: 256,
temp: 276,
}
elements.methylanthranilateice = {
color: "#FFFBD7",
behavior: behaviors.WALL,
category: "solids",
state: "solid",
density: 1120,
stateHigh: "methulanthranilate",
temphigh: -19,
temp: -39,
}
elements.grapesoda = {
color: "#5B134F",
behavior: behaviors.LIQUID,
category: "food",
state: "liquid",
density: 1120,
stateHigh: "grapesodagas",
tempHigh: 257,
stateLow: "grapesodaice",
tempLow: -20,
}
elements.grapesodagas = {
color: "#B99FEA",
behavior: behaviors.GAS,
category: "gases",
state: "gas",
density: 1100,
stateLow: "grapesoda",
tempLow: 256,
temp: 257,
}
elements.grapesodaice = {
color: "#B99FC2",
behavior: behaviors.WALL,
category: "solids",
state: "solid",
density: 1140,
stateHigh: "grapesoda",
tempHigh: -19,
temp: -20,
}

View File

@ -1,10 +1,8 @@
// Science mod for Sandboxels
// (Inspired by survival.js)
// Build 19
// By: Lucifer (@a_british_proto (Discord))
// If there is anything you want to suggest or there's a bug then just dm me on discord
// Build 20
// If there is anything you want to suggest or there's a bug then just dm me on discord (@a_british_proto)
// Todo:
// - Try to get the mod to work by making different ways to craft all the (116) elements in the mod
// - Make new substances that you can get after mixing different elements
// - Make a way to get the different substances by mixing different elements and different substances
// - Create different proporties for the substances (doing now)
@ -1383,7 +1381,7 @@ substance.Silver_Sulfate = {
hidden:true
}
// I have finally gotten my motivation back! :D
// Decided to just change the console.log to a comment because it got me confused between the github page and VSC
substance.Silver_Selenide = {
behavior: behaviors.WALL,
@ -1446,25 +1444,24 @@ substance.Aluminum_Diboride = {
hidden:true
}
// Doing this later as my schools blocked chatgpt and the definition is not on Ptable.com :/
// substance.Aluminum_Dodecaboride = {
// behavior: behaviors.NULL,
// color: "000000",
// category: "null",
// state: "null",
// hidden:true
// }
substance.Aluminum_Dodecaboride = {
behavior: behaviors.WALL,
color: "000000",
category: "lands",
state: "solid",
hidden:true
}
// substance.Aluminum_Bromate_Nonahydrate = {
// behavior: behaviors.NULL,
// color: "000000",
// category: "null",
// state: "null",
// hidden:true
// }
substance.Aluminum_Bromate_Nonahydrate = {
behavior: behaviors.WALL,
color: "FFFFFF",
category: "lands",
state: "solid",
hidden:true
}
substance.Aluminum_Tribromide = {
behavior: behavior.NULL, // It's meant to be a powder but I'm too tired to go look plus I need to go to my next lesson now
behavior: behavior.POWDER,
color: "FF0000",
category: "lands",
state: "powder",

44
mods/potato_chips.js Normal file
View File

@ -0,0 +1,44 @@
elements.potato_chip = {
behavior: behaviors.STURDYPOWDER,
state: "solid",
density: 1350,
color: ["#F7DD93", "#D8A44B"],
category: "food",
desc: "Potato chip. Turns potato next to it into potato chip if temp is >= 104.",
tick: function(pixel) {
if(pixelTicks - pixel.start >= 15) {
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");
}
}
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");
}
}
if (!isEmpty(pixel.x - 1, pixel.y, true)) {
if (pixel.temp >= 104 && pixelMap[pixel.x - 1][pixel.y].element === "potato") {
changePixel(pixelMap[pixel.x - 1][pixel.y], "potato_chip");
}
}
if (!isEmpty(pixel.x + 1,pixel.y, true)) {
if (pixel.temp >= 104 && pixelMap[pixel.x + 1][pixel.y].element === "potato") {
changePixel(pixelMap[pixel.x + 1][pixel.y], "potato_chip");
}
}
}
}
}
elements.sunflower_oil = {
behavior: behaviors.LIQUID,
color: ["#FFFFCC", "#FFFF99", "#FFFF66", "#FFFF33", "#FFFF00", "#FFCC00"],
viscosity: 63,
category: "food",
state: "liquid",
reactions: {
"potato": {elem2: "potato_chip", tempMin: 140},
}
}