diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json index d3a403f2b93cc..9002fe1c4defe 100644 --- a/data/mods/Xedra_Evolved/effects/effects.json +++ b/data/mods/Xedra_Evolved/effects/effects.json @@ -1377,13 +1377,28 @@ "desc": [ "" ], "removes_effects": [ "effect_evil_eye" ] }, + { + "type": "effect_type", + "id": "effect_hedge_no_nightmares", + "//": "Empty to hide effect", + "name": [ "" ], + "desc": [ "" ] + }, { "type": "effect_type", "id": "effect_hedge_increase_healing_rate", "name": [ "Convalescence" ], - "desc": [ "Your wounds are healing more quickly, as long as you don't do to much to upset the charm." ], + "desc": [ "Your wounds are healing more quickly, as long as you don't do too much to upset the charm." ], "enchantments": [ { "values": [ { "value": "REGEN_HP", "multiply": 0.2 } ] } ] }, + { + "type": "effect_type", + "id": "effect_hedge_increase_bandaging_rate", + "name": [ "Halt the Scarlet Flow" ], + "desc": [ "Blood easily stops flowing under your touch." ], + "rating": "good", + "enchantments": [ { "values": [ { "value": "BLEED_STOP_BONUS", "multiply": 0.66 } ] } ] + }, { "type": "effect_type", "id": "mutagen_plantkin", diff --git a/data/mods/Xedra_Evolved/eocs/vanilla_overwrites.json b/data/mods/Xedra_Evolved/eocs/vanilla_overwrites.json new file mode 100644 index 0000000000000..ff73f80d6fb44 --- /dev/null +++ b/data/mods/Xedra_Evolved/eocs/vanilla_overwrites.json @@ -0,0 +1,21 @@ +[ + { + "type": "effect_on_condition", + "id": "EOC_GIVE_NIGHTMARES", + "eoc_type": "EVENT", + "required_event": "character_wakes_up", + "condition": { + "and": [ + { "not": { "u_has_effect": "effect_hedge_no_nightmares" } }, + { "u_has_effect": "nightmares" }, + { "math": [ "dream_counter", "==", "0" ] } + ] + }, + "effect": [ + { "u_message": "nightmares", "snippet": true, "type": "bad" }, + { "u_add_morale": "morale_nightmare", "bonus": [ -15, -30 ], "max_bonus": -30 }, + { "math": [ "dream_counter", "=", "1" ] }, + { "queue_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 } + ] + } +] diff --git a/data/mods/Xedra_Evolved/itemgroups/itemgroups.json b/data/mods/Xedra_Evolved/itemgroups/itemgroups.json index 49be0767202e7..ebc3fe5895b30 100644 --- a/data/mods/Xedra_Evolved/itemgroups/itemgroups.json +++ b/data/mods/Xedra_Evolved/itemgroups/itemgroups.json @@ -399,7 +399,9 @@ "entries": [ { "item": "spellbook_hedge_farm", "prob": 1 }, { "item": "spellbook_hedge_ward_demons", "prob": 1 }, - { "item": "spellbook_hedge_doctor_book", "prob": 1 } + { "item": "spellbook_hedge_doctor_book", "prob": 1 }, + { "item": "spellbook_hedge_blood_book", "prob": 1 }, + { "item": "spellbook_hedge_ward_dreams", "prob": 1 } ] }, { diff --git a/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json b/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json index a5db8b1039aa0..ff7f0bb2ad09f 100644 --- a/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json +++ b/data/mods/Xedra_Evolved/items/spell_learning_items/spellbooks_hedge.json @@ -43,5 +43,41 @@ "symbol": "?", "color": "light_green", "use_action": { "type": "learn_spell", "spells": [ "hedge_increase_healing_rate", "hedge_cure_cold_or_flu", "hedge_light_fire" ] } + }, + { + "id": "spellbook_hedge_blood_book", + "type": "BOOK", + "category": "manuals", + "name": { + "str": "Bloodstoppers and Bearwalkers: Folk Traditions of Michigan's Upper Peninsula", + "str_pl": "copies of Bloodstoppers and Bearwalkers: Folk Traditions of Michigan's Upper Peninsula" + }, + "description": "This is an anthropological collection of American folk beliefs in the Upper Peninsula of Michigan, consisting of stories, legends, descriptions of rituals, tall tales, and anything else the author heard during his period of study. The \"Bloodstoppers\" of the title are individuals believed to be able to stop the flow of blood from a wound, with an incantation or ritual or sheer force of will, and the bearwalkers were allegedly sorcerers who could assume the shape of a bear and cause misfortune.", + "weight": "211 g", + "volume": "500 ml", + "price": 5000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "light_red", + "use_action": { "type": "learn_spell", "spells": [ "hedge_increase_bandaging_rate" ] } + }, + { + "id": "spellbook_hedge_ward_dreams", + "type": "BOOK", + "category": "manuals", + "name": { + "str": "Ward your Dreams for a Good Night's Sleep!", + "str_pl": "copies of Ward your Dreams for a Good Night's Sleep!" + }, + "description": "This is a very thin booklet, more of a pamphlet, about various ways to protect from nightmares. There are quite a few techniques in here, though you're a bit skeptical about whether the author took the end of the world into their calculations.", + "weight": "83 g", + "volume": "132 ml", + "price": 1000, + "material": [ "paper" ], + "looks_like": "cookbook", + "symbol": "?", + "color": "dark_gray", + "use_action": { "type": "learn_spell", "spells": [ "hedge_no_nightmares" ] } } ] diff --git a/data/mods/Xedra_Evolved/mutations/temporary.json b/data/mods/Xedra_Evolved/mutations/temporary.json index aaea53868f8fb..98347dea72cbe 100644 --- a/data/mods/Xedra_Evolved/mutations/temporary.json +++ b/data/mods/Xedra_Evolved/mutations/temporary.json @@ -93,5 +93,18 @@ "starting_trait": false, "purifiable": false, "activated_eocs": [ "EOC_LUCID_DREAM_FORCE_END" ] + }, + { + "type": "mutation", + "id": "HEDGE_FOREST_BUSH_SHAPE", + "name": { "str": "To Vanish Amidst the Leaves" }, + "points": 99, + "description": "You still sleep, yet your dreams still can impact the world. Activate to wake up.", + "valid": false, + "starting_trait": false, + "purifiable": false, + "player_display": false, + "override_look": { "id": "t_shrub", "tile_category": "terrain" }, + "flags": [ "INVISIBLE", "NO_SCENT" ] } ] diff --git a/data/mods/Xedra_Evolved/requirements/spell_components.json b/data/mods/Xedra_Evolved/requirements/spell_components.json index 1a43e16ba4ca6..897c46d3052a4 100644 --- a/data/mods/Xedra_Evolved/requirements/spell_components.json +++ b/data/mods/Xedra_Evolved/requirements/spell_components.json @@ -162,5 +162,23 @@ "type": "requirement", "qualities": [ { "id": "FINE_GRIND", "level": 1 } ], "components": [ [ [ "wild_herbs", 50 ] ], [ [ "willowbark", 4 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ] + }, + { + "id": "spell_components_hedge_increase_bandaging_rate", + "type": "requirement", + "components": [ [ [ "scrap_cast_iron", 1 ] ], [ [ "salt", 10 ] ], [ [ "wild_herbs", 4 ] ] ] + }, + { + "id": "spell_components_hedge_hide_in_forest", + "type": "requirement", + "components": [ + [ [ "leaves", 1 ], [ "grape_leaves", 1 ], [ "young_leaves", 2 ], [ "chicory_leaves", 2 ], [ "wintergreen_leaves", 2 ] ], + [ [ "raw_beans", 1 ] ] + ] + }, + { + "id": "spell_components_hedge_no_nightmares", + "type": "requirement", + "components": [ [ [ "wild_herbs", 15 ] ], [ [ "thyme_oil", 2 ] ] ] } ] diff --git a/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json b/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json index d45a8da5403fb..79e070ae261d3 100644 --- a/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json +++ b/data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json @@ -1,40 +1,59 @@ [ { "type": "effect_on_condition", - "id": "EOC_HEDGE_MAGIC_REMOVE_EFFECTS", - "effect": [ { "u_remove_item_with": "hedge_witchlight" } ] + "id": "EOC_HEDGE_MAGIC_REMOVE_MOVEMENT_EFFECTS", + "effect": [ { "u_lose_trait": "HEDGE_FOREST_BUSH_SHAPE" }, { "u_lose_effect": "effect_hedge_no_nightmares" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_HEDGE_MAGIC_REMOVE_ATTACK_EFFECTS", + "effect": [ { "u_remove_item_with": "hedge_witchlight" }, { "u_lose_trait": "HEDGE_FOREST_BUSH_SHAPE" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_HEDGE_MAGIC_MOVEMENT_CANCEL", + "eoc_type": "EVENT", + "required_event": "avatar_moves", + "condition": { "or": [ { "u_has_trait": "HEDGE_FOREST_BUSH_SHAPE" }, { "u_has_effect": "effect_hedge_no_nightmares" } ] }, + "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_MOVEMENT_EFFECTS" ] } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_HEDGE_MAGIC_MELEE_EOC_CONDITIONS", + "condition": { "or": [ { "u_has_trait": "HEDGE_FOREST_BUSH_SHAPE" }, { "u_has_item": "hedge_witchlight" } ] }, + "effect": [ ] }, { "type": "effect_on_condition", "id": "EOC_HEDGE_MAGIC_MELEE_MONSTER_CANCEL", "eoc_type": "EVENT", "required_event": "character_melee_attacks_monster", - "condition": { "or": [ { "u_has_item": "hedge_witchlight" } ] }, - "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_EFFECTS" ] } ] + "condition": { "test_eoc": "EOC_HEDGE_MAGIC_MELEE_EOC_CONDITIONS" }, + "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_ATTACK_EFFECTS" ] } ] }, { "type": "effect_on_condition", "id": "EOC_HEDGE_MAGIC_MELEE_CHARACTER_CANCEL", "eoc_type": "EVENT", "required_event": "character_melee_attacks_character", - "condition": { "or": [ { "u_has_item": "hedge_witchlight" } ] }, - "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_EFFECTS" ] } ] + "condition": { "test_eoc": "EOC_HEDGE_MAGIC_MELEE_EOC_CONDITIONS" }, + "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_ATTACK_EFFECTS" ] } ] }, { "type": "effect_on_condition", "id": "EOC_HEDGE_MAGIC_RANGED_MONSTER_CANCEL", "eoc_type": "EVENT", "required_event": "character_ranged_attacks_monster", - "condition": { "or": [ { "u_has_item": "hedge_witchlight" } ] }, - "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_EFFECTS" ] } ] + "condition": { "test_eoc": "EOC_HEDGE_MAGIC_MELEE_EOC_CONDITIONS" }, + "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_ATTACK_EFFECTS" ] } ] }, { "type": "effect_on_condition", "id": "EOC_HEDGE_MAGIC_RANGED_CHARACTER_CANCEL", "eoc_type": "EVENT", "required_event": "character_ranged_attacks_character", - "condition": { "or": [ { "u_has_item": "hedge_witchlight" } ] }, - "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_EFFECTS" ] } ] + "condition": { "test_eoc": "EOC_HEDGE_MAGIC_MELEE_EOC_CONDITIONS" }, + "effect": [ { "run_eocs": [ "EOC_HEDGE_MAGIC_REMOVE_ATTACK_EFFECTS" ] } ] }, { "type": "effect_on_condition", @@ -190,5 +209,12 @@ "and": [ { "u_has_effect": "effect_hedge_increase_healing_rate" }, { "math": [ "u_val('activity_level')", ">=", "3" ] } ] }, "effect": [ { "u_lose_effect": "effect_hedge_increase_healing_rate" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_HEDGE_HIDE_IN_FOREST", + "condition": { "and": [ "u_is_outside", { "or": [ { "u_at_om_location": "forest_thick" }, { "u_at_om_location": "forest" } ] } ] }, + "effect": [ { "u_add_trait": "HEDGE_FOREST_BUSH_SHAPE" } ], + "false_effect": [ { "u_message": "Without being in a forest, the charm has no effect." } ] } ] diff --git a/data/mods/Xedra_Evolved/spells/hedge_magic_spells.json b/data/mods/Xedra_Evolved/spells/hedge_magic_spells.json index c5737198e012f..e0c91e467075e 100644 --- a/data/mods/Xedra_Evolved/spells/hedge_magic_spells.json +++ b/data/mods/Xedra_Evolved/spells/hedge_magic_spells.json @@ -280,5 +280,65 @@ "base_casting_time": 540000, "min_duration": 8640000, "max_duration": 8640000 + }, + { + "id": "hedge_increase_bandaging_rate", + "type": "SPELL", + "name": "To Halt the Scarlet Flow", + "description": "With some whispered words and a mixture of iron, salt, and herbs, increase your ability to stop the flow of blood. Best recited right before bandaging a wound.", + "message": "You face toward the east and recite the words of the charm as you rub the iron and salt and herbs on your hands.", + "flags": [ "VERBAL", "SOMATIC", "NO_FAIL" ], + "valid_targets": [ "self" ], + "difficulty": 1, + "spell_class": "HEDGE_MAGIC", + "skill": "survival", + "effect": "attack", + "effect_str": "effect_hedge_increase_bandaging_rate", + "shape": "blast", + "components": "spell_components_hedge_increase_bandaging_rate", + "max_level": 1, + "base_casting_time": 1000, + "min_duration": 18000, + "max_duration": 18000 + }, + { + "id": "hedge_hide_in_forest", + "type": "SPELL", + "name": "To Vanish Amidst the Leaves", + "description": "While standing in a forest, conceal your presence. For a brief time after using the charm, anything looking at you will only see another bit of foliage. Movement or taking any hostile action will cancel the charm.", + "message": "You wrap the beans in the leaf and, with a slight grimace, recite the words of the charm before you put them in your mouth and hold them there.", + "flags": [ "VERBAL", "SOMATIC", "NO_FAIL" ], + "valid_targets": [ "self" ], + "difficulty": 1, + "spell_class": "HEDGE_MAGIC", + "skill": "survival", + "effect": "effect_on_condition", + "effect_str": "EOC_HEDGE_HIDE_IN_FOREST", + "shape": "blast", + "components": "spell_components_hedge_hide_in_forest", + "max_level": 1, + "base_casting_time": 350, + "min_duration": 30000, + "max_duration": 30000 + }, + { + "id": "hedge_no_nightmares", + "type": "SPELL", + "name": "To Sail on the River of Dreams", + "description": "With lavender and thyme, weave a barrier around your sleeping space to keep bad dreams away. You must perform the charm directly before trying to sleep; moving will breach the barrier and allow the nightmares to find a way in again.", + "message": "You place the herbs under your pillow and, while chanting the words of the charm, paint some thyme oil on the four corners of your sleeping space.", + "flags": [ "VERBAL", "SOMATIC", "NO_FAIL" ], + "valid_targets": [ "self" ], + "difficulty": 1, + "spell_class": "HEDGE_MAGIC", + "skill": "survival", + "effect": "attack", + "effect_str": "effect_hedge_no_nightmares", + "shape": "blast", + "components": "spell_components_hedge_no_nightmares", + "max_level": 1, + "base_casting_time": 60000, + "min_duration": 4320000, + "max_duration": 4320000 } ]