From c198e8387b00b0297f614ab719877ef4c0c53122 Mon Sep 17 00:00:00 2001 From: Jayd-Rubies <155784127+Jayd-Rubies@users.noreply.github.com> Date: Sat, 6 Jan 2024 18:36:57 -0500 Subject: [PATCH 1/4] Update jaydsmods.js --- mods/jaydsmods.js | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/mods/jaydsmods.js b/mods/jaydsmods.js index 1070777b..f7dbb3f9 100644 --- a/mods/jaydsmods.js +++ b/mods/jaydsmods.js @@ -16,7 +16,7 @@ elements.tsar_bomba = { ], category: "weapons", state: "solid", - density: 1300, + density: 1700, excludeRandom: true, cooldown: defaultCooldown } @@ -28,4 +28,24 @@ elements.meese = { "XX|M1|XX", ], category: "life" - } \ No newline at end of file + }, +elements.blackpowder = { + color: ["#555D50","#36454F"], + behavior: behaviors.STURDYPOWDER, + category: "powders", + burn: 100, + burnTime: 250, + tempHigh: 292, + state: "solid", + density: 5150, + }, +elements.rp1= { + color: "#db5968", + behavior: behaviors.LIQUID, + category: "liquids", + state: "liquid", + density: 1700, + alias: "rocket propellant 1", + burn: 100, + burnTime: 400, + }; From ed2a6fd1a457c6ce020fc66cd80ee583b2101c1a Mon Sep 17 00:00:00 2001 From: Jayd-Rubies <155784127+Jayd-Rubies@users.noreply.github.com> Date: Sat, 6 Jan 2024 19:16:06 -0500 Subject: [PATCH 2/4] Add files via upload --- volcanic_expansion.js | 57 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 volcanic_expansion.js diff --git a/volcanic_expansion.js b/volcanic_expansion.js new file mode 100644 index 00000000..f9908966 --- /dev/null +++ b/volcanic_expansion.js @@ -0,0 +1,57 @@ +elements.obsidian = { + color: ["#343434", "#313639"], + behavior: behaviors.SOLID, + category: "solids", + state: "solid", + density: 2380, + reactions: { + "sand": { elem1: "obsidian_shard" }, + "dirt": { elem1: "obsidian_shard" }, + "rock": { elem1: "obsidian_shard" }, + "mudstone": { elem1: "obsidian_shard" }, + "packed_snow": { elem1: "obsidian_shard" }, + "gravel": { elem1: "obsidian_shard" }, + "clay": { elem1: "obsidian_shard" }, + "clay_soil": { elem1: "obsidian_shard" }, + "permafrost": { elem1: "obsidian_shard" }, + "mulch": { elem1: "obsidian_shard" }, + "basalt": { elem1: "obsidian_shard" }, + "tuff": { elem1: "mud" }, + "limestone": { elem1: "obsidian_shard" }, + "quicklime": { elem1: "obsidian_shard" }, + "slaked_lime": { elem1: "obsidian_shard" }, + } + }, + elements.obsidian_shard = { + color: ["#343434", "#313639"], + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2380, + reactions: { + "glue": { elem1: "obsidian" }, + } + }, +elements.pumice = { + color: "#bac0b4", + behavior: behaviors.POWDER, + category: "land", + state: "solid", + density: 550, + tempHigh: 900, + stateHigh: "magma", + hardness: 0.5, + }, +elements.magma.stateLow = ["basalt","basalt","basalt","pumice","basalt","rock","obsidian_shard","obsidian"], + elements.eruption = { + color: ["#ff6f00","#ff8c00","#ff4d00"], + behavior: [ + "XX|M1|XX", + "XX|DL%1|XX", + "CR:magma|CR:magma|CR:magma", + ], + category: "weapons", + state: "solid", + temp:1200, + density: 2725, +}; \ No newline at end of file From abaf1fa86a864f1143e83d3dafea74f59bea173a Mon Sep 17 00:00:00 2001 From: Jayd-Rubies <155784127+Jayd-Rubies@users.noreply.github.com> Date: Sun, 7 Jan 2024 16:32:17 -0500 Subject: [PATCH 3/4] Delete volcanic_expansion.js --- volcanic_expansion.js | 57 ------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 volcanic_expansion.js diff --git a/volcanic_expansion.js b/volcanic_expansion.js deleted file mode 100644 index f9908966..00000000 --- a/volcanic_expansion.js +++ /dev/null @@ -1,57 +0,0 @@ -elements.obsidian = { - color: ["#343434", "#313639"], - behavior: behaviors.SOLID, - category: "solids", - state: "solid", - density: 2380, - reactions: { - "sand": { elem1: "obsidian_shard" }, - "dirt": { elem1: "obsidian_shard" }, - "rock": { elem1: "obsidian_shard" }, - "mudstone": { elem1: "obsidian_shard" }, - "packed_snow": { elem1: "obsidian_shard" }, - "gravel": { elem1: "obsidian_shard" }, - "clay": { elem1: "obsidian_shard" }, - "clay_soil": { elem1: "obsidian_shard" }, - "permafrost": { elem1: "obsidian_shard" }, - "mulch": { elem1: "obsidian_shard" }, - "basalt": { elem1: "obsidian_shard" }, - "tuff": { elem1: "mud" }, - "limestone": { elem1: "obsidian_shard" }, - "quicklime": { elem1: "obsidian_shard" }, - "slaked_lime": { elem1: "obsidian_shard" }, - } - }, - elements.obsidian_shard = { - color: ["#343434", "#313639"], - behavior: behaviors.POWDER, - category: "powders", - state: "solid", - density: 2380, - reactions: { - "glue": { elem1: "obsidian" }, - } - }, -elements.pumice = { - color: "#bac0b4", - behavior: behaviors.POWDER, - category: "land", - state: "solid", - density: 550, - tempHigh: 900, - stateHigh: "magma", - hardness: 0.5, - }, -elements.magma.stateLow = ["basalt","basalt","basalt","pumice","basalt","rock","obsidian_shard","obsidian"], - elements.eruption = { - color: ["#ff6f00","#ff8c00","#ff4d00"], - behavior: [ - "XX|M1|XX", - "XX|DL%1|XX", - "CR:magma|CR:magma|CR:magma", - ], - category: "weapons", - state: "solid", - temp:1200, - density: 2725, -}; \ No newline at end of file From 508bb4c4f83fb763b68f6dbddda9aac1930b6f9e Mon Sep 17 00:00:00 2001 From: Jayd-Rubies <155784127+Jayd-Rubies@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:03:12 -0500 Subject: [PATCH 4/4] Add files via upload --- mods/jaydsmods.js | 2 +- mods/volcanic_expansion.js | 93 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 mods/volcanic_expansion.js diff --git a/mods/jaydsmods.js b/mods/jaydsmods.js index f7dbb3f9..f49b3066 100644 --- a/mods/jaydsmods.js +++ b/mods/jaydsmods.js @@ -48,4 +48,4 @@ elements.rp1= { alias: "rocket propellant 1", burn: 100, burnTime: 400, - }; + }; \ No newline at end of file diff --git a/mods/volcanic_expansion.js b/mods/volcanic_expansion.js new file mode 100644 index 00000000..8dd3eb56 --- /dev/null +++ b/mods/volcanic_expansion.js @@ -0,0 +1,93 @@ +elements.obsidian = { + color: ["#343434", "#313639"], + behavior: behaviors.SOLID, + category: "land", + state: "solid", + density: 2380, + tempHigh: 900, + stateHigh: "magma", + breakInto: "obsidian_shard", + reactions: { + "sand": { elem1: "obsidian_shard" }, + "dirt": { elem1: "obsidian_shard" }, + "rock": { elem1: "obsidian_shard" }, + "mudstone": { elem1: "obsidian_shard" }, + "packed_snow": { elem1: "obsidian_shard" }, + "gravel": { elem1: "obsidian_shard" }, + "clay": { elem1: "obsidian_shard" }, + "clay_soil": { elem1: "obsidian_shard" }, + "permafrost": { elem1: "obsidian_shard" }, + "mulch": { elem1: "obsidian_shard" }, + "basalt": { elem1: "obsidian_shard" }, + "tuff": { elem1: "mud" }, + "limestone": { elem1: "obsidian_shard" }, + "quicklime": { elem1: "obsidian_shard" }, + "slaked_lime": { elem1: "obsidian_shard" }, + } + }, + elements.obsidian_shard = { + color: ["#343434", "#313639"], + behavior: behaviors.POWDER, + category: "powders", + state: "solid", + density: 2380, + tempHigh: 900, + stateHigh: "magma", + reactions: { + "glue": { elem1: "obsidian" }, + } + }, +elements.pumice = { + color: "#bac0b4", + behavior: behaviors.POWDER, + category: "land", + state: "solid", + density: 550, + tempHigh: 900, + stateHigh: "magma", + hardness: 0.5, + }, +elements.magma.stateLow = ["basalt","basalt","basalt","pumice","doritoite","basalt","rock","obsidian_shard","diorite","andesite"], + elements.eruption = { + color: ["#ff6f00","#ff8c00","#ff4d00"], + behavior: [ + "XX|M1|XX", + "XX|DL%1|XX", + "CR:magma|CR:magma|CR:magma", + ], + category: "weapons", + state: "solid", + temp:1200, + density: 2725, +}, +elements.andesite = { + color: "#777C7C", + behavior: behaviors.SOLID, + category: "land", + state: "solid", + density: 2771, + tempHigh: 900, + stateHigh: "magma", + }, + elements.diorite = { + color: ["#d4d4d4","#2b2b2b"], + behavior: behaviors.SOLID, + category: "land", + state: "solid", + density: 2900, + tempHigh: 900, + stateHigh: "magma", + }, + elements.doritoite = { + color: ["#ff5349","#f2ba49"], + behavior: behaviors.POWDER, + category: "food", + state: "solid", + density: 157.8, + tempHigh: 900, + stateHigh: "magma", + reactions: { + "head": { elem1: "null" }, + }, + isFood: true + }; \ No newline at end of file