Merge pull request #2 from R74nCom/main

s
This commit is contained in:
guzzo86 2024-05-05 15:15:10 -04:00 committed by GitHub
commit b3c7ba1b59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 363 additions and 106 deletions

View File

@ -16244,7 +16244,7 @@ Cancer, Landmine, Grenade, Smoke Grenade">?</span> <input type="button" value="O
</optgroup>
</select></p>
<p>Try our NEW GAME: <a href="https://R74n.com/cook/" target="_blank">Infinite Chef</a></p>
<p>Email us at <a href="mailto:contact@R74n.com">contact@R74n.com</a> for advertising, help, or education!</p>
<p>Email us at <a href="mailto:contact@R74n.com?subject=%5BSandboxels%5D">contact@R74n.com</a> for advertising, help, or education!</p>
<div id="newsletterFrame">Be notified when Sandboxels and other R74n projects are updated, along with ramblings from the developer!<br><br>
<form action="https://news.r74n.com/api/v1/free?nojs=true" method="post" class="form _form_1mxvn_6" novalidate="" target="_blank"><input type="hidden" name="first_url" value="https://news.r74n.com/embed"><input type="hidden" name="first_referrer"><input type="hidden" name="current_url" value="https://news.r74n.com/embed"><input type="hidden" name="current_referrer"><input type="hidden" name="referral_code"><input type="hidden" name="source" value="embed"><input type="hidden" name="referring_pub_id"><input type="hidden" name="additional_referring_pub_ids">
<input type="email" placeholder="Type your email..." name="email" style="padding:15px"><input type="submit" value="Subscribe" style="background: rgb(23, 166, 255); padding:15px; border-radius: 20px"></input>
@ -16259,10 +16259,10 @@ Cancer, Landmine, Grenade, Smoke Grenade">?</span> <input type="button" value="O
border: white solid 2px;
}
</style>
<!-- <iframe id="newsletteriframe" width="450" height="250" style="border:1px solid #EEE; background:black; max-width:90%" frameborder="0" scrolling="no"></iframe>
<!-- <iframe id="newsletteriframe" width="450" height="250" style="border:1px solid #EEE; background:black; max-width:90%" frameborder="0" scrolling="no"></iframe> -->
<script>
window.addEventListener('load', function() {
document.getElementById("newsletteriframe").src = "https://news.r74n.com/embed";
// document.getElementById("newsletteriframe").src = "https://news.r74n.com/embed";
var langSelect = document.getElementById("langSelect");
if (langCode) { langSelect.value = langCode }
else if (settings.lang) { langSelect.value = settings.lang }
@ -16271,7 +16271,7 @@ Cancer, Landmine, Grenade, Smoke Grenade">?</span> <input type="button" value="O
document.getElementById("langCredit").style.display = "block";
}
})
</script> -->
</script>
<p>Support development by subscribing on <a href="https://www.patreon.com/R74n" rel="me" target="_blank">our Patreon</a>! Many benefits!!</p>
</div>
@ -16285,7 +16285,7 @@ Cancer, Landmine, Grenade, Smoke Grenade">?</span> <input type="button" value="O
<p>Sandboxels has many <a href="https://sandboxels.R74n.com/education-use"></a>applications in education</a>. With a hands-on experience, it can give students an understanding of emerging phenomena in many fields, such as biology, chemistry, ecology, geology, cooking, and even virology. There are countless aspects to discover.</p>
<p>We have a thriving community on <a href="https://discord.gg/ejUc6YPQuS" target="_blank">Discord</a>! There you can post feedback or share your creations.</p>
<!-- <p>If you'd like to support us, consider donating on <a href="https://www.paypal.com/donate/?hosted_button_id=GCX4VHQ7SZWTN" target="_blank">PayPal</a> or <a href="https://cash.app/$emojiartist" target="_blank" title="$emojiartist">CashApp</a>, or subscribing on Discord.</p> -->
<p>Business inquiries? Education stories? Help needed? Email us at <a href="mailto:contact@r74n.com">contact@R74n.com</a>!</p>
<p>Business inquiries? Education stories? Help needed? Email us at <a href="mailto:contact@R74n.com?subject=%5BSandboxels%5D">contact@R74n.com</a>!</p>
<p>More links: <a href="https://sandboxels.R74n.com/help" rel="help">Help</a><a href="https://sandboxels.R74n.com/tips">Tips</a><a href="https://sandboxels.R74n.com/mod-list">Mods</a><a href="https://sandboxels.R74n.com/mobile-use">Mobile</a><a href="https://sandboxels.R74n.com/offline-use">Offline</a><a href="https://R74n.com/privacy">Privacy</a></p>
<p>Thanks to: Serioustar, ggod, Midi_png, personman, fnl4y, PitsPower, swagg boi, kaeud, WeiChei, Trent, u2ce</p>
<p style="display:none" id="langCredit">Translation by R74n</p>

