Merge branch 'R74nCom:main' into main

This commit is contained in:
SquareScreamYT 2024-03-30 12:39:11 +08:00 committed by GitHub
commit 76a0dce43a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 2579 additions and 116 deletions

View File

@ -523,21 +523,21 @@
"molten_potassium_salt":"stopiona_sól_potasowa",
"molten_sodium_acetate":"stopiony_octan_sodu",
"frozen_nitro":"zamrożona_nitrogliceryna",
"cured_meat": "",
"cured_meat": "wędzone_mięso",
"nut_oil": "olej z orzechów",
"grease": "",
"grease": "smar",
"fat": "tłuszcz",
"potassium": "potas",
"molten_potassium": "roztopiony_potas",
"magnesium": "",
"molten_magnesium": "",
"magnesium": "magnez",
"molten_magnesium": "stopiony_magnez",
"sandstorm": "burza_piaskowa",
"caustic_potash": "",
"antibomb": "",
"antibomb": "antybomba",
"tornado": "tornado",
"earthquake": "trzęsienie_ziemi",
"tsunami": "tsunami",
"blaster": "promień",
"propane_ice": "",
"propane_ice": "lód_propanowy",
"molten_caustic_potash": ""
}

View File

@ -202,7 +202,7 @@
<tr><td>ticking_temp_stuff.js</td><td>Adds more heaters and coolers</td><td>Alice</td></tr>
<tr><td>video.js</td><td>Adds a video player</td><td>ggod</td></tr>
<tr><td>waterspout.js</td><td>Adds back the old Water Spout</td><td>mollthecoder</td></tr>
<tr><td>WhisperingTheory.js</td><td>Adds powder and gas variant of heater and cooler</td><td>kaeud</td></tr>
<tr><td>WhisperingTheory.js</td><td>Adds many more variants of heater and cooler</td><td>kaeud</td></tr>
<!----><tr><td class="modCat" colspan="3">Weapons</td></tr><!---->
<tr><td>aircrafts.js</td><td>Adds aircraft and aircraft part pixels</td><td>Jayd</td></tr>

View File

@ -67,10 +67,24 @@ elements.computer = {
density: 8908,
tempHigh: 1414,
stateHigh: "explosion",
conduct: 1,
reactions: {
"virus": { elem1 : null , elem2:"malware", chance:0.9 },
"water": { elem1: null , elem2: "electric" },
}
};
elements.carbon_monoxide_detector = {
behavior: behaviors.WALL,
desc: "give red light and electric when found Carbon Monoxide touch",
color: "#ffffff",
reactions: {
"carbon_monoxide": {"charge1":1},
},
conduct: 1,
tempHigh: 1550,
stateHigh: ["molten_metal_scrap","electric","molten_plastic"],
colorOn: "#ff0000",
movable: false,
category:"machines",
darkText: true,
hardness: 1,
};

View File

