From 9f43baa208b3e79e62ca13fc5eca5b6d8aea5728 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 22 Jan 2021 13:24:37 -0600 Subject: [PATCH] [ 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 --- data/mods/Magiclysm/Spells/monsterspells.json | 19 ++++++++++ data/mods/Magiclysm/effects/effects.json | 10 ++++++ data/mods/Magiclysm/emitter.json | 9 +++++ data/mods/Magiclysm/field.json | 28 +++++++++++++++ .../mods/Magiclysm/itemgroups/itemgroups.json | 4 +-- data/mods/Magiclysm/items/enchanted.json | 3 ++ .../mods/Magiclysm/items/enchanted_belts.json | 1 + .../mods/Magiclysm/items/enchanted_boots.json | 5 +++ .../Magiclysm/items/enchanted_bracers.json | 4 +++ data/mods/Magiclysm/items/enchanted_misc.json | 5 +++ .../mods/Magiclysm/items/enchanted_rings.json | 35 +++++++++++++++++++ .../mods/Magiclysm/items/enchanted_wands.json | 3 +- .../Magiclysm/monsters/forgedwellers.json | 8 +++++ data/mods/Magiclysm/terrain.json | 25 +++++++++++++ data/mods/Magiclysm/traps.json | 14 ++++++++ .../Magiclysm/worldgen/forge_of_wonders.json | 11 +++--- 16 files changed, 177 insertions(+), 7 deletions(-) create mode 100644 data/mods/Magiclysm/emitter.json diff --git a/data/mods/Magiclysm/Spells/monsterspells.json b/data/mods/Magiclysm/Spells/monsterspells.json index c1663ac59cbdb..6ac657a2a887c 100644 --- 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 index 4755266db890c..69d437726b9e4 100644 --- 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 new file mode 100644 index 0000000000000..4ec4a3b292082 --- /dev/null +++ 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 index 2cd801043c44f..6f81ab048dcde 100644 --- 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 index 530d71bdf7818..88487a5faf1e0 100644 --- 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 index d003b5c3652de..194b6e9b4be86 100644 --- a/data/mods/Magiclysm/items/enchanted.json +++ b/data/mods/Magiclysm/items/enchanted.json @@ -3,6 +3,7 @@ "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 } ] } ] } }, @@ -10,6 +11,7 @@ "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 index d68ef4991d247..9c2628ab984d4 100644 --- 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 index 7e933e00edb67..d99ce8999b1dd 100644 --- 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 index 4dec1beedcb34..c5353f4b9cbc1 100644 --- 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 index 45659512e4a4f..44c7608ea25da 100644 --- 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": ";", diff --git a/data/mods/Magiclysm/items/enchanted_rings.json b/data/mods/Magiclysm/items/enchanted_rings.json index 718c942c876e9..52ea3568c77fb 100644 --- a/data/mods/Magiclysm/items/enchanted_rings.json +++ b/data/mods/Magiclysm/items/enchanted_rings.json @@ -7,6 +7,7 @@ "weight": "4 g", "volume": "1 ml", "price": 5000, + "price_postapoc": "20 USD", "material": [ "copper" ], "symbol": "[", "color": "light_red", @@ -24,6 +25,7 @@ "weight": "5 g", "volume": "1 ml", "price": 5000, + "price_postapoc": "20 USD", "material": [ "silver" ], "symbol": "[", "color": "light_gray", @@ -41,6 +43,7 @@ "weight": "9 g", "volume": "1 ml", "price": 5000, + "price_postapoc": "20 USD", "material": [ "gold" ], "symbol": "[", "color": "yellow", @@ -58,6 +61,7 @@ "weight": "11 g", "volume": "1 ml", "price": 5000, + "price_postapoc": "20 USD", "material": [ "platinum" ], "symbol": "[", "color": "light_gray", @@ -73,12 +77,14 @@ "id": "mring_wizardry_minor", "name": { "str": "minor ring of wizardry", "str_pl": "minor rings of wizardry" }, "description": "A thin copper band ring, engraved with a single sealed scroll. Increases mana capacity slightly.", + "price_postapoc": "1000 USD", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 200 } ] } ] } }, { "copy-from": "mring_silver", "type": "TOOL_ARMOR", "id": "mring_wizardry_lesser", + "price_postapoc": "2000 USD", "name": { "str": "lesser ring of wizardry", "str_pl": "lesser rings of wizardry" }, "description": "A thin silver band ring, engraved with two sealed scrolls. Increases mana capacity somewhat.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 400 } ] } ] } @@ -88,6 +94,7 @@ "type": "TOOL_ARMOR", "id": "mring_wizardry_moderate", "name": { "str": "ring of wizardry", "str_pl": "rings of wizardry" }, + "price_postapoc": "4000 USD", "description": "A thin gold band ring, engraved with a bound book. Increases mana capacity moderately.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 800 } ] } ] } }, @@ -96,6 +103,7 @@ "type": "TOOL_ARMOR", "id": "mring_wizardry_greater", "name": { "str": "greater ring of wizardry", "str_pl": "greater rings of wizardry" }, + "price_postapoc": "8000 USD", "description": "A thin platinum band ring, engraved with two bound books. Increases mana capacity greatly.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "MAX_MANA", "add": 1200 } ] } ] } }, @@ -104,6 +112,7 @@ "type": "TOOL_ARMOR", "id": "mring_blades_lesser", "name": { "str": "ring of blades", "str_pl": "rings of blades" }, + "price_postapoc": "1500 USD", "description": "An ornate silver ring engraved with daggers that conjures a near perfect throwing knife into your hand on activation.", "use_action": { "type": "cast_spell", "spell_id": "conj_throwing_blade1", "no_fail": true, "level": 1, "need_worn": true }, "flags": [ "NO_UNLOAD", "NO_RELOAD" ], @@ -116,6 +125,7 @@ "type": "TOOL_ARMOR", "id": "mring_dodge_bonus_1", "name": "eel ring", + "price_postapoc": "1500 USD", "description": "A thin silver band ring, depicting an eel coiled on itself. Allows you to dodge an extra attack per turn.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 1 } ] } ] } }, @@ -123,6 +133,7 @@ "copy-from": "mring_gold", "type": "TOOL_ARMOR", "id": "mring_dodge_bonus_2", + "price_postapoc": "3000 USD", "name": { "str": "bicephalous eel ring" }, "description": "A thin gold band ring, depicting a bicephalous eel coiled on itself. Allows you to dodge two extra attacks per turn.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "BONUS_DODGE", "add": 2 } ] } ] } @@ -131,6 +142,7 @@ "copy-from": "mring_copper", "type": "TOOL_ARMOR", "id": "mring_strength_1", + "price_postapoc": "1000 USD", "name": { "str": "ring of strength +1", "str_pl": "rings of strength +1" }, "description": "A copper ring that makes you a little stronger when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "STRENGTH", "add": 1 } ] } ] } @@ -139,6 +151,7 @@ "copy-from": "mring_silver", "type": "TOOL_ARMOR", "id": "mring_strength_2", + "price_postapoc": "2000 USD", "name": { "str": "ring of strength +2", "str_pl": "rings of strength +2" }, "description": "A silver ring that makes you a good bit stronger when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "STRENGTH", "add": 2 } ] } ] } @@ -147,6 +160,7 @@ "copy-from": "mring_gold", "type": "TOOL_ARMOR", "id": "mring_strength_3", + "price_postapoc": "4000 USD", "name": { "str": "ring of strength +3", "str_pl": "rings of strength +3" }, "description": "A golden ring that makes you surprisingly stronger when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "STRENGTH", "add": 3 } ] } ] } @@ -155,6 +169,7 @@ "copy-from": "mring_platinum", "type": "TOOL_ARMOR", "id": "mring_strength_4", + "price_postapoc": "6000 USD", "name": { "str": "ring of strength +4", "str_pl": "rings of strength +4" }, "description": "A platinum ring that makes you much stronger when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "STRENGTH", "add": 4 } ] } ] } @@ -163,6 +178,7 @@ "copy-from": "mring_copper", "type": "TOOL_ARMOR", "id": "mring_dexterity_1", + "price_postapoc": "1000 USD", "name": { "str": "ring of dexterity +1", "str_pl": "rings of dexterity +1" }, "description": "A copper ring that makes you a little more agile when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "DEXTERITY", "add": 1 } ] } ] } @@ -171,6 +187,7 @@ "copy-from": "mring_silver", "type": "TOOL_ARMOR", "id": "mring_dexterity_2", + "price_postapoc": "2000 USD", "name": { "str": "ring of dexterity +2", "str_pl": "rings of dexterity +2" }, "description": "A silver ring that makes you a good bit more agile when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "DEXTERITY", "add": 2 } ] } ] } @@ -179,6 +196,7 @@ "copy-from": "mring_gold", "type": "TOOL_ARMOR", "id": "mring_dexterity_3", + "price_postapoc": "4000 USD", "name": { "str": "ring of dexterity +3", "str_pl": "rings of dexterity +3" }, "description": "A golden ring that makes you surprisingly more agile when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "DEXTERITY", "add": 3 } ] } ] } @@ -187,6 +205,7 @@ "copy-from": "mring_platinum", "type": "TOOL_ARMOR", "id": "mring_dexterity_4", + "price_postapoc": "6000 USD", "name": { "str": "ring of dexterity +4", "str_pl": "rings of dexterity +4" }, "description": "A platinum ring that makes you much more agile when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "DEXTERITY", "add": 4 } ] } ] } @@ -195,6 +214,7 @@ "copy-from": "mring_copper", "type": "TOOL_ARMOR", "id": "mring_intelligence_1", + "price_postapoc": "1000 USD", "name": { "str": "ring of intelligence +1", "str_pl": "rings of intelligence +1" }, "description": "A copper ring that makes you a little more intelligent when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "INTELLIGENCE", "add": 1 } ] } ] } @@ -203,6 +223,7 @@ "copy-from": "mring_silver", "type": "TOOL_ARMOR", "id": "mring_intelligence_2", + "price_postapoc": "2000 USD", "name": { "str": "ring of intelligence +2", "str_pl": "rings of intelligence +2" }, "description": "A silver ring that makes you a good bit more intelligent when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "INTELLIGENCE", "add": 2 } ] } ] } @@ -211,6 +232,7 @@ "copy-from": "mring_gold", "type": "TOOL_ARMOR", "id": "mring_intelligence_3", + "price_postapoc": "4000 USD", "name": { "str": "ring of intelligence +3", "str_pl": "rings of intelligence +3" }, "description": "A golden ring that makes you surprisingly more intelligent when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "INTELLIGENCE", "add": 3 } ] } ] } @@ -219,6 +241,7 @@ "copy-from": "mring_platinum", "type": "TOOL_ARMOR", "id": "mring_intelligence_4", + "price_postapoc": "6000 USD", "name": { "str": "ring of intelligence +4", "str_pl": "rings of intelligence +4" }, "description": "A platinum ring that makes you much more intelligent when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "INTELLIGENCE", "add": 4 } ] } ] } @@ -227,6 +250,7 @@ "copy-from": "mring_copper", "type": "TOOL_ARMOR", "id": "mring_perception_1", + "price_postapoc": "1000 USD", "name": { "str": "ring of perception +1", "str_pl": "rings of perception +1" }, "description": "A copper ring that makes you a little more perceptive when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "PERCEPTION", "add": 1 } ] } ] } @@ -235,6 +259,7 @@ "copy-from": "mring_silver", "type": "TOOL_ARMOR", "id": "mring_perception_2", + "price_postapoc": "2000 USD", "name": { "str": "ring of perception +2", "str_pl": "rings of perception +2" }, "description": "A silver ring that makes you a good bit more perceptive when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "PERCEPTION", "add": 2 } ] } ] } @@ -243,6 +268,7 @@ "copy-from": "mring_gold", "type": "TOOL_ARMOR", "id": "mring_perception_3", + "price_postapoc": "4000 USD", "name": { "str": "ring of perception +3", "str_pl": "rings of perception +3" }, "description": "A golden ring that makes you eye-openingly more perceptive when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "PERCEPTION", "add": 3 } ] } ] } @@ -251,6 +277,7 @@ "copy-from": "mring_platinum", "type": "TOOL_ARMOR", "id": "mring_perception_4", + "price_postapoc": "6000 USD", "name": { "str": "ring of perception +4", "str_pl": "rings of perception +4" }, "description": "A platinum ring that makes you much more perceptive when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "PERCEPTION", "add": 4 } ] } ] } @@ -259,6 +286,7 @@ "copy-from": "mring_copper", "type": "TOOL_ARMOR", "id": "mring_speed_3", + "price_postapoc": "1700 USD", "name": { "str": "ring of speed +3", "str_pl": "rings of speed +3" }, "description": "A copper ring that makes you a little faster when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "SPEED", "add": 3 } ] } ] } @@ -267,6 +295,7 @@ "copy-from": "mring_silver", "type": "TOOL_ARMOR", "id": "mring_speed_5", + "price_postapoc": "2500 USD", "name": { "str": "ring of speed +5", "str_pl": "rings of speed +5" }, "description": "A silver ring that makes you a good bit faster when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "SPEED", "add": 5 } ] } ] } @@ -275,6 +304,7 @@ "copy-from": "mring_gold", "type": "TOOL_ARMOR", "id": "mring_speed_7", + "price_postapoc": "5000 USD", "name": { "str": "ring of speed +7", "str_pl": "rings of speed +7" }, "description": "A golden ring that makes you quite hasty when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "SPEED", "add": 7 } ] } ] } @@ -283,6 +313,7 @@ "copy-from": "mring_platinum", "type": "TOOL_ARMOR", "id": "mring_speed_10", + "price_postapoc": "8000 USD", "name": { "str": "ring of speed +10", "str_pl": "rings of speed +10" }, "description": "A platinum ring that makes you much faster when you wear it.", "relic_data": { "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "SPEED", "add": 10 } ] } ] } @@ -291,6 +322,7 @@ "copy-from": "mring_copper", "type": "TOOL_ARMOR", "id": "mring_protection_2", + "price_postapoc": "1000 USD", "name": { "str": "ring of protection +2", "str_pl": "rings of protection +2" }, "description": "A copper ring that reduces some of the force of damage you take when you wear it.", "relic_data": { @@ -312,6 +344,7 @@ "copy-from": "mring_silver", "type": "TOOL_ARMOR", "id": "mring_protection_4", + "price_postapoc": "2000 USD", "name": { "str": "ring of protection +4", "str_pl": "rings of protection +4" }, "description": "A silver ring that appreciably reduces some of the force of damage you take when you wear it.", "relic_data": { @@ -333,6 +366,7 @@ "copy-from": "mring_gold", "type": "TOOL_ARMOR", "id": "mring_protection_6", + "price_postapoc": "4000 USD", "name": { "str": "ring of protection +6", "str_pl": "rings of protection +6" }, "description": "A golden ring that greatly reduces some of the force of damage you take when you wear it.", "relic_data": { @@ -354,6 +388,7 @@ "copy-from": "mring_platinum", "type": "TOOL_ARMOR", "id": "mring_protection_8", + "price_postapoc": "8000 USD", "name": { "str": "ring of protection +8", "str_pl": "rings of protection +8" }, "description": "A platinum ring that vastly reduces some of the force of damage you take when you wear it.", "relic_data": { diff --git a/data/mods/Magiclysm/items/enchanted_wands.json b/data/mods/Magiclysm/items/enchanted_wands.json index a0779b4da4bee..5fb4f3a9087d5 100644 --- a/data/mods/Magiclysm/items/enchanted_wands.json +++ b/data/mods/Magiclysm/items/enchanted_wands.json @@ -5,7 +5,7 @@ "type": "TOOL", "weight": "230 g", "volume": "500 ml", - "price": 10000, + "price": "400 USD", "bashing": 3, "to_hit": 1, "material": [ "wood" ], @@ -45,6 +45,7 @@ "id": "wand_magic_missile_minor", "name": { "str": "minor wand of magic missile", "str_pl": "minor wands of magic missile" }, "copy-from": "spell_wand", + "price_postapoc": "150 USD", "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated. This wand casts magic missile.", "use_action": { "type": "cast_spell", "spell_id": "magic_missile", "no_fail": true, "level": 5, "need_wielding": true } }, diff --git a/data/mods/Magiclysm/monsters/forgedwellers.json b/data/mods/Magiclysm/monsters/forgedwellers.json index 9aed8bacec7d4..c7e34cc91ad73 100644 --- a/data/mods/Magiclysm/monsters/forgedwellers.json +++ b/data/mods/Magiclysm/monsters/forgedwellers.json @@ -127,5 +127,13 @@ "death_drops": { "subtype": "collection", "groups": [ [ "forge_life", 40 ], [ "bedroom", 1 ], [ "dresser", 5 ], [ "ammo", 18 ] ] }, "death_function": [ "NORMAL" ], "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "PATH_AVOID_DANGER_2" ] + }, + { + "id": "mon_forgehounds", + "type": "MONSTER", + "name": { "str": "forge hounds" }, + "description": "A metallic hound steps out of a nearby angle and growls at you. Run!!!", + "default_faction": "wonder_forge", + "copy-from": "mon_hound_tindalos" } ] diff --git a/data/mods/Magiclysm/terrain.json b/data/mods/Magiclysm/terrain.json index b41dbaf4dff7c..bdeb5e28bc143 100644 --- a/data/mods/Magiclysm/terrain.json +++ b/data/mods/Magiclysm/terrain.json @@ -105,5 +105,30 @@ "ter_set": "t_thconc_floor", "items": [ { "item": "glass_shard", "count": [ 8, 16 ] } ] } + }, + { + "type": "terrain", + "id": "t_vault_vent", + "name": "vault vent", + "description": "This concrete flooring has a vent pouring fresh, clean air into the vault.", + "looks_like": "t_strconc_floor", + "symbol": ".", + "color": "cyan", + "move_cost": 2, + "roof": "t_flat_roof", + "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ], + "bash": { + "sound": "SMASH!", + "ter_set": "t_null", + "str_min": 150, + "str_max": 400, + "str_min_supported": 200, + "items": [ + { "item": "rock", "count": [ 10, 22 ] }, + { "item": "scrap", "count": [ 10, 12 ] }, + { "item": "rebar", "count": [ 0, 4 ] } + ] + }, + "emissions": [ "emit_vault_atmosphere" ] } ] diff --git a/data/mods/Magiclysm/traps.json b/data/mods/Magiclysm/traps.json index 278152784cf32..33106a7bf023d 100644 --- a/data/mods/Magiclysm/traps.json +++ b/data/mods/Magiclysm/traps.json @@ -11,5 +11,19 @@ "avoidance": 99, "difficulty": 99, "spell_data": { "id": "bear_trap" } + }, + { + "type": "trap", + "id": "tr_forge_vault", + "name": "summon hounds", + "color": "brown", + "symbol": ".", + "visibility": 99, + "avoidance": 99, + "difficulty": 99, + "trap_radius": 2, + "action": "spell", + "spell_data": { "id": "forge_trap" }, + "benign": false } ] diff --git a/data/mods/Magiclysm/worldgen/forge_of_wonders.json b/data/mods/Magiclysm/worldgen/forge_of_wonders.json index 8e906a1401a13..e5681b712e32c 100644 --- a/data/mods/Magiclysm/worldgen/forge_of_wonders.json +++ b/data/mods/Magiclysm/worldgen/forge_of_wonders.json @@ -32,7 +32,7 @@ " #...fffff..........................##...........##..................#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", " #....@.@.........................................................XXX#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", " #........................................44......................X94#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", - " #............4...........................44......................X99#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", + " #............4...........................44......................X89#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", " #................................................................X94#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", " #...........@.@..................................................XXX#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.| ", " #.........zZZZZZ....................................................#$$$$$$$$$$$$$$$$$$$$$$$$$$$$X.# ", @@ -106,10 +106,11 @@ "1": "t_strconc_floor", "z": "t_strconc_floor", "Z": "t_strconc_floor", - "$": "t_strconc_floor", + "$": [ "t_strconc_floor", "t_vault_vent" ], "f": "t_strconc_floor", "F": "t_strconc_floor", - "9": "t_strconc_floor", + "8": "t_strconc_floor", + "9": "t_vault_vent", "2": "t_strconc_floor", "4": "t_thconc_floor_echandelier", "+": "t_railroad_rubble" @@ -128,12 +129,14 @@ }, "items": { "!": { "item": "magic_smith", "chance": 40, "repeat": [ 1, 2 ] }, + "8": { "item": "NC_FORGE_LORD_STORE", "chance": 100, "repeat": [ 5, 8 ] }, "9": { "item": "NC_FORGE_LORD_STORE", "chance": 100, "repeat": [ 5, 8 ] }, "$": [ { "item": "forge_vault_items", "chance": 10, "repeat": [ 1, 2 ] }, { "item": "forge_vault_money", "chance": 95, "repeat": [ 1, 3 ] } ] - } + }, + "traps": { "9": "tr_forge_vault" } }, { "type": "overmap_special",