View File

@ -1,266 +1,517 @@
elements.peat_bog = {
elements.peat_bog = {
color: "#483C32",
behavior: behaviors.LIQUID,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 120,
density: 1200,
stain: 0.2
};
};
elements.marsh_muck = {
color: "#6B8E23",
behavior: behaviors.LIQUID,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 50,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 140,
density: 1000,
stain: 0.25
};
};
elements.quagmire = {
color: "#8B4513",
behavior: behaviors.LIQUID,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 160,
density: 1000,
stain: 0.3
};
};
elements.slime_mold = {
color: "#00FF00",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 30,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 100,
density: 1000,
stain: 0.2
};
};
elements.mangrove_mud = {
color: "#8B4513",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 150,
density: 1089,
stain: 0.25
};
peat_slurry = {
};
peat_slurry = {
color: "#556B2F",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 50,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 130,
density: 1452,
stain: 0.28
};
elements.bog_ooze = {
};
elements.bog_ooze = {
color: "#2E8B57",
behavior: behaviors.STICKY,
behavior:elements.slime.behavior,
viscosity: 10000,
tempHigh: 100,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 135,
density: 1350,
stain: 0.3
};
elements.fen_mud = {
};
elements.fen_mud = {
color: "#556B2F",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 100,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 155,
density: 1550,
stain: 0.28
};
elements.swamp_sludge = {
};
elements.swamp_sludge = {
color: "#6B8E23",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 52,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 145,
density: 1450,
stain: 0.25
};
elements.marsh_slime = {
};
elements.marsh_slime = {
color: "#00FF00",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 32,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 105,
density: 1050,
stain: 0.16
};
elements.peat_paste = {
};
elements.peat_paste = {
color: "#8B4513",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 57,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 160,
density: 1600,
stain: 0.1
};
elements.mudflat_mud = {
};
elements.mudflat_mud = {
color: "#8B4513",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 170,
density: 1700,
stain: 0.25
};
elements.swamp_ooze = {
};
elements.swamp_ooze = {
color: "#556B2F",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 54,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 140,
density: 1400,
stain: 0.20
};
elements.peat_pudding = {
};
elements.peat_pudding = {
color: "#8B4513",
behavior: behaviors.STICKY,
behavior: elements.sap.behavior,
viscosity: 10000,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 160,
density: 1600,
stain: 0.21
};
elements.mudflow = {
};
elements.mudflow = {
color: "#8B4513",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 170,
density: 1700,
stain: 0.2
};
elements.marsh_mire = {
};
elements.marsh_mire = {
color: "#6B8E23",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 55,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 150,
density: 1500,
stain: 0.12
};
elements.peat_paste = {
};
elements.moor = {
color: "#556B2F",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 57,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 160,
density: 1600,
stain: 0.18
};
elements.quicksand_fen = {
};
elements.quicksand_fen = {
color: "#DAA520",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 62,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 155,
density: 1550,
stain: 0.15
};
elements.marsh_mudslide = {
};
elements.marsh_mudslide = {
color: "#8B4513",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 58,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 160,
density: 1600,
stain: 0.1
};
elements.swamp_slime = {
};
elements.swamp_slime = {
color: "#00FF00",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 35,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 110,
density: 1100,
stain: 0.15
};
elements.mire_mud = {
};
elements.mire_mud = {
color: "#8B4513",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 60,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 170,
density: 1700,
stain: 0.17
};
elements.peat_quicksand = {
};
elements.peat_quicksand = {
color: "#DAA520",
behavior: behaviors.STICKY,
behavior: elements.slime.behavior,
viscosity: 10000,
tempHigh: 65,
stateHigh: "liquid",
tempLow: 0,
category: "liquids",
state: "liquid",
density: 180,
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

@ -3,7 +3,7 @@ function weightedAverage(num1, num2, weight){
}
const heatfunc = function(pixel){
if (pixel.element != "metal_scrap" || eLists.metals.includes(pixel.scrapType) || !pixel.scrapType){{
if (pixel.ogR == null || pixel.ogG == null || pixel.ogB == null || (pixel.element != pixel.ogElement && pixel.element == "metal_scrap") || (pixel.element != "metal_scrap" && pixel.ogElement == "metal_scrap")){
if (pixel.ogR == null || pixel.ogG == null || pixel.ogB == null || (pixel.element != pixel.ogElement && pixel.element == "metal_scrap") || (pixel.element != "metal_scrap" && pixel.ogElement == "metal_scrap") || (pixel.element == "oxidized_copper" && pixel.ogElement == "copper")){
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)

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