hotfix test

This commit is contained in:
slweeb 2023-12-14 15:20:52 -05:00
parent fdf1766ef9
commit ec560b373f
3 changed files with 46 additions and 35 deletions

View File

@ -97,36 +97,7 @@
</script> </script>
<script> // Mod Loader <script> // Mod Loader
runAfterLoadList = [];
// runAfterLoad() takes a function and adds it to the runAfterLoadList.
function runAfterLoad(func) {
runAfterLoadList.push(func);
}
runAfterAutogenList = [];
function runAfterAutogen(callback) {
runAfterAutogenList.push(callback);
}
// If the localStorage key "enabledMods" exists, load it as an array.
// If it doesn't exist, create an empty array.
enabledMods = localStorage.getItem("enabledMods") ? JSON.parse(localStorage.getItem("enabledMods")) : [];
// Run all scripts in the enabledMods array, if it fails print to console
for (var i = 0; i < enabledMods.length; i++) {
try {
var script = document.createElement('script');
var src = enabledMods[i];
script.src = src;
document.head.appendChild(script);
} catch (e) {
console.log("Error in mod: " + enabledMods[i]);
console.log(e);
}
}
// if the URL contains fools=true, load the fools.js mod
if (window.location.href.includes("fools=true")) {
var script = document.createElement('script');
script.src = "mods/fools.js"
document.head.appendChild(script);
}
</script> </script>
<script> // PWA things <script> // PWA things
@ -10243,6 +10214,38 @@ else if (currentMonth == 11) { // December
elements.candy.color = ["#c92626","#e3e3e3","#c92626","#e3e3e3","#c92626"] elements.candy.color = ["#c92626","#e3e3e3","#c92626","#e3e3e3","#c92626"]
} }
// Mod Loader
runAfterLoadList = [];
// runAfterLoad() takes a function and adds it to the runAfterLoadList.
function runAfterLoad(func) {
runAfterLoadList.push(func);
}
runAfterAutogenList = [];
function runAfterAutogen(callback) {
runAfterAutogenList.push(callback);
}
// If the localStorage key "enabledMods" exists, load it as an array.
// If it doesn't exist, create an empty array.
enabledMods = localStorage.getItem("enabledMods") ? JSON.parse(localStorage.getItem("enabledMods")) : [];
// Run all scripts in the enabledMods array, if it fails print to console
for (var i = 0; i < enabledMods.length; i++) {
try {
var script = document.createElement('script');
var src = enabledMods[i];
script.src = src;
document.head.appendChild(script);
} catch (e) {
console.log("Error in mod: " + enabledMods[i]);
console.log(e);
}
}
// if the URL contains fools=true, load the fools.js mod
if (window.location.href.includes("fools=true")) {
var script = document.createElement('script');
script.src = "mods/fools.js"
document.head.appendChild(script);
}
function hexToRGB(hex) { function hexToRGB(hex) {
var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
return result ? { return result ? {
@ -14848,7 +14851,7 @@ You can also join our <a href="https://discord.gg/ejUc6YPQuS" target="_blank">Di
<div id="categoryControls"></div> <div id="categoryControls"></div>
<div id="elementControls"></div> <div id="elementControls"></div>
</div> </div>
<div id="extraInfo"><small><a href="https://sandboxels.r74n.com/changelog" id="changelogButton" target="_blank">Changelog</a><a href="feedback" target="_blank">Feedback</a><a href="https://sandboxels.wiki.gg/" target="_blank" id="wikiButton" title="Official Sandboxels Wiki - wiki.gg">Wiki</a><a id="moreSocial" href="https://reddit.com/r/Sandboxels" target="_blank">Reddit</a><a href="https://discord.gg/ejUc6YPQuS" target="_blank" style="text-shadow: 0px 2px 10px #ff00ff;">Discord</a><span id="install-button" style="display:none">&nbsp;<a onclick="deferredPrompt.prompt(); return false" style="text-shadow: 0px 2px 10px #ff00ff; cursor:pointer">Install Offline</a></span><br><br><!----><a style="color:lime" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLSf8pVMSdC6oSnBSaTpzjPQa8Ef-vxG_eXL99UITnMSQtJFTJA/viewform?usp=sf_link">FILL OUT THE CENSUS<span style="color:red">(NEW)</span></a><!----></small></div> <div id="extraInfo"><small><a href="https://sandboxels.r74n.com/changelog" id="changelogButton" target="_blank">Changelog</a><a href="feedback" target="_blank">Feedback</a><a href="https://sandboxels.wiki.gg/" target="_blank" id="wikiButton" title="Official Sandboxels Wiki - wiki.gg">Wiki</a><a id="moreSocial" href="https://reddit.com/r/Sandboxels" target="_blank">Reddit</a><a href="https://discord.gg/ejUc6YPQuS" target="_blank" style="text-shadow: 0px 2px 10px #ff00ff;">Discord</a><span id="install-button" style="display:none">&nbsp;<a onclick="deferredPrompt.prompt(); return false" href="#" style="text-shadow: 0px 2px 10px #ff00ff; cursor:pointer">Install Offline</a></span><br><br><!----><a style="color:lime" target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLSf8pVMSdC6oSnBSaTpzjPQa8Ef-vxG_eXL99UITnMSQtJFTJA/viewform?usp=sf_link">FILL OUT THE CENSUS<span style="color:red">(NEW)</span></a><!----></small></div>
<script> <script>
// version check // version check
if (!settings["lastversion"] || settings["lastversion"]!==currentversion) { if (!settings["lastversion"] || settings["lastversion"]!==currentversion) {
@ -14972,7 +14975,7 @@ You can also join our <a href="https://discord.gg/ejUc6YPQuS" target="_blank">Di
<option value="1">Unhide All Elements</option> <option value="1">Unhide All Elements</option>
<option value="2">Unlock as Discovered</option> <option value="2">Unlock as Discovered</option>
</select> </select>
<a onclick="window.location.reload();" style="font-style:italic;cursor:pointer"></a> <a onclick="window.location.reload();" href="#" style="font-style:italic;cursor:pointer"></a>
</span> </span>
<span setting="bg" class="setting-span" title="Default: Black (#000000)"> <span setting="bg" class="setting-span" title="Default: Black (#000000)">
Background <input onchange="setSetting('bg',this.value);" oninput="setSetting('bg',this.value);" type="color" value="#000000"> Background <input onchange="setSetting('bg',this.value);" oninput="setSetting('bg',this.value);" type="color" value="#000000">
@ -15015,7 +15018,7 @@ You can also join our <a href="https://discord.gg/ejUc6YPQuS" target="_blank">Di
<span setting="cheerful" class="setting-span"> <span setting="cheerful" class="setting-span">
Cheerful Mode <span class="helpMark" title="If you're going through a bad time, enable this to hide these elements from the menu: Cheerful Mode <span class="helpMark" title="If you're going through a bad time, enable this to hide these elements from the menu:
Cancer, Landmine, Grenade, Smoke Grenade">?</span> <input type="button" value="OFF" class="toggleInput" onclick="toggleInput(this,'cheerful');this.nextElementSibling.innerText='Refresh Page'" state="0"> Cancer, Landmine, Grenade, Smoke Grenade">?</span> <input type="button" value="OFF" class="toggleInput" onclick="toggleInput(this,'cheerful');this.nextElementSibling.innerText='Refresh Page'" state="0">
<a onclick="window.location.reload();" style="font-style:italic;cursor:pointer"></a> <a onclick="window.location.reload();" href="#" style="font-style:italic;cursor:pointer"></a>
</span> </span>
<span setting="airtemp" class="setting-span multisetting" title="Temperature that pixels spawn in at. Default: 20 (°C)"> <span setting="airtemp" class="setting-span multisetting" title="Temperature that pixels spawn in at. Default: 20 (°C)">
Air Temp<input type="number" value="20" onchange="if(this.value===''){this.value=20} airTemp=parseFloat(this.value); setSetting('airtemp',airTemp)"> Air Temp<input type="number" value="20" onchange="if(this.value===''){this.value=20} airTemp=parseFloat(this.value); setSetting('airtemp',airTemp)">

View File

@ -10,6 +10,7 @@
<link href="https://fonts.googleapis.com/css?family=Press+Start+2P" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Press+Start+2P" rel="stylesheet">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://R74n.com/load.js"></script> <script src="https://R74n.com/load.js"></script>
<meta http-equiv='content-language' content='en-us'>
<style> <style>
html, html,
@ -1557,7 +1558,6 @@
<a href="https://sandboxels.R74n.com" class="backbutton">&lt;</a> <a href="https://sandboxels.R74n.com" class="backbutton">&lt;</a>
Sandboxels Lite (by <a href="http://markverb1.xyz">markverb1</a>)</h1><br> Sandboxels Lite (by <a href="http://markverb1.xyz">markverb1</a>)</h1><br>
<div id="gameDiv"> <div id="gameDiv">
<h1>
<canvas id="game" width="800" height="600" oncontextmenu="return false;"> <canvas id="game" width="800" height="600" oncontextmenu="return false;">
Your browser does not support the HTML5 canvas tag. Your browser does not support the HTML5 canvas tag.
</canvas> </canvas>
@ -1578,7 +1578,6 @@
</div> </div>
</div> </div>
</div> </div>
</h1>
<!-- i like having this but ublock blocks these things anyway --> <!-- i like having this but ublock blocks these things anyway -->

View File

@ -130,3 +130,12 @@ elements.food = {
}, },
category: "food" category: "food"
} }
elements.liquid = {
behavior: [
"XX|XX|XX",
"M2|XX|M2",
"M1|M1|M1",
],
category: "special"
}