[ Magiclysm ] Fortifying the forge (#46039)

* oversight corrections * traps * changes to forge * Update forge_of_wonders.json * reprice rings * adding some price differences * Update forge_of_wonders.json * Update forge_of_wonders.json * Update enchanted_misc.json * lint * Update forge_of_wonders.json * tr not trap * minimum charges to start these items * Update forge_of_wonders.json * Update traps.json * Update traps.json * can't get npc defense trap to work * trap updates * Apply suggestions from code review * rethought traps * lint * argh * eureka * Apply suggestions from code review
CleverRaven · Jan 22, 2021 · 9f43baa · 9f43baa
1 parent 43dfb22
commit 9f43baa
Show file tree

Hide file tree

Showing 16 changed files with 177 additions and 7 deletions.
diff --git a/data/mods/Magiclysm/Spells/monsterspells.json b/data/mods/Magiclysm/Spells/monsterspells.json
@@ -37,6 +37,25 @@
     "effect": "summon",
     "effect_str": "mon_bear"
   },
+  {
+    "id": "forge_trap",
+    "type": "SPELL",
+    "name": "Forge Trap",
+    "description": "A trap that summons forge hounds!  Not what you were expecting, is it?",
+    "valid_targets": [ "ground" ],
+    "flags": [ "HOSTILE_SUMMON", "LOUD", "NO_PROJECTILE" ],
+    "min_damage": 3,
+    "max_damage": 3,
+    "min_aoe": 5,
+    "max_aoe": 5,
+    "sound_description": "\"It's a trap!\"",
+    "min_duration": 30000,
+    "max_duration": 30000,
+    "sound_type": "speech",
+    "shape": "blast",
+    "effect": "summon",
+    "effect_str": "mon_forgehounds"
+  },
   {
     "id": "rocket_punch",
     "type": "SPELL",

diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json
@@ -280,5 +280,15 @@
     "rating": "bad",
     "max_duration": "10 s",
     "base_mods": { "speed_mod": [ 20 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "vault_atmosphere",
+    "name": [ "Vault Air" ],
+    "desc": [ "You feel at home." ],
+    "apply_message": "This smells like home.",
+    "remove_message": "Time to go.",
+    "rating": "bad",
+    "flags": [ "DIMENSIONAL_ANCHOR" ]
   }
 ]
diff --git a/data/mods/Magiclysm/emitter.json b/data/mods/Magiclysm/emitter.json
@@ -0,0 +1,9 @@
+[
+  {
+    "id": "emit_vault_atmosphere",
+    "type": "emit",
+    "field": "fd_vault_atmosphere",
+    "intensity": 1,
+    "chance": 30
+  }
+]
diff --git a/data/mods/Magiclysm/field.json b/data/mods/Magiclysm/field.json
@@ -11,5 +11,33 @@
     "half_life": "1 seconds",
     "phase": "solid",
     "display_field": false
+  },
+  {
+    "id": "fd_vault_atmosphere",
+    "type": "field_type",
+    "intensity_levels": [
+      {
+        "name": "crisp air",
+        "effects": [
+          {
+            "effect_id": "vault_atmosphere",
+            "body_part": "mouth",
+            "intensity": 1,
+            "min_duration": "100 seconds",
+            "max_duration": "350 seconds",
+            "immune_inside_vehicle": false
+          }
+        ]
+      },
+      { "//": "repeat last entry" },
+      { "//": "repeat last entry" }
+    ],
+    "decay_amount_factor": 5,
+    "gas_absorption_factor": 15,
+    "percent_spread": 30,
+    "outdoor_age_speedup": "3 minutes",
+    "priority": 8,
+    "half_life": "10 minutes",
+    "phase": "gas"
   }
 ]
diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json
@@ -316,8 +316,8 @@
       { "item": "mkey_opening", "prob": 100 },
       { "item": "mtorch_everburning", "prob": 100 },
       { "item": "mflask_hip_whiskey", "prob": 100 },
-      { "item": "mtailors_kit", "prob": 100 },
-      { "item": "mspider_box", "prob": 100 },
+      { "item": "mtailors_kit", "prob": 100, "charges-min": 3, "charges-max": 24 },
+      { "item": "mspider_box", "prob": 100, "charges-min": 3, "charges-max": 24 },
       { "item": "cauldron_demon_chitin", "prob": 20 },
       { "item": "fridge_holding_1", "prob": 12 },
       { "item": "bag_holding_1", "prob": 8 },