@ -27,6 +27,13 @@ elements.roomtemper = {
movable: false,
};
elements.cold_fire.behavior = [
"M1|M1|M1",
"M2|DL%8|M2",
"XX|M2|XX",
];
// powder
elements.powder_heater = {
category: "machines",
behavior: [
@ -60,7 +67,7 @@ elements.powder_superheater = {
insulate: true,
};
elements.powder_freeze = {
elements.powder_freezer = {
category: "machines",
behavior: [
"XX|CO:10|XX",
@ -71,12 +78,7 @@ elements.powder_freeze = {
insulate: true,
};
elements.cold_fire.behavior = [
"M1|M1|M1",
"M2|DL%8|M2",
"XX|M2|XX",
];
// gas
elements.gas_heater = {
color: "#881111",
behavior: [
@ -88,17 +90,6 @@ elements.gas_heater = {
insulate: true,
};
elements.gas_superheater = {
color: "#dd1111",
behavior: [
"M2|M1 AND HT:10|M2",
"M1 AND HT:10|XX|M1 AND HT:10",
"M2|M1 AND HT:10|M2",
],
category: "machines",
insulate: true,
};
elements.gas_cooler = {
color: "#111188",
behavior: [
@ -110,6 +101,17 @@ elements.gas_cooler = {
insulate: true,
};
elements.gas_superheater = {
color: "#dd1111",
behavior: [
"M2|M1 AND HT:10|M2",
"M1 AND HT:10|XX|M1 AND HT:10",
"M2|M1 AND HT:10|M2",
],
category: "machines",
insulate: true,
};
elements.gas_freezer = {
color: "#1111dd",
behavior: [
@ -120,3 +122,48 @@ elements.gas_freezer = {
category: "machines",
insulate: true,
};
// antipowder
elements.anti_heater = {
color: "#881111",
behavior: [
"M2|M1 AND HT:2|M2",
"HT:2|XX|HT:2",
"XX|HT:2|XX",
],
category: "special",
insulate: true,
};
elements.anti_cooler = {
color: "#111188",
behavior: [
"M2|M1 AND CO:2|M2",
"CO:2|XX|CO:2",
"XX:CO:2|XX",
],
category: "special",
insulate: true,
};
elements.anti_superheater = {
color: "#881111",
behavior: [
"M2|M1 AND HT:10|M2",
"HT:10|XX|HT:10",
"XX|HT:10|XX",
],
category: "special",
insulate: true,
};
elements.anti_freezer = {
color: "#1111dd",
behavior: [
"M2|M1 AND CO:10|M2",
"CO:10|XX|CO:10",
"XX:CO:10|XX",
],
category: "special",
insulate: true,
};

34
mods/drugs.js Normal file
View File

@ -0,0 +1,34 @@
elements.methamphetamine = {
category: "powders",
color: ["#b6ccd8", "#c5cfd6", "#cbd5db", "#6da5e0"],
state: "solid",
behavior: behaviors.POWDER,
temp: 20,
tempHigh: 1700,
stateHigh: "molten_methamphetamine",
reactions: {
"water": {elem1: null, elem2: "dirty_water"},
"cell": {elem1: "methamphetamine", elem2: "plague", chance: 0.001},
"plant": {elem1: "methamphetamine", elem2: "dead_plant", chance: 0.005},
},
};
elements.molten_methamphetamine = {
category: "states",
color: ["#fb7300", "#f93100", "#e05a1d", "#d65611"],
state: "liquid",
behavior: behaviors.RADMOLTEN,
tempLow: 1700,
stateLow: "methamphetamine",
};
elements.morphine = {
category: "powders",
color: "#c4dcf2",
state: "solid",
behavior: behaviors.POWDER,
reactions: {
"head": {elem1: "n_explosion", elem2: "n_explosion", chance: 0.00008},
"body": {elem1: "n_explosion", elem2: "n_explosion", chance: 0.00008},
},
};

View File

@ -72,13 +72,46 @@ elements.subzero_grass = {
stateHigh: "dead_plant",
density:1400
},
elements.ruthenium = {
color: ["#ffffff","#c9c9c9","#b1b1b1","#9e9e9e","#888888"],
behavior: behaviors.STURDYPOWDER,
category: "powders",
state: "liquid",
tempHigh: 2334,
stateHigh: "molten_ruthenium",
density: 12370,
}
elements.molten_ruthenium = {
color: ["#ffc251", "#dd562c", "#e9a423", "#d8722e"],
behavior: behaviors.MOLTEN,
category: "states",
state: "liquid",
hidden: true,
density: 10650,
tempLow: 2330,
stateLow: "ruthenium"
}
elements.acid.ignore.push("ruthenium"),
elements.acid.ignore.push("molten_ruthenium"),
elements.acid_gas.ignore.push("ruthenium"),
elements.acid_gas.ignore.push("molten_ruthenium")
elements.technetium = {
color: ["#e7d9bb", "#bab195", "#8f8a70", "#66654e"],
behavior: [
"XX|XX|XX",
"XX|CH:neutron%0.07|XX",
"XX|XX|XX",
],
behavior: behaviors.WALL,
tick: function(pixel){
if(Math.random() < 0.0007){
for (var i = 0; i < squareCoords.length; i++) {
var coord = squareCoords[i];
var x = pixel.x+coord[0];
var y = pixel.y+coord[1];
if (isEmpty(x, y)){
createPixel("positron", x, y)
break;
}
}
changePixel(pixel, "ruthenium", false);
}
},
category: "solids",
state: "solid",
tempHigh: 2157,
@ -88,14 +121,24 @@ elements.technetium = {
},
elements.molten_technetium = {
color: ["#d16b42", "#da904c", "#dfb360", "#e2d57f"],
behavior: behaviors.LIQUID,
tick: function(pixel) {
if (Math.random() < 0.0007) {
changePixel(pixel, "neutron", false);
}
},
behavior: behaviors.MOLTEN,
tick: function(pixel){
if(Math.random() < 0.0007){
for (var i = 0; i < squareCoords.length; i++) {
var coord = squareCoords[i];
var x = pixel.x+coord[0];
var y = pixel.y+coord[1];
if (isEmpty(x, y)){
createPixel("positron", x, y)
break;
}
}
changePixel(pixel, "ruthenium", false);
}
},
category: "states",
state: "liquid",
hidden: true,
tempLow: 2140,
temp: 2200,
stateLow: "technetium",

250
mods/pullers.js Normal file
View File

@ -0,0 +1,250 @@
// made by voidapex11
// a sandboxels mod that adds pullers
/*
==CHANGELOG==
Version 1.1.1#
@voidapex11
~initial comit
+pullersDesc
+imovable_inator& movable_inator
+imovable wall, steel & insulation
+L, R, U & D pullers
+void light&dark
~don't comit without permision as you may disrupt other dev's hard work
~update changelog with newer updates first
~Version format is:
rewrites.major updates.paches&minor feechers
put a '#' at end of version format if it has not been pushed to the github
~for change-log
'~' means notes/changes '+' means aditions and '-' is removals
*/
behaviors.SELFDELETE = [
"XX|XX|XX",
"XX|DL|XX",
"XX|XX|XX",
];
pullerColour = '#e0adb6'
elements.pullersDesc = {
color: pullerColour,
name: 'pullers.js',
category: "mods",
behavior: behaviors.SELFDELETE,
tool: function(pixel) {},
onSelect: function(pixel) {
let info1stMod = `pullers.js is a mod made by voidapex11 that adds pullers to sandboxels`
alert(info1stMod)
return
},
};
// for the inator reference: if you know you know
elements.imovable_inator = {
color: "#525252",
tool: function(pixel) {
pixel.imovable = true
},
category: "tools",
}
elements.movable_inator = {
color: "#a8a8a8",
tool: function(pixel) {
pixel.imovable = false
},
category: 'tools',
}
elements.imovable_wall = {
color: "#808080",
behavior: behaviors.WALL,
category: "solids",
insulate: true,
hardness: 1,
noMix: true,
properties: {
imovable: true
}
}
elements.imovable_steel = {
color: "#71797e",
behavior: behaviors.WALL,
reactions: {
"water": { elem1:"rust", chance:0.002 },
"salt_water": { elem1:"rust", chance:0.004 },
"dirty_water": { elem1:"rust", chance:0.03 },
"pool_water": { elem1:"rust", chance:0.03 },
"sugar_water": { elem1:"rust", chance:0.003 },
"seltzer": { elem1:"rust", chance:0.005 },
"salt": { elem1:"rust", chance:0.003 },
"blood": { elem1:"rust", chance:0.002 },
"infection": { elem1:"rust", chance:0.002 },
"antibody": { elem1:"rust", chance:0.002 },
},
tempHigh: 1455.5,
category: "solids",
density: 7850,
conduct: 0.42,
hardness: 0.8,
properties: {
imovable: true
}
}
elements.imovable_insulation = {
color: "#b8aea5",
behavior: behaviors.WALL,
category: "solids",
insulate: true,
state: "solid",
noMix: true,
properties: {
imovable: true
}
}
elements.left_puller = {
color: pullerColour,
properties: {
range: 10,
pushStrength: 1,
},
tick: function(pixel) {
pixel.range ??= 10;
pixel.pushStrength ??= 1;
for(h = pixel.pushStrength; h >= pixel.pushStrength; h--) {
for (i = 1; i <= pixel.range; i++) {
if (!isEmpty(pixel.x + i, pixel.y, true)) {
if (pixelMap[pixel.x+i][pixel.y]['imovable']) {break}
else {
tryMove(pixelMap[pixel.x + i][pixel.y], pixel.x + i - 1, pixel.y);
}
}
}
};
doDefaults(pixel);
},
category: "machines",
breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
tempHigh: 2400,
stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
density: 10000,
hardness: 0.85,
conduct: 1,
state: "solid",
}
elements.right_puller = {
color: pullerColour,
properties: {
range: 10,
pushStrength: 1,
},
tick: function(pixel) {
pixel.range ??= 10;
pixel.pushStrength ??= 1;
for(h = pixel.pushStrength; h >= pixel.pushStrength; h--) {
for (i = 1; i <= pixel.range; i++) {
if (!isEmpty(pixel.x - i, pixel.y, true)) {
if (pixelMap[pixel.x-i][pixel.y]['imovable']) {break}
else {
tryMove(pixelMap[pixel.x - i][pixel.y], pixel.x - i + 1, pixel.y);
}
}
}
};
doDefaults(pixel);
},
category: "machines",
breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
tempHigh: 2400,
stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
density: 10000,
hardness: 0.85,
conduct: 1,
state: "solid",
}
elements.down_puller = {
color: pullerColour,
properties: {
range: 10,
pushStrength: 1,
},
tick: function(pixel) {
pixel.range ??= 10;
pixel.pushStrength ??= 1;
for(h = pixel.pushStrength; h >= pixel.pushStrength; h--) {
for (i = 1; i <= pixel.range; i++) {
if (!isEmpty(pixel.x, pixel.y - i, true)) {
if (pixelMap[pixel.x][pixel.y - i]['imovable']) {break}
else {
tryMove(pixelMap[pixel.x][pixel.y - i], pixel.x, pixel.y - i + 1);
}
}
}
};
doDefaults(pixel);
},
category: "machines",
breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
tempHigh: 2400,
stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
density: 10000,
hardness: 0.85,
conduct: 1,
state: "solid",
}
elements.up_puller = {
color: pullerColour,
properties: {
range: 10,
pushStrength: 1,
},
tick: function(pixel) {
pixel.range ??= 10;
pixel.pushStrength ??= 1;
for(h = pixel.pushStrength; h >= pixel.pushStrength; h--) {
for (i = 1; i <= pixel.range; i++) {
if (!isEmpty(pixel.x, pixel.y + i, true)) {
if (pixelMap[pixel.x][pixel.y + i]['imovable']){
break
}
else {
tryMove(pixelMap[pixel.x][pixel.y + i], pixel.x, pixel.y + i - 1);
}
}
}
};
doDefaults(pixel);
},
category: "machines",
breakInto: ["metal_scrap", "steel", "iron", "glass", "uranium", "tin"],
tempHigh: 2400,
stateHigh: ["molten_aluminum", "molten_steel", "molten_iron", "molten_glass", "molten_uranium", "molten_tin"],
density: 10000,
hardness: 0.85,
conduct: 1,
state: "solid",
}
if (enabledMods.includes("pushers.js")) {
console.info('compatibility with pushers.js and imovable objects coming in a later update of the pullers.js')
}

File diff suppressed because it is too large Load Diff

91
mods/tech.js Normal file
View File

@ -0,0 +1,91 @@
elements.monitor_case = {
color: "#4a4848",
behavior: behaviors.SOLID,
category: "tech",
state: "solid",
density: 500,
};
elements.pc_core = {
color: "#f0cd43",
behavior: [
"XX|SH|XX",
"SH|XX|SH",
"XX|SH|XX",
],
category: "tech",
tempHigh: 8000,
stateHigh: ["molten_steel","explosion","molten_iron"],
reactions: {
"poison": { elem1: "malfunctioned_wire", elem2: "null" },
"salt_water": { elem1: "malfunctioned_wire", elem2: "null" },
"water": { elem1: "explosion", elem2: "null" },
"malware": { elem1: "null", elem2: "null" },
},
breakInto: ["rust", "electrogalvanized"],
};
elements.malfunctioned_wire = {
color: "#6d32a8",
behavior: behaviors.WALL,
category: "tech",
conduct: 999,
noMix: true
};
elements.red_wire = {
color: "#ff3d1f",
behavior: behaviors.WALL,
category: "tech",
insulate: true,
conduct: 1,
noMix: true,
reactions: {
"acid": { elem1: "malfunctioned_wire", elem2: "null" },
"poison": { elem1: "malfunctioned_wire", elem2: "null" },
"salt_water": { elem1: "malfunctioned_wire", elem2: "null" },
"water": { elem1: "malfunctioned_wire", elem2: "null" },
},
breakInto: ["plastic", "copper"],
};
elements.green_wire = {
color: "#66c22d",
behavior: behaviors.WALL,
category: "tech",
insulate: true,
conduct: 1,
noMix: true,
reactions: {
"acid": { elem1: "malfunctioned_wire", elem2: "null" },
"poison": { elem1: "malfunctioned_wire", elem2: "null" },
"salt_water": { elem1: "malfunctioned_wire", elem2: "null" },
"water": { elem1: "malfunctioned_wire", elem2: "null" },
},
breakInto: ["plastic", "copper"],
};
elements.blue_wire = {
color: "#1f81cc",
behavior: behaviors.WALL,
category: "tech",
insulate: true,
conduct: 1,
noMix: true,
reactions: {
"acid": { elem1: "malfunctioned_wire", elem2: "null" },
"poison": { elem1: "malfunctioned_wire", elem2: "null" },
"water": { elem1: "malfunctioned_wire", elem2: "null" },
"salt_water": { elem1: "malfunctioned_wire", elem2: "null" },
},
breakInto: ["plastic", "copper"],
};
elements.electrogalvanized = {
color: "#6c6e70",
behavior: behaviors.WALL,
category: "tech",
state: "solid",
conduct: 2,
density: 7850,
};