From 37ce55a4932d4a348510f25622dbfb74c1f5a467 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 31 May 2023 11:07:27 -0500 Subject: [PATCH] XE Alchemy Perks (#65311) * XE Perks lint * Alchemy1 stuff * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update ethereal_items.json * Update alchemy.json * Apply suggestions from code review * Update ethereal_items.json * Update ethereal_items.json * Update perk_menu.json * Fixes * OK let's see if alchemy 1 works * Update data/mods/Xedra_Evolved/perks/perk_data/Alchemy1.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update effects.json Update effects.json Update alchemy.json * Update Alchemy1.json * Update alchemy.json * Fixes * Further Alchemy perks Lint Update effects.json * Cold Iron Damage and flags lint * Ironwrought * Moar * Update data/mods/Xedra_Evolved/recipes/category.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Dictionary and sixdust spawns Update itemgroups.json dust and charm * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Xedra_Evolved/items/alchemy.json * alchemy 3 alchemy 3 lint * fixes fix Update alchemy.json * Update data/mods/Xedra_Evolved/items/alchemy.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * lint * Update cold_iron.json * lint * Update cold_iron.json * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Xedra_Evolved/items/comestibles/med.json * Create mutation_type.json * Update mutations.json * Revert "Update mutations.json" This reverts commit c703166df2066e31dfc5c67c1f6d89406c3c95a8. * Revert "Create mutation_type.json" This reverts commit 8a8681ad33d036af3e0b96e54a0bf88ac949c819. * Saints blood * Update effects.json * Life extension potion * Update effects.json * Extended life * potions * Update item_spells.json * Level 4 * Fix * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix * Work on level 5 * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/Xedra_Evolved/recipes/alchemy.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Remove level 5 Alchemy work * Update data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json * Apply suggestions from code review * Update data/mods/Xedra_Evolved/items/alchemy.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update alchemy.json * cold iron fixes * fixes Lint fixes * Last fixes Update damage_types.json Update Alchemy1.json * Update README.md --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CMakePresets.json | 7 +- data/mods/Xedra_Evolved/README.md | 2 + data/mods/Xedra_Evolved/damage_types.json | 65 ++++ data/mods/Xedra_Evolved/effects/effects.json | 96 ++++- .../Xedra_Evolved/enchantments/armor.json | 58 +++ data/mods/Xedra_Evolved/flags.json | 7 + .../furniture-plants.json | 17 + data/mods/Xedra_Evolved/harvest.json | 5 + .../Xedra_Evolved/itemgroups/itemgroups.json | 7 + data/mods/Xedra_Evolved/items/alchemy.json | 289 ++++++++++++++ data/mods/Xedra_Evolved/items/cold_iron.json | 100 +++++ .../Xedra_Evolved/items/comestibles/med.json | 75 ++++ .../items/comestibles/raw_fruit.json | 13 + .../Xedra_Evolved/items/ethereal_items.json | 28 ++ .../Xedra_Evolved/mapgen/overmap_terrain.json | 2 +- .../Xedra_Evolved/monsters/changeling.json | 123 +++++- .../Xedra_Evolved/mutations/mutations.json | 37 ++ .../perks/perk_data/Alchemy1.json | 87 +++++ data/mods/Xedra_Evolved/perks/perk_menu.json | 206 ++++++++++ data/mods/Xedra_Evolved/perks/perks.json | 62 +++ data/mods/Xedra_Evolved/recipes/alchemy.json | 363 ++++++++++++++++++ data/mods/Xedra_Evolved/recipes/category.json | 9 +- .../mods/Xedra_Evolved/recipes/cold_iron.json | 147 +++++++ .../Xedra_Evolved/spells/item_spells.json | 131 +++++++ data/mods/Xedra_Evolved/vitamin.json | 13 + src/monstergenerator.cpp | 1 + src/mtype.h | 1 + tools/spell_checker/dictionary.txt | 8 + 28 files changed, 1938 insertions(+), 21 deletions(-) create mode 100644 data/mods/Xedra_Evolved/damage_types.json create mode 100644 data/mods/Xedra_Evolved/flags.json create mode 100644 data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json create mode 100644 data/mods/Xedra_Evolved/items/alchemy.json create mode 100644 data/mods/Xedra_Evolved/items/cold_iron.json create mode 100644 data/mods/Xedra_Evolved/items/comestibles/med.json create mode 100644 data/mods/Xedra_Evolved/perks/perk_data/Alchemy1.json create mode 100644 data/mods/Xedra_Evolved/perks/perk_menu.json create mode 100644 data/mods/Xedra_Evolved/perks/perks.json create mode 100644 data/mods/Xedra_Evolved/recipes/alchemy.json create mode 100644 data/mods/Xedra_Evolved/recipes/cold_iron.json diff --git a/CMakePresets.json b/CMakePresets.json index d3c484d59a993..c2b49bdf07153 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -23,7 +23,7 @@ "LOCALIZE": "True", "TILES": "True", "SOUND": "True", - "TESTS": "False" + "TESTS": "False" } }, { @@ -47,9 +47,6 @@ } ], "buildPresets": [ - { - "name": "linux-tiles-sounds-x64", - "configurePreset": "linux-tiles-sounds-x64" - } + { "name": "linux-tiles-sounds-x64", "configurePreset": "linux-tiles-sounds-x64" } ] } diff --git a/data/mods/Xedra_Evolved/README.md b/data/mods/Xedra_Evolved/README.md index cb967a3958ef6..e705bd3ad8246 100644 --- a/data/mods/Xedra_Evolved/README.md +++ b/data/mods/Xedra_Evolved/README.md @@ -30,6 +30,8 @@ Several new CBMs Dozens of new spells 1 Vehicle 1 new skill +Perks for Bombastic Perks and Xedra Evolved. +Alchemy requires that you also be running bombastic perks. The level five alchemy recipes are taking their time and this PR has gotten too large as it is, for other people to review. There are four levels of Alchemy, level one is slightly buffed versions of common materials and medicines. Level two are more advanced versions of what is available already with on. Some of these substances might allow the imbiber to exceed his normal physical limits or to gain access to more mystical senses. Level three you can make substances that enhance their target to superhuman levels or create materials that exceed normal limitations (supernaturally strong alloys, etc). Level four should have single mutations and attribute increases. Level 5 should have character defining post thresh mutations and effects that transform the PC. Cold Iron is an example of a branching Alchemy specialty that focuses on building gear that targets fae. And a plethora of other effects, furniture/terrain, missions, lore and other things necessary to support the above. diff --git a/data/mods/Xedra_Evolved/damage_types.json b/data/mods/Xedra_Evolved/damage_types.json new file mode 100644 index 0000000000000..60915654ba90d --- /dev/null +++ b/data/mods/Xedra_Evolved/damage_types.json @@ -0,0 +1,65 @@ +[ + { + "id": "xe_cold_iron_cut_damage", + "type": "damage_type", + "physical": true, + "magic_color": "light_gray", + "name": "cold iron cut", + "skill": "cutting", + "derived_from": [ "cut", 1 ], + "immune_flags": { "character": [ "IRONSWORN" ], "monster": [ "IRONWROUGHT" ] } + }, + { + "id": "xe_cold_iron_cut_damage", + "type": "damage_info_order", + "info_display": "detailed", + "verb": "cutting", + "bionic_info": { "order": 999999, "show_type": false }, + "protection_info": { "order": 999999, "show_type": false }, + "pet_prot_info": { "order": 999999, "show_type": false }, + "melee_combat_info": { "order": 999999, "show_type": false }, + "ablative_info": { "order": 999999, "show_type": false } + }, + { + "id": "xe_cold_iron_bash_damage", + "type": "damage_type", + "physical": true, + "magic_color": "light_gray", + "name": "cold iron bash", + "skill": "bashing", + "derived_from": [ "bash", 1 ], + "immune_flags": { "character": [ "IRONSWORN" ], "monster": [ "IRONWROUGHT" ] } + }, + { + "id": "xe_cold_iron_bash_damage", + "type": "damage_info_order", + "info_display": "detailed", + "verb": "bashing", + "bionic_info": { "order": 999999, "show_type": false }, + "protection_info": { "order": 999999, "show_type": false }, + "pet_prot_info": { "order": 999999, "show_type": false }, + "melee_combat_info": { "order": 999999, "show_type": false }, + "ablative_info": { "order": 999999, "show_type": false } + }, + { + "id": "xe_cold_iron_stab_damage", + "type": "damage_type", + "physical": true, + "magic_color": "light_gray", + "name": "cold iron stab", + "skill": "stabbing", + "derived_from": [ "stab", 1 ], + "immune_flags": { "character": [ "IRONSWORN" ], "monster": [ "IRONWROUGHT" ] } + }, + { + "id": "xe_cold_iron_stab_damage", + "type": "damage_info_order", + "info_display": "detailed", + "verb": "piercing", + "bionic_info": { "order": 999999, "show_type": false }, + "protection_info": { "order": 999999, "show_type": false }, + "pet_prot_info": { "order": 999999, "show_type": false }, + "melee_combat_info": { "order": 999999, "show_type": false }, + "ablative_info": { "order": 999999, "show_type": false } + } +] diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json index 6c771e656894b..943f3d3ae8210 100644 --- a/data/mods/Xedra_Evolved/effects/effects.json +++ b/data/mods/Xedra_Evolved/effects/effects.json @@ -9,6 +9,21 @@ "rating": "good", "base_mods": { "dex_mod": [ 4 ], "speed_mod": [ 250 ] } }, + { + "type": "effect_type", + "id": "xtr_str_aspirin", + "max_duration": "4 m", + "base_mods": { + "pkill_tick": [ 42 ], + "pkill_min": [ 1 ], + "pkill_max_val": [ 15 ], + "hurt_tick": [ 42 ], + "hurt_min": [ -1 ], + "hurt_max": [ -5 ] + }, + "rating": "good", + "blood_analysis_description": "Strange Painkiller" + }, { "type": "effect_type", "id": "blood_spiders", @@ -36,6 +51,12 @@ }, "blood_analysis_description": "Unknown Hemolytic Parasite" }, + { + "type": "effect_type", + "id": "curesome", + "removes_effects": [ "common_cold", "flu" ], + "base_mods": { "pkill_min": [ 5 ] } + }, { "type": "effect_type", "id": "faewild", @@ -117,6 +138,16 @@ "max_intensity": 3, "rating": "good" }, + { + "type": "effect_type", + "id": "mental_exhaustion", + "//": "Prevents you from learning new alchemy recipes.", + "name": [ "Mental Exhaustion" ], + "desc": [ "You have recently realized a new alchemical recipe and your thoughts are scattered." ], + "remove_message": "Your mind feels normal enough that you could focus on new alchemy ideas once again.", + "max_intensity": 1, + "rating": "bad" + }, { "type": "effect_type", "id": "dreamer_eff", @@ -182,6 +213,47 @@ "base_mods": { "speed_mod": [ -10 ], "dex_mod": [ -1 ], "dodge_mod": [ -1 ] }, "scaling_mods": { "speed_mod": [ -20 ], "dex_mod": [ -1 ], "dodge_mod": [ -1 ] } }, + { + "type": "effect_type", + "id": "cheval_overdose", + "//": "Intensity 1 is a standard dosage of the drug. Further intensities reflect taking pills while the first dose hasn't worn off. It is not wise to do so.", + "name": [ "Energized", "Enflamed", "Arythmic", "Tachycardiac" ], + "apply_message": "These magickal trucker pills have kicked in and you feel great!", + "decay_messages": [ + [ + "These magickal trucker pills have worn off and you feel rough. It might be best to go ahead and sleep through the hangover as best you can.", + "bad" + ], + [ + "Aside from any leftover pain and damage that was done to your body by overdosing your feeling pretty good now.", + "good" + ], + [ "Your heartbeat slows into a somewhat normal rhythm but your skin is still on fire.", "good" ], + [ "The pain in your chest subsides but your heart is still beating in a concerning fashion.", "good" ] + ], + "rating": "mixed", + "max_intensity": 4, + "blood_analysis_description": "Patient has dangerous levels of multiple chemicals in their blood. Sedation and restraint suggested.", + "base_mods": { "speed_mod": [ 10 ], "str_mod": [ 1 ], "stim_amount": [ 1 ], "stim_tick": [ 500 ], "stim_max_val": [ 50 ] }, + "scaling_mods": { + "perspiration_amount": [ 6 ], + "perspiration_min": [ 1 ], + "perspiration_chance": [ 2 ], + "perspiration_tick": [ 1500 ], + "pain_amount": [ 10 ], + "pain_min": [ 1 ], + "pain_chance": [ 2 ], + "pain_tick": [ 6000 ], + "stim_max_val": [ 100 ] + } + }, + { + "type": "effect_type", + "id": "cheval_withdrawal", + "rating": "bad", + "blood_analysis_description": "Heightened levels of organosulfur compounds, mercury, and silver.", + "base_mods": { "speed_mod": [ -15 ], "str_mod": [ -1 ], "stim_amount": [ -1 ], "stim_tick": [ 500 ], "stim_max_val": [ -50 ] } + }, { "type": "effect_type", "id": "poisoned_blood", @@ -230,7 +302,7 @@ "death_msg": "You succumb to your deadly necrotic condition.", "apply_memorial_log": "Contracted a bloodborne pathogen out of legend.", "remove_memorial_log": "Rid themselves of a horrific curse of the blood.", - "resist_traits": [ "ACIDBLOOD" ], + "resist_traits": [ "ACIDBLOOD", "BLOOD_OF_SAINTS" ], "resist_effects": [ "blood_treatment" ], "blocks_effects": [ "cold", "flu" ], "max_intensity": 3, @@ -501,5 +573,27 @@ "description": "Nothing can slow you down, and your pain sensations are dull.", "enchantments": [ { "values": [ { "value": "PAIN", "multiply": -1 } ] } ], "flags": [ "STEADY" ] + }, + { + "type": "effect_type", + "id": "wicked_quick_hands", + "name": [ "Wicked Quick Hands" ], + "desc": [ "Your hands move wicked quick!" ], + "apply_message": "Your reflexes are heightened!", + "remove_message": "Your reflexes return to normal.", + "rating": "good", + "removes_effects": [ "terrible_strength" ], + "base_mods": { "dex_mod": [ 4 ] } + }, + { + "type": "effect_type", + "id": "terrible_strength", + "name": [ "terrible strength" ], + "desc": [ "You have a terrible strength!" ], + "apply_message": "You feel strong!", + "remove_message": "Your strength deflates.", + "rating": "good", + "removes_effects": [ "wicked_quick_hands" ], + "base_mods": { "str_mod": [ 4 ] } } ] diff --git a/data/mods/Xedra_Evolved/enchantments/armor.json b/data/mods/Xedra_Evolved/enchantments/armor.json index ffc51ad6f5499..838127db1f289 100644 --- a/data/mods/Xedra_Evolved/enchantments/armor.json +++ b/data/mods/Xedra_Evolved/enchantments/armor.json @@ -1,4 +1,62 @@ [ + { + "id": "ench_climate_control_marzanna", + "name": { "str": "Charm of Spring" }, + "description": "You are wearing equipment that helps handle harsh climates and protects from damaging cold.", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 20 }, { "value": "ARMOR_COLD", "add": -15 } ] + }, + { + "id": "ench_climate_periapta_feline", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "mutations": [ "CLAWS_RETRACT" ] + }, + { + "id": "ench_climate_periapta_lupine", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "mutations": [ "FANGS" ] + }, + { + "id": "ench_climate_periapta_cephalopod", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "mutations": [ "INK_GLANDS" ] + }, + { + "id": "ench_climate_periapta_butterfly", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "mutations": [ "WINGS_BUTTERFLY" ] + }, + { + "id": "ench_climate_periapta_plant", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "mutations": [ "BARK" ] + }, + { + "id": "ench_climate_periapta_scorpion", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "mutations": [ "TAIL_STING" ] + }, + { + "id": "ench_climate_periapta_spider", + "type": "enchantment", + "has": "WORN", + "condition": "ALWAYS", + "mutations": [ "WEB_WALKER" ] + }, { "type": "enchantment", "id": "DEDUCTION_REGEN_MANA", diff --git a/data/mods/Xedra_Evolved/flags.json b/data/mods/Xedra_Evolved/flags.json new file mode 100644 index 0000000000000..0ff8d5af4a834 --- /dev/null +++ b/data/mods/Xedra_Evolved/flags.json @@ -0,0 +1,7 @@ +[ + { + "id": "IRONSWORN", + "type": "json_flag", + "info": "This gear completely protects you from cold iron damage." + } +] diff --git a/data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json b/data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json new file mode 100644 index 0000000000000..3356b270a7451 --- /dev/null +++ b/data/mods/Xedra_Evolved/furniture_and_terrain/furniture-plants.json @@ -0,0 +1,17 @@ +[ + { + "type": "furniture", + "id": "f_elder_ginseng", + "name": "hundred year old ginseng", + "description": "The ginseng plant has leaves that grow in a circle around a straight stem. Yellowish-green, umbrella-shaped flowers grow in the center and produce red berries. Wrinkles around the neck of the root tell how old the plant is. This plant is over a hundred years old and if you decide to harvest it, you will need the roots.", + "symbol": "*", + "color": "cyan", + "looks_like": "f_burdock", + "move_cost_mod": 0, + "required_str": -1, + "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ], + "examine_action": "harvest_furn", + "harvest_by_season": [ { "seasons": [ "spring", "summer", "autumn" ], "id": "elder_ginseng_harv" } ], + "bash": { "str_min": 2, "str_max": 6, "sound": "crunch.", "sound_fail": "whish." } + } +] diff --git a/data/mods/Xedra_Evolved/harvest.json b/data/mods/Xedra_Evolved/harvest.json index b5cd10a7c4ae0..cddf73b265574 100644 --- a/data/mods/Xedra_Evolved/harvest.json +++ b/data/mods/Xedra_Evolved/harvest.json @@ -23,5 +23,10 @@ "id": "pomegranate_harv", "type": "harvest", "entries": [ { "drop": "pomegranate", "base_num": [ 2, 5 ], "scale_num": [ 0, 0.5 ] } ] + }, + { + "id": "elder_ginseng_harv", + "type": "harvest", + "entries": [ { "drop": "xe_elder_ginseng", "base_num": [ 1, 1 ] } ] } ] diff --git a/data/mods/Xedra_Evolved/itemgroups/itemgroups.json b/data/mods/Xedra_Evolved/itemgroups/itemgroups.json index a73c127019409..147660a54bbf4 100644 --- a/data/mods/Xedra_Evolved/itemgroups/itemgroups.json +++ b/data/mods/Xedra_Evolved/itemgroups/itemgroups.json @@ -134,6 +134,13 @@ { "item": "wyld_candy", "prob": 15, "container-item": "wrapper_wyld", "sealed": false } ] }, + { + "type": "item_group", + "id": "softdrugs", + "subtype": "distribution", + "copy-from": "softdrugs", + "extend": { "entries": [ { "item": "truckstop_viagra", "prob": 15 } ] } + }, { "type": "item_group", "subtype": "distribution", diff --git a/data/mods/Xedra_Evolved/items/alchemy.json b/data/mods/Xedra_Evolved/items/alchemy.json new file mode 100644 index 0000000000000..70a0fd4598d6b --- /dev/null +++ b/data/mods/Xedra_Evolved/items/alchemy.json @@ -0,0 +1,289 @@ +[ + { + "type": "COMESTIBLE", + "id": "blackout_rage_drink", + "looks_like": "cola", + "name": { "str": "Bored, the blackout rage drink" }, + "weight": "253 g", + "color": "magenta", + "addiction_type": "alcohol", + "fatigue_mod": 112, + "stim": 34, + "container": "jug_plastic", + "comestible_type": "DRINK", + "symbol": "~", + "quench": 15, + "healthy": -4, + "addiction_potential": 6, + "calories": 157, + "description": "An incredibly alcoholic and caffeinated drink. This probably isn't healthy.", + "price": 170, + "price_postapoc": 50, + "material": [ "alcohol" ], + "primary_material": "water", + "volume": "250 ml", + "phase": "liquid", + "flags": [ "EATEN_COLD", "NO_AUTO_CONSUME" ], + "use_action": { "type": "cast_spell", "spell_id": "blackout_rage_drink", "no_fail": true, "level": 0 }, + "fun": 5 + }, + { + "id": "sixdust", + "type": "AMMO", + "name": { "str_sp": "sixdust" }, + "description": "Sixdust, for when you must scorch the earth. A sprayable anti-fungal/anti-insecticidal ammo for the chemical thrower. Best used with some kind of mask or mouth protection.", + "weight": "3 g", + "volume": "250 ml", + "price": 600, + "price_postapoc": 500, + "material": [ "water" ], + "symbol": "=", + "color": "yellow_red", + "container": "bottle_plastic", + "sealed": false, + "phase": "liquid", + "ammo_type": "chemical_spray", + "range": 4, + "count": 100, + "effects": [ "GAS_FUNGICIDAL", "STREAM_GAS_FUNGICIDAL", "GAS_INSECTICIDAL", "STREAM_GAS_INSECTICIDAL", "NEVER_MISFIRES", "JET" ] + }, + { + "id": "small_blessing_brigit", + "type": "COMESTIBLE", + "comestible_type": "MED", + "name": { "str": "small blessing of Brigit", "str_pl": "some blessings of Brigit" }, + "description": "A small pill made from royal jelly, ash, and poppies. Blessed with prayers to Brigit over several hours. Will end any cold or flu instantaneously.", + "weight": "15 g", + "volume": "5 ml", + "price": 1000, + "price_postapoc": 8000, + "stack_size": 5, + "material": [ "veggy" ], + "symbol": "!", + "color": "green", + "healthy": 15, + "use_action": { + "type": "consume_drug", + "activation_message": "You feel better almost instantly.", + "effects": [ { "id": "curesome" } ] + }, + "flags": [ "NPC_SAFE", "IRREPLACEABLE_CONSUMABLE", "WATER_DISSOLVE", "EDIBLE_FROZEN" ] + }, + { + "id": "prophets_lsd", + "type": "COMESTIBLE", + "comestible_type": "MED", + "name": { "str_sp": "prophet's LSD" }, + "description": "A windowpane worth of Rainbow Skull LSD tabs. These tabs are said to grant the consumer the ability to see several seconds into the future.", + "weight": "1 g", + "volume": "250 ml", + "price": 10000, + "price_postapoc": 2500, + "charges": 5, + "stack_size": 100, + "symbol": "!", + "color": "pink", + "stim": 20, + "fun": 25, + "flags": [ "NO_INGEST", "IRREPLACEABLE_CONSUMABLE", "EDIBLE_FROZEN" ], + "use_action": { "type": "cast_spell", "spell_id": "future_sight", "no_fail": true, "level": 25 } + }, + { + "id": "truckers_stamina_pills", + "type": "COMESTIBLE", + "comestible_type": "MED", + "name": { "str_sp": "alchemically altered trucker pills" }, + "description": "When you began the sinister path into occultism, you never imagined you'd be alchemically altering truckstop viagra into combat drugs. But here you are, no sleep til Boston.", + "weight": "1 g", + "volume": "250 ml", + "price": 15000, + "price_postapoc": 5000, + "charges": 6, + "stack_size": 100, + "material": [ "powder" ], + "symbol": "!", + "color": "light_cyan", + "container": "bag_zipper", + "quench": -2, + "stim": 20, + "healthy": -7, + "fun": 30, + "addiction_potential": 15, + "addiction_type": [ "amphetamine", { "addiction": "opiate", "potential": 10 } ], + "flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ], + "use_action": { + "type": "consume_drug", + "activation_message": "You swallow a couple of the large green pills.", + "vitamins": [ [ "cheval", 1000 ] ] + } + }, + { + "id": "spiritshow_dust", + "name": { "str": "spirit show dust" }, + "description": "A key ingredient for Victorian seances led by actual occultists. This dust summons spirits from beyond to walk the earth again for a short time. The spirits it summons are mindless and disappear upon being touched.", + "use_action": { "type": "cast_spell", "spell_id": "ghost_inflatable", "no_fail": true, "level": 0 }, + "type": "COMESTIBLE", + "weight": "265 g", + "quench": -1, + "calories": 0, + "volume": "250ml", + "charges": 1, + "fun": -1, + "symbol": "~", + "container": "flask_glass", + "color": "light_blue", + "comestible_type": "MED", + "flags": [ "EATEN_COLD", "NO_AUTO_CONSUME", "NUTRIENT_OVERRIDE" ], + "material": [ "powder" ], + "price": 2500 + }, + { + "id": "charm_of_marzanna", + "copy-from": "garnet_silver_pendant_necklace", + "type": "ARMOR", + "name": { "str": "charm of Marzanna" }, + "description": "A tiny effigy of a woman with singed extremities and a waterlogged face.", + "color": "light_blue", + "relic_data": { "passive_effects": [ { "id": "ench_climate_control_marzanna" } ] } + }, + { + "id": "feline_periapta", + "copy-from": "diamond_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "feline periapta" }, + "description": "A shiny, gold necklace adorned with an image of a cat with strange runes on it and diamond eyes.", + "material": [ { "type": "gold", "portion": 9 }, { "type": "diamond" } ], + "color": "white", + "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, + "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_feline" } ] } + }, + { + "id": "lupine_periapta", + "copy-from": "diamond_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "lupine periapta" }, + "description": "A shiny, gold necklace adorned with an image of a wolf with strange runes on it and diamond eyes.", + "material": [ { "type": "gold", "portion": 9 }, { "type": "diamond" } ], + "color": "white", + "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, + "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_lupine" } ] } + }, + { + "id": "cephalopod_periapta", + "copy-from": "diamond_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "cephalopod periapta" }, + "description": "A shiny, gold necklace adorned with an image of an octopus with strange runes on it and diamond eyes.", + "material": [ { "type": "gold", "portion": 9 }, { "type": "diamond" } ], + "color": "white", + "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, + "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_cephalopod" } ] } + }, + { + "id": "plant_periapta", + "copy-from": "diamond_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "tree periapta" }, + "description": "A shiny, gold necklace adorned with an image of a tree with strange runes on it and diamond eyes.", + "material": [ { "type": "gold", "portion": 9 }, { "type": "diamond" } ], + "color": "white", + "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, + "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_plant" } ] } + }, + { + "id": "scorpion_periapta", + "copy-from": "diamond_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "scorpion periapta" }, + "description": "A shiny, gold necklace adorned with an image of a scorpion with strange runes on it and diamond eyes.", + "material": [ { "type": "gold", "portion": 9 }, { "type": "diamond" } ], + "color": "white", + "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, + "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_scorpion" } ] } + }, + { + "id": "butterfly_periapta", + "copy-from": "diamond_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "butterfly periapta" }, + "description": "A shiny, gold necklace adorned with an image of a butterfly with strange runes on it and diamond eyes.", + "material": [ { "type": "gold", "portion": 9 }, { "type": "diamond" } ], + "color": "white", + "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, + "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_butterfly" } ] } + }, + { + "id": "spider_periapta", + "copy-from": "diamond_gold_pendant_necklace", + "type": "ARMOR", + "name": { "str": "spider periapta" }, + "description": "A shiny, gold necklace adorned with an image of a spider with strange runes on it and diamond eyes.", + "material": [ { "type": "gold", "portion": 9 }, { "type": "diamond" } ], + "color": "white", + "delete": { "flags": [ "NO_WEAR_EFFECT" ] }, + "relic_data": { "passive_effects": [ { "id": "ench_climate_periapta_spider" } ] } + }, + { + "id": "life_extension_potion", + "type": "COMESTIBLE", + "comestible_type": "MED", + "name": { "str_sp": "life extension potion" }, + "description": "The primary means by which alchemists gain wealthy patrons these potions will add decades of healthy life to their users span. But the ingredients are rare and even this won't prolong life forever. You'll have to resort to other means of achieving immortality, if that's even a goal you are seeking.", + "weight": "50 g", + "volume": "250 ml", + "price": 15000, + "price_postapoc": 50000, + "charges": 1, + "stack_size": 100, + "material": [ "water" ], + "symbol": "!", + "color": "light_cyan", + "container": "flask_glass", + "quench": 2, + "healthy": 7, + "fun": -30, + "flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ], + "use_action": { "type": "cast_spell", "spell_id": "extend_life", "no_fail": true, "level": 1 } + }, + { + "id": "potion_dex", + "type": "COMESTIBLE", + "name": { "str": "potion of wicked quick hands", "str_pl": "potions of wicked quick hands" }, + "description": "This is a potion of wicked quick hands. It will increase your dexterity for 50 minutes.", + "copy-from": "life_extension_potion", + "calories": 25, + "use_action": { "type": "cast_spell", "spell_id": "potion_dex", "no_fail": true, "level": 25 }, + "color": "green", + "price": 3000 + }, + { + "id": "potion_strength", + "name": { "str": "potion of terrible strength", "str_pl": "potions of terrible strength" }, + "description": "This is a potion of terrible strength. It will increase your strength for 50 minutes.", + "use_action": { "type": "cast_spell", "spell_id": "potion_strength", "no_fail": true, "level": 25 }, + "type": "COMESTIBLE", + "color": "red", + "calories": 50, + "copy-from": "life_extension_potion" + }, + { + "id": "hares_leap_potion", + "name": { "str": "potion of hare's leap", "str_pl": "potions of hare's leap" }, + "description": "This is a potion of hare's leap. It will increase your strength for 50 minutes.", + "use_action": { "type": "cast_spell", "spell_id": "spell_hare_leap", "no_fail": true, "level": 25 }, + "type": "COMESTIBLE", + "color": "green_yellow", + "calories": 50, + "copy-from": "life_extension_potion" + }, + { + "id": "hyde_formula", + "name": { "str": "Hyde Formula", "str_pl": "Hyde Formulae" }, + "description": "This is a transmutation potion that will bring your best attributes to the forefront.", + "use_action": { "type": "cast_spell", "spell_id": "spell_hyde_formula", "no_fail": true, "level": 1 }, + "type": "COMESTIBLE", + "color": "green_yellow", + "calories": 50, + "copy-from": "life_extension_potion" + } +] diff --git a/data/mods/Xedra_Evolved/items/cold_iron.json b/data/mods/Xedra_Evolved/items/cold_iron.json new file mode 100644 index 0000000000000..3289cd2142027 --- /dev/null +++ b/data/mods/Xedra_Evolved/items/cold_iron.json @@ -0,0 +1,100 @@ +[ + { + "id": "cold_iron_ingot", + "type": "AMMO", + "category": "spare_parts", + "name": { "str": "cold iron ingot" }, + "description": "A five-liter ingot of solid cold iron.", + "weight": "39365 g", + "volume": "5 L", + "price": 10000, + "price_postapoc": 200, + "material": [ "iron" ], + "symbol": "=", + "color": "dark_gray", + "ammo_type": "components" + }, + { + "id": "cold_iron_arming_sword", + "type": "TOOL", + "looks_like": "arming_sword", + "category": "weapons", + "symbol": "/", + "color": "dark_gray", + "name": { "str": "cold iron arming sword" }, + "description": "A classic medieval sword, just the right size to use one-handed.\n\nMade with cold iron and lacking a proper grip, this is better than the sticks you swung around as a kid, but you know you can do better.", + "weight": "1360 g", + "volume": "2 L", + "longest_side": "90 cm", + "price": 100000, + "price_postapoc": 4500, + "material": [ "iron" ], + "repairs_with": [ "iron" ], + "flags": [ "SHEATH_SWORD", "CONDUCTIVE" ], + "techniques": [ "WBLOCK_2" ], + "to_hit": { "grip": "solid", "length": "long", "surface": "line", "balance": "good" }, + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 7 ] ], + "weapon_category": [ "MEDIEVAL_SWORDS", "MEDIUM_SWORDS" ], + "melee_damage": { "xe_cold_iron_bash_damage": 6, "xe_cold_iron_cut_damage": 26 } + }, + { + "type": "GENERIC", + "id": "cold_iron_warhammer", + "name": { "str": "war hammer" }, + "description": "A medieval hammer with a spike on one end, made for battle. Its odd shape and balance make it an excellent weapon, but an ineffective tool.", + "weight": "1337 g", + "price_postapoc": 6000, + "color": "dark_gray", + "symbol": "/", + "material": [ "iron", "wood" ], + "repairs_with": [ "iron" ], + "techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ], + "flags": [ "DURABLE_MELEE", "SPEAR", "NONCONDUCTIVE" ], + "weapon_category": [ "HOOKING_WEAPONRY", "GREAT_HAMMERS" ], + "volume": "1250 ml", + "longest_side": "120 cm", + "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "good" }, + "price": 16000, + "qualities": [ [ "HAMMER", 1 ] ], + "melee_damage": { "xe_cold_iron_bash_damage": 22, "xe_cold_iron_stab_damage": 23 } + }, + { + "id": "cold_iron_battleaxe", + "type": "TOOL", + "name": { "str": "cold iron battle axe" }, + "description": "A huge cold iron axe designed for early warfare. Though intended for use as a weapon, it can also be pressed into service as a rather clumsy woodcutting tool.", + "weight": "2002 g", + "volume": "2500 ml", + "longest_side": "100 cm", + "price": 40000, + "price_postapoc": 12000, + "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "uneven" }, + "material": [ "iron", "wood" ], + "symbol": "/", + "color": "dark_gray", + "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], + "qualities": [ [ "AXE", 2 ], [ "BUTCHER", -20 ] ], + "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_AXE" ], + "weapon_category": [ "HOOKING_WEAPONRY", "GREAT_AXES" ], + "category": "weapons", + "melee_damage": { "xe_cold_iron_bash_damage": 19, "xe_cold_iron_cut_damage": 38 } + }, + { + "id": "cold_iron_knife", + "type": "TOOL", + "name": { "str": "cold iron baselard" }, + "description": "A medieval dagger forged from cold iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.", + "weight": "420 g", + "volume": "250 ml", + "longest_side": "60 cm", + "price": 19590, + "to_hit": { "grip": "weapon", "length": "short", "surface": "point", "balance": "good" }, + "material": [ "iron" ], + "symbol": ";", + "color": "dark_gray", + "qualities": [ [ "CUT", 2 ], [ "BUTCHER", 15 ] ], + "flags": [ "SHEATH_KNIFE", "ALLOWS_BODY_BLOCK" ], + "weapon_category": [ "KNIVES" ], + "melee_damage": { "xe_cold_iron_bash_damage": 5, "xe_cold_iron_stab_damage": 16 } + } +] diff --git a/data/mods/Xedra_Evolved/items/comestibles/med.json b/data/mods/Xedra_Evolved/items/comestibles/med.json new file mode 100644 index 0000000000000..d9b87ca0afbe5 --- /dev/null +++ b/data/mods/Xedra_Evolved/items/comestibles/med.json @@ -0,0 +1,75 @@ +[ + { + "id": "extra_str_aspirin", + "type": "COMESTIBLE", + "comestible_type": "MED", + "name": { "str": "eXtra strength aspirin" }, + "description": "Alchemically altered aspirin. Take to relieve pain and injury.", + "weight": "1 g", + "volume": "250 ml", + "price": 500, + "price_postapoc": 7500, + "charges": 20, + "stack_size": 200, + "material": [ "powder" ], + "symbol": "!", + "color": "white", + "container": "bottle_plastic_pill_painkiller", + "healthy": -1, + "flags": [ "WATER_DISSOLVE", "EDIBLE_FROZEN" ], + "use_action": { + "type": "consume_drug", + "activation_message": "You take some eXtra strength aspirin.", + "effects": [ { "id": "xtr_str_aspirin", "duration": 720 } ] + } + }, + { + "id": "truckstop_viagra", + "type": "COMESTIBLE", + "comestible_type": "MED", + "name": { "str_sp": "horny rhino pills" }, + "description": "DOES YOUR PARTNER FIND YOUR LACK OF SEXUAL POTENCY PATHETHIC?!??! SMASH YOUR BEDROOM LIKE A WILD ANIMAL ALL NIGHT LONG!!! -ingredients not confirmed with the FDA.", + "weight": "1 g", + "volume": "100 ml", + "price": 90, + "price_postapoc": 100, + "charges": 20, + "stack_size": 20, + "symbol": "!", + "color": "magenta", + "container": "bottle_plastic_pill_supplement", + "quench": -4, + "stim": 10, + "healthy": -3, + "fun": 10, + "addiction_potential": 10, + "addiction_type": "amphetamine", + "flags": [ "NO_INGEST", "WATER_DISSOLVE", "EDIBLE_FROZEN" ], + "use_action": { "type": "consume_drug", "activation_message": "You take the %s. Your skin feels like it is vibrating." } + }, + { + "id": "blood_of_saints", + "type": "COMESTIBLE", + "name": { "str_sp": "blood of the saints" }, + "description": "A rare substance of uncertain origins. Causes you to mutate.", + "price": "2500 USD", + "price_postapoc": "500 USD", + "//": "Not commercially traded, in case there was any question.", + "comestible_type": "MED", + "category": "mutagen", + "weight": "250 g", + "volume": "250 ml", + "phase": "liquid", + "container": "flask_glass", + "symbol": "~", + "color": "light_green", + "healthy": -2, + "addiction_potential": 2, + "addiction_type": "mutagen", + "flags": [ "NO_INGEST", "NUTRIENT_OVERRIDE" ], + "vitamins": [ ], + "material": [ "water" ], + "freezing_point": -8, + "use_action": { "type": "cast_spell", "spell_id": "learn_blood_of_saints", "no_fail": true, "level": 1 } + } +] diff --git a/data/mods/Xedra_Evolved/items/comestibles/raw_fruit.json b/data/mods/Xedra_Evolved/items/comestibles/raw_fruit.json index 7b05a56c264bd..7c6d9d1ac5c90 100644 --- a/data/mods/Xedra_Evolved/items/comestibles/raw_fruit.json +++ b/data/mods/Xedra_Evolved/items/comestibles/raw_fruit.json @@ -59,5 +59,18 @@ "fun": 5, "flags": [ "SMOKABLE" ], "smoking_result": "dry_fruit" + }, + { + "type": "GENERIC", + "id": "xe_elder_ginseng", + "name": { "str": "elder ginseng", "str_pl": "several elder ginseng" }, + "//": "magical poisons, 'death' and 'bio' related", + "color": "white", + "symbol": "*", + "description": "A clump of off white roots in the shape of a humanoid body. It feels strange to the touch, almost alive.", + "price_postapoc": 700, + "volume": "5 ml", + "weight": "5 g", + "material": "veggy" } ] diff --git a/data/mods/Xedra_Evolved/items/ethereal_items.json b/data/mods/Xedra_Evolved/items/ethereal_items.json index e6b8000a84670..0b8279d5e24ec 100644 --- a/data/mods/Xedra_Evolved/items/ethereal_items.json +++ b/data/mods/Xedra_Evolved/items/ethereal_items.json @@ -95,6 +95,34 @@ } ] }, + { + "id": "aura_drunken_master", + "type": "ARMOR", + "name": "Drunken Master aura", + "description": "Hey I thought this was America…", + "weight": "1 g", + "volume": "1 ml", + "price": 3646, + "symbol": "o", + "color": "white", + "material": [ "dreamstuff" ], + "flags": [ "PERSONAL", "SEMITANGIBLE", "OVERSIZE", "ONLY_ONE", "TRADER_AVOID", "NO_TAKEOFF", "NONCONDUCTIVE" ], + "relic_data": { + "passive_effects": [ + { + "has": "WORN", + "condition": "ALWAYS", + "values": [ + { "value": "STRENGTH", "add": 3 }, + { "value": "DEXTERITY", "add": 3 }, + { "value": "INTELLIGENCE", "add": -6 }, + { "value": "PERCEPTION", "add": -3 } + ], + "mutations": [ "DRUNKEN", "GOODCARDIO" ] + } + ] + } + }, { "type": "TOOL", "id": "xe_oneiric_hammer", diff --git a/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json b/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json index a169f4a4c5fe7..3f043077e84cd 100644 --- a/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json +++ b/data/mods/Xedra_Evolved/mapgen/overmap_terrain.json @@ -1,7 +1,7 @@ [ { "type": "overmap_terrain", - "name": "government office", + "name": "border patrol office", "id": [ "field_office_1", "field_office_2", diff --git a/data/mods/Xedra_Evolved/monsters/changeling.json b/data/mods/Xedra_Evolved/monsters/changeling.json index 39a192a595d29..ac98457be403d 100644 --- a/data/mods/Xedra_Evolved/monsters/changeling.json +++ b/data/mods/Xedra_Evolved/monsters/changeling.json @@ -49,7 +49,17 @@ "fungalize_into": "mon_cracked_mirror", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "DROPS_AMMO" ], - "armor": { "bash": 6, "cut": 6, "stab": 6, "heat": 6, "bullet": 6, "electric": 2 } + "armor": { + "bash": 6, + "cut": 6, + "stab": 6, + "heat": 6, + "bullet": 6, + "electric": 2, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_changeling_bannerman", @@ -64,7 +74,18 @@ "melee_dice_sides": 5, "melee_damage": [ { "damage_type": "cut", "amount": 8 } ], "death_drops": "changeling_bannerman_death_drops", - "armor": { "stab": 6, "heat": 6, "electric": 2, "bash": 8, "cut": 8, "bullet": 8, "pure": 8 } + "armor": { + "stab": 6, + "heat": 6, + "electric": 2, + "bash": 8, + "cut": 8, + "bullet": 8, + "pure": 8, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_redcap_aspirant", @@ -83,7 +104,18 @@ "melee_damage": [ { "damage_type": "cut", "amount": 12 } ], "special_attacks": [ { "id": "impale" } ], "death_drops": "changeling_redcap_aspirant_death_drops", - "armor": { "stab": 6, "heat": 6, "electric": 2, "bash": 12, "cut": 12, "bullet": 24, "pure": 16 } + "armor": { + "stab": 6, + "heat": 6, + "electric": 2, + "bash": 12, + "cut": 12, + "bullet": 24, + "pure": 16, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_pooka_aspirant", @@ -102,7 +134,18 @@ "melee_damage": [ { "damage_type": "cut", "amount": 12 } ], "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ], "death_drops": "changeling_pooka_aspirant_death_drops", - "armor": { "stab": 6, "heat": 6, "electric": 2, "bash": 12, "cut": 12, "bullet": 24, "pure": 16 } + "armor": { + "stab": 6, + "heat": 6, + "electric": 2, + "bash": 12, + "cut": 12, + "bullet": 24, + "pure": 16, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_march_lord", @@ -136,7 +179,18 @@ "death_drops": "changeling_lord_death_drops", "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ], "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "DROPS_AMMO" ], - "armor": { "bash": 22, "cut": 36, "stab": 16, "heat": 90, "bullet": 36, "electric": 2, "pure": 160 } + "armor": { + "bash": 22, + "cut": 36, + "stab": 16, + "heat": 90, + "bullet": 36, + "electric": 2, + "pure": 160, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_draugr", @@ -180,7 +234,16 @@ "PUSH_MON", "FILTHY" ], - "armor": { "bash": 6, "cut": 6, "stab": 9, "bullet": 6, "electric": 2 } + "armor": { + "bash": 6, + "cut": 6, + "stab": 9, + "bullet": 6, + "electric": 2, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_cracked_mirror", @@ -211,7 +274,16 @@ "special_attacks": [ [ "FUNGUS", 200 ], { "id": "bite_humanoid", "cooldown": 5 }, { "id": "grab" } ], "death_drops": "changeling_death_drops", "flags": [ "SEES", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "PUSH_MON", "FILTHY" ], - "armor": { "bash": 2, "cut": 9, "stab": 16, "bullet": 12, "electric": 20 } + "armor": { + "bash": 2, + "cut": 9, + "stab": 16, + "bullet": 12, + "electric": 20, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_fetch_child", @@ -271,7 +343,7 @@ "vision_night": 3, "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s bursts into a rain of pollen!" }, "flags": [ "SEES", "HEARS", "WARM", "BASHES" ], - "armor": { "cut": 4, "bullet": 4 } + "armor": { "cut": 4, "bullet": 4, "xe_cold_iron_cut_damage": 0, "xe_cold_iron_bash_damage": 0, "xe_cold_iron_stab_damage": 0 } }, { "id": "mon_fae_wolf", @@ -304,7 +376,7 @@ "path_settings": { "max_dist": 10 }, "special_attacks": [ { "type": "bite", "cooldown": 6 } ], "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "BASHES", "HIT_AND_RUN" ], - "armor": { "cut": 5, "bullet": 15 } + "armor": { "cut": 5, "bullet": 15, "xe_cold_iron_cut_damage": 0, "xe_cold_iron_bash_damage": 0, "xe_cold_iron_stab_damage": 0 } }, { "id": "mon_goblin_spider", @@ -338,7 +410,14 @@ "weakpoint_sets": [ "wps_humanoid_head_small", "wps_arthropod_spider" ], "families": [ "prof_wp_demihuman" ], "flags": [ "SEES", "SMELLS", "HEARS", "WEBWALK", "CLIMBS", "PATH_AVOID_FIRE", "PATH_AVOID_FALL", "NIGHT_INVISIBILITY" ], - "armor": { "bash": 2, "cut": 6, "bullet": 8 } + "armor": { + "bash": 2, + "cut": 6, + "bullet": 8, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_xe_unicorn", @@ -383,7 +462,17 @@ "WARM", "HIT_AND_RUN" ], - "armor": { "bash": 8, "cut": 6, "bullet": 18, "electric": 9, "cold": 20, "pure": 10 } + "armor": { + "bash": 8, + "cut": 6, + "bullet": 18, + "electric": 9, + "cold": 20, + "pure": 10, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } }, { "id": "mon_xe_unicorn_foal", @@ -419,7 +508,7 @@ "special_attacks": [ [ "EAT_CROP", 100 ] ], "petfood": { "food": [ "UNICORNFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." }, "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PET_WONT_FOLLOW", "PATH_AVOID_DANGER_1", "WARM", "NO_BREED" ], - "armor": { "bash": 2, "electric": 1 } + "armor": { "bash": 2, "electric": 1, "xe_cold_iron_cut_damage": 0, "xe_cold_iron_bash_damage": 0, "xe_cold_iron_stab_damage": 0 } }, { "id": "mon_xe_mavka", @@ -504,6 +593,14 @@ "COMBAT_MOUNT", "INSECTICIDEPROOF" ], - "armor": { "bash": 10, "cut": 16, "bullet": 13, "electric": 2 } + "armor": { + "bash": 10, + "cut": 16, + "bullet": 13, + "electric": 2, + "xe_cold_iron_cut_damage": 0, + "xe_cold_iron_bash_damage": 0, + "xe_cold_iron_stab_damage": 0 + } } ] diff --git a/data/mods/Xedra_Evolved/mutations/mutations.json b/data/mods/Xedra_Evolved/mutations/mutations.json index e6e065389158d..518d63ef2f7cd 100644 --- a/data/mods/Xedra_Evolved/mutations/mutations.json +++ b/data/mods/Xedra_Evolved/mutations/mutations.json @@ -63,6 +63,33 @@ "valid": false, "description": "You feel like you've left behind your old life and form." }, + { + "type": "mutation", + "id": "DRUNKEN", + "name": { "str": "Drunken Master" }, + "points": 1, + "description": "The ancient arts of drunken brawling come naturally to you! While under the influence of alcohol, your melee skill will rise considerably, especially unarmed combat.", + "starting_trait": true, + "valid": false, + "cancels": [ "LIGHTWEIGHT" ] + }, + { + "type": "mutation", + "id": "KI_STRIKE", + "name": { "str": "Ki Strike" }, + "points": 2, + "description": "Who needs weapons? You deal more melee damage while fighting barehanded and without gloves. This damage improves as your unarmed skill increases.", + "starting_trait": true, + "valid": false + }, + { + "type": "mutation", + "id": "EXTEND_LIFE", + "name": { "str": "Extended Life" }, + "points": 0, + "description": "You swallow the potion and feel younger already. Though the taste lingers long past when you'd hope it would pass.", + "valid": false + }, { "type": "mutation", "id": "NIGHTMARE_CHIMERAS", @@ -235,5 +262,15 @@ "flags": [ "CANNIBAL", "SUNBURN", "DAYFEAR" ], "metabolism_modifier": 5, "stamina_regen_modifier": 0.1 + }, + { + "type": "mutation", + "id": "BLOOD_OF_SAINTS", + "name": { "str": "Saint's blood" }, + "points": 0, + "description": "Through a complicated ritual utilizing a saint's relic, you have transubstantiated your own blood with the holy blood of the saints. It'll prevent you from becoming infected with vampirism while you live, effects postmortem unknown.", + "valid": false, + "purifiable": false, + "types": [ "BLOOD" ] } ] diff --git a/data/mods/Xedra_Evolved/perks/perk_data/Alchemy1.json b/data/mods/Xedra_Evolved/perks/perk_data/Alchemy1.json new file mode 100644 index 0000000000000..2e89b31eeddc0 --- /dev/null +++ b/data/mods/Xedra_Evolved/perks/perk_data/Alchemy1.json @@ -0,0 +1,87 @@ +[ + { + "type": "effect_on_condition", + "id": "EOC_ALCHEMY1", + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY1" }, { "not": { "u_has_effect": "mental_exhaustion" } } ] }, + "effect": [ + { + "u_roll_remainder": [ "extra_str_aspirin", "blackout_rage_drink", "sixdust", "small_blessing_brigit" ], + "type": "recipe" + }, + { "u_add_effect": "mental_exhaustion", "intensity": 1, "duration": "24 hours" }, + { "u_message": "You learn a new secret of alchemy." } + ], + "false_effect": [ { "u_message": "Your thoughts are too scattered to unearth more secrets of the universe." } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_ALCHEMY2", + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY2" }, { "not": { "u_has_effect": "mental_exhaustion" } } ] }, + "effect": [ + { + "u_roll_remainder": [ "prophets_lsd", "truckers_stamina_pills", "spiritshow_dust", "charm_of_marzanna" ], + "type": "recipe" + }, + { "u_add_effect": "mental_exhaustion", "intensity": 1, "duration": "48 hours" }, + { "u_message": "You learn a new secret of alchemy." } + ], + "false_effect": [ { "u_message": "Your thoughts are too scattered to unearth more secrets of the universe." } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_ALCHEMY3", + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY3" }, { "not": { "u_has_effect": "mental_exhaustion" } } ] }, + "effect": [ + { + "u_roll_remainder": [ + "feline_periapta", + "lupine_periapta", + "cephalopod_periapta", + "plant_periapta", + "scorpion_periapta", + "butterfly_periapta", + "spider_periapta", + "cold_iron_ingot" + ], + "type": "recipe" + }, + { "u_add_effect": "mental_exhaustion", "intensity": 1, "duration": "96 hours" }, + { "u_message": "You learn a new secret of alchemy." } + ], + "false_effect": [ { "u_message": "Your thoughts are too scattered to unearth more secrets of the universe." } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_COLD_IRON", + "condition": { + "and": [ + { "u_has_trait": "perk_ALCHEMY3" }, + { "u_has_trait": "perk_ALCHEMY3_COLD_IRON" }, + { "not": { "u_has_effect": "mental_exhaustion" } } + ] + }, + "effect": [ + { + "u_roll_remainder": [ "cold_iron_knife", "cold_iron_sword", "cold_iron_warhammer", "cold_iron_battleaxe", "blood_of_saints" ], + "type": "recipe" + }, + { "u_add_effect": "mental_exhaustion", "intensity": 1, "duration": "96 hours" }, + { "u_message": "You learn a new secret of alchemy." } + ], + "false_effect": [ { "u_message": "Your thoughts are too scattered to unearth more secrets of the universe." } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_ALCHEMY4", + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY4" }, { "not": { "u_has_effect": "mental_exhaustion" } } ] }, + "effect": [ + { + "u_roll_remainder": [ "life_extension_potion", "potion_strength", "potion_dex", "hares_leap_potion" ], + "type": "recipe" + }, + { "u_add_effect": "mental_exhaustion", "intensity": 1, "duration": "192 hours" }, + { "u_message": "You learn a new secret of alchemy." } + ], + "false_effect": [ { "u_message": "Your thoughts are too scattered to unearth more secrets of the universe." } ] + } +] diff --git a/data/mods/Xedra_Evolved/perks/perk_menu.json b/data/mods/Xedra_Evolved/perks/perk_menu.json new file mode 100644 index 0000000000000..b829828c7cd84 --- /dev/null +++ b/data/mods/Xedra_Evolved/perks/perk_menu.json @@ -0,0 +1,206 @@ +[ + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_MAIN", + "responses": [ + { + "condition": { "not": { "u_has_trait": "perk_ALCHEMY1" } }, + "text": "Gain [ Basic Alchemical Knowledge ]", + "topic": "TALK_PERK_MENU_ALCHEMY1" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_ALCHEMY1", + "dynamic_line": ": \"\"", + "responses": [ + { + "text": "Select Perk.", + "topic": "TALK_PERK_MENU_MAIN", + "condition": { "compare_num": [ { "u_val": "var", "var_name": "num_perks" }, ">", { "const": 0 } ] }, + "failure_explanation": "Requirements Not Met", + "failure_topic": "TALK_PERK_MENU_FAIL", + "effect": [ + { "u_add_trait": "perk_ALCHEMY1" }, + { + "arithmetic": [ { "u_val": "var", "var_name": "num_perks" }, "=", { "u_val": "var", "var_name": "num_perks" }, "-", { "const": 1 } ] + } + ] + }, + { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, + { "text": "Quit.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_MAIN", + "responses": [ + { + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY1" }, { "not": { "u_has_trait": "perk_ALCHEMY2" } } ] }, + "text": "Gain [ Initiate Alchemy ]", + "topic": "TALK_PERK_MENU_ALCHEMY2" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_ALCHEMY2", + "dynamic_line": ": \"\"", + "responses": [ + { + "text": "Select Perk.", + "topic": "TALK_PERK_MENU_MAIN", + "condition": { "compare_num": [ { "u_val": "var", "var_name": "num_perks" }, ">", { "const": 0 } ] }, + "failure_explanation": "Requirements Not Met", + "failure_topic": "TALK_PERK_MENU_FAIL", + "effect": [ + { "u_add_trait": "perk_ALCHEMY2" }, + { + "arithmetic": [ { "u_val": "var", "var_name": "num_perks" }, "=", { "u_val": "var", "var_name": "num_perks" }, "-", { "const": 1 } ] + } + ] + }, + { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, + { "text": "Quit.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_MAIN", + "responses": [ + { + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY2" }, { "not": { "u_has_trait": "perk_ALCHEMY3" } } ] }, + "text": "Gain [ Adept Alchemy ]", + "topic": "TALK_PERK_MENU_ALCHEMY3" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_ALCHEMY3", + "dynamic_line": ": \"\"", + "responses": [ + { + "text": "Select Perk.", + "topic": "TALK_PERK_MENU_MAIN", + "condition": { "compare_num": [ { "u_val": "var", "var_name": "num_perks" }, ">", { "const": 0 } ] }, + "failure_explanation": "Requirements Not Met", + "failure_topic": "TALK_PERK_MENU_FAIL", + "effect": [ + { "u_add_trait": "perk_ALCHEMY3" }, + { + "arithmetic": [ { "u_val": "var", "var_name": "num_perks" }, "=", { "u_val": "var", "var_name": "num_perks" }, "-", { "const": 1 } ] + } + ] + }, + { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, + { "text": "Quit.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_MAIN", + "responses": [ + { + "condition": { + "and": [ + { "u_has_trait": "perk_ALCHEMY3" }, + { "u_know_recipe": "cold_iron_ingot" }, + { "not": { "u_has_trait": "perk_ALCHEMY3_COLD_IRON" } } + ] + }, + "text": "Gain [ Cold Iron Knowledge ]", + "topic": "TALK_PERK_MENU_ALCHEMY3_COLD_IRON" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_ALCHEMY3_COLD_IRON", + "dynamic_line": ": \"\"", + "responses": [ + { + "text": "Select Perk.", + "topic": "TALK_PERK_MENU_MAIN", + "condition": { "compare_num": [ { "u_val": "var", "var_name": "num_perks" }, ">", { "const": 0 } ] }, + "failure_explanation": "Requirements Not Met", + "failure_topic": "TALK_PERK_MENU_FAIL", + "effect": [ + { "u_add_trait": "perk_ALCHEMY3_COLD_IRON" }, + { + "arithmetic": [ { "u_val": "var", "var_name": "num_perks" }, "=", { "u_val": "var", "var_name": "num_perks" }, "-", { "const": 1 } ] + } + ] + }, + { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, + { "text": "Quit.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_MAIN", + "responses": [ + { + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY3" }, { "not": { "u_has_trait": "perk_ALCHEMY4" } } ] }, + "text": "Gain [ Magister Alchemy ]", + "topic": "TALK_PERK_MENU_ALCHEMY4" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_ALCHEMY4", + "dynamic_line": ": \"\"", + "responses": [ + { + "text": "Select Perk.", + "topic": "TALK_PERK_MENU_MAIN", + "condition": { "compare_num": [ { "u_val": "var", "var_name": "num_perks" }, ">", { "const": 0 } ] }, + "failure_explanation": "Requirements Not Met", + "failure_topic": "TALK_PERK_MENU_FAIL", + "effect": [ + { "u_add_trait": "perk_ALCHEMY4" }, + { + "arithmetic": [ { "u_val": "var", "var_name": "num_perks" }, "=", { "u_val": "var", "var_name": "num_perks" }, "-", { "const": 1 } ] + } + ] + }, + { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, + { "text": "Quit.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_MAIN", + "responses": [ + { + "condition": { "and": [ { "u_has_trait": "perk_ALCHEMY4" }, { "not": { "u_has_trait": "perk_ALCHEMY5" } } ] }, + "text": "Gain [ Illuminated Alchemy ]", + "topic": "TALK_PERK_MENU_ALCHEMY5" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_PERK_MENU_ALCHEMY4", + "dynamic_line": ": \"\"", + "responses": [ + { + "text": "Select Perk.", + "topic": "TALK_PERK_MENU_MAIN", + "condition": { "compare_num": [ { "u_val": "var", "var_name": "num_perks" }, ">", { "const": 0 } ] }, + "failure_explanation": "Requirements Not Met", + "failure_topic": "TALK_PERK_MENU_FAIL", + "effect": [ + { "u_add_trait": "perk_ALCHEMY5" }, + { + "arithmetic": [ { "u_val": "var", "var_name": "num_perks" }, "=", { "u_val": "var", "var_name": "num_perks" }, "-", { "const": 1 } ] + } + ] + }, + { "text": "Go Back.", "topic": "TALK_PERK_MENU_MAIN" }, + { "text": "Quit.", "topic": "TALK_DONE" } + ] + } +] diff --git a/data/mods/Xedra_Evolved/perks/perks.json b/data/mods/Xedra_Evolved/perks/perks.json new file mode 100644 index 0000000000000..7f3ebd9c53e1d --- /dev/null +++ b/data/mods/Xedra_Evolved/perks/perks.json @@ -0,0 +1,62 @@ +[ + { + "type": "mutation", + "id": "perk_ALCHEMY1", + "name": { "str": "Basic Alchemical Knowledge" }, + "points": 0, + "description": "You spent years before the Cataclysm researching esoteric sciences and occult mysteries but only now in the heat of survival, have you experienced the epiphany that will allow you to create alchemical substances.", + "category": [ "perk" ], + "active": true, + "activated_eocs": [ "EOC_ALCHEMY1" ] + }, + { + "type": "mutation", + "id": "perk_ALCHEMY2", + "name": { "str": "Initiate Alchemy" }, + "points": 0, + "description": "The days and weeks since the Cataclysm have been a blur of ideas and thoughts that you can only wish you had been able to think of before everything ended.", + "category": [ "perk" ], + "active": true, + "activated_eocs": [ "EOC_ALCHEMY2" ] + }, + { + "type": "mutation", + "id": "perk_ALCHEMY3", + "name": { "str": "Adept Alchemical Knowledge" }, + "points": 0, + "description": "The things you've learned would have changed your life in the old days, you could have dropped out of the rat race and become a hidden master of the occult.", + "category": [ "perk" ], + "active": true, + "activated_eocs": [ "EOC_ALCHEMY3" ] + }, + { + "type": "mutation", + "id": "perk_ALCHEMY3_COLD_IRON", + "name": { "str": "Cold Iron Knowledge" }, + "points": 0, + "description": "You've mastered the technique of cold forging iron from ingots into various items and weapons that are particularly effective against creatures from faerie myths.", + "category": [ "perk" ], + "active": true, + "activated_eocs": [ "EOC_ALCHEMY3_COLD_IRON" ] + }, + { + "type": "mutation", + "id": "perk_ALCHEMY4", + "name": { "str": "Magister Alchemical Knowledge" }, + "points": 0, + "description": "At this stage in your occult education, normally you would start a small cabal of your own with apprentices that would engage in research and material gathering. You would likely have several rich patrons financing you in return for alchemical medicines and goods to give them health and longevity.", + "category": [ "perk" ], + "active": true, + "activated_eocs": [ "EOC_ALCHEMY4" ] + }, + { + "type": "mutation", + "id": "perk_ALCHEMY5", + "name": { "str": "Illuminated Alchemy" }, + "points": 0, + "description": "Truly you have become one of the hidden occult masters of the world. It's a pity that so few people are around for you to enjoy the benefits of your knowledge. At least it's helping you to survive and maybe even thrive in this post-Cataclysm world.", + "category": [ "perk" ], + "active": true, + "activated_eocs": [ "EOC_ALCHEMY5" ] + } +] diff --git a/data/mods/Xedra_Evolved/recipes/alchemy.json b/data/mods/Xedra_Evolved/recipes/alchemy.json new file mode 100644 index 0000000000000..63f9433d5a528 --- /dev/null +++ b/data/mods/Xedra_Evolved/recipes/alchemy.json @@ -0,0 +1,363 @@ +[ + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "extra_str_aspirin", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "chemistry", + "skills_required": [ "firstaid", 1 ], + "difficulty": 2, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_pharmaceutical" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], + "components": [ [ [ "chem_ethanol", 1 ] ], [ [ "aspirin", 1 ] ], [ [ "faewild", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "small_blessing_brigit", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_DRUGS", + "skill_used": "chemistry", + "skills_required": [ "cooking", 1 ], + "flags": [ "SECRET" ], + "difficulty": 2, + "time": "160 m", + "result_mult": 3, + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_pharmaceutical" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], + "components": [ [ [ "water_clean", 1 ] ], [ [ "corpse_ash", 1 ] ], [ [ "poppy_bud", 1 ] ], [ [ "royal_jelly", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "blackout_rage_drink", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "deduction", + "difficulty": 3, + "time": "1 m", + "batch_time_factors": [ 50, 4 ], + "autolearn": true, + "result_mult": 6, + "flags": [ "SECRET" ], + "components": [ [ [ "energy_drink", 3 ] ], [ [ "vodka", 3 ], [ "tequila", 3 ] ], [ [ "lotus_blossom", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "sixdust", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "deduction", + "difficulty": 6, + "time": "1 h", + "result_mult": 20, + "batch_time_factors": [ 80, 1 ], + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_organic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ + [ [ "surface_heat", 50, "LIST" ] ], + [ [ "electrolysis_kit", 200 ] ], + [ [ "chem_sulphuric_acid", -1 ] ], + [ [ "chem_muriatic_acid", -1 ] ], + [ [ "chem_antimony_trichloride", -1 ] ], + [ [ "chem_ferric_chloride", -1 ] ], + [ [ "silver_small", -1 ] ], + [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] + ], + "components": [ + [ [ "chem_ethanol", 46 ] ], + [ [ "salt_water", 4 ] ], + [ [ "chem_benzene", 90 ] ], + [ [ "disinfectant", 20 ], [ "oxy_powder", 100 ] ], + [ [ "bleach", 5 ] ], + [ [ "wyld_candy", 2 ] ] + ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "prophets_lsd", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "deduction", + "difficulty": 6, + "time": "1 h", + "result_mult": 20, + "batch_time_factors": [ 80, 1 ], + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_organic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ + [ [ "surface_heat", 50, "LIST" ] ], + [ [ "electrolysis_kit", 200 ] ], + [ [ "chem_sulphuric_acid", -1 ] ], + [ [ "chem_muriatic_acid", -1 ] ], + [ [ "chem_antimony_trichloride", -1 ] ], + [ [ "chem_ferric_chloride", -1 ] ], + [ [ "silver_small", -1 ] ], + [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] + ], + "components": [ + [ [ "chem_ethanol", 46 ] ], + [ [ "lsd", 4 ] ], + [ [ "fae_meat", 1 ] ], + [ [ "chem_benzene", 90 ] ], + [ [ "oxy_powder", 100 ] ], + [ [ "scrap_dreamdross", 5 ] ], + [ [ "lotus_blossom", 2 ] ] + ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "truckers_stamina_pills", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "chemistry", + "skills_required": [ "firstaid", 1 ], + "difficulty": 2, + "time": "24 m", + "flags": [ "SECRET" ], + "charges": 10, + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_pharmaceutical" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], + "components": [ [ [ "chem_ethanol", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "truckstop_viagra", 10 ] ], [ [ "faewild", 10 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "feline_periapta", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 1 ], + "difficulty": 3, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "metal_file", -1 ] ] ], + "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "feline_sample", 1 ] ], [ [ "diamond", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "lupine_periapta", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 1 ], + "difficulty": 3, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "metal_file", -1 ] ] ], + "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "lupine_sample", 1 ] ], [ [ "diamond", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "cephalopod_periapta", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 1 ], + "difficulty": 3, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "metal_file", -1 ] ] ], + "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "cephalopod_sample", 1 ] ], [ [ "diamond", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "butterfly_periapta", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 1 ], + "difficulty": 3, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "metal_file", -1 ] ] ], + "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "insect_sample", 1 ] ], [ [ "diamond", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "scorpion_periapta", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 1 ], + "difficulty": 3, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "metal_file", -1 ] ] ], + "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "insect_sample", 1 ] ], [ [ "diamond", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "spider_periapta", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 1 ], + "difficulty": 3, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "metal_file", -1 ] ] ], + "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "spider_sample", 1 ] ], [ [ "diamond", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "plant_periapta", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "skills_required": [ "deduction", 1 ], + "difficulty": 3, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ { "proficiency": "prof_fine_metalsmithing", "required": false, "time_multiplier": 3 } ], + "tools": [ [ [ "metal_file", -1 ] ] ], + "components": [ [ [ "gold_necklace", 1 ] ], [ [ "scrap_dreamdross", 3 ] ], [ [ "plant_sample", 1 ] ], [ [ "diamond", 1 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "life_extension_potion", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "chemistry", + "skills_required": [ "firstaid", 4 ], + "difficulty": 5, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_pharmaceutical" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], + "components": [ [ [ "chem_sulphur", 1 ] ], [ [ "chem_manganese_dioxide", 1 ] ], [ [ "xe_elder_ginseng", 1 ] ], [ [ "water", 2 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "potion_dex", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "chemistry", + "skills_required": [ "firstaid", 4 ], + "difficulty": 5, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_pharmaceutical" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], + "components": [ + [ [ "chem_sulphur", 1 ] ], + [ [ "chem_manganese_dioxide", 1 ] ], + [ [ "feline_sample", 1 ], [ "lupine_sample", 1 ], [ "batrachian_sample", 1 ] ], + [ [ "water", 2 ] ] + ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "potion_strength", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "chemistry", + "skills_required": [ "firstaid", 4 ], + "difficulty": 5, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_pharmaceutical" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], + "components": [ + [ [ "chem_sulphur", 1 ] ], + [ [ "chem_manganese_dioxide", 1 ] ], + [ [ "cattle_sample", 1 ], [ "ursine_sample", 1 ], [ "beast_sample", 1 ] ], + [ [ "water", 2 ] ] + ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "hares_leap_potion", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "chemistry", + "skills_required": [ "firstaid", 4 ], + "difficulty": 5, + "time": "24 m", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_pharmaceutical" } + ], + "qualities": [ { "id": "CHEM", "level": 2 } ], + "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], + "components": [ + [ [ "chem_sulphur", 1 ] ], + [ [ "chem_manganese_dioxide", 1 ] ], + [ [ "batrachian_sample", 1 ], [ "rabbit_sample", 1 ] ], + [ [ "water", 2 ] ] + ] + } +] diff --git a/data/mods/Xedra_Evolved/recipes/category.json b/data/mods/Xedra_Evolved/recipes/category.json index 1acfd3209a37b..35bb4cd4256d7 100644 --- a/data/mods/Xedra_Evolved/recipes/category.json +++ b/data/mods/Xedra_Evolved/recipes/category.json @@ -2,6 +2,13 @@ { "type": "recipe_category", "id": "CC_XEDRA", - "recipe_subcategories": [ "CSC_XEDRA_RESEARCH", "CSC_XEDRA_WEAPONS", "CSC_XEDRA_ARMOR", "CSC_XEDRA_ROBOTS", "CSC_XEDRA_MISC" ] + "recipe_subcategories": [ + "CSC_XEDRA_RESEARCH", + "CSC_XEDRA_WEAPONS", + "CSC_XEDRA_ARMOR", + "CSC_XEDRA_ROBOTS", + "CSC_XEDRA_MISC", + "CSC_XEDRA_ALCHEMY" + ] } ] diff --git a/data/mods/Xedra_Evolved/recipes/cold_iron.json b/data/mods/Xedra_Evolved/recipes/cold_iron.json new file mode 100644 index 0000000000000..b00ed36ebbae8 --- /dev/null +++ b/data/mods/Xedra_Evolved/recipes/cold_iron.json @@ -0,0 +1,147 @@ +[ + { + "type": "recipe", + "activity_level": "BRISK_EXERCISE", + "result": "cold_iron_ingot", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "difficulty": 3, + "time": "8 h", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_blacksmithing" }, + { "proficiency": "prof_toolsmithing" } + ], + "using": [ [ "blacksmithing_standard", 8 ], [ "lc_steel_standard", 2 ] ], + "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], + "components": [ [ [ "wax", 1 ] ], [ [ "lamp_oil", 5 ] ], [ [ "scrap_dreamdross", 1 ], [ "holy_symbol", 2 ] ] ] + }, + { + "type": "recipe", + "activity_level": "BRISK_EXERCISE", + "result": "cold_iron_warhammer", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "difficulty": 7, + "time": "8 h", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_blacksmithing" }, + { "proficiency": "prof_toolsmithing" }, + { "proficiency": "prof_carving", "skill_penalty": 0 } + ], + "using": [ [ "blacksmithing_standard", 8 ] ], + "qualities": [ { "id": "GRIND", "level": 2 } ], + "tools": [ [ [ "drift", -1 ] ] ], + "components": [ [ [ "cold_iron_ingot", 4 ] ], [ [ "2x4", 1 ], [ "stick", 2 ] ] ] + }, + { + "type": "recipe", + "activity_level": "BRISK_EXERCISE", + "result": "cold_iron_arming_sword", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "difficulty": 7, + "time": "7 h", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_blacksmithing" }, + { "proficiency": "prof_bladesmith" } + ], + "using": [ [ "blacksmithing_standard", 12 ], [ "tailoring_leather_patchwork_simple", 1 ] ], + "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "GRIND", "level": 2 } ], + "tools": [ [ [ "tongs", -1 ] ], [ [ "hotcut", -1 ] ] ], + "components": [ [ [ "cold_iron_ingot", 2 ] ] ] + }, + { + "type": "recipe", + "activity_level": "BRISK_EXERCISE", + "result": "cold_iron_battleaxe", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "difficulty": 8, + "time": "8 h", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_metalworking", "time_multiplier": 1.2, "learning_time_multiplier": 0.2, "skill_penalty": 0 }, + { + "proficiency": "prof_blacksmithing", + "time_multiplier": 1.2, + "learning_time_multiplier": 0.2, + "skill_penalty": 0 + }, + { + "proficiency": "prof_bladesmith", + "time_multiplier": 1.2, + "learning_time_multiplier": 0.2, + "skill_penalty": 0 + }, + { "proficiency": "prof_carving", "time_multiplier": 1.2, "learning_time_multiplier": 0.2, "skill_penalty": 0 } + ], + "using": [ [ "blacksmithing_standard", 12 ] ], + "qualities": [ { "id": "GRIND", "level": 2 } ], + "tools": [ [ [ "hotcut", -1 ], [ "drift", -1 ] ] ], + "components": [ [ [ "2x4", 2 ], [ "stick", 4 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ], [ [ "cold_iron_ingot", 4 ] ] ] + }, + { + "type": "recipe", + "activity_level": "BRISK_EXERCISE", + "result": "cold_iron_knife", + "category": "CC_XEDRA", + "subcategory": "CSC_XEDRA_ALCHEMY", + "skill_used": "fabrication", + "difficulty": 4, + "time": "6 h 30 m", + "flags": [ "SECRET" ], + "proficiencies": [ + { "proficiency": "prof_metalworking" }, + { "proficiency": "prof_blacksmithing" }, + { "proficiency": "prof_bladesmith" } + ], + "using": [ [ "forging_standard", 2 ] ], + "qualities": [ { "id": "GRIND", "level": 2 } ], + "tools": [ [ [ "tongs", -1 ], [ "metalworking_tongs", -1 ] ], [ [ "casting_mold", -1 ] ] ], + "components": [ + [ [ "cordage_short", 2, "LIST" ] ], + [ [ "cold_iron_ingot", 1 ] ], + [ [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "adhesive", 2, "LIST" ] ] + ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "blood_of_saints", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_MUTAGEN", + "skill_used": "chemistry", + "skills_required": [ "deduction", 3 ], + "difficulty": 6, + "time": "45 m", + "batch_time_factors": [ 80, 20 ], + "flags": [ "SECRET" ], + "using": [ [ "mutagen_production_standard", 25 ] ], + "proficiencies": [ + { "proficiency": "prof_intro_chemistry" }, + { "proficiency": "prof_inorganic_chemistry" }, + { "proficiency": "prof_biochemistry" }, + { "proficiency": "prof_intro_chem_synth" }, + { "proficiency": "prof_chem_synth" } + ], + "components": [ + [ [ "small_relic", 2 ] ], + [ [ "bleach", 2 ], [ "oxy_powder", 200 ] ], + [ [ "ammonia_liquid", 1 ], [ "lye_powder", 100 ] ], + [ [ "mercury", 1 ] ], + [ [ "silver_small", 3 ] ], + [ [ "gold_small", 1 ] ] + ] + } +] diff --git a/data/mods/Xedra_Evolved/spells/item_spells.json b/data/mods/Xedra_Evolved/spells/item_spells.json index 167e6f41f5b96..6329c6c2019d4 100644 --- a/data/mods/Xedra_Evolved/spells/item_spells.json +++ b/data/mods/Xedra_Evolved/spells/item_spells.json @@ -29,6 +29,29 @@ "effect": "recover_energy", "effect_str": "STAMINA" }, + { + "id": "blackout_rage_drink", + "type": "SPELL", + "name": "Blackout rage drank", + "//": "Used for blackout rage drink, not castable.", + "description": "This spell transforms you into a drunken master.", + "valid_targets": [ "self" ], + "flags": [ "SILENT", "NO_LEGS", "NO_HANDS" ], + "effect": "spawn_item", + "effect_str": "aura_drunken_master", + "shape": "blast", + "max_level": 1, + "min_damage": 1, + "max_damage": 1, + "damage_increment": 0, + "damage_type": "biological", + "difficulty": 0, + "spell_class": "NONE", + "base_casting_time": 300, + "base_energy_cost": 2, + "min_duration": 432000, + "max_duration": 432000 + }, { "id": "bio_explosion", "type": "SPELL", @@ -141,5 +164,113 @@ "min_field_intensity": 1, "max_field_intensity": 1, "field_chance": 1 + }, + { + "type": "SPELL", + "id": "learn_blood_of_saints", + "name": { "str": "Blood of Saints" }, + "effect": "mutate", + "shape": "blast", + "effect_str": "BLOOD_OF_SAINTS", + "description": "This grants a specific mutation.", + "message": "You imbibed the concoction and you feel your veins flex in a warm glow.", + "min_damage": 10000, + "max_damage": 10000, + "flags": [ "SILENT", "MUTATE_TRAIT" ], + "valid_targets": [ "self", "ally" ] + }, + { + "type": "SPELL", + "id": "extend_life", + "name": { "str": "Extend Life" }, + "effect": "mutate", + "shape": "blast", + "effect_str": "EXTEND_LIFE", + "description": "This grants a specific mutation.", + "message": "You imbibed the concoction and you feel your chakras align and your DNA de-age.", + "min_damage": 10000, + "max_damage": 10000, + "flags": [ "SILENT", "MUTATE_TRAIT" ], + "valid_targets": [ "self", "ally" ] + }, + { + "type": "SPELL", + "id": "hyde_formula", + "name": { "str": "Hyde Formula" }, + "effect": "mutate", + "shape": "blast", + "effect_str": "HYDE", + "description": "This grants a specific mutation.", + "message": "You imbibed the concoction and you feel your inner self unleashed.", + "min_damage": 10000, + "max_damage": 10000, + "flags": [ "SILENT", "MUTATE_TRAIT" ], + "valid_targets": [ "self", "ally" ] + }, + { + "id": "wicked_quick_hands", + "type": "SPELL", + "name": "Wicked Quick Hands", + "description": "You become more graceful, agile, and coordinated.", + "valid_targets": [ "self" ], + "min_duration": 6000, + "max_duration": 360000, + "duration_increment": 17700, + "max_level": 20, + "spell_class": "MAGUS", + "energy_source": "MANA", + "base_energy_cost": 400, + "energy_increment": -5.0, + "final_energy_cost": 300, + "base_casting_time": 250, + "difficulty": 5, + "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ], + "shape": "blast", + "effect": "attack", + "effect_str": "wicked_quick_hands" + }, + { + "id": "terrible_strength", + "type": "SPELL", + "name": "Terrible Strength", + "description": "You gain a terrible strength.", + "valid_targets": [ "self" ], + "min_duration": 6000, + "max_duration": 360000, + "duration_increment": 17700, + "max_level": 20, + "spell_class": "MAGUS", + "energy_source": "MANA", + "base_energy_cost": 400, + "energy_increment": -5.0, + "final_energy_cost": 300, + "base_casting_time": 250, + "difficulty": 5, + "flags": [ "VERBAL", "SOMATIC", "NO_LEGS", "NO_PROJECTILE" ], + "shape": "blast", + "effect": "attack", + "effect_str": "terrible_strength" + }, + { + "type": "SPELL", + "id": "spell_hare_leap", + "name": "Hare Leap", + "description": "You squat down, build up tension in your legs and release. Launching yourself quite a distance.", + "valid_targets": [ "ground" ], + "flags": [ "SILENT", "NO_LEGS", "NO_HANDS", "MUST_HAVE_CLASS_TO_LEARN", "NO_EXPLOSION_SFX" ], + "effect": "dash", + "shape": "cone", + "min_damage": 0, + "max_damage": 0, + "damage_increment": 0, + "damage_type": "bash", + "min_range": 8, + "max_range": 8, + "spell_class": "NONE", + "difficulty": -20, + "base_casting_time": 200, + "base_energy_cost": 200, + "max_level": 1, + "energy_source": "MANA" } ] diff --git a/data/mods/Xedra_Evolved/vitamin.json b/data/mods/Xedra_Evolved/vitamin.json index f9d930835b200..105727f2c81fe 100644 --- a/data/mods/Xedra_Evolved/vitamin.json +++ b/data/mods/Xedra_Evolved/vitamin.json @@ -24,6 +24,19 @@ "disease": [ [ -4800, -5600 ], [ -5601, -6400 ], [ -6401, -11998 ], [ -11999, -12000 ] ], "disease_excess": [ [ 1800, 2400 ], [ 2401, 4400 ], [ 4401, 5600 ] ] }, + { + "id": "cheval", + "type": "vitamin", + "vit_type": "counter", + "name": { "str": "Cheval" }, + "excess": "cheval_overdose", + "deficiency": "cheval_withdrawal", + "min": 0, + "max": 2000, + "rate": "1 m", + "disease": [ [ 1, 400 ] ], + "disease_excess": [ [ 401, 1000 ], [ 1001, 1300 ], [ 1301, 1600 ], [ 1601, 2000 ] ] + }, { "id": "creative_spark_research", "type": "vitamin", diff --git a/src/monstergenerator.cpp b/src/monstergenerator.cpp index 0ff41b9c0e03b..02e9cacbc4295 100644 --- a/src/monstergenerator.cpp +++ b/src/monstergenerator.cpp @@ -133,6 +133,7 @@ std::string enum_to_string( m_flag data ) case MF_ACIDTRAIL: return "ACIDTRAIL"; case MF_SHORTACIDTRAIL: return "SHORTACIDTRAIL"; case MF_FIREPROOF: return "FIREPROOF"; + case MF_IRONWROUGHT: return "IRONWROUGHT"; case MF_SLUDGEPROOF: return "SLUDGEPROOF"; case MF_SLUDGETRAIL: return "SLUDGETRAIL"; case MF_SMALLSLUDGETRAIL: return "SMALLSLUDGETRAIL"; diff --git a/src/mtype.h b/src/mtype.h index fca9624bfe15d..78bd1faaad634 100644 --- a/src/mtype.h +++ b/src/mtype.h @@ -101,6 +101,7 @@ enum m_flag : int { MF_ACIDTRAIL, // Leaves a trail of acid MF_SHORTACIDTRAIL, // Leaves an intermittent trail of acid MF_FIREPROOF, // Immune to fire + MF_IRONWROUGHT, // Immune to cold iron and does cold iron damage instead of any cutting damage MF_SLUDGEPROOF, // Ignores the effect of sludge trails MF_SLUDGETRAIL, // Causes monster to leave a sludge trap trail when moving MF_SMALLSLUDGETRAIL, // Causes monster to leave a low intensity, 1 tile sludge pool approximately every other tile when moving diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index d66f1e71396c3..16614043d2461 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -59,6 +59,7 @@ alay albertonykus albertosaurus alchemic +alchemically alchemies aldosterone alembic @@ -1659,6 +1660,7 @@ macronutrient macrophenotypic macuahuitl maculata +magickal magwells maiasaura maintainers @@ -1958,6 +1960,8 @@ numbnut numpad obovate obsoleted +occultism +occultists ocher octo ocularium @@ -2079,6 +2083,8 @@ pentagonal peptone percents perforator +periapta +periaptas peridot peridots peripheric @@ -2571,6 +2577,7 @@ siloing sinensis sintering sithen +sixdust skeletonized skeltal skillset @@ -2927,6 +2934,7 @@ trippin troglobite troodon troublin +truckstop trudges tryphillum tsumi