diff --git a/data/mods/Magiclysm/items/enchanted.json b/data/mods/Magiclysm/items/enchanted.json
@@ -3,13 +3,15 @@
     "id": "belt_str",
     "copy-from": "leather_belt",
     "type": "ARMOR",
+    "price_postapoc": "1750 USD",
     "name": { "str": "belt of strength +2", "str_pl": "belts of strength +2" },
     "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "STRENGTH", "add": 2 } ] } ] }
   },
   {
     "id": "belt_haste",
     "copy-from": "leather_belt",
     "type": "ARMOR",
+    "price_postapoc": "3500 USD",
     "name": { "str": "belt of haste", "str_pl": "belts of haste" },
     "relic_data": {
       "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "SPEED", "multiply": 0.15, "add": 5 } ] } ]
@@ -86,6 +88,7 @@
     "weight": "390 g",
     "volume": "2 L",
     "price": 9500,
+    "price_postapoc": "1200 USD",
     "material": [ "cotton" ],
     "symbol": "^",
     "color": "light_blue",

diff --git a/data/mods/Magiclysm/items/enchanted_belts.json b/data/mods/Magiclysm/items/enchanted_belts.json
@@ -34,6 +34,7 @@
     "copy-from": "mbelt_leather",
     "id": "mbelt_thor",
     "name": { "str_sp": "Megingjörð" },
+    "price_postapoc": "9500 USD",
     "description": "The mythical belt of Thor, god of thunder.  Or at least so it appears.  It doubles the wearer's base strength.",
     "material": [ "superalloy" ],
     "material_thickness": 10,

diff --git a/data/mods/Magiclysm/items/enchanted_boots.json b/data/mods/Magiclysm/items/enchanted_boots.json
@@ -5,6 +5,7 @@
     "copy-from": "boots_hiking",
     "name": { "str": "seven league boots", "str_pl": "pairs of seven league boots" },
     "looks_like": "boots_hiking",
+    "price_postapoc": "750 USD",
     "description": "Rugged yet extremely comfortable and well fitting boots of worn leather and steel, they look like they've seen a lot of use and will likely see a lot more.  They make your movement a lot less work.",
     "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "MOVE_COST", "add": -30 } ] } ] },
     "encumbrance": 8,
@@ -19,6 +20,7 @@
     "copy-from": "boots_hiking",
     "name": { "str": "boots of haste", "str_pl": "pairs of boots of haste" },
     "looks_like": "boots_hiking",
+    "price_postapoc": "950 USD",
     "description": "Rugged yet extremely comfortable and well fitting boots of worn leather and steel, they look like they've seen a lot of use and will likely see a lot more.  They make your movement a lot less work.",
     "relic_data": {
       "passive_effects": [
@@ -38,6 +40,7 @@
     "copy-from": "boots_hiking",
     "name": { "str_sp": "escape boots" },
     "looks_like": "boots_hiking",
+    "price_postapoc": "550 USD",
     "description": "Rugged yet extremely comfortable and well fitting boots of worn leather and steel, these boots can be activated once a day to escape from nasty situations, teleporting you a good distance in a random direction.",
     "charges_per_use": 1,
     "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "24 h", "regenerate_ammo": true } },
@@ -55,6 +58,7 @@
     "copy-from": "boots_hiking",
     "name": { "str_sp": "freerunner's boots" },
     "looks_like": "boots_hiking",
+    "price_postapoc": "350 USD",
     "description": "Rugged yet extremely comfortable and well fitting boots of worn leather and steel, seeming a bit more flexible and breathable than typical for their materials.  The enchantment they bear helps guide their wearer in their motions, to make movement around and over obstacles much more fluid and efficient.",
     "relic_data": {
       "passive_effects": [
@@ -73,6 +77,7 @@
     "copy-from": "boots_hiking",
     "name": { "str": "boots of grounding", "str_pl": "pairs of boots of grounding" },
     "looks_like": "boots_hiking",
+    "price_postapoc": "350 USD",
     "description": "Rugged yet extremely comfortable and well fitting boots of leather with small engraved runes seemingly filled with rubber.  When worn, you are immune to damage from electricity.",
     "encumbrance": 8,
     "warmth": 30,

diff --git a/data/mods/Magiclysm/items/enchanted_bracers.json b/data/mods/Magiclysm/items/enchanted_bracers.json
@@ -34,6 +34,7 @@
     "type": "TOOL_ARMOR",
     "id": "mbracer_defense_lesser",
     "name": { "str": "bracer of lesser defense", "str_pl": "bracers of lesser defense" },
+    "price_postapoc": "950 USD",
     "description": "A light but extremely sturdy steel bracer with an ornate shield engraved on the top, silver accentuates the intricate design.  It protects your body with a light aura to reduce damage you take.",
     "material_thickness": 6,
     "flags": [ "BELTED", "STURDY", "BLOCK_WHILE_WORN" ],
@@ -56,6 +57,7 @@
     "copy-from": "mbracer_steel_single",
     "type": "TOOL_ARMOR",
     "id": "mbracer_defense_greater",
+    "price_postapoc": "1850 USD",
     "name": { "str": "bracer of greater defense", "str_pl": "bracers of greater defense" },
     "description": "A light but extremely sturdy steel bracer with an ornate shield engraved on the top, gold accentuates the intricate design.  It protects your body with a strong aura to reduce damage you take.",
     "material_thickness": 6,
@@ -80,6 +82,7 @@
     "type": "TOOL_ARMOR",
     "id": "mbracer_lightning_lesser",
     "name": { "str": "lesser bracer of lightning", "str_pl": "lesser bracers of lightning" },
+    "price_postapoc": "750 USD",
     "description": "A light but extremely sturdy steel bracer with an ornate bundle of lightning bolts engraved on the top, silver accentuates the intricate design.  It protects your body with a light aura to reduce electrical damage you take, as well as being able to release a Jolt spell 3 times a day.",
     "charges_per_use": 1,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "ammo_restriction": { "crystallized_mana": 3 } } ],
@@ -95,6 +98,7 @@
     "type": "TOOL_ARMOR",
     "id": "mbracer_lightning_greater",
     "name": { "str": "greater bracer of lightning", "str_pl": "greater bracers of lightning" },
+    "price_postapoc": "1750 USD",
     "description": "A light but extremely sturdy steel bracer with an ornate bundle of lightning bolts engraved on the top, gold accentuates the intricate design.  It protects your body with a strong aura to reduce electrical damage you take, as well as being able to release a Lightning Bolt spell 3 times a day.",
     "charges_per_use": 1,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "ammo_restriction": { "crystallized_mana": 3 } } ],

diff --git a/data/mods/Magiclysm/items/enchanted_misc.json b/data/mods/Magiclysm/items/enchanted_misc.json
@@ -72,6 +72,7 @@
     "weight": "831 g",
     "volume": "750 ml",
     "price": 0,
+    "price_postapoc": "150 USD",
     "to_hit": 1,
     "bashing": 8,
     "material": [ "wood" ],
@@ -111,7 +112,9 @@
     "id": "mflask_hip_whiskey",
     "type": "GENERIC",
     "copy-from": "flask_hip",
+    "price_postapoc": "850 USD",
     "category": "clothing",
+    "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "24 h", "regenerate_ammo": true } },
     "use_action": {
       "target": "whiskey",
       "msg": "You open the flask and discover it full of sweet, sweet, whiskey!",
@@ -131,6 +134,7 @@
     "name": "enchanted tailor's kit",
     "description": "This is a high quality, engraved steel kit with a variety of needles, some plastic spools for thread, some small scissors, even a small heating element for melting and joining plastic.  Use a tailor's kit to customize your clothing and armor.  This uses your tailoring skill.  It also contains one of those magic spiders that constantly, if slowly, makes new thread.",
     "price": 100000,
+    "price_postapoc": "1700 USD",
     "material": [ "steel" ],
     "charges_per_use": 1,
     "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "1 h", "regenerate_ammo": true } },
@@ -176,6 +180,7 @@
     "weight": "100 g",
     "volume": "100 ml",
     "price": 100000,
+    "price_postapoc": "1150 USD",
     "to_hit": -2,
     "material": [ "glass" ],
     "symbol": ";",