From 88c5bca7ff5b09dcf465a3801b8a635b84052759 Mon Sep 17 00:00:00 2001 From: DoobieRalsei <163950752+DoobieRalsei@users.noreply.github.com> Date: Wed, 15 May 2024 10:10:05 -0700 Subject: [PATCH 1/8] Bug Amber now has color --- mods/fossils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mods/fossils.js b/mods/fossils.js index 27e5e5f5..04144003 100644 --- a/mods/fossils.js +++ b/mods/fossils.js @@ -127,7 +127,7 @@ elements.petrified_wood = { elements.skull = { color: "#d9d9d9", hidden:true, - behavior: behaviors.SUPPORT, + behavior: behaviors.SUPPORTPOWDER, reactions: { "water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, "salt_water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, @@ -160,6 +160,7 @@ elements.skull = { }, elements.bug_amber = { + color: "#ffc000", temp: 20, tempHigh: 345, stateHigh: ["smoke","sap","sap","calcium","sugar"], From 761b8cfd7d12d46f4ffae1f4521ccca41fb7488e Mon Sep 17 00:00:00 2001 From: Jayd-Rubies <155784127+Jayd-Rubies@users.noreply.github.com> Date: Wed, 15 May 2024 14:14:31 -0400 Subject: [PATCH 2/8] Add files via upload --- mods/nopixellimit.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/nopixellimit.js b/mods/nopixellimit.js index 44c33146..a563e1e6 100644 --- a/mods/nopixellimit.js +++ b/mods/nopixellimit.js @@ -1,2 +1,2 @@ - maxPixelCount = settings.maxpixels || 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; - if (settings.maxpixels === 0) { maxPixelCount = 1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; } \ No newline at end of file + maxPixelCount = settings.maxpixels || Number.MAX_VALUE; + if (settings.maxpixels === 0) { maxPixelCount = Number.MAX_VALUE; } \ No newline at end of file From 50755789d42f886cc82cbcb52d503b12b9c75c23 Mon Sep 17 00:00:00 2001 From: Jayd-Rubies <155784127+Jayd-Rubies@users.noreply.github.com> Date: Wed, 15 May 2024 14:24:19 -0400 Subject: [PATCH 3/8] Add files via upload --- mod-list.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod-list.html b/mod-list.html index be9438b4..0ac97b0f 100644 --- a/mod-list.html +++ b/mod-list.html @@ -104,6 +104,7 @@ Official alchemy.jsStart with only 4 elements and unlock more by reacting them together. (Most are not possible)R74n +building.jsAdds building generators and materialsR74n classic_explosives.jsAdds back 4 explosives removed in v1.9.3R74n classic_textures.jsUse textures from early versions of the gameR74n color_everything.jsAllows every element to have a custom colorR74n @@ -135,6 +136,7 @@ elementsManager.jsCreate and edit custom elementsggod evenmoretemptools.jsAdds different temperature-modifying tools (±350/tick, NaN, and Infinity)Alice extra_element_info.jsAdds descriptions to various vanilla elements. Used to provide the functionality that desc now does before it was added to vanillaMelecie +extrasaveslots.jsAdds extra saves slots !SAVE IMPORTANT SAVES AS FILES!Jayd find.jsAdds a find mode that highlights a chosen element as pulsating red and yellow (read commit description)Alice jaydsfunctions.jsAdds extra toolsJayd insane_random_events.jsMassively buffs random eventsAlice @@ -143,6 +145,7 @@ moretools.jsAdds more temperature-modifying tools (±10/tick, ±50/tick, and absolute zero tools)Sightnado move_tools.jsAdds tools that move pixelsAlice noconfirm.jsRemoves all confirmation pop upsmollthecoder +nopixellimit.jsRemoves the pixel limitJayd page_color.jsAllows changing the background color outside of the canvas with the “pageColor” query parameterAlice pixelResizeTool.jsAdds a button to change pixel scalefeeshmaster prompt.jsAdds a primitive command consoleAlice @@ -386,4 +389,4 @@ - + \ No newline at end of file From 31b9c8535f964b3ed605c34b56231a5d08ee2bdb Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Wed, 15 May 2024 20:58:54 -0400 Subject: [PATCH 4/8] hotfix --- changelog.txt | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 8cd27c7a..eb60c9e4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -91,7 +91,7 @@ A fancier version of this changelog can be found here: https://sandboxels.R74n.c ~ Fixed: Gaps when drawing fast on mobile ~ Fixed: Middle clicking empty space causes freeze ~ Fixed: Bless and Rock Wall can't be drawn in a line - ~ Fixed: Gapes when drawing Bless and Rock Wall fast + ~ Fixed: Gaps when drawing Bless and Rock Wall fast ~ Fixed: Bless and Rock Wall don't display info ~ Fixed: Bless and Rock Wall can't use Replace Mode ~ Fixed: Brown Dwarf Suns can emit Light when eclipsed diff --git a/index.html b/index.html index b1fd40f3..83f30c3d 100644 --- a/index.html +++ b/index.html @@ -13087,7 +13087,7 @@ behaviorRules = { function circleCoords(x,y,radius) { var coords = []; for (let i = Math.max(0, x - radius); i <= Math.min(width, x + radius); i++) { - for (let j = Math.max(0, y - radius); j <= Math.min(width, y + radius); j++) { + for (let j = Math.max(0, y - radius); j <= Math.min(height, y + radius); j++) { if (Math.pow(i - x, 2) + Math.pow(j - y, 2) <= Math.pow(radius, 2)) { coords.push({x: i,y: j}); } From 82785f83429bcea9647dd8d262a4e7ece64be0df Mon Sep 17 00:00:00 2001 From: slweeb <91897291+slweeb@users.noreply.github.com> Date: Wed, 15 May 2024 22:59:18 -0400 Subject: [PATCH 5/8] hotfix --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 83f30c3d..5497b621 100644 --- a/index.html +++ b/index.html @@ -15492,6 +15492,7 @@ window.onload = function() { function autoGen(newname,element,autoType) { var autoInfo = autoElements[autoType]; var newcolor = elements[element].colorObject; + if (!newcolor) { newcolor = {r:255,g:255,b:255} }; var colorList = []; var colorObjectList = []; // if newcolor is not an array, put it in an array From 4a4baaad24808d6a12981928bbe0d48b214bfacb Mon Sep 17 00:00:00 2001 From: DoobieRalsei <163950752+DoobieRalsei@users.noreply.github.com> Date: Thu, 16 May 2024 09:52:18 -0700 Subject: [PATCH 6/8] Hives can fossilize in amber and snails have resistance --- mods/fossils.js | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/mods/fossils.js b/mods/fossils.js index 04144003..eee690b4 100644 --- a/mods/fossils.js +++ b/mods/fossils.js @@ -168,12 +168,22 @@ elements.bug_amber = { category: "solids" }, +elements.hive_amber = { + color: "#ffc000", + temp: 20, + tempHigh: 345, + stateHigh: ["smoke","honey","honey","calcium","sugar"], + breakInto: [null,"dna","dna","honey","honey","honey","honey","honey","sap","dead_bug",null,"dna","dna","honey","honey","honey","honey","honey","sap","dead_bug","bee"], + category: "solids" +}, + elements.head.breakInto = ["blood","meat","skull"] elements.dead_bug.breakInto = ["calcium","calcium","calcium","quicklime"] if (!elements.sap.reactions) { elements.sap.reactions = {} } elements.sap.reactions.dead_bug = { elem1:"bug_amber", elem2:null, chance:0.1 }; + elements.sap.reactions.hive = { elem1:null, elem2:"hive_amber", chance:0.01 }; elements.sap.reactions.ant = { elem1:"bug_amber", elem2:null, chance:0.1 }; elements.sap.reactions.fly = { elem1:"bug_amber", elem2:null, chance:0.1 }; elements.sap.reactions.flea = { elem1:"bug_amber", elem2:null, chance:0.1 }; @@ -182,8 +192,8 @@ if (!elements.sap.reactions) { elements.sap.reactions = {} } elements.sap.reactions.bee = { elem1:"bug_amber", elem2:null, chance:0.1 }; elements.sap.reactions.firefly = { elem1:"bug_amber", elem2:null, chance:0.1 }; elements.sap.reactions.stinkbug = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.slug = { elem1:"bug_amber", elem2:null, chance:0.1 }; - elements.sap.reactions.snail = { elem1:"bug_amber", elem2:null, chance:0.1 }; + elements.sap.reactions.slug = { elem1:"bug_amber", elem2:null, chance:0.08 }; + elements.sap.reactions.snail = { elem1:"bug_amber", elem2:null, chance:0.05 }; if (!elements.bone.reactions) { elements.bone.reactions = {} } @@ -207,8 +217,8 @@ if (!elements.bone.reactions) { elements.bone.reactions = {} } if (!elements.bone_marrow.reactions) { elements.bone_marrow.reactions = {} } elements.bone_marrow.reactions.rock = { "elem1": "marrow_fossil", chance:0.00005 }; -elements.bone_marrow.reactions.sand = { "elem1": "marrow_fossil", chance:0.000035 }; -elements.bone_marrow.reactions.dirt = { "elem1": "marrow_fossil", chance:0.00003 }; +elements.bone_marrow.reactions.sand = { "elem1": "petrified_wood", chance:0.000035 }; +elements.bone_marrow.reactions.dirt = { "elem1": "petrified_wood", chance:0.0003 }; elements.bone_marrow.reactions.tuff = { "elem1": "marrow_fossil", chance:0.00005 }; elements.bone_marrow.reactions.basalt = { "elem1": "marrow_fossil", chance:0.00004 }; elements.bone_marrow.reactions.mudstone = { "elem1": "marrow_fossil", chance:0.00004 }; @@ -226,8 +236,6 @@ elements.bone_marrow.reactions.slaked_lime = { "elem1": "marrow_fossil", chance: if (!elements.wood.reactions) { elements.wood.reactions = {} } elements.wood.reactions.rock = { "elem1": "petrified_wood", chance:0.000045 }; -elements.wood.reactions.sand = { "elem1": "petrified_wood", chance:0.00003 }; -elements.wood.reactions.dirt = { "elem1": "petrified_wood", chance:0.000025 }; elements.wood.reactions.tuff = { "elem1": "petrified_wood", chance:0.000045 }; elements.wood.reactions.basalt = { "elem1": "petrified_wood", chance:0.000035 }; elements.wood.reactions.mudstone = { "elem1": "petrified_wood", chance:0.000035 }; @@ -245,8 +253,6 @@ elements.wood.reactions.slaked_lime = { "elem1": "petrified_wood", chance:0.0000 if (!elements.tree_branch.reactions) { elements.tree_branch.reactions = {} } elements.tree_branch.reactions.rock = { "elem1": "petrified_wood", chance:0.00005 }; -elements.tree_branch.reactions.sand = { "elem1": "petrified_wood", chance:0.000035 }; -elements.tree_branch.reactions.dirt = { "elem1": "petrified_wood", chance:0.00003 }; elements.tree_branch.reactions.tuff = { "elem1": "petrified_wood", chance:0.00005 }; elements.tree_branch.reactions.basalt = { "elem1": "petrified_wood", chance:0.00004 }; elements.tree_branch.reactions.mudstone = { "elem1": "petrified_wood", chance:0.00004 }; From a4b34cd22de6972e80c297ed5298916d201edb50 Mon Sep 17 00:00:00 2001 From: DoobieRalsei <163950752+DoobieRalsei@users.noreply.github.com> Date: Thu, 16 May 2024 11:00:14 -0700 Subject: [PATCH 7/8] Fossils form depending on temp, charcoal can form from fossilizing wood --- mods/fossils.js | 130 +++++++++++++++++++++++++----------------------- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/mods/fossils.js b/mods/fossils.js index eee690b4..e0f030ab 100644 --- a/mods/fossils.js +++ b/mods/fossils.js @@ -127,7 +127,7 @@ elements.petrified_wood = { elements.skull = { color: "#d9d9d9", hidden:true, - behavior: behaviors.SUPPORTPOWDER, + behavior: behaviors.POWDER, reactions: { "water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, "salt_water": { elem2:"broth", tempMin:70, color2:"#d7db69" }, @@ -197,72 +197,80 @@ if (!elements.sap.reactions) { elements.sap.reactions = {} } if (!elements.bone.reactions) { elements.bone.reactions = {} } - elements.bone.reactions.rock = { "elem1": "fossil", chance:0.00005 }; - elements.bone.reactions.sand = { "elem1": "fossil", chance:0.000035 }; - elements.bone.reactions.dirt = { "elem1": "fossil", chance:0.00003 }; - elements.bone.reactions.tuff = { "elem1": "fossil", chance:0.00005 }; - elements.bone.reactions.basalt = { "elem1": "fossil", chance:0.00004 }; - elements.bone.reactions.mudstone = { "elem1": "fossil", chance:0.00004 }; - elements.bone.reactions.packed_sand = { "elem1": "fossil", chance:0.00004 }; - elements.bone.reactions.gravel = { "elem1": "fossil", chance:0.000035 }; - elements.bone.reactions.clay = { "elem1": "fossil", chance:0.00003 }; - elements.bone.reactions.clay_soil = { "elem1": "fossil", chance:0.00003 }; - elements.bone.reactions.permafrost = { "elem1": "fossil", chance:0.000035 }; - elements.bone.reactions.mulch = { "elem1": "fossil", chance:0.00003 }; - elements.bone.reactions.ant_wall = { "elem1": "fossil", chance:0.00002 }; - elements.bone.reactions.limestone = { "elem1": "fossil", chance:0.00005 }; - elements.bone.reactions.quicklime = { "elem1": "fossil", chance:0.000045 }; - elements.bone.reactions.slaked_lime = { "elem1": "fossil", chance:0.000035 }; + elements.bone.reactions.rock = { "elem1": "fossil", tempMin:60, chance:0.00005 }; + elements.bone.reactions.sand = { "elem1": "fossil", tempMin:60, chance:0.000035 }; + elements.bone.reactions.dirt = { "elem1": "fossil", tempMin:60, chance:0.00003 }; + elements.bone.reactions.tuff = { "elem1": "fossil", tempMin:60, chance:0.00005 }; + elements.bone.reactions.basalt = { "elem1": "fossil", tempMin:60, chance:0.00004 }; + elements.bone.reactions.mudstone = { "elem1": "fossil", tempMin:60, chance:0.00004 }; + elements.bone.reactions.packed_sand = { "elem1": "fossil", tempMin:60, chance:0.00004 }; + elements.bone.reactions.gravel = { "elem1": "fossil", tempMin:60, chance:0.000035 }; + elements.bone.reactions.clay = { "elem1": "fossil", tempMin:60, chance:0.00003 }; + elements.bone.reactions.clay_soil = { "elem1": "fossil", tempMin:60, chance:0.00003 }; + elements.bone.reactions.permafrost = { "elem1": "fossil", tempMin:60, chance:0.000035 }; + elements.bone.reactions.mulch = { "elem1": "fossil", tempMin:60, chance:0.00003 }; + elements.bone.reactions.ant_wall = { "elem1": "fossil", tempMin:60, chance:0.00002 }; + elements.bone.reactions.limestone = { "elem1": "fossil", tempMin:60, chance:0.00005 }; + elements.bone.reactions.quicklime = { "elem1": "fossil", tempMin:60, chance:0.000045 }; + elements.bone.reactions.slaked_lime = { "elem1": "fossil", tempMin:60, chance:0.000035 }; if (!elements.bone_marrow.reactions) { elements.bone_marrow.reactions = {} } -elements.bone_marrow.reactions.rock = { "elem1": "marrow_fossil", chance:0.00005 }; -elements.bone_marrow.reactions.sand = { "elem1": "petrified_wood", chance:0.000035 }; -elements.bone_marrow.reactions.dirt = { "elem1": "petrified_wood", chance:0.0003 }; -elements.bone_marrow.reactions.tuff = { "elem1": "marrow_fossil", chance:0.00005 }; -elements.bone_marrow.reactions.basalt = { "elem1": "marrow_fossil", chance:0.00004 }; -elements.bone_marrow.reactions.mudstone = { "elem1": "marrow_fossil", chance:0.00004 }; -elements.bone_marrow.reactions.packed_sand = { "elem1": "marrow_fossil", chance:0.00004 }; -elements.bone_marrow.reactions.gravel = { "elem1": "marrow_fossil", chance:0.000035 }; -elements.bone_marrow.reactions.clay = { "elem1": "marrow_fossil", chance:0.00003 }; -elements.bone_marrow.reactions.clay_soil = { "elem1": "marrow_fossil", chance:0.00003 }; -elements.bone_marrow.reactions.permafrost = { "elem1": "marrow_fossil", chance:0.000035 }; -elements.bone_marrow.reactions.mulch = { "elem1": "marrow_fossil", chance:0.00003 }; -elements.bone_marrow.reactions.ant_wall = { "elem1": "marrow_fossil", chance:0.00002 }; -elements.bone_marrow.reactions.limestone = { "elem1": "marrow_fossil", chance:0.00005 }; -elements.bone_marrow.reactions.quicklime = { "elem1": "marrow_fossil", chance:0.000045 }; -elements.bone_marrow.reactions.slaked_lime = { "elem1": "marrow_fossil", chance:0.000035 }; +elements.bone_marrow.reactions.rock = { "elem1": "marrow_fossil", tempMin:70, chance:0.00005 }; +elements.bone_marrow.reactions.sand = { "elem1": "marrow_fossil", tempMin:70, chance:0.000035 }; +elements.bone_marrow.reactions.dirt = { "elem1": "marrow_fossil", tempMin:70, chance:0.0003 }; +elements.bone_marrow.reactions.tuff = { "elem1": "marrow_fossil", tempMin:70, chance:0.00005 }; +elements.bone_marrow.reactions.basalt = { "elem1": "marrow_fossil", tempMin:70, chance:0.00004 }; +elements.bone_marrow.reactions.mudstone = { "elem1": "marrow_fossil", tempMin:70, chance:0.00004 }; +elements.bone_marrow.reactions.packed_sand = { "elem1": "marrow_fossil", tempMin:70, chance:0.00004 }; +elements.bone_marrow.reactions.gravel = { "elem1": "marrow_fossil", tempMin:70, chance:0.000035 }; +elements.bone_marrow.reactions.clay = { "elem1": "marrow_fossil", tempMin:70, chance:0.00003 }; +elements.bone_marrow.reactions.clay_soil = { "elem1": "marrow_fossil", tempMin:70, chance:0.00003 }; +elements.bone_marrow.reactions.permafrost = { "elem1": "marrow_fossil", tempMin:70, chance:0.000035 }; +elements.bone_marrow.reactions.mulch = { "elem1": "marrow_fossil", tempMin:70, chance:0.00003 }; +elements.bone_marrow.reactions.ant_wall = { "elem1": "marrow_fossil", tempMin:70, chance:0.00002 }; +elements.bone_marrow.reactions.limestone = { "elem1": "marrow_fossil", tempMin:70, chance:0.00005 }; +elements.bone_marrow.reactions.quicklime = { "elem1": "marrow_fossil", tempMin:70, chance:0.000045 }; +elements.bone_marrow.reactions.slaked_lime = { "elem1": "marrow_fossil", tempMin:70, chance:0.000035 }; if (!elements.wood.reactions) { elements.wood.reactions = {} } -elements.wood.reactions.rock = { "elem1": "petrified_wood", chance:0.000045 }; -elements.wood.reactions.tuff = { "elem1": "petrified_wood", chance:0.000045 }; -elements.wood.reactions.basalt = { "elem1": "petrified_wood", chance:0.000035 }; -elements.wood.reactions.mudstone = { "elem1": "petrified_wood", chance:0.000035 }; -elements.wood.reactions.packed_sand = { "elem1": "petrified_wood", chance:0.000035 }; -elements.wood.reactions.gravel = { "elem1": "petrified_wood", chance:0.00003 }; -elements.wood.reactions.clay = { "elem1": "petrified_wood", chance:0.000025 }; -elements.wood.reactions.clay_soil = { "elem1": "petrified_wood", chance:0.000025 }; -elements.wood.reactions.permafrost = { "elem1": "petrified_wood", chance:0.00003 }; -elements.wood.reactions.mulch = { "elem1": "petrified_wood", chance:0.000025 }; -elements.wood.reactions.ant_wall = { "elem1": "petrified_wood", chance:0.000015 }; -elements.wood.reactions.limestone = { "elem1": "petrified_wood", chance:0.000045 }; -elements.wood.reactions.quicklime = { "elem1": "petrified_wood", chance:0.00004 }; -elements.wood.reactions.slaked_lime = { "elem1": "petrified_wood", chance:0.00003 }; +elements.wood.reactions.rock = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000045 }; +elements.wood.reactions.rock = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000045 }; +elements.wood.reactions.sand = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000035 }; +elements.wood.reactions.dirt = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00003 }; +elements.wood.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, chance:0.000045 }; +elements.wood.reactions.basalt = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000035 }; +elements.wood.reactions.basalt = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000035 }; +elements.wood.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; +elements.wood.reactions.packed_sand = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; +elements.wood.reactions.gravel = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; +elements.wood.reactions.clay = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 }; +elements.wood.reactions.clay_soil = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 }; +elements.wood.reactions.permafrost = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; +elements.wood.reactions.mulch = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 }; +elements.wood.reactions.ant_wall = { "elem1": "petrified_wood", tempMin:50, chance:0.000015 }; +elements.wood.reactions.limestone = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000045 }; +elements.wood.reactions.limestone = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000045 }; +elements.wood.reactions.quicklime = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 }; +elements.wood.reactions.slaked_lime = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; if (!elements.tree_branch.reactions) { elements.tree_branch.reactions = {} } -elements.tree_branch.reactions.rock = { "elem1": "petrified_wood", chance:0.00005 }; -elements.tree_branch.reactions.tuff = { "elem1": "petrified_wood", chance:0.00005 }; -elements.tree_branch.reactions.basalt = { "elem1": "petrified_wood", chance:0.00004 }; -elements.tree_branch.reactions.mudstone = { "elem1": "petrified_wood", chance:0.00004 }; -elements.tree_branch.reactions.packed_sand = { "elem1": "petrified_wood", chance:0.00004 }; -elements.tree_branch.reactions.gravel = { "elem1": "petrified_wood", chance:0.000035 }; -elements.tree_branch.reactions.clay = { "elem1": "petrified_wood", chance:0.00003 }; -elements.tree_branch.reactions.clay_soil = { "elem1": "petrified_wood", chance:0.00003 }; -elements.tree_branch.reactions.permafrost = { "elem1": "petrified_wood", chance:0.000035 }; -elements.tree_branch.reactions.mulch = { "elem1": "petrified_wood", chance:0.00003 }; -elements.tree_branch.reactions.ant_wall = { "elem1": "petrified_wood", chance:0.00002 }; -elements.tree_branch.reactions.limestone = { "elem1": "petrified_wood", chance:0.00005 }; -elements.tree_branch.reactions.quicklime = { "elem1": "petrified_wood", chance:0.000045 }; -elements.tree_branch.reactions.slaked_lime = { "elem1": "petrified_wood", chance:0.000035 }; +elements.tree_branch.reactions.rock = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00005 }; +elements.tree_branch.reactions.rock = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00005 }; +elements.tree_branch.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, chance:0.00005 }; +elements.tree_branch.reactions.basalt = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00004 }; +elements.tree_branch.reactions.basalt = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00004 }; +elements.tree_branch.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 }; +elements.tree_branch.reactions.packed_sand = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 }; +elements.tree_branch.reactions.gravel = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; +elements.tree_branch.reactions.clay = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; +elements.tree_branch.reactions.clay_soil = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; +elements.tree_branch.reactions.permafrost = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; +elements.tree_branch.reactions.mulch = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; +elements.tree_branch.reactions.ant_wall = { "elem1": "petrified_wood", tempMin:50, chance:0.00002 }; +elements.tree_branch.reactions.limestone = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00005 }; +elements.tree_branch.reactions.limestone = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00005 }; +elements.tree_branch.reactions.quicklime = { "elem1": "petrified_wood", tempMin:50, chance:0.000045 }; +elements.tree_branch.reactions.slaked_lime = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; From 6e9f008af4f5d943843ed8539e5e3b4f0a67a9c7 Mon Sep 17 00:00:00 2001 From: DoobieRalsei <163950752+DoobieRalsei@users.noreply.github.com> Date: Thu, 16 May 2024 11:19:46 -0700 Subject: [PATCH 8/8] Coal update Added coal --- mods/fossils.js | 71 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 54 insertions(+), 17 deletions(-) diff --git a/mods/fossils.js b/mods/fossils.js index e0f030ab..866d75eb 100644 --- a/mods/fossils.js +++ b/mods/fossils.js @@ -159,6 +159,29 @@ elements.skull = { breakInto: ["quicklime","bone","bone","bone_marrow"] }, +elements.coal = { + color: "#2b2b2b", + behavior: behaviors.STURDYPOWDER, + reactions: { + "water": { elem2:"dirty_water", chance:0.02 }, + "salt_water": { elem2:"dirty_water", chance:0.02 }, + "sugar_water": { elem2:"dirty_water", chance:0.02 }, + "seltzer": { elem2:"dirty_water", chance:0.02 }, + "dead_plant": { elem2:["coal","charcoal"], tempMin:200, chance:0.005, oneway:true }, + "charcoal": { elem2:"coal", tempMin:200, chance:0.005, oneway:true }, + }, + burn: 28, + burnTime: 1500, + burnInto: ["fire","fire","fire","fire","ash","carbon_dioxide"], + tempHigh: 6000, + stateHigh: "fire", + category: "powders", + state: "solid", + density: 250, + breakInto: ["ash","ash","carbon_dioxide"], + hardness: 0.5, +}, + elements.bug_amber = { color: "#ffc000", temp: 20, @@ -207,7 +230,6 @@ if (!elements.bone.reactions) { elements.bone.reactions = {} } elements.bone.reactions.gravel = { "elem1": "fossil", tempMin:60, chance:0.000035 }; elements.bone.reactions.clay = { "elem1": "fossil", tempMin:60, chance:0.00003 }; elements.bone.reactions.clay_soil = { "elem1": "fossil", tempMin:60, chance:0.00003 }; - elements.bone.reactions.permafrost = { "elem1": "fossil", tempMin:60, chance:0.000035 }; elements.bone.reactions.mulch = { "elem1": "fossil", tempMin:60, chance:0.00003 }; elements.bone.reactions.ant_wall = { "elem1": "fossil", tempMin:60, chance:0.00002 }; elements.bone.reactions.limestone = { "elem1": "fossil", tempMin:60, chance:0.00005 }; @@ -225,8 +247,7 @@ elements.bone_marrow.reactions.mudstone = { "elem1": "marrow_fossil", tempMin:70 elements.bone_marrow.reactions.packed_sand = { "elem1": "marrow_fossil", tempMin:70, chance:0.00004 }; elements.bone_marrow.reactions.gravel = { "elem1": "marrow_fossil", tempMin:70, chance:0.000035 }; elements.bone_marrow.reactions.clay = { "elem1": "marrow_fossil", tempMin:70, chance:0.00003 }; -elements.bone_marrow.reactions.clay_soil = { "elem1": "marrow_fossil", tempMin:70, chance:0.00003 }; -elements.bone_marrow.reactions.permafrost = { "elem1": "marrow_fossil", tempMin:70, chance:0.000035 }; +elements.bone_marrow.reactions.clay_soil = { "elem1": "marrow_fossil", tempMin:70, chance:0.00003 } elements.bone_marrow.reactions.mulch = { "elem1": "marrow_fossil", tempMin:70, chance:0.00003 }; elements.bone_marrow.reactions.ant_wall = { "elem1": "marrow_fossil", tempMin:70, chance:0.00002 }; elements.bone_marrow.reactions.limestone = { "elem1": "marrow_fossil", tempMin:70, chance:0.00005 }; @@ -236,41 +257,57 @@ elements.bone_marrow.reactions.slaked_lime = { "elem1": "marrow_fossil", tempMin if (!elements.wood.reactions) { elements.wood.reactions = {} } elements.wood.reactions.rock = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000045 }; -elements.wood.reactions.rock = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000045 }; -elements.wood.reactions.sand = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000035 }; -elements.wood.reactions.dirt = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00003 }; +elements.wood.reactions.rock = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000045 }; +elements.wood.reactions.sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 }; +elements.wood.reactions.dirt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 }; elements.wood.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, chance:0.000045 }; elements.wood.reactions.basalt = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000035 }; -elements.wood.reactions.basalt = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000035 }; +elements.wood.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 }; elements.wood.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; elements.wood.reactions.packed_sand = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; elements.wood.reactions.gravel = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; elements.wood.reactions.clay = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 }; -elements.wood.reactions.clay_soil = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 }; -elements.wood.reactions.permafrost = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; +elements.wood.reactions.clay_soil = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 } elements.wood.reactions.mulch = { "elem1": "petrified_wood", tempMin:50, chance:0.000025 }; elements.wood.reactions.ant_wall = { "elem1": "petrified_wood", tempMin:50, chance:0.000015 }; -elements.wood.reactions.limestone = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.000045 }; -elements.wood.reactions.limestone = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.000045 }; +elements.wood.reactions.limestone = { "elem1": "petrified_wood", tempMin:50, chance:0.000045 }; elements.wood.reactions.quicklime = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 }; elements.wood.reactions.slaked_lime = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; if (!elements.tree_branch.reactions) { elements.tree_branch.reactions = {} } elements.tree_branch.reactions.rock = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00005 }; -elements.tree_branch.reactions.rock = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00005 }; +elements.tree_branch.reactions.rock = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 }; +elements.tree_branch.reactions.sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 }; +elements.tree_branch.reactions.dirt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; elements.tree_branch.reactions.tuff = { "elem1": "petrified_wood", tempMin:50, chance:0.00005 }; elements.tree_branch.reactions.basalt = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00004 }; -elements.tree_branch.reactions.basalt = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00004 }; +elements.tree_branch.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00004 }; elements.tree_branch.reactions.mudstone = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 }; elements.tree_branch.reactions.packed_sand = { "elem1": "petrified_wood", tempMin:50, chance:0.00004 }; elements.tree_branch.reactions.gravel = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; elements.tree_branch.reactions.clay = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; -elements.tree_branch.reactions.clay_soil = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; -elements.tree_branch.reactions.permafrost = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; +elements.tree_branch.reactions.clay_soil = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 } elements.tree_branch.reactions.mulch = { "elem1": "petrified_wood", tempMin:50, chance:0.00003 }; elements.tree_branch.reactions.ant_wall = { "elem1": "petrified_wood", tempMin:50, chance:0.00002 }; -elements.tree_branch.reactions.limestone = { "elem1": "petrified_wood", tempMin:50, tempMax:279, chance:0.00005 }; -elements.tree_branch.reactions.limestone = { "elem1": ["petrified_wood","charcoal","charcoal","charcoal"], tempMin:280, chance:0.00005 }; +elements.tree_branch.reactions.limestone = { "elem1": "petrified_wood", tempMin:50, chance:0.00005 }; elements.tree_branch.reactions.quicklime = { "elem1": "petrified_wood", tempMin:50, chance:0.000045 }; elements.tree_branch.reactions.slaked_lime = { "elem1": "petrified_wood", tempMin:50, chance:0.000035 }; + +if (!elements.dead_plant.reactions) { elements.dead_plant.reactions = {} } +elements.dead_plant.reactions.rock = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 }; +elements.dead_plant.reactions.sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.dirt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.tuff = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00005 }; +elements.dead_plant.reactions.basalt = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.mudstone = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.packed_sand = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.00003 }; +elements.dead_plant.reactions.gravel = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.clay = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.clay_soil = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.mulch = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.ant_wall = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.limestone = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000035 }; +elements.dead_plant.reactions.quicklime = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 }; +elements.dead_plant.reactions.slaked_lime = { "elem1": ["oil","oil","methane","coal","coal","coal","coal"], tempMin:280, chance:0.000025 };