From d4a2294a57f5245de6f8ff058065601c76f5944a Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Fri, 7 Feb 2025 15:10:27 -0600 Subject: [PATCH 01/19] Add Footsteps in the Snow --- .../effects_changeling_seasonal_magic.json | 13 ++++++++ ...angeling_seasonal_magic_research_eocs.json | 7 ++++- .../changeling_seasonal_magic_winter.json | 31 +++++++++++++++++++ 3 files changed, 50 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index d305fd6fcefd9..f2ad0ab61d565 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -105,6 +105,19 @@ "show_in_info": true, "flags": [ "CANNOT_ATTACK", "CANNOT_MOVE" ] }, + { + "type": "effect_type", + "id": "effect_changeling_winter_walk_in_silence", + "name": [ "Footsteps in the Snow" ], + "desc": [ "Like an animal in winter, you are moving in almost complete silence." ], + "apply_message": "", + "remove_message": "The sound of your footsteps intrudes in your perceptions.", + "max_duration": "6 hours", + "enchantments": [ + { "condition": { "not": { "is_season": "winter" } }, "values": [ { "value": "FOOTSTEP_NOISE", "multiply": -0.9 } ] }, + { "condition": { "is_season": "winter" }, "values": [ { "value": "FOOTSTEP_NOISE", "multiply": -1 } ] } + ] + }, { "type": "effect_type", "id": "effect_changeling_winter_walk_on_water", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index 812ee01866da4..eef797550af46 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -289,6 +289,7 @@ { "type": "effect_on_condition", "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SPRING_FINALIZE", + "//": "Spells have a tier equal to one-half their Difficulty. Tier 5 is everything 'and up'.", "effect": [ { "run_eocs": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_PAY_COST" }, { @@ -607,7 +608,11 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_WINTER_TIER_1", "effect": [ { - "u_roll_remainder": [ "changeling_winter_walk_on_water_spell", "changeling_winter_freeze_target_in_place_spell" ], + "u_roll_remainder": [ + "changeling_winter_walk_on_water_spell", + "changeling_winter_freeze_target_in_place_spell", + "changeling_winter_walk_in_silence" + ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json index b9856c1a11367..a2e8b062fa074 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json @@ -12,6 +12,37 @@ "max_book_level": 0, "failure_chance_formula_id": "xe_fey_seasonal_magick_winter_failure_chance" }, + { + "id": "changeling_winter_walk_in_silence", + "type": "SPELL", + "name": "Footsteps in the Snow", + "description": "Your footsteps make almost no sound when you move, like the footsteps of an animal traveling across new-fallen snow. If used in winter, your footsteps are totally silent. The glamour is quicker to expire in summer.", + "flags": [ "SOMATIC", "VERBAL", "RANDOM_DURATION" ], + "magic_type": "xe_fey_seasonal_magick_winter", + "spell_class": "CHANGELING_SEASONAL_MAGIC_WINTER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 2, + "effect": "attack", + "effect_str": "effect_changeling_winter_walk_in_silence", + "min_duration": { + "math": [ + "( ( 5831 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 2882) + (u_skill('deduction') * 15385) ) ) * (global_what_is_the_season == 2 ? 0.6 : 1)" + ] + }, + "max_duration": { + "math": [ + "( ( 19850 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 9850) + (u_skill('deduction') * 35482) ) ) * (global_what_is_the_season == 2 ? 0.4 : 1)" + ] + }, + "base_energy_cost": { + "math": [ "max( ( 150 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 4) - (u_skill('deduction') * 6)), 50)" ] + }, + "base_casting_time": 75 + }, { "id": "changeling_winter_freeze_target_in_place_spell", "type": "SPELL", From 3f4cd30fc960c0f90038a115895696d9b5184d42 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Fri, 7 Feb 2025 15:13:48 -0600 Subject: [PATCH 02/19] Make Footsteps in the Snow usable on allies --- .../spells/changeling_seasonal_magic_winter.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json index a2e8b062fa074..59d2642f1b80c 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json @@ -16,18 +16,19 @@ "id": "changeling_winter_walk_in_silence", "type": "SPELL", "name": "Footsteps in the Snow", - "description": "Your footsteps make almost no sound when you move, like the footsteps of an animal traveling across new-fallen snow. If used in winter, your footsteps are totally silent. The glamour is quicker to expire in summer.", + "description": "The target's footsteps make almost no sound when they move, like the footsteps of an animal traveling across new-fallen snow. If used in winter, the target's footsteps are totally silent. The glamour is quicker to expire in summer.", "flags": [ "SOMATIC", "VERBAL", "RANDOM_DURATION" ], "magic_type": "xe_fey_seasonal_magick_winter", "spell_class": "CHANGELING_SEASONAL_MAGIC_WINTER", - "valid_targets": [ "self" ], + "valid_targets": [ "self", "ally" ], "teachable": false, "skill": "deduction", "max_level": 1, "shape": "blast", - "difficulty": 2, + "difficulty": 1, "effect": "attack", "effect_str": "effect_changeling_winter_walk_in_silence", + "min_range": 6, "min_duration": { "math": [ "( ( 5831 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 2882) + (u_skill('deduction') * 15385) ) ) * (global_what_is_the_season == 2 ? 0.6 : 1)" From bb2d4105010a12662bdc5626500c672a0a847883 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Fri, 7 Feb 2025 15:16:22 -0600 Subject: [PATCH 03/19] Footsteps in the Snow has an AoE centered on you --- .../spells/changeling_seasonal_magic_winter.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json index 59d2642f1b80c..2fdfbbac5a282 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json @@ -16,8 +16,8 @@ "id": "changeling_winter_walk_in_silence", "type": "SPELL", "name": "Footsteps in the Snow", - "description": "The target's footsteps make almost no sound when they move, like the footsteps of an animal traveling across new-fallen snow. If used in winter, the target's footsteps are totally silent. The glamour is quicker to expire in summer.", - "flags": [ "SOMATIC", "VERBAL", "RANDOM_DURATION" ], + "description": "You and your nearby allies' footsteps make almost no sound when you move, like the footsteps of an animal traveling across new-fallen snow. If used in winter, your footsteps are totally silent. The glamour is quicker to expire in summer.", + "flags": [ "SOMATIC", "VERBAL", "RANDOM_DURATION", "IGNORE_WALLS", "NO_EXPLOSION_SFX" ], "magic_type": "xe_fey_seasonal_magick_winter", "spell_class": "CHANGELING_SEASONAL_MAGIC_WINTER", "valid_targets": [ "self", "ally" ], @@ -28,7 +28,11 @@ "difficulty": 1, "effect": "attack", "effect_str": "effect_changeling_winter_walk_in_silence", - "min_range": 6, + "min_aoe": { + "math": [ + "min( ( 1 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 0.1) + (u_skill('deduction') * 0.2) ), 10)" + ] + }, "min_duration": { "math": [ "( ( 5831 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 2882) + (u_skill('deduction') * 15385) ) ) * (global_what_is_the_season == 2 ? 0.6 : 1)" From 3d6ea2c16e8e0955f962f625b0e0c4d713419256 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Mon, 10 Feb 2025 00:08:29 -0600 Subject: [PATCH 04/19] Add Quick-Kindle --- ...angeling_seasonal_magic_research_eocs.json | 2 +- .../changeling_seasonal_magic_summer.json | 22 +++++++++++++++++++ ...changeling_seasonal_magic_summer_eocs.json | 10 +++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index eef797550af46..ccacbb7629aad 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -414,7 +414,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SUMMER_TIER_1", "effect": [ { - "u_roll_remainder": [ "changeling_summer_light_spell", "changeling_summer_sun_glasses_spell" ], + "u_roll_remainder": [ "changeling_summer_light_spell", "changeling_summer_light_fire_spell", "changeling_summer_sun_glasses_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json index f2a4a216f3d55..21c529b07429d 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json @@ -46,6 +46,28 @@ }, "base_casting_time": 50 }, + { + "id": "changeling_summer_light_fire_spell", + "type": "SPELL", + "name": "Quick-Kindle", + "description": "With a quick gesture, summon up a burst of heat sufficient to ignite flammable material. The glamour cannot be used in winter.", + "message": "", + "flags": [ "SOMATIC" ], + "magic_type": "xe_fey_seasonal_magick_summer", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SUMMER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 1, + "effect": "effect_on_condition", + "effect_str": "EOC_CHANGELING_SUMMER_LIGHT_FIRE_INITIATE", + "base_energy_cost": { + "math": [ "max( ( 75 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 2) - (u_skill('deduction') * 2)), 25)" ] + }, + "base_casting_time": 50 + }, { "id": "changeling_summer_sun_glasses_spell", "type": "SPELL", diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json index 76d9af117f845..d8faee4ee9302 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json @@ -22,6 +22,16 @@ ], "false_effect": [ { "u_lose_effect": "effect_changeling_summer_light_spell" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_SUMMER_LIGHT_FIRE_INITIATE", + "condition": { "not": { "is_season": "winter" } }, + "effect": [ + { "run_eocs": "EOC_HEDGE_LIGHT_FIRE" }, + { "u_message": "You gesture and summon up a burst of fiery heat.", "type": "neutral" } + ], + "false_effect": [ { "u_message": "You gesture but nothing happens.", "type": "bad" } ] + }, { "type": "effect_on_condition", "id": "EOC_CHANGELING_SUMMER_SUN_GLASSES_INITIATE", From f7d0d3298f0b58db11bcac40b4a0b8d7329da63a Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Mon, 10 Feb 2025 09:54:32 -0600 Subject: [PATCH 05/19] Add Viridian Cuirass --- .../effects_changeling_seasonal_magic.json | 16 ++++++++ ...angeling_seasonal_magic_research_eocs.json | 2 +- .../changeling_seasonal_magic_spring.json | 40 ++++++++++++++++++- ...changeling_seasonal_magic_summer_eocs.json | 13 +++++- 4 files changed, 68 insertions(+), 3 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index f2ad0ab61d565..f41699487aabe 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -1,4 +1,20 @@ [ + { + "type": "effect_type", + "id": "effect_changeling_spring_protective_plant_armor", + "name": [ "Viridian Cuirass" ], + "desc": [ "You are covered in a set of living bark armor." ], + "apply_message": "Bark and leaves quickly grow over your skin.", + "remove_message": "The bark armor cracks and falls away.", + "enchantments": [ + { "mutations": [ "ARVORE_MOSS", "BARK" ] }, + { + "condition": { "not": { "is_season": "autumn" } }, + "incoming_damage_mod": [ { "type": "cold", "multiply": -0.5 } ], + "values": [ { "value": "CLIMATE_CONTROL_HEAT", "add": 50 } ] + } + ] + }, { "type": "effect_type", "id": "effect_changeling_summer_light_spell", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index ccacbb7629aad..2105e282550f5 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -343,7 +343,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SPRING_TIER_3", "effect": [ { - "u_roll_remainder": [ "changeling_spring_growing_plants_spell" ], + "u_roll_remainder": [ "changeling_spring_protective_plant_armor_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json index a1f83c856997e..e62d7d57bb6f2 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json @@ -1,6 +1,6 @@ [ { - "//": "Spring magic should focus on: plants, growth, healing, rain, and love.", + "//": "Spring magic should focus on: plants, growth, healing, rain, creativity, and love.", "//2": "Make sure to add each new spell to the proper research EoC in the playable_changeling_seasonal_magic_research_eocs file.", "//3": "Seasonal magic can have direct damage spells, but they should always be relevantly themed to the season, accomplish some secondary effect (slowing, blinding, starting fires, terrain alteration, etc), have some limitation on targets, or otherwise be less efficient than 'Wizard casts fireball' ", "id": "xe_fey_seasonal_magick_spring", @@ -109,5 +109,43 @@ "max( ( 6000 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 150) - (u_skill('deduction') * 75)), 1500)" ] } + }, + { + "id": "changeling_spring_protective_plant_armor_spell", + "type": "SPELL", + "name": "Viridian Cuirass", + "description": "Grow a set of enchanted living armor around yourself or an ally, providing protection and resistance to chill temperatures. The glamour offers no protection from cold in autumn.", + "flags": [ "VERBAL", "SOMATIC", "RANDOM_DURATION" ], + "magic_type": "xe_fey_seasonal_magick_spring", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SPRING", + "valid_targets": [ "self", "ally" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 5, + "effect": "attack", + "effect_str": "effect_changeling_spring_protective_plant_armor", + "min_range": 1, + "min_duration": { + "math": [ + "( ( 20864 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 7534) + (u_skill('deduction') * 9852) ) )" + ] + }, + "max_duration": { + "math": [ + "( ( 85346 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 17854) + (u_skill('deduction') * 21852) ) )" + ] + }, + "base_energy_cost": { + "math": [ + "max( ( 500 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 6) - (u_skill('deduction') * 10)), 300)" + ] + }, + "base_casting_time": { + "math": [ + "max( ( 3000 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 75) - (u_skill('deduction') * 100)), 500)" + ] + } } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json index d8faee4ee9302..df1914141e35f 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json @@ -30,7 +30,18 @@ { "run_eocs": "EOC_HEDGE_LIGHT_FIRE" }, { "u_message": "You gesture and summon up a burst of fiery heat.", "type": "neutral" } ], - "false_effect": [ { "u_message": "You gesture but nothing happens.", "type": "bad" } ] + "false_effect": [ + { + "if": { + "x_in_y_chance": { "x": { "math": [ "50 + u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER')" ] }, "y": 100 } + }, + "then": [ + { "run_eocs": "EOC_HEDGE_LIGHT_FIRE" }, + { "u_message": "You gesture and summon up a burst of fiery heat.", "type": "neutral" } + ], + "else": { "u_message": "You gesture but nothing happens.", "type": "bad" } + } + ] }, { "type": "effect_on_condition", From a57c362fe42cc53299801608f3499fbd8b52f75f Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Mon, 10 Feb 2025 10:28:30 -0600 Subject: [PATCH 06/19] Add New Growth --- .../effects_changeling_seasonal_magic.json | 68 ++++++++++++++++++- ...angeling_seasonal_magic_research_eocs.json | 2 +- .../changeling_seasonal_magic_spring.json | 38 +++++++++++ ...changeling_seasonal_magic_spring_eocs.json | 49 +++++++++++++ 4 files changed, 155 insertions(+), 2 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index f41699487aabe..ea3986683ca6a 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -6,6 +6,7 @@ "desc": [ "You are covered in a set of living bark armor." ], "apply_message": "Bark and leaves quickly grow over your skin.", "remove_message": "The bark armor cracks and falls away.", + "max_duration": "12 hours", "enchantments": [ { "mutations": [ "ARVORE_MOSS", "BARK" ] }, { @@ -15,6 +16,61 @@ } ] }, + { + "type": "effect_type", + "id": "effect_changeling_spring_healing_increase_while_outside", + "name": [ "New Growth" ], + "desc": [ "You are drawing on the energy of life to increase your healing rate." ], + "apply_message": "", + "remove_message": "The warmth fades away.", + "max_duration": "12 hours", + "enchantments": [ + { + "condition": { "and": [ "u_is_outside", "u_is_avatar" ] }, + "values": [ + { "value": "REGEN_HP_AWAKE", "multiply": 1 }, + { + "value": "REGEN_HP", + "multiply": { + "math": [ + "(10 + u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') + (u_skill('deduction') * 2) ) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + ] + } + }, + { + "value": "MENDING_MODIFIER", + "multiply": { + "math": [ + "(3 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') / 3) + u_skill('deduction') ) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + ] + } + } + ] + }, + { + "condition": { "and": [ "u_is_outside", "u_is_npc" ] }, + "values": [ + { "value": "REGEN_HP_AWAKE", "multiply": 1 }, + { + "value": "REGEN_HP", + "multiply": { + "math": [ + "(10 + u_spring_magic_spell_count + (u_spring_magic_deduction_level * 2) ) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + ] + } + }, + { + "value": "MENDING_MODIFIER", + "multiply": { + "math": [ + "(3 + (u_spring_magic_spell_count / 3) + u_spring_magic_deduction_level) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + ] + } + } + ] + } + ] + }, { "type": "effect_type", "id": "effect_changeling_summer_light_spell", @@ -22,6 +78,7 @@ "desc": [ "A wisp of flickering insubstantial fire hovers near your shoulder." ], "apply_message": "", "remove_message": "The wisp winks out.", + "max_duration": "12 hours", "enchantments": [ { "values": [ { "value": "LUMINATION", "add": 10 } ] } ] }, { @@ -31,6 +88,7 @@ "desc": [ "Nearby lights don't seem quite as bright now." ], "apply_message": "", "remove_message": "You blink as nearby lights grow brighter.", + "max_duration": "12 hours", "flags": [ "GLARE_RESIST" ] }, { @@ -40,6 +98,7 @@ "desc": [ "Ethereal flames flicker around your hands" ], "apply_message": "", "remove_message": "The flames gutter out.", + "max_duration": "12 hours", "enchantments": [ { "condition": "u_has_weapon", @@ -78,6 +137,7 @@ "apply_message": "", "remove_message": "Your vigor returns.", "show_in_info": true, + "max_duration": "12 hours", "enchantments": [ { "values": [ { "value": "STRENGTH", "add": -3 }, { "value": "DEXTERITY", "add": -2 }, { "value": "SPEED", "add": -5 } ] @@ -92,6 +152,7 @@ "apply_message": "", "remove_message": "Your vigor returns.", "show_in_info": true, + "max_duration": "12 hours", "base_mods": { "hit_mod": [ -1 ], "dodge_mod": [ -1 ], "speed_mod": [ -5 ] } }, { @@ -109,6 +170,7 @@ "apply_message": "", "remove_message": "You can move again.", "show_in_info": true, + "max_duration": "20 minutes", "flags": [ "CANNOT_MOVE" ] }, { @@ -119,6 +181,7 @@ "apply_message": "", "remove_message": "The chill around your feet fades away.", "show_in_info": true, + "max_duration": "20 minutes", "flags": [ "CANNOT_ATTACK", "CANNOT_MOVE" ] }, { @@ -128,7 +191,7 @@ "desc": [ "Like an animal in winter, you are moving in almost complete silence." ], "apply_message": "", "remove_message": "The sound of your footsteps intrudes in your perceptions.", - "max_duration": "6 hours", + "max_duration": "12 hours", "enchantments": [ { "condition": { "not": { "is_season": "winter" } }, "values": [ { "value": "FOOTSTEP_NOISE", "multiply": -0.9 } ] }, { "condition": { "is_season": "winter" }, "values": [ { "value": "FOOTSTEP_NOISE", "multiply": -1 } ] } @@ -141,6 +204,7 @@ "desc": [ "Each step you take leaves a tracing of frost on the ground, and liquids freeze at your touch." ], "apply_message": "", "remove_message": "The chill around your feet fades away.", + "max_duration": "12 hours", "flags": [ "WATERWALKING", "ITEM_WATERPROOFING", "SLUDGEPROOF" ] }, { @@ -150,6 +214,8 @@ "desc": [ "Your movements are slowed." ], "apply_message": "", "remove_message": "The bone-deep chill fades away.", + "show_in_info": true, + "max_duration": "20 minutes", "enchantments": [ { "values": [ { "value": "SPEED", "multiply": -0.1 } ] } ], "base_mods": { "hit_mod": [ -1 ] } } diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index 2105e282550f5..326469efe2d07 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -356,7 +356,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SPRING_TIER_4", "effect": [ { - "u_roll_remainder": [ "changeling_spring_growing_plants_spell" ], + "u_roll_remainder": [ "changeling_spring_healing_increase_while_outside_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json index e62d7d57bb6f2..718a1cde9adde 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json @@ -147,5 +147,43 @@ "max( ( 3000 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 75) - (u_skill('deduction') * 100)), 500)" ] } + }, + { + "id": "changeling_spring_healing_increase_while_outside_spell", + "type": "SPELL", + "name": "New Growth", + "description": "Draw on the power of growth and new sprouts to speed the healing of yourself or one of your allies, as long as you are outside. The healing rate is reduced in autumn.", + "flags": [ "VERBAL", "SOMATIC", "RANDOM_DURATION" ], + "magic_type": "xe_fey_seasonal_magick_spring", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SPRING", + "valid_targets": [ "self", "ally" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 8, + "effect": "effect_on_condition", + "effect_str": "EOC_CHANGELING_SPRING_HEALING_INCREASE_WHILE_OUTSIDE_INITIATE", + "min_range": 10, + "min_duration": { + "math": [ + "( ( 84612 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 12952) + (u_skill('deduction') * 18542) ) )" + ] + }, + "max_duration": { + "math": [ + "( ( 168524 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 34815) + (u_skill('deduction') * 49851) ) )" + ] + }, + "base_energy_cost": { + "math": [ + "max( ( 800 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 8) - (u_skill('deduction') * 15)), 450)" + ] + }, + "base_casting_time": { + "math": [ + "max( ( 2000 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 50) - (u_skill('deduction') * 75)), 250)" + ] + } } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring_eocs.json index ed0f77dce403f..59ebae975c999 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring_eocs.json @@ -15,5 +15,54 @@ { "u_transform_radius": 0, "ter_furn_transform": "ter_changeling_spring_verdant_vitality" } ], "false_effect": [ { "u_message": "You need to be standing on vegetation to drawn on its vitality.", "type": "bad" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_SPRING_HEALING_INCREASE_WHILE_OUTSIDE_INITIATE", + "condition": "u_is_avatar", + "effect": [ + { + "math": [ + "u_spell_low_duration = ( ( 846.12 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 129.52) + (u_skill('deduction') * 185.42) ) )" + ] + }, + { + "math": [ + "u_spell_high_duration = ( ( 1685.24 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 348.15) + (u_skill('deduction') * 498.51) ) )" + ] + }, + { + "run_eocs": [ + { + "id": "EOC_CHANGELING_SPRING_HEALING_INCREASE_WHILE_OUTSIDE_APPLY_EFFECT", + "effect": [ + { + "u_add_effect": "effect_changeling_spring_healing_increase_while_outside", + "duration": { "math": [ "rng(u_spell_low_duration,u_spell_high_duration)" ] } + }, + { + "if": "u_is_outside", + "then": { "u_message": "You feel a warm sensation spread over your entire body.", "type": "good" } + } + ] + } + ] + } + ], + "false_effect": [ + { "math": [ "u_spring_magic_spell_count = n_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING')" ] }, + { "math": [ "u_spring_magic_deduction_level = n_skill('deduction')" ] }, + { + "math": [ + "u_spell_low_duration = ( ( 846.12 + (n_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 129.52) + (n_skill('deduction') * 185.42) ) )" + ] + }, + { + "math": [ + "u_spell_high_duration = ( ( 1685.24 + (n_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') * 348.15) + (n_skill('deduction') * 498.51) ) )" + ] + }, + { "run_eocs": "EOC_CHANGELING_SPRING_HEALING_INCREASE_WHILE_OUTSIDE_APPLY_EFFECT" } + ] } ] From 8ed6a3af3f9d19ba51568a36fe69b5279302312e Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Mon, 10 Feb 2025 12:31:24 -0600 Subject: [PATCH 07/19] Add Salmon Leap --- ...angeling_seasonal_magic_research_eocs.json | 2 +- .../changeling_seasonal_magic_summer.json | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index 326469efe2d07..e31851819e10b 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -427,7 +427,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SUMMER_TIER_2", "effect": [ { - "u_roll_remainder": [ "changeling_summer_fire_melee_damage_spell" ], + "u_roll_remainder": [ "changeling_summer_fire_melee_damage_spell", "changeling_summer_jump_distance_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json index 21c529b07429d..b22f3d3dffd75 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json @@ -96,6 +96,40 @@ }, "base_casting_time": 100 }, + { + "id": "changeling_summer_jump_distance_spell", + "type": "SPELL", + "name": "Salmon Leap", + "description": "Like a salmon leaping over obstacles in a river, you can make prodigious jumps.", + "message": "", + "flags": [ "SOMATIC" ], + "magic_type": "xe_fey_seasonal_magick_summer", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SUMMER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 3, + "effect": "dash", + "min_damage": 0, + "max_damage": 0, + "damage_type": "bash", + "min_range": { + "math": [ + "min( ( ( 2 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 0.25) + (u_skill('deduction') * 0.5) ) ), 12) * (global_what_is_the_season == 2 ? 1.35 : 1)" + ] + }, + "max_range": { + "math": [ + "min( ( ( 2 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 0.25) + (u_skill('deduction') * 0.5) ) ), 12) * (global_what_is_the_season == 2 ? 1.35 : 1)" + ] + }, + "base_energy_cost": { + "math": [ "max( ( 150 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 2) - (u_skill('deduction') * 4)), 50)" ] + }, + "base_casting_time": 50 + }, { "id": "changeling_summer_fire_melee_damage_spell", "type": "SPELL", From de271326bb163d762cc74c04cde9873deec773f1 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Mon, 10 Feb 2025 12:56:30 -0600 Subject: [PATCH 08/19] Add Outracing the Sun --- .../effects_changeling_seasonal_magic.json | 23 ++++++++++--- .../mutations/playable_changeling_eocs.json | 33 ++++++++++++++++--- ...angeling_seasonal_magic_research_eocs.json | 2 +- .../changeling_seasonal_magic_summer.json | 25 ++++++++++++++ ...changeling_seasonal_magic_summer_eocs.json | 33 +++++++++++++++++++ 5 files changed, 107 insertions(+), 9 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index ea3986683ca6a..1ce628a0c4846 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -33,7 +33,7 @@ "value": "REGEN_HP", "multiply": { "math": [ - "(10 + u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') + (u_skill('deduction') * 2) ) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + "( 10 + u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') + (u_skill('deduction') * 2) ) * (global_what_is_the_season == 3 ? 0.5 : 1)" ] } }, @@ -41,7 +41,7 @@ "value": "MENDING_MODIFIER", "multiply": { "math": [ - "(3 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') / 3) + u_skill('deduction') ) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + "(3 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SPRING') / 3) + u_skill('deduction') ) * (global_what_is_the_season == 3 ? 0.5 : 1)" ] } } @@ -55,7 +55,7 @@ "value": "REGEN_HP", "multiply": { "math": [ - "(10 + u_spring_magic_spell_count + (u_spring_magic_deduction_level * 2) ) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + "(10 + u_spring_magic_spell_count + (u_spring_magic_deduction_level * 2) ) * (global_what_is_the_season == 3 ? 0.5 : 1)" ] } }, @@ -63,7 +63,7 @@ "value": "MENDING_MODIFIER", "multiply": { "math": [ - "(3 + (u_spring_magic_spell_count / 3) + u_spring_magic_deduction_level) * (global_what_is_the_season == 3 ? 0.5 : 1) )" + "(3 + (u_spring_magic_spell_count / 3) + u_spring_magic_deduction_level) * (global_what_is_the_season == 3 ? 0.5 : 1)" ] } } @@ -129,6 +129,21 @@ { "values": [ { "value": "LUMINATION", "add": 2 } ] } ] }, + { + "type": "effect_type", + "id": "effect_changeling_summer_run_for_long_periods", + "name": [ "Outracing the Sun" ], + "desc": [ "You are filled with burning energy." ], + "apply_message": "", + "remove_message": "The burning energy filling your muscles dissipates.", + "max_duration": "12 hours", + "enchantments": [ + { + "condition": { "or": [ { "not": { "is_season": "winter" } }, { "and": [ { "is_season": "winter" }, "u_is_outside" ] } ] }, + "values": [ { "value": "REGEN_STAMINA", "add": 200 } ] + } + ] + }, { "type": "effect_type", "id": "effect_changeling_autumn_touch_of_frailty_character", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index df68832898c1c..a89cd39b21664 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -38,8 +38,13 @@ "id": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_COMBAT", "condition": { "or": [ - { "u_has_effect": "effect_changeling_invisibility" }, - { "u_has_effect": "effect_changeling_right_of_passage" }, + { + "u_has_any_effect": [ + "effect_changeling_invisibility", + "effect_changeling_right_of_passage", + "effect_changeling_summer_run_for_long_periods" + ] + }, { "u_has_any_trait": [ "CHANGELING_DISGUISE_AS_NATURE_BUSH", @@ -53,6 +58,12 @@ }, "effect": [ ] }, + { + "type": "effect_on_condition", + "id": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_CASTING", + "condition": { "u_has_any_effect": [ "effect_changeling_summer_run_for_long_periods" ] }, + "effect": [ ] + }, { "type": "effect_on_condition", "id": "EOC_UNKNOWING_CHANGELING_WEARING_IRON_OR_STEEL", @@ -191,17 +202,31 @@ }, { "type": "effect_on_condition", - "id": "EOC_CHANGELING_EFFECTS_REMOVED_BY_TAKING DAMAGE", + "id": "EOC_CHANGELING_EFFECTS_REMOVED_BY_TAKING_DAMAGE", "eoc_type": "EVENT", "required_event": "character_takes_damage", "condition": { "test_eoc": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_COMBAT" }, "effect": [ { "run_eocs": "EOC_CHANGELING_EFFECTS_REMOVED_LOSE_EFFECTS" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_EFFECTS_REMOVED_BY_SPELLCASTING", + "eoc_type": "EVENT", + "required_event": "spellcasting_finish", + "condition": { "test_eoc": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_CASTING" }, + "effect": [ { "u_lose_effect": [ "effect_changeling_summer_run_for_long_periods" ] } ] + }, { "type": "effect_on_condition", "id": "EOC_CHANGELING_EFFECTS_REMOVED_LOSE_EFFECTS", "effect": [ - { "u_lose_effect": [ "effect_changeling_invisibility", "effect_changeling_right_of_passage" ] }, + { + "u_lose_effect": [ + "effect_changeling_invisibility", + "effect_changeling_right_of_passage", + "effect_changeling_summer_run_for_long_periods" + ] + }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_BUSH" }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_TREE" }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_POND" }, diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index e31851819e10b..d3b9fe3777993 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -440,7 +440,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SUMMER_TIER_3", "effect": [ { - "u_roll_remainder": [ "changeling_summer_fire_melee_damage_spell" ], + "u_roll_remainder": [ "changeling_summer_run_for_long_periods_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json index b22f3d3dffd75..c4ef25d90457a 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json @@ -100,6 +100,7 @@ "id": "changeling_summer_jump_distance_spell", "type": "SPELL", "name": "Salmon Leap", + "//": "If/when there is a distinction between fast running and jumps, this is a jump.", "description": "Like a salmon leaping over obstacles in a river, you can make prodigious jumps.", "message": "", "flags": [ "SOMATIC" ], @@ -161,5 +162,29 @@ "math": [ "max( ( 300 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 5) - (u_skill('deduction') * 4)), 120)" ] }, "base_casting_time": 150 + }, + { + "id": "changeling_summer_run_for_long_periods_spell", + "type": "SPELL", + "name": "Outracing the Sun", + "description": "After using this glamour, begin running. As long as you continue running, you will not run out of stamina. Weaving another glamour or attacking breaks the effect. In the winter the glamour does not work if you are indoors.", + "message": "", + "flags": [ "SOMATIC", "VERBAL" ], + "magic_type": "xe_fey_seasonal_magick_summer", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SUMMER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 5, + "effect": "attack", + "effect_str": "effect_changeling_summer_run_for_long_periods", + "min_duration": 2, + "max_duration": 2, + "base_energy_cost": { + "math": [ "max( ( 450 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 5) - (u_skill('deduction') * 4)), 250)" ] + }, + "base_casting_time": 100 } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json index df1914141e35f..83fbe68a773bd 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json @@ -72,5 +72,38 @@ "required_event": "character_loses_effect", "condition": { "compare_string": [ "effect_changeling_summer_sun_glasses_spell", { "context_val": "effect" } ] }, "effect": { "u_remove_item_with": "changeling_summer_sunglasses" } + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_SUMMER_RUN_FOR_LONG_PERIODS_CONTINUANCE", + "eoc_type": "EVENT", + "required_event": "avatar_moves", + "condition": { + "and": [ + { "u_has_effect": "effect_changeling_summer_run_for_long_periods" }, + { "compare_string": [ "run", { "context_val": "movement_mode" } ] } + ] + }, + "effect": [ + { + "if": { "math": [ "u_effect_duration('effect_changeling_summer_run_for_long_periods') < 2" ] }, + "then": [ { "u_add_effect": "effect_changeling_summer_run_for_long_periods", "duration": 2 } ], + "else": [ { "u_add_effect": "effect_changeling_summer_run_for_long_periods", "duration": 1 } ] + } + ], + "false_effect": [ { "u_lose_effect": "effect_changeling_summer_run_for_long_periods" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_HEDGE_WALK_ON_WATER_RUNNING_CANCEL", + "eoc_type": "EVENT", + "required_event": "avatar_moves", + "condition": { + "and": [ + { "u_has_effect": "effect_hedge_walk_on_water" }, + { "compare_string": [ "run", { "context_val": "movement_mode" } ] } + ] + }, + "effect": [ { "u_lose_effect": "effect_hedge_walk_on_water" } ] } ] From 00ca9a455545254e216eb75ac7a501fb5499bec3 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Mon, 10 Feb 2025 16:50:41 -0600 Subject: [PATCH 09/19] Fixes --- .../effects_changeling_seasonal_magic.json | 9 ++++++- .../mutations/playable_changeling_eocs.json | 26 ++++++++++++++++--- .../changeling_seasonal_magic_summer.json | 8 +++--- ...changeling_seasonal_magic_summer_eocs.json | 21 ++++++--------- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index 1ce628a0c4846..51ddc924a9650 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -1,4 +1,11 @@ [ + { + "type": "effect_type", + "id": "effect_changeling_using_glamour_removes_checker", + "//": "Hidden effect, used to prevent the initial use of a glamour that's not supposed to be used with other glamours from removing itself", + "name": [ "" ], + "desc": [ "" ] + }, { "type": "effect_type", "id": "effect_changeling_spring_protective_plant_armor", @@ -134,7 +141,7 @@ "id": "effect_changeling_summer_run_for_long_periods", "name": [ "Outracing the Sun" ], "desc": [ "You are filled with burning energy." ], - "apply_message": "", + "apply_message": "You are filled with burning energy.", "remove_message": "The burning energy filling your muscles dissipates.", "max_duration": "12 hours", "enchantments": [ diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index a89cd39b21664..02d9a020f3c8f 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -61,7 +61,12 @@ { "type": "effect_on_condition", "id": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_CASTING", - "condition": { "u_has_any_effect": [ "effect_changeling_summer_run_for_long_periods" ] }, + "condition": { + "and": [ + { "u_has_effect": "effect_changeling_using_glamour_removes_checker" }, + { "u_has_any_effect": [ "effect_changeling_summer_run_for_long_periods" ] } + ] + }, "effect": [ ] }, { @@ -208,13 +213,28 @@ "condition": { "test_eoc": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_COMBAT" }, "effect": [ { "run_eocs": "EOC_CHANGELING_EFFECTS_REMOVED_LOSE_EFFECTS" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_NO_CASTING_OTHER_GLAMOURS_CHECKER", + "//": "Due to the way spellcasting_finish events work, this has to be run 1 second after the initial glamour weaving, or a glamour that fades if another glamour is woven is immediately removed because the initial weaving count as 'another glamour' ", + "effect": [ { "u_add_effect": "effect_changeling_using_glamour_removes_checker", "duration": "PERMANENT" } ] + }, { "type": "effect_on_condition", "id": "EOC_CHANGELING_EFFECTS_REMOVED_BY_SPELLCASTING", "eoc_type": "EVENT", "required_event": "spellcasting_finish", - "condition": { "test_eoc": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_CASTING" }, - "effect": [ { "u_lose_effect": [ "effect_changeling_summer_run_for_long_periods" ] } ] + "condition": { + "and": [ + { "u_has_effect": "effect_changeling_using_glamour_removes_checker" }, + { "test_eoc": "EOC_TEST_CHANGELING_EFFECTS_REMOVED_BY_CASTING" } + ] + }, + "effect": [ + { + "u_lose_effect": [ "effect_changeling_using_glamour_removes_checker", "effect_changeling_summer_run_for_long_periods" ] + } + ] }, { "type": "effect_on_condition", diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json index c4ef25d90457a..e43ea756c1473 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json @@ -106,7 +106,7 @@ "flags": [ "SOMATIC" ], "magic_type": "xe_fey_seasonal_magick_summer", "spell_class": "CHANGELING_SEASONAL_MAGIC_SUMMER", - "valid_targets": [ "self" ], + "valid_targets": [ "ally", "hostile", "ground" ], "teachable": false, "skill": "deduction", "max_level": 1, @@ -178,10 +178,8 @@ "max_level": 1, "shape": "blast", "difficulty": 5, - "effect": "attack", - "effect_str": "effect_changeling_summer_run_for_long_periods", - "min_duration": 2, - "max_duration": 2, + "effect": "effect_on_condition", + "effect_str": "EOC_CHANGELING_SUMMER_RUN_FOR_LONG_PERIODS", "base_energy_cost": { "math": [ "max( ( 450 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 5) - (u_skill('deduction') * 4)), 250)" ] }, diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json index 83fbe68a773bd..a77799aa5d90e 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json @@ -73,6 +73,14 @@ "condition": { "compare_string": [ "effect_changeling_summer_sun_glasses_spell", { "context_val": "effect" } ] }, "effect": { "u_remove_item_with": "changeling_summer_sunglasses" } }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_SUMMER_RUN_FOR_LONG_PERIODS", + "effect": [ + { "u_add_effect": "effect_changeling_summer_run_for_long_periods", "duration": 2 }, + { "run_eocs": "EOC_CHANGELING_NO_CASTING_OTHER_GLAMOURS_CHECKER", "time_in_future": 1 } + ] + }, { "type": "effect_on_condition", "id": "EOC_CHANGELING_SUMMER_RUN_FOR_LONG_PERIODS_CONTINUANCE", @@ -92,18 +100,5 @@ } ], "false_effect": [ { "u_lose_effect": "effect_changeling_summer_run_for_long_periods" } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_HEDGE_WALK_ON_WATER_RUNNING_CANCEL", - "eoc_type": "EVENT", - "required_event": "avatar_moves", - "condition": { - "and": [ - { "u_has_effect": "effect_hedge_walk_on_water" }, - { "compare_string": [ "run", { "context_val": "movement_mode" } ] } - ] - }, - "effect": [ { "u_lose_effect": "effect_hedge_walk_on_water" } ] } ] From 87c790ca75f544911560cfc9e80d09cbb770a0e0 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:53:43 -0500 Subject: [PATCH 10/19] Add Swirl of Autumn Leaves --- .../effects_changeling_seasonal_magic.json | 25 ++++++++++++ ...angeling_seasonal_magic_research_eocs.json | 2 +- .../changeling_seasonal_magic_autumn.json | 38 ++++++++++++++++++- 3 files changed, 63 insertions(+), 2 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index 51ddc924a9650..e4c3c35e59a74 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -184,6 +184,31 @@ "name": [ "" ], "desc": [ "" ] }, + { + "type": "effect_type", + "id": "effect_changeling_autumn_protection_from_ranged", + "name": [ "Swirl of Autumn Leaves" ], + "desc": [ "A chill wind is whirling around you." ], + "apply_message": "", + "remove_message": "The autumn leaves fall to the ground.", + "show_in_info": true, + "max_duration": "12 hours", + "enchantments": [ + { + "values": [ + { + "value": "RANGE_DODGE", + "multiply": { + "math": [ + "min( ( 15 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 0.75) + (u_skill('deduction') * 1.5) ), 50 )" + ] + } + } + ] + }, + { "condition": { "is_season": "autumn" }, "values": [ { "value": "STEALTH_MODIFIER", "add": 33 } ] } + ] + }, { "type": "effect_type", "id": "effect_changeling_winter_freeze_target_in_place_not_winter", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index d3b9fe3777993..9f0421927a0eb 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -537,7 +537,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_AUTUMN_TIER_3", "effect": [ { - "u_roll_remainder": [ "changeling_autumn_call_mists_spell" ], + "u_roll_remainder": [ "changeling_autumn_protection_from_ranged_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json index dc95e461c2a3a..681d35bdf0dc0 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json @@ -1,6 +1,6 @@ [ { - "//": "Autumn magic should focus on: fear, decay, the harvest, preservation, fog, colors.", + "//": "Autumn magic should focus on: fear, decay, the harvest, preservation, fog, colors, home and the hearth.", "//2": "Make sure to add each new spell to the proper research EoC in the playable_changeling_seasonal_magic_research_eocs file.", "//3": "Seasonal magic can have direct damage spells, but they should always be relevantly themed to the season, accomplish some secondary effect (slowing, blinding, starting fires, terrain alteration, etc), have some limitation on targets, or otherwise be less efficient than 'Wizard casts fireball' ", "id": "xe_fey_seasonal_magick_autumn", @@ -112,5 +112,41 @@ "u_effect_intensity('effect_controlling_weather_fog') > -1 ? 50 : max( ( 6000 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 56) - (u_skill('deduction') * 125)), 400)" ] } + }, + { + "id": "changeling_autumn_protection_from_ranged_spell", + "type": "SPELL", + "name": "Swirl of Autumn Leaves", + "description": "Whip up a wind and a swirl of autumn leaves around yourself, giving ranged attacks a chance to go awry. The glamour also makes you harder to spot if used in autumn.", + "message": "A spray of colored leaves whirl around you.", + "flags": [ "VERBAL", "RANDOM_DURATION" ], + "magic_type": "xe_fey_seasonal_magick_autumn", + "spell_class": "CHANGELING_SEASONAL_MAGIC_AUTUMN", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 6, + "effect": "attack", + "effect_str": "effect_changeling_autumn_protection_from_ranged", + "min_duration": { + "math": [ + "( ( 19852 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 5852) + (u_skill('deduction') * 11512) ) )" + ] + }, + "max_duration": { + "math": [ + "( ( 40851 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 16815) + (u_skill('deduction') * 32945) ) )" + ] + }, + "base_energy_cost": { + "math": [ "max( ( 450 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 5) - (u_skill('deduction') * 8)), 250)" ] + }, + "base_casting_time": { + "math": [ + "max( ( 500 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 8) - (u_skill('deduction') * 15)), 150)" + ] + } } ] From b0e3768eb788821a7c5f7873797796c4b21749ba Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:23:35 -0500 Subject: [PATCH 11/19] Add Stillness of the Tomb --- .../effects_changeling_seasonal_magic.json | 19 +++++++ .../mutations/playable_changeling_eocs.json | 56 ++++++++++++------- ...angeling_seasonal_magic_research_eocs.json | 2 +- .../Xedra_Evolved/mutations/temporary.json | 45 +++++++++++++++ .../changeling_seasonal_magic_winter.json | 22 ++++++++ ...changeling_seasonal_magic_winter_eocs.json | 8 +++ 6 files changed, 131 insertions(+), 21 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index e4c3c35e59a74..bb6ae0b89fe0b 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -254,6 +254,25 @@ "max_duration": "12 hours", "flags": [ "WATERWALKING", "ITEM_WATERPROOFING", "SLUDGEPROOF" ] }, + { + "type": "effect_type", + "id": "effect_changeling_winter_feign_death", + "name": [ "Stillness of the Tomb" ], + "desc": [ "You do not move, or breathe, or think, or live. For now." ], + "apply_message": "", + "remove_message": "Life returns to your limbs.", + "show_in_info": true, + "max_duration": "6 hours", + "enchantments": [ { "mutations": [ "WINTER_FEIGN_DEATH_TRAITS" ] } ], + "limb_score_mods": [ + { "limb_score": "lift", "modifier": 0.2 }, + { "limb_score": "block", "modifier": 0.0 }, + { "limb_score": "swim", "modifier": 0.0 }, + { "limb_score": "manip", "modifier": 0.1 }, + { "limb_score": "grip", "modifier": 0.1 } + ], + "flags": [ "EFFECT_LIMB_SCORE_MOD" ] + }, { "type": "effect_type", "id": "effect_changeling_winter_frozen_breath", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index 02d9a020f3c8f..b9b3fb0f4c3f3 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -42,7 +42,8 @@ "u_has_any_effect": [ "effect_changeling_invisibility", "effect_changeling_right_of_passage", - "effect_changeling_summer_run_for_long_periods" + "effect_changeling_summer_run_for_long_periods", + "effect_changeling_winter_feign_death" ] }, { @@ -64,7 +65,9 @@ "condition": { "and": [ { "u_has_effect": "effect_changeling_using_glamour_removes_checker" }, - { "u_has_any_effect": [ "effect_changeling_summer_run_for_long_periods" ] } + { + "u_has_any_effect": [ "effect_changeling_summer_run_for_long_periods", "effect_changeling_winter_feign_death" ] + } ] }, "effect": [ ] @@ -232,7 +235,11 @@ }, "effect": [ { - "u_lose_effect": [ "effect_changeling_using_glamour_removes_checker", "effect_changeling_summer_run_for_long_periods" ] + "u_lose_effect": [ + "effect_changeling_using_glamour_removes_checker", + "effect_changeling_summer_run_for_long_periods", + "effect_changeling_winter_feign_death" + ] } ] }, @@ -244,7 +251,8 @@ "u_lose_effect": [ "effect_changeling_invisibility", "effect_changeling_right_of_passage", - "effect_changeling_summer_run_for_long_periods" + "effect_changeling_summer_run_for_long_periods", + "effect_changeling_winter_feign_death" ] }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_BUSH" }, @@ -254,6 +262,30 @@ { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_ROCK" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_EFFECTS_REMOVED_BY_MOVEMENT", + "eoc_type": "EVENT", + "required_event": "avatar_moves", + "condition": { + "or": [ + { "u_has_any_effect": [ "effect_changeling_winter_feign_death" ] }, + { + "u_has_any_trait": [ + "CHANGELING_DISGUISE_AS_NATURE_BUSH", + "CHANGELING_DISGUISE_AS_NATURE_TREE", + "CHANGELING_DISGUISE_AS_NATURE_POND", + "CHANGELING_DISGUISE_AS_NATURE_GRASS", + "CHANGELING_DISGUISE_AS_NATURE_ROCK" + ] + } + ] + }, + "effect": [ + { "u_lose_effect": [ "effect_changeling_winter_feign_death" ] }, + { "run_eocs": "EOC_CHANGELING_DISGUISE_AS_NATURE_END" } + ] + }, { "type": "effect_on_condition", "id": "EOC_INCONSPICUOUS_BROWNIE_ATTACKS_MELEE_MONSTER", @@ -388,22 +420,6 @@ { "u_message": "The glamour disguising you fades.", "type": "bad" } ] }, - { - "type": "effect_on_condition", - "id": "EOC_CHANGELING_DISGUISE_AS_NATURE_MOVEMENT_ENDS", - "eoc_type": "EVENT", - "required_event": "avatar_moves", - "condition": { - "u_has_any_trait": [ - "CHANGELING_DISGUISE_AS_NATURE_BUSH", - "CHANGELING_DISGUISE_AS_NATURE_TREE", - "CHANGELING_DISGUISE_AS_NATURE_POND", - "CHANGELING_DISGUISE_AS_NATURE_GRASS", - "CHANGELING_DISGUISE_AS_NATURE_ROCK" - ] - }, - "effect": [ { "run_eocs": "EOC_CHANGELING_DISGUISE_AS_NATURE_END" } ] - }, { "type": "effect_on_condition", "id": "EOC_CHANGELING_NOBLE_BURNING_WEAPON", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index 9f0421927a0eb..4299bb7424bc4 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -625,7 +625,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_WINTER_TIER_2", "effect": [ { - "u_roll_remainder": [ "changeling_winter_frozen_breath_spell" ], + "u_roll_remainder": [ "changeling_winter_frozen_breath_spell", "changeling_winter_feign_death_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/mutations/temporary.json b/data/mods/Xedra_Evolved/mutations/temporary.json index c0e741c464aa0..ee42616574f32 100644 --- a/data/mods/Xedra_Evolved/mutations/temporary.json +++ b/data/mods/Xedra_Evolved/mutations/temporary.json @@ -446,5 +446,50 @@ "player_display": false, "points": 0, "ignored_by": [ "MAMMAL", "AMPHIBIAN", "BIRD", "REPTILE", "FISH", "KRAKEN", "INSECT", "CENTIPEDE", "INSECT_FLYING", "SPIDER" ] + }, + { + "type": "mutation", + "id": "WINTER_FEIGN_DEATH_TRAITS", + "name": { "str": "Stillness of the Tomb", "//~": "NO_I18N" }, + "description": { "str": "You are feigning death. Shhhhhhh!", "//~": "NO_I18N" }, + "valid": false, + "player_display": false, + "points": 0, + "ignored_by": [ + "MAMMAL", + "AMPHIBIAN", + "MUTANT", + "CYBORG", + "REPTILE", + "FISH", + "KRAKEN", + "MIGO", + "SLIME", + "LEECH_PLANT", + "INSECT", + "CENTIPEDE", + "INSECT_FLYING", + "SPIDER", + "BIRD", + "MOLLUSK", + "WORM", + "ZOMBIE", + "NETHER", + "PLANT", + "FERAL", + "ROBOT", + "HORROR", + "ABERRATION", + "HUMAN", + "VAMPIRE", + "NIGHTMARE", + "CHANGELING", + "ARVORE", + "HOMULLUS", + "IERDE", + "SALAMANDER", + "SYLPH", + "UNDINE" + ] } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json index 2fdfbbac5a282..418b302d49e6f 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json @@ -120,6 +120,28 @@ }, "base_casting_time": 75 }, + { + "id": "changeling_winter_feign_death_spell", + "type": "SPELL", + "name": "Stillness of the Tomb", + "description": "You and your nearby allies' footsteps make almost no sound when you move, like the footsteps of an animal traveling across new-fallen snow. If used in winter, your footsteps are totally silent. The glamour is quicker to expire in summer.", + "message": "You collapse to the ground as your chest ceases its movements.", + "flags": [ "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], + "magic_type": "xe_fey_seasonal_magick_winter", + "spell_class": "CHANGELING_SEASONAL_MAGIC_WINTER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 3, + "effect": "effect_on_condition", + "effect_str": "EOC_CHANGELING_WINTER_FEIGN_DEATH", + "base_energy_cost": { + "math": [ "max( ( 100 - u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') - (u_skill('deduction') * 2)), 40)" ] + }, + "base_casting_time": 25 + }, { "id": "changeling_winter_frozen_breath_spell", "type": "SPELL", diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json index 6c98fcc9f7f7c..d535e4624645f 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json @@ -76,5 +76,13 @@ "else": [ { "npc_message": "The target easily shatters the ice!", "type": "bad" } ] } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_WINTER_FEIGN_DEATH", + "effect": [ + { "u_add_effect": "effect_changeling_winter_feign_death", "duration": "PERMANENT" }, + { "run_eocs": "EOC_CHANGELING_NO_CASTING_OTHER_GLAMOURS_CHECKER", "time_in_future": 1 } + ] } ] From ca14433fa815242c5471725e850b37a82ef36314 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:31:03 -0500 Subject: [PATCH 12/19] Add Helios's Wrath --- .../effects_changeling_seasonal_magic.json | 26 +++++- .../obsoletion_and_migration/effects.json | 27 +++++++ .../requirements/spell_components.json | 20 +++++ .../changeling_seasonal_magic_spring.json | 1 + .../changeling_seasonal_magic_summer.json | 81 ++++++++++++++++++- ...changeling_seasonal_magic_summer_eocs.json | 42 +++++++++- 6 files changed, 188 insertions(+), 9 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index bb6ae0b89fe0b..3991178c6fd7b 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -80,7 +80,7 @@ }, { "type": "effect_type", - "id": "effect_changeling_summer_light_spell", + "id": "effect_changeling_summer_light", "name": [ "Bonefire's Light" ], "desc": [ "A wisp of flickering insubstantial fire hovers near your shoulder." ], "apply_message": "", @@ -90,7 +90,7 @@ }, { "type": "effect_type", - "id": "effect_changeling_summer_sun_glasses_spell", + "id": "effect_changeling_summer_sun_glasses", "name": [ "Shading Your Eyes" ], "desc": [ "Nearby lights don't seem quite as bright now." ], "apply_message": "", @@ -100,7 +100,7 @@ }, { "type": "effect_type", - "id": "effect_changeling_fire_melee_damage_spell", + "id": "effect_changeling_fire_melee_damage", "name": [ "Burning Solar Grasp" ], "desc": [ "Ethereal flames flicker around your hands" ], "apply_message": "", @@ -151,6 +151,26 @@ } ] }, + { + "type": "effect_type", + "id": "effect_changeling_summer_powerful_sunlight", + "name": [ "Helios's Wrath" ], + "desc": [ "You blaze with the pure light of the summer sun." ], + "apply_message": "", + "remove_message": "The blinding light fades away.", + "show_in_info": true, + "max_duration": "12 hours", + "enchantments": [ + { + "values": [ { "value": "LUMINATION", "add": 8000 } ], + "intermittent_activation": { + "effects": [ + { "frequency": "4 seconds", "spell_effects": [ { "id": "changeling_summer_powerful_sunlight_spell_aura_effects" } ] } + ] + } + } + ] + }, { "type": "effect_type", "id": "effect_changeling_autumn_touch_of_frailty_character", diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/effects.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/effects.json index 70d045e818411..a208264e6126b 100644 --- a/data/mods/Xedra_Evolved/obsoletion_and_migration/effects.json +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/effects.json @@ -36,5 +36,32 @@ "show_intensity": false, "limb_score_mods": [ { "limb_score": "lift", "modifier": 0.51 }, { "limb_score": "grip", "modifier": 0.25 } ], "flags": [ "EFFECT_LIMB_SCORE_MOD", "EFFECT_IMPEDING" ] + }, + { + "type": "effect_type", + "id": "effect_changeling_summer_light_spell", + "name": [ "Bonefire's Light" ], + "desc": [ "A wisp of flickering insubstantial fire hovers near your shoulder." ], + "apply_message": "", + "remove_message": "The wisp winks out.", + "max_duration": "12 hours" + }, + { + "type": "effect_type", + "id": "effect_changeling_summer_sun_glasses_spell", + "name": [ "Shading Your Eyes" ], + "desc": [ "Nearby lights don't seem quite as bright now." ], + "apply_message": "", + "remove_message": "You blink as nearby lights grow brighter.", + "max_duration": "12 hours" + }, + { + "type": "effect_type", + "id": "effect_changeling_fire_melee_damage_spell", + "name": [ "Burning Solar Grasp" ], + "desc": [ "Ethereal flames flicker around your hands" ], + "apply_message": "", + "remove_message": "The flames gutter out.", + "max_duration": "12 hours" } ] diff --git a/data/mods/Xedra_Evolved/requirements/spell_components.json b/data/mods/Xedra_Evolved/requirements/spell_components.json index bb375ed2f9905..01891ea9755b6 100644 --- a/data/mods/Xedra_Evolved/requirements/spell_components.json +++ b/data/mods/Xedra_Evolved/requirements/spell_components.json @@ -4,6 +4,26 @@ "type": "requirement", "components": [ [ [ "scrap_dreamdross", 1 ] ] ] }, + { + "id": "spell_components_dreamdross_2", + "type": "requirement", + "components": [ [ [ "scrap_dreamdross", 2 ] ] ] + }, + { + "id": "spell_components_dreamdross_3", + "type": "requirement", + "components": [ [ [ "scrap_dreamdross", 3 ] ] ] + }, + { + "id": "spell_components_dreamdross_4", + "type": "requirement", + "components": [ [ [ "scrap_dreamdross", 4 ] ] ] + }, + { + "id": "spell_components_dreamdross_5", + "type": "requirement", + "components": [ [ [ "scrap_dreamdross", 5 ] ] ] + }, { "id": "spell_components_dreamdross2", "type": "requirement", diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json index 718a1cde9adde..a8aad12892c9c 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_spring.json @@ -162,6 +162,7 @@ "max_level": 1, "shape": "blast", "difficulty": 8, + "components": "spell_components_dreamdross_2", "effect": "effect_on_condition", "effect_str": "EOC_CHANGELING_SPRING_HEALING_INCREASE_WHILE_OUTSIDE_INITIATE", "min_range": 10, diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json index e43ea756c1473..cc377c93343ef 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json @@ -41,7 +41,7 @@ }, "base_energy_cost": { "math": [ - "u_effect_intensity('effect_changeling_summer_light_spell') > -1 ? 0 : max( ( 100 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 3) - (u_skill('deduction') * 3)), 25)" + "u_effect_intensity('effect_changeling_summer_light') > -1 ? 0 : max( ( 100 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 3) - (u_skill('deduction') * 3)), 25)" ] }, "base_casting_time": 50 @@ -147,7 +147,7 @@ "shape": "blast", "difficulty": 4, "effect": "attack", - "effect_str": "effect_changeling_fire_melee_damage_spell", + "effect_str": "effect_changeling_fire_melee_damage", "min_duration": { "math": [ "( ( 2285 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 915) + (u_skill('deduction') * 3045) ) ) * (global_what_is_the_season == 4 ? 0.6 : 1)" @@ -184,5 +184,82 @@ "math": [ "max( ( 450 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 5) - (u_skill('deduction') * 4)), 250)" ] }, "base_casting_time": 100 + }, + { + "id": "changeling_summer_powerful_sunlight_spell", + "type": "SPELL", + "name": "Helios's Wrath", + "description": "Blaze with the blinding light of the sun, blinding anyone nearby capable of seeing you. This is real sunlight and affects creatures harmed by it accordingly. Reweave the glamour to dispel it.", + "message": "", + "flags": [ "VERBAL", "RANDOM_DURATION" ], + "magic_type": "xe_fey_seasonal_magick_summer", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SUMMER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 10, + "components": "spell_components_dreamdross_4", + "effect": "effect_on_condition", + "effect_str": "EOC_CHANGELING_SUMMER_POWERFUL_SUNLIGHT_INITIATE", + "min_duration": { + "math": [ "( ( 595 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 152) + (u_skill('deduction') * 251) ) )" ] + }, + "max_duration": { + "math": [ "( ( 1520 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 382) + (u_skill('deduction') * 601) ) )" ] + }, + "base_energy_cost": { + "math": [ + "u_effect_intensity('effect_changeling_summer_powerful_sunlight') > -1 ? 0 : max( ( 900 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 5) - (u_skill('deduction') * 10)), 600)" + ] + }, + "base_casting_time": 50 + }, + { + "id": "changeling_summer_powerful_sunlight_spell_aura_effects", + "type": "SPELL", + "name": { "str": "Helios's Wrath Special effects", "//~": "NO_I18N" }, + "description": { + "str": "Used because auras are not currently possible. Blind targets are harms those who die in sunlight.", + "//~": "NO_I18N" + }, + "message": "", + "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], + "magic_type": "xe_fey_seasonal_magick_summer", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SUMMER", + "valid_targets": [ "ally", "hostile" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "effect": "effect_on_condition", + "effect_str": "EOC_CHANGELING_SUMMER_POWERFUL_SUNLIGHT_AURA_EFFECTS", + "min_aoe": 45, + "max_aoe": 45 + }, + { + "id": "changeling_summer_powerful_sunlight_spell_sundeath_self_damage", + "type": "SPELL", + "name": { "str": "Helios's Wrath Sundeath damage", "//~": "NO_I18N" }, + "description": { + "str": "Used because auras are not currently possible. Causes enemies with the SUNDEATH flag to burn.", + "//~": "NO_I18N" + }, + "message": "", + "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], + "magic_type": "xe_fey_seasonal_magick_summer", + "spell_class": "CHANGELING_SEASONAL_MAGIC_SUMMER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "effect": "attack", + "damage_type": "pure", + "min_dot": 75, + "max_dot": 75, + "min_duration": 300, + "max_duration": 300 } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json index a77799aa5d90e..62d2274467976 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json @@ -15,12 +15,12 @@ ] }, { - "u_add_effect": "effect_changeling_summer_light_spell", + "u_add_effect": "effect_changeling_summer_light", "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } }, { "u_message": "A flickering red-orange wisp of light kindles near your shoulder.", "type": "neutral" } ], - "false_effect": [ { "u_lose_effect": "effect_changeling_summer_light_spell" } ] + "false_effect": [ { "u_lose_effect": "effect_changeling_summer_light" } ] }, { "type": "effect_on_condition", @@ -58,7 +58,7 @@ ] }, { - "u_add_effect": "effect_changeling_summer_sun_glasses_spell", + "u_add_effect": "effect_changeling_summer_sun_glasses", "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } }, { "u_spawn_item": "changeling_summer_sunglasses", "suppress_message": true, "force_equip": true }, @@ -70,7 +70,7 @@ "id": "EOC_CHANGELING_SUMMER_SUN_GLASSES_REMOVER", "eoc_type": "EVENT", "required_event": "character_loses_effect", - "condition": { "compare_string": [ "effect_changeling_summer_sun_glasses_spell", { "context_val": "effect" } ] }, + "condition": { "compare_string": [ "effect_changeling_summer_sun_glasses", { "context_val": "effect" } ] }, "effect": { "u_remove_item_with": "changeling_summer_sunglasses" } }, { @@ -100,5 +100,39 @@ } ], "false_effect": [ { "u_lose_effect": "effect_changeling_summer_run_for_long_periods" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_SUMMER_POWERFUL_SUNLIGHT_INITIATE", + "condition": { "not": { "u_has_effect": "effect_changeling_summer_powerful_sunlight" } }, + "effect": [ + { + "math": [ + "u_spell_low_duration = ( 5.95 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 1.52) + (u_skill('deduction') * 2.51) )" + ] + }, + { + "math": [ + "u_spell_high_duration = ( 15.20 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 3.82) + (u_skill('deduction') * 6.01) )" + ] + }, + { + "u_add_effect": "effect_changeling_summer_powerful_sunlight", + "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } + } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_SUMMER_POWERFUL_SUNLIGHT_AURA_EFFECTS", + "effect": [ + { "if": { "not": { "u_has_effect": "blind" }, "then": { "u_add_effect": "blind", "duration": "1 minutes" } } }, + { + "if": { + "not": { "u_has_flag": "SUNDEATH" }, + "then": { "u_cast_spell": { "id": "changeling_summer_powerful_sunlight_spell_sundeath_self_damage", "hit_self": false } } + } + } + ] } ] From 3ed6f32abd0cc0eff55766307c337d3f8eab11b7 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Tue, 11 Feb 2025 16:32:01 -0500 Subject: [PATCH 13/19] Add missing u_message --- .../spells/changeling_seasonal_magic_summer_eocs.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json index 62d2274467976..83b7805f4807e 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json @@ -119,8 +119,10 @@ { "u_add_effect": "effect_changeling_summer_powerful_sunlight", "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } - } - ] + }, + { "u_message": "You blaze with brilliant light.", "type": "good" } + ], + "false_effect": { "u_lose_effect": "effect_changeling_summer_powerful_sunlight" } }, { "type": "effect_on_condition", From b3913af67b7d383200b5fa6ac0f334a318968586 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Tue, 11 Feb 2025 23:53:25 -0600 Subject: [PATCH 14/19] Add SPLIT_DAMAGE --- .../Xedra_Evolved/spells/changeling_seasonal_magic_winter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json index 418b302d49e6f..67d61588dc0c2 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json @@ -148,7 +148,7 @@ "name": "Jack's Breath", "description": "Draw in the chill air of winter and breathe out a cone of freezing air and ice, damaging and slowing your opponents.", "message": "You breathe out a cone of freezing air.", - "flags": [ "SOMATIC", "RANDOM_DAMAGE", "SILENT", "RANDOM_DURATION" ], + "flags": [ "SOMATIC", "RANDOM_DAMAGE", "SILENT", "RANDOM_DURATION", "SPLIT_DAMAGE" ], "magic_type": "xe_fey_seasonal_magick_winter", "spell_class": "CHANGELING_SEASONAL_MAGIC_WINTER", "valid_targets": [ "ally", "hostile", "ground" ], From edb83a4e38210f880cb15a90fd52570ac5c3a99c Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 12 Feb 2025 09:53:00 -0600 Subject: [PATCH 15/19] Fixes --- .../effects_changeling_seasonal_magic.json | 8 ++ .../mutations/playable_changeling_eocs.json | 15 ++- .../changeling_seasonal_magic_summer.json | 4 +- ...changeling_seasonal_magic_summer_eocs.json | 21 ++-- .../changeling_seasonal_magic_winter.json | 2 +- ...changeling_seasonal_magic_winter_eocs.json | 107 ++++++++++++++++++ 6 files changed, 143 insertions(+), 14 deletions(-) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index 3991178c6fd7b..490b8a8740805 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -293,6 +293,14 @@ ], "flags": [ "EFFECT_LIMB_SCORE_MOD" ] }, + { + "type": "effect_type", + "id": "effect_changeling_winter_feign_death_limiter", + "name": [ "Definitely Alive" ], + "desc": [ "You can fool them once, but you can't fool them twice." ], + "max_duration": "1 minutes", + "blocks_effects": [ "effect_changeling_winter_feign_death" ] + }, { "type": "effect_type", "id": "effect_changeling_winter_frozen_breath", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json index b9b3fb0f4c3f3..b52d8fe417e6d 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_eocs.json @@ -412,12 +412,23 @@ "type": "effect_on_condition", "id": "EOC_CHANGELING_DISGUISE_AS_NATURE_END", "effect": [ + { + "if": { + "u_has_any_trait": [ + "CHANGELING_DISGUISE_AS_NATURE_BUSH", + "CHANGELING_DISGUISE_AS_NATURE_TREE", + "CHANGELING_DISGUISE_AS_NATURE_POND", + "CHANGELING_DISGUISE_AS_NATURE_GRASS", + "CHANGELING_DISGUISE_AS_NATURE_ROCK" + ] + }, + "then": { "u_message": "The glamour disguising you fades.", "type": "bad" } + }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_BUSH" }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_TREE" }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_POND" }, { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_GRASS" }, - { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_ROCK" }, - { "u_message": "The glamour disguising you fades.", "type": "bad" } + { "u_lose_trait": "CHANGELING_DISGUISE_AS_NATURE_ROCK" } ] }, { diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json index cc377c93343ef..c28f9e9f02393 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer.json @@ -189,7 +189,7 @@ "id": "changeling_summer_powerful_sunlight_spell", "type": "SPELL", "name": "Helios's Wrath", - "description": "Blaze with the blinding light of the sun, blinding anyone nearby capable of seeing you. This is real sunlight and affects creatures harmed by it accordingly. Reweave the glamour to dispel it.", + "description": "Blaze with the blinding light of the sun, blinding anyone nearby capable of seeing you. This is real sunlight and affects creatures harmed by it accordingly.", "message": "", "flags": [ "VERBAL", "RANDOM_DURATION" ], "magic_type": "xe_fey_seasonal_magick_summer", @@ -211,7 +211,7 @@ }, "base_energy_cost": { "math": [ - "u_effect_intensity('effect_changeling_summer_powerful_sunlight') > -1 ? 0 : max( ( 900 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 5) - (u_skill('deduction') * 10)), 600)" + "max( ( 900 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_SUMMER') * 5) - (u_skill('deduction') * 10)), 600)" ] }, "base_casting_time": 50 diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json index 83b7805f4807e..1d3c5d8be9424 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_summer_eocs.json @@ -104,7 +104,6 @@ { "type": "effect_on_condition", "id": "EOC_CHANGELING_SUMMER_POWERFUL_SUNLIGHT_INITIATE", - "condition": { "not": { "u_has_effect": "effect_changeling_summer_powerful_sunlight" } }, "effect": [ { "math": [ @@ -120,20 +119,24 @@ "u_add_effect": "effect_changeling_summer_powerful_sunlight", "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } }, - { "u_message": "You blaze with brilliant light.", "type": "good" } - ], - "false_effect": { "u_lose_effect": "effect_changeling_summer_powerful_sunlight" } + { "u_message": "You blaze with brilliant light.", "type": "good" }, + { "u_cast_spell": { "id": "changeling_summer_powerful_sunlight_spell_aura_effects", "hit_self": false } } + ] }, { "type": "effect_on_condition", "id": "EOC_CHANGELING_SUMMER_POWERFUL_SUNLIGHT_AURA_EFFECTS", "effect": [ - { "if": { "not": { "u_has_effect": "blind" }, "then": { "u_add_effect": "blind", "duration": "1 minutes" } } }, + { "if": { "not": { "u_has_effect": "blind" } }, "then": { "u_add_effect": "blind", "duration": "1 minutes" } }, { - "if": { - "not": { "u_has_flag": "SUNDEATH" }, - "then": { "u_cast_spell": { "id": "changeling_summer_powerful_sunlight_spell_sundeath_self_damage", "hit_self": false } } - } + "if": { "u_has_flag": "SUNDEATH" }, + "then": [ + { "math": [ "u_val('morale')", "-=", "200" ] }, + { + "u_cast_spell": { "id": "changeling_summer_powerful_sunlight_spell_sundeath_self_damage", "hit_self": true } + }, + { "message": "The is seared by the brilliant light!", "type": "neutral" } + ] } ] } diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json index 67d61588dc0c2..59c8f582de9e2 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json @@ -125,7 +125,7 @@ "type": "SPELL", "name": "Stillness of the Tomb", "description": "You and your nearby allies' footsteps make almost no sound when you move, like the footsteps of an animal traveling across new-fallen snow. If used in winter, your footsteps are totally silent. The glamour is quicker to expire in summer.", - "message": "You collapse to the ground as your chest ceases its movements.", + "message": "", "flags": [ "NO_HANDS", "NO_LEGS", "RANDOM_DURATION" ], "magic_type": "xe_fey_seasonal_magick_winter", "spell_class": "CHANGELING_SEASONAL_MAGIC_WINTER", diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json index d535e4624645f..1e1a75981c64f 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json @@ -82,7 +82,114 @@ "id": "EOC_CHANGELING_WINTER_FEIGN_DEATH", "effect": [ { "u_add_effect": "effect_changeling_winter_feign_death", "duration": "PERMANENT" }, + { + "if": { "not": { "u_has_effect": "effect_changeling_winter_feign_death_limiter" } }, + "then": { "u_message": "You collapse to the ground as your chest ceases its movements.", "type": "neutral" }, + "else": { "u_message": "You collapse to the ground, but nothing seems fooled!", "type": "bad" } + }, { "run_eocs": "EOC_CHANGELING_NO_CASTING_OTHER_GLAMOURS_CHECKER", "time_in_future": 1 } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_WINTER_FEIGN_DEATH_LIMITER_ON_LOSS", + "eoc_type": "EVENT", + "required_event": "character_loses_effect", + "condition": { "compare_string": [ "effect_changeling_winter_feign_death", { "context_val": "effect" } ] }, + "effect": { "u_add_effect": "effect_changeling_winter_feign_death_limiter", "duration": "1 minutes" } + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_WINTER_FEIGN_DEATH_LOST_ON_ACTIVITY", + "eoc_type": "EVENT", + "required_event": "character_starts_activity", + "condition": { + "and": [ + { "u_has_effect": "effect_changeling_winter_feign_death" }, + { + "or": [ + { "compare_string": [ "ACT_LOCKPICK", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_REPAIR_ITEM", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MEND_ITEM", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_VEHICLE_REPAIR", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_RELOAD", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_FIRSTAID", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MILK", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_HACKSAW", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_BOLTCUTTING", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_HAIRCUT", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_SHAVE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_CRACKING", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_READ", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_EBOOKSAVE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_TIDY_UP", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MOP", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_VEHICLE_DECONSTRUCTION", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_VEHICLE_FOLD", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_VEHICLE_UNFOLD", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_BIKERACK_UNRACKING", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_BIKERACK_RACKING", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_DIS", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_FISH", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_CRAFT", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_CHOP_PLANKS", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_CHOP_TREES", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_MINE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_CONSTRUCTION", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_MOP", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_READ", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_FISH", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_GENERIC_GAME", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_GAME", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_DISASSEMBLE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MULTIPLE_FARM", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_HARVEST", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_FIELD_DRESS", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_SKIN", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_QUARTER", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_DISSECT", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_LONGSALVAGE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_BUILD", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_PICKAXE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_HAND_CRANK", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_PICKUP", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_AUTODRIVE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_FERTILIZE_PLOT", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_MOVE_LOOT", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_UNLOAD_LOOT", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_INSERT_ITEM", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_START_FIRE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_OPEN_GATE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_FILL_LIQUID", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_SHEARING", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_HOTWIRE_CAR", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_AIM", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_ATM", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_START_ENGINES", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_OXYTORCH", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_TOOLMOD_ADD", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_CLEAR_RUBBLE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_WASH", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_PRYING", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_CHOP_LOGS", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_CHOP_PLANKS", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_JACKHAMMER", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_CHURN", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_PLANT_SEED", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_WEAR", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_PICKUP", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_WIELD", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_BINDER_COPY_RECIPE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_DATA_HANDLING", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_FURNITURE_MOVE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_TENT_PLACE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_TENT_DECONSTRUCT", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_REEL_CABLE", { "context_val": "activity" } ] }, + { "compare_string": [ "ACT_SALINE_INFUSE", { "context_val": "activity" } ] } + ] + } + ] + }, + "effect": [ { "u_lose_effect": "effect_changeling_winter_feign_death." } ] } ] From a794b8d68e3cfeb83b601a30728a00e07f392cc4 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 12 Feb 2025 15:54:59 -0600 Subject: [PATCH 16/19] Add The Frozen Heart --- .../effects_changeling_seasonal_magic.json | 7 + .../changeling_seasonal_magic_winter.json | 34 +++++ ...changeling_seasonal_magic_winter_eocs.json | 144 ++++++++++++++++++ 3 files changed, 185 insertions(+) diff --git a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json index 490b8a8740805..366fc75925b28 100644 --- a/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json +++ b/data/mods/Xedra_Evolved/effects/effects_changeling_seasonal_magic.json @@ -312,5 +312,12 @@ "max_duration": "20 minutes", "enchantments": [ { "values": [ { "value": "SPEED", "multiply": -0.1 } ] } ], "base_mods": { "hit_mod": [ -1 ] } + }, + { + "type": "effect_type", + "id": "effect_changeling_winter_neutralize_morale", + "name": [ "Frozen Heart" ], + "desc": [ "All emotions are frozen out." ], + "enchantments": [ { "mutations": [ "PSYCHOPATH" ] } ] } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json index 59c8f582de9e2..cb22b1d94aa77 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter.json @@ -192,5 +192,39 @@ "math": [ "max( ( 200 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 3) - (u_skill('deduction') * 5)), 100)" ] }, "base_casting_time": 100 + }, + { + "id": "changeling_winter_neutralize_morale_spell", + "type": "SPELL", + "name": "The Frozen Heart", + "description": "Freeze out all emotion in your heart, rendering you perfectly calm. This will cancel extremes of both positive and negative emotion and prevent you from feeling anything for the glamour's duration. This latter effect does not occur in summer.", + "message": "", + "flags": [ "NO_LEGS", "SOMATIC", "RANDOM_DURATION" ], + "magic_type": "xe_fey_seasonal_magick_winter", + "spell_class": "CHANGELING_SEASONAL_MAGIC_WINTER", + "valid_targets": [ "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 5, + "effect": "effect_on_condition", + "effect_str": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE", + "min_duration": { + "math": [ + "( ( 2912 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 1582) + (u_skill('deduction') * 3184) ) ) * (global_what_is_the_season == 2 ? 0 : 1)" + ] + }, + "max_duration": { + "math": [ + "( ( 6952 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 4185) + (u_skill('deduction') * 9052) ) ) * (global_what_is_the_season == 2 ? 0 : 1)" + ] + }, + "base_energy_cost": { + "math": [ + "max( ( 500 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 2 ) - (u_skill('deduction') * 4)), 350)" + ] + }, + "base_casting_time": 500 } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json index 1e1a75981c64f..424506fb736a9 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json @@ -191,5 +191,149 @@ ] }, "effect": [ { "u_lose_effect": "effect_changeling_winter_feign_death." } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE", + "effect": [ + { + "run_eocs": [ + { + "id": "EOC_FULL_MORALE_NEUTRALIZATION", + "//": "I really wish there were a better way to do this.", + "effect": [ + { "u_lose_morale": "morale_bile" }, + { "u_lose_morale": "morale_food_good" }, + { "u_lose_morale": "morale_food_hot" }, + { "u_lose_morale": "morale_chat" }, + { "u_lose_morale": "morale_chat_uncaring" }, + { "u_lose_morale": "morale_ate_with_table" }, + { "u_lose_morale": "morale_ate_without_table" }, + { "u_lose_morale": "morale_music" }, + { "u_lose_morale": "morale_honey" }, + { "u_lose_morale": "morale_game" }, + { "u_lose_morale": "morale_marloss" }, + { "u_lose_morale": "morale_mutagen" }, + { "u_lose_morale": "morale_feeling_good" }, + { "u_lose_morale": "morale_support" }, + { "u_lose_morale": "morale_photos" }, + { "u_lose_morale": "morale_craving_nicotine" }, + { "u_lose_morale": "morale_craving_caffeine" }, + { "u_lose_morale": "morale_craving_alcohol" }, + { "u_lose_morale": "morale_craving_opiate" }, + { "u_lose_morale": "morale_craving_speed" }, + { "u_lose_morale": "morale_craving_cocaine" }, + { "u_lose_morale": "morale_craving_crack" }, + { "u_lose_morale": "morale_craving_mutagen" }, + { "u_lose_morale": "morale_craving_diazepam" }, + { "u_lose_morale": "morale_craving_marloss" }, + { "u_lose_morale": "morale_food_bad" }, + { "u_lose_morale": "morale_cannibal" }, + { "u_lose_morale": "morale_demicannibal" }, + { "u_lose_morale": "morale_vegetarian" }, + { "u_lose_morale": "morale_antiveggy" }, + { "u_lose_morale": "morale_meatarian" }, + { "u_lose_morale": "morale_antimeat" }, + { "u_lose_morale": "morale_antifruit" }, + { "u_lose_morale": "morale_lactose" }, + { "u_lose_morale": "morale_antijunk" }, + { "u_lose_morale": "morale_antiwheat" }, + { "u_lose_morale": "morale_sweettooth" }, + { "u_lose_morale": "morale_no_digest" }, + { "u_lose_morale": "morale_wet" }, + { "u_lose_morale": "morale_dried_off" }, + { "u_lose_morale": "morale_cold" }, + { "u_lose_morale": "morale_hot" }, + { "u_lose_morale": "morale_feeling_bad" }, + { "u_lose_morale": "morale_bad_protein_bar" }, + { "u_lose_morale": "morale_killed_innocent" }, + { "u_lose_morale": "morale_killed_friend" }, + { "u_lose_morale": "morale_killed_monster" }, + { "u_lose_morale": "morale_mutilate_corpse" }, + { "u_lose_morale": "morale_mutagen_elf" }, + { "u_lose_morale": "morale_mutagen_chimera" }, + { "u_lose_morale": "morale_mutagen_mutation" }, + { "u_lose_morale": "morale_moodswing" }, + { "u_lose_morale": "morale_book" }, + { "u_lose_morale": "morale_comfy" }, + { "u_lose_morale": "morale_scream" }, + { "u_lose_morale": "morale_perm_masochist" }, + { "u_lose_morale": "morale_perm_radiophile" }, + { "u_lose_morale": "morale_perm_noface" }, + { "u_lose_morale": "morale_perm_fpmode_on" }, + { "u_lose_morale": "morale_perm_hoarder" }, + { "u_lose_morale": "morale_perm_fancy" }, + { "u_lose_morale": "morale_perm_optimist" }, + { "u_lose_morale": "morale_perm_badtemper" }, + { "u_lose_morale": "morale_perm_numb" }, + { "u_lose_morale": "morale_perm_constrained" }, + { "u_lose_morale": "morale_perm_nomad" }, + { "u_lose_morale": "morale_game_found_kitten" }, + { "u_lose_morale": "morale_haircut" }, + { "u_lose_morale": "morale_shave" }, + { "u_lose_morale": "morale_vomited" }, + { "u_lose_morale": "morale_play_with_pet" }, + { "u_lose_morale": "morale_pyromania_startfire" }, + { "u_lose_morale": "morale_pyromania_nearfire" }, + { "u_lose_morale": "morale_pyromania_nofire" }, + { "u_lose_morale": "morale_killer_has_killed" }, + { "u_lose_morale": "morale_killer_need_to_kill" }, + { "u_lose_morale": "morale_perm_filthy" }, + { "u_lose_morale": "morale_butcher" }, + { "u_lose_morale": "morale_gravedigger" }, + { "u_lose_morale": "morale_funeral" }, + { "u_lose_morale": "morale_tree_communion" }, + { "u_lose_morale": "morale_accomplishment" }, + { "u_lose_morale": "morale_failure" }, + { "u_lose_morale": "morale_nightmare" }, + { "u_lose_morale": "morale_migo_bio_tech" }, + { "u_lose_morale": "morale_impossible_shape" }, + { "u_lose_morale": "morale_afs_drugs" }, + { "u_lose_morale": "morale_social" }, + { "u_lose_morale": "morale_asocial" }, + { "u_lose_morale": "morale_sunrise" }, + { "u_lose_morale": "morale_sunset" }, + { "u_lose_morale": "morale_ate_dross" }, + { "u_lose_morale": "morale_drank_blood" }, + { "u_lose_morale": "morale_craving_lotus_blossom" }, + { "u_lose_morale": "morale_forest_unity" }, + { "u_lose_morale": "morale_broke_fae_ban" }, + { "u_lose_morale": "morale_homullus_self_deception" }, + { "u_lose_morale": "morale_ierde_meditation" }, + { "u_lose_morale": "morale_boring_fruit" } + ] + }, + { + "if": { "not": { "is_season": "summer" } }, + "then": [ + { + "math": [ + "u_spell_low_duration = ( ( 29.12 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 15.82) + (u_skill('deduction') * 31.84) ) )" + ] + }, + { + "math": [ + "u_spell_high_duration = ( ( 69.52 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 41.85) + (u_skill('deduction') * 90.52) ) )" + ] + }, + { + "u_add_effect": "effect_changeling_winter_neutralize_morale", + "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } + }, + { "run_eocs": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE_CONTINUANCE", "time_in_future": 60 } + ] + } + ] + } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE_CONTINUANCE", + "condition": { "u_has_effect": "effect_changeling_winter_neutralize_morale" }, + "effect": [ + { "run_eocs": "EOC_FULL_MORALE_NEUTRALIZATION" }, + { "run_eocs": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE_CONTINUANCE", "time_in_future": 60 } + ] } ] From d971fc98f331cecf8a81ef7e187eee72334c492f Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 12 Feb 2025 16:04:41 -0600 Subject: [PATCH 17/19] Fixes --- ...changeling_seasonal_magic_winter_eocs.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json index 424506fb736a9..601458d803ada 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json @@ -302,27 +302,27 @@ { "u_lose_morale": "morale_ierde_meditation" }, { "u_lose_morale": "morale_boring_fruit" } ] + } + ] + }, + { + "if": { "not": { "is_season": "summer" } }, + "then": [ + { + "math": [ + "u_spell_low_duration = ( ( 29.12 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 15.82) + (u_skill('deduction') * 31.84) ) )" + ] }, { - "if": { "not": { "is_season": "summer" } }, - "then": [ - { - "math": [ - "u_spell_low_duration = ( ( 29.12 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 15.82) + (u_skill('deduction') * 31.84) ) )" - ] - }, - { - "math": [ - "u_spell_high_duration = ( ( 69.52 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 41.85) + (u_skill('deduction') * 90.52) ) )" - ] - }, - { - "u_add_effect": "effect_changeling_winter_neutralize_morale", - "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } - }, - { "run_eocs": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE_CONTINUANCE", "time_in_future": 60 } + "math": [ + "u_spell_high_duration = ( ( 69.52 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_WINTER') * 41.85) + (u_skill('deduction') * 90.52) ) )" ] - } + }, + { + "u_add_effect": "effect_changeling_winter_neutralize_morale", + "duration": { "math": [ "rng(u_spell_low_duration, u_spell_high_duration)" ] } + }, + { "run_eocs": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE_CONTINUANCE", "time_in_future": 60 } ] } ] From 547b5628ac5e7f006a009aa0fc6d41e76cea0a06 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 12 Feb 2025 16:59:08 -0600 Subject: [PATCH 18/19] Add Lost in the Mists --- data/mods/Xedra_Evolved/eocs/misc_eoc.json | 106 +++++++++++++++++ data/mods/Xedra_Evolved/field_type.json | 51 +++++++- .../mutations/paraclesians/ierde_eocs.json | 19 --- .../paraclesians/ierde_mutations.json | 2 +- ...angeling_seasonal_magic_research_eocs.json | 14 +-- .../changeling_seasonal_magic_autumn.json | 53 +++++++++ ...changeling_seasonal_magic_winter_eocs.json | 110 +----------------- 7 files changed, 217 insertions(+), 138 deletions(-) diff --git a/data/mods/Xedra_Evolved/eocs/misc_eoc.json b/data/mods/Xedra_Evolved/eocs/misc_eoc.json index b1887930c9ce9..8c3bfadb5c5c6 100644 --- a/data/mods/Xedra_Evolved/eocs/misc_eoc.json +++ b/data/mods/Xedra_Evolved/eocs/misc_eoc.json @@ -337,5 +337,111 @@ "required_event": "character_wakes_up", "condition": { "u_has_effect": "effect_sleep_shield" }, "effect": [ { "u_lose_effect": "effect_sleep_shield" }, { "u_teleport": { "u_val": "SLEEP_SHIELD_location" }, "force": true } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_FULL_MORALE_NEUTRALIZATION", + "//": "I really wish there were a better way to do this.", + "effect": [ + { "u_lose_morale": "morale_bile" }, + { "u_lose_morale": "morale_food_good" }, + { "u_lose_morale": "morale_food_hot" }, + { "u_lose_morale": "morale_chat" }, + { "u_lose_morale": "morale_chat_uncaring" }, + { "u_lose_morale": "morale_ate_with_table" }, + { "u_lose_morale": "morale_ate_without_table" }, + { "u_lose_morale": "morale_music" }, + { "u_lose_morale": "morale_honey" }, + { "u_lose_morale": "morale_game" }, + { "u_lose_morale": "morale_marloss" }, + { "u_lose_morale": "morale_mutagen" }, + { "u_lose_morale": "morale_feeling_good" }, + { "u_lose_morale": "morale_support" }, + { "u_lose_morale": "morale_photos" }, + { "u_lose_morale": "morale_craving_nicotine" }, + { "u_lose_morale": "morale_craving_caffeine" }, + { "u_lose_morale": "morale_craving_alcohol" }, + { "u_lose_morale": "morale_craving_opiate" }, + { "u_lose_morale": "morale_craving_speed" }, + { "u_lose_morale": "morale_craving_cocaine" }, + { "u_lose_morale": "morale_craving_crack" }, + { "u_lose_morale": "morale_craving_mutagen" }, + { "u_lose_morale": "morale_craving_diazepam" }, + { "u_lose_morale": "morale_craving_marloss" }, + { "u_lose_morale": "morale_food_bad" }, + { "u_lose_morale": "morale_cannibal" }, + { "u_lose_morale": "morale_demicannibal" }, + { "u_lose_morale": "morale_vegetarian" }, + { "u_lose_morale": "morale_antiveggy" }, + { "u_lose_morale": "morale_meatarian" }, + { "u_lose_morale": "morale_antimeat" }, + { "u_lose_morale": "morale_antifruit" }, + { "u_lose_morale": "morale_lactose" }, + { "u_lose_morale": "morale_antijunk" }, + { "u_lose_morale": "morale_antiwheat" }, + { "u_lose_morale": "morale_sweettooth" }, + { "u_lose_morale": "morale_no_digest" }, + { "u_lose_morale": "morale_wet" }, + { "u_lose_morale": "morale_dried_off" }, + { "u_lose_morale": "morale_cold" }, + { "u_lose_morale": "morale_hot" }, + { "u_lose_morale": "morale_feeling_bad" }, + { "u_lose_morale": "morale_bad_protein_bar" }, + { "u_lose_morale": "morale_killed_innocent" }, + { "u_lose_morale": "morale_killed_friend" }, + { "u_lose_morale": "morale_killed_monster" }, + { "u_lose_morale": "morale_mutilate_corpse" }, + { "u_lose_morale": "morale_mutagen_elf" }, + { "u_lose_morale": "morale_mutagen_chimera" }, + { "u_lose_morale": "morale_mutagen_mutation" }, + { "u_lose_morale": "morale_moodswing" }, + { "u_lose_morale": "morale_book" }, + { "u_lose_morale": "morale_comfy" }, + { "u_lose_morale": "morale_scream" }, + { "u_lose_morale": "morale_perm_masochist" }, + { "u_lose_morale": "morale_perm_radiophile" }, + { "u_lose_morale": "morale_perm_noface" }, + { "u_lose_morale": "morale_perm_fpmode_on" }, + { "u_lose_morale": "morale_perm_hoarder" }, + { "u_lose_morale": "morale_perm_fancy" }, + { "u_lose_morale": "morale_perm_optimist" }, + { "u_lose_morale": "morale_perm_badtemper" }, + { "u_lose_morale": "morale_perm_numb" }, + { "u_lose_morale": "morale_perm_constrained" }, + { "u_lose_morale": "morale_perm_nomad" }, + { "u_lose_morale": "morale_game_found_kitten" }, + { "u_lose_morale": "morale_haircut" }, + { "u_lose_morale": "morale_shave" }, + { "u_lose_morale": "morale_vomited" }, + { "u_lose_morale": "morale_play_with_pet" }, + { "u_lose_morale": "morale_pyromania_startfire" }, + { "u_lose_morale": "morale_pyromania_nearfire" }, + { "u_lose_morale": "morale_pyromania_nofire" }, + { "u_lose_morale": "morale_killer_has_killed" }, + { "u_lose_morale": "morale_killer_need_to_kill" }, + { "u_lose_morale": "morale_perm_filthy" }, + { "u_lose_morale": "morale_butcher" }, + { "u_lose_morale": "morale_gravedigger" }, + { "u_lose_morale": "morale_funeral" }, + { "u_lose_morale": "morale_tree_communion" }, + { "u_lose_morale": "morale_accomplishment" }, + { "u_lose_morale": "morale_failure" }, + { "u_lose_morale": "morale_nightmare" }, + { "u_lose_morale": "morale_migo_bio_tech" }, + { "u_lose_morale": "morale_impossible_shape" }, + { "u_lose_morale": "morale_afs_drugs" }, + { "u_lose_morale": "morale_social" }, + { "u_lose_morale": "morale_asocial" }, + { "u_lose_morale": "morale_sunrise" }, + { "u_lose_morale": "morale_sunset" }, + { "u_lose_morale": "morale_ate_dross" }, + { "u_lose_morale": "morale_drank_blood" }, + { "u_lose_morale": "morale_craving_lotus_blossom" }, + { "u_lose_morale": "morale_forest_unity" }, + { "u_lose_morale": "morale_broke_fae_ban" }, + { "u_lose_morale": "morale_homullus_self_deception" }, + { "u_lose_morale": "morale_ierde_meditation" }, + { "u_lose_morale": "morale_boring_fruit" } + ] } ] diff --git a/data/mods/Xedra_Evolved/field_type.json b/data/mods/Xedra_Evolved/field_type.json index 8e2af110bf0eb..c0207e23d7a3d 100644 --- a/data/mods/Xedra_Evolved/field_type.json +++ b/data/mods/Xedra_Evolved/field_type.json @@ -243,10 +243,8 @@ { "name": "impenetrable fog", "translucency": 0, "color": "dark_gray", "scent_neutralization": 9 } ], "decay_amount_factor": 15, - "gas_absorption_factor": 5, "percent_spread": 35, "dirty_transparency_cache": true, - "has_fume": true, "priority": 8, "half_life": "7 minutes", "phase": "gas", @@ -254,6 +252,55 @@ "display_field": true, "looks_like": "fd_smoke" }, + { + "id": "fd_autumn_lost_fog", + "type": "field_type", + "intensity_levels": [ + { + "name": "obscuring fog", + "sym": "~", + "dangerous": false, + "transparent": false, + "translucency": 0, + "color": "dark_gray", + "move_cost": 75, + "scent_neutralization": 9, + "light_override": 0, + "effects": [ + { + "effect_id": "blind", + "min_duration": "1 seconds", + "max_duration": "3 seconds", + "intensity": 1, + "body_part": "eyes", + "chance_outside_vehicle": 1, + "message": "You're lost in the fog!", + "message_type": "bad" + }, + { + "effect_id": "deaf", + "min_duration": "1 seconds", + "max_duration": "3 seconds", + "intensity": 1, + "chance_outside_vehicle": 1, + "message": "You're lost in the fog!", + "message_type": "bad" + } + ] + } + ], + "npc_complain": { "chance": 10, "duration": "1 minutes", "speech": "I can't see a thing!" }, + "decay_amount_factor": 15, + "percent_spread": 45, + "dirty_transparency_cache": true, + "priority": 8, + "//": "FIXME: The below half-life makes it last the expected 8-16 minutes.", + "half_life": "24 hours", + "phase": "gas", + "display_items": false, + "display_field": true, + "looks_like": "fd_smoke" + }, { "id": "fd_frozen_time", "type": "field_type", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json index 29a118be64c22..a945785618d34 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_eocs.json @@ -671,24 +671,5 @@ { "if": { "math": [ "u_hp('leg_r')", "==", "0" ] }, "then": { "math": [ "u_hp('leg_r')++" ] } }, { "if": { "math": [ "u_hp('leg_l')", "==", "0" ] }, "then": { "math": [ "u_hp('leg_l')++" ] } } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_IERDE_STONE_MEDITATIONS", - "effect": [ - { - "switch": { "math": [ "u_val('morale')" ] }, - "cases": [ - { "case": -100, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": 90, "max_bonus": 90 } }, - { "case": -75, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": 65, "max_bonus": 65 } }, - { "case": -50, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": 45, "max_bonus": 45 } }, - { "case": -25, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": 22, "max_bonus": 22 } }, - { "case": 25, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": -22, "max_bonus": -22 } }, - { "case": 50, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": -45, "max_bonus": 45 } }, - { "case": 75, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": -65, "max_bonus": -65 } }, - { "case": 100, "effect": { "u_add_morale": "morale_ierde_meditation", "bonus": -90, "max_bonus": -90 } } - ] - } - ] } ] diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json index 0bb680629672c..841f63981f496 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/ierde_mutations.json @@ -693,7 +693,7 @@ "cost": 1, "time": 5000, "activation_msg": "Your feelings calcify.", - "activated_eocs": [ "EOC_IERDE_STONE_MEDITATIONS" ] + "activated_eocs": [ "EOC_FULL_MORALE_NEUTRALIZATION" ] }, { "type": "mutation", diff --git a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json index 4299bb7424bc4..4a7c13e810311 100644 --- a/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/playable_changeling_seasonal_magic_research_eocs.json @@ -453,7 +453,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SUMMER_TIER_4", "effect": [ { - "u_roll_remainder": [ "changeling_summer_fire_melee_damage_spell" ], + "u_roll_remainder": [ "changeling_summer_run_for_long_periods_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], @@ -466,7 +466,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_SUMMER_TIER_5", "effect": [ { - "u_roll_remainder": [ "changeling_summer_fire_melee_damage_spell" ], + "u_roll_remainder": [ "changeling_summer_powerful_sunlight_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], @@ -550,7 +550,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_AUTUMN_TIER_4", "effect": [ { - "u_roll_remainder": [ "changeling_autumn_call_mists_spell" ], + "u_roll_remainder": [ "changeling_autumn_create_confusion_mist_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], @@ -563,7 +563,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_AUTUMN_TIER_5", "effect": [ { - "u_roll_remainder": [ "changeling_autumn_call_mists_spell" ], + "u_roll_remainder": [ "changeling_autumn_create_confusion_mist_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], @@ -638,7 +638,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_WINTER_TIER_3", "effect": [ { - "u_roll_remainder": [ "changeling_winter_frozen_breath_spell" ], + "u_roll_remainder": [ "changeling_winter_neutralize_morale_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], @@ -651,7 +651,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_WINTER_TIER_4", "effect": [ { - "u_roll_remainder": [ "changeling_winter_frozen_breath_spell" ], + "u_roll_remainder": [ "changeling_winter_neutralize_morale_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], @@ -664,7 +664,7 @@ "id": "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_WINTER_TIER_5", "effect": [ { - "u_roll_remainder": [ "changeling_winter_frozen_breath_spell" ], + "u_roll_remainder": [ "changeling_winter_neutralize_morale_spell" ], "type": "spell", "message": "Your research bears fruit! You learn the %s glamour.", "true_eocs": [ "EOC_CHANGELING_RESEARCH_SEASONAL_MAGIC_DREAMDROSS_COST_UPDATER" ], diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json index 681d35bdf0dc0..9b53a37daadee 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_autumn.json @@ -148,5 +148,58 @@ "max( ( 500 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 8) - (u_skill('deduction') * 15)), 150)" ] } + }, + { + "id": "changeling_autumn_create_confusion_mist_spell", + "type": "SPELL", + "name": "Lost in the Mists", + "description": "Call up an obscuring mist, rendering anything inside insensate and incapable of navigating or determining their location. Those inside the fog will wander, blind and deaf, until the glamour fades or they somehow find their way outside of its area. The effected area is reduced in the spring.", + "message": "With a gesture, a mist begins to rise.", + "flags": [ "VERBAL", "SOMATIC", "RANDOM_DURATION", "IGNORE_WALLS" ], + "magic_type": "xe_fey_seasonal_magick_autumn", + "spell_class": "CHANGELING_SEASONAL_MAGIC_AUTUMN", + "valid_targets": [ "hostile", "ally", "ground", "self" ], + "teachable": false, + "skill": "deduction", + "max_level": 1, + "shape": "blast", + "difficulty": 8, + "effect": "attack", + "effect_str": "stunned", + "components": "spell_components_dreamdross_2", + "min_duration": 300, + "max_duration": 600, + "min_range": { + "math": [ + "min( ( 4 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 0.4) + (u_skill('deduction') * 1) ), 25 ) * (global_what_is_the_season == 1 ? 0.5 : 1)" + ] + }, + "max_range": { + "math": [ + "min( ( 4 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 0.4) + (u_skill('deduction') * 1) ), 25 ) * (global_what_is_the_season == 1 ? 0.5 : 1)" + ] + }, + "min_aoe": { + "math": [ + "min( ( 2 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 0.4) + (u_skill('deduction') * 1) ), 20 ) * (global_what_is_the_season == 1 ? 0.5 : 1)" + ] + }, + "max_aoe": { + "math": [ + "min( ( 2 + (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 0.4) + (u_skill('deduction') * 1) ), 20 ) * (global_what_is_the_season == 1 ? 0.5 : 1)" + ] + }, + "base_energy_cost": { + "math": [ "max( ( 750 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 4) - (u_skill('deduction') * 8)), 500)" ] + }, + "base_casting_time": { + "math": [ + "max( ( 250 - (u_spell_count('school': 'CHANGELING_SEASONAL_MAGIC_AUTUMN') * 5) - (u_skill('deduction') * 10)), 100)" + ] + }, + "field_id": "fd_autumn_lost_fog", + "field_chance": 1, + "min_field_intensity": 1, + "max_field_intensity": 1 } ] diff --git a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json index 601458d803ada..7afcee47b4947 100644 --- a/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json +++ b/data/mods/Xedra_Evolved/spells/changeling_seasonal_magic_winter_eocs.json @@ -196,115 +196,7 @@ "type": "effect_on_condition", "id": "EOC_CHANGELING_WINTER_NEUTRALIZE_MORALE", "effect": [ - { - "run_eocs": [ - { - "id": "EOC_FULL_MORALE_NEUTRALIZATION", - "//": "I really wish there were a better way to do this.", - "effect": [ - { "u_lose_morale": "morale_bile" }, - { "u_lose_morale": "morale_food_good" }, - { "u_lose_morale": "morale_food_hot" }, - { "u_lose_morale": "morale_chat" }, - { "u_lose_morale": "morale_chat_uncaring" }, - { "u_lose_morale": "morale_ate_with_table" }, - { "u_lose_morale": "morale_ate_without_table" }, - { "u_lose_morale": "morale_music" }, - { "u_lose_morale": "morale_honey" }, - { "u_lose_morale": "morale_game" }, - { "u_lose_morale": "morale_marloss" }, - { "u_lose_morale": "morale_mutagen" }, - { "u_lose_morale": "morale_feeling_good" }, - { "u_lose_morale": "morale_support" }, - { "u_lose_morale": "morale_photos" }, - { "u_lose_morale": "morale_craving_nicotine" }, - { "u_lose_morale": "morale_craving_caffeine" }, - { "u_lose_morale": "morale_craving_alcohol" }, - { "u_lose_morale": "morale_craving_opiate" }, - { "u_lose_morale": "morale_craving_speed" }, - { "u_lose_morale": "morale_craving_cocaine" }, - { "u_lose_morale": "morale_craving_crack" }, - { "u_lose_morale": "morale_craving_mutagen" }, - { "u_lose_morale": "morale_craving_diazepam" }, - { "u_lose_morale": "morale_craving_marloss" }, - { "u_lose_morale": "morale_food_bad" }, - { "u_lose_morale": "morale_cannibal" }, - { "u_lose_morale": "morale_demicannibal" }, - { "u_lose_morale": "morale_vegetarian" }, - { "u_lose_morale": "morale_antiveggy" }, - { "u_lose_morale": "morale_meatarian" }, - { "u_lose_morale": "morale_antimeat" }, - { "u_lose_morale": "morale_antifruit" }, - { "u_lose_morale": "morale_lactose" }, - { "u_lose_morale": "morale_antijunk" }, - { "u_lose_morale": "morale_antiwheat" }, - { "u_lose_morale": "morale_sweettooth" }, - { "u_lose_morale": "morale_no_digest" }, - { "u_lose_morale": "morale_wet" }, - { "u_lose_morale": "morale_dried_off" }, - { "u_lose_morale": "morale_cold" }, - { "u_lose_morale": "morale_hot" }, - { "u_lose_morale": "morale_feeling_bad" }, - { "u_lose_morale": "morale_bad_protein_bar" }, - { "u_lose_morale": "morale_killed_innocent" }, - { "u_lose_morale": "morale_killed_friend" }, - { "u_lose_morale": "morale_killed_monster" }, - { "u_lose_morale": "morale_mutilate_corpse" }, - { "u_lose_morale": "morale_mutagen_elf" }, - { "u_lose_morale": "morale_mutagen_chimera" }, - { "u_lose_morale": "morale_mutagen_mutation" }, - { "u_lose_morale": "morale_moodswing" }, - { "u_lose_morale": "morale_book" }, - { "u_lose_morale": "morale_comfy" }, - { "u_lose_morale": "morale_scream" }, - { "u_lose_morale": "morale_perm_masochist" }, - { "u_lose_morale": "morale_perm_radiophile" }, - { "u_lose_morale": "morale_perm_noface" }, - { "u_lose_morale": "morale_perm_fpmode_on" }, - { "u_lose_morale": "morale_perm_hoarder" }, - { "u_lose_morale": "morale_perm_fancy" }, - { "u_lose_morale": "morale_perm_optimist" }, - { "u_lose_morale": "morale_perm_badtemper" }, - { "u_lose_morale": "morale_perm_numb" }, - { "u_lose_morale": "morale_perm_constrained" }, - { "u_lose_morale": "morale_perm_nomad" }, - { "u_lose_morale": "morale_game_found_kitten" }, - { "u_lose_morale": "morale_haircut" }, - { "u_lose_morale": "morale_shave" }, - { "u_lose_morale": "morale_vomited" }, - { "u_lose_morale": "morale_play_with_pet" }, - { "u_lose_morale": "morale_pyromania_startfire" }, - { "u_lose_morale": "morale_pyromania_nearfire" }, - { "u_lose_morale": "morale_pyromania_nofire" }, - { "u_lose_morale": "morale_killer_has_killed" }, - { "u_lose_morale": "morale_killer_need_to_kill" }, - { "u_lose_morale": "morale_perm_filthy" }, - { "u_lose_morale": "morale_butcher" }, - { "u_lose_morale": "morale_gravedigger" }, - { "u_lose_morale": "morale_funeral" }, - { "u_lose_morale": "morale_tree_communion" }, - { "u_lose_morale": "morale_accomplishment" }, - { "u_lose_morale": "morale_failure" }, - { "u_lose_morale": "morale_nightmare" }, - { "u_lose_morale": "morale_migo_bio_tech" }, - { "u_lose_morale": "morale_impossible_shape" }, - { "u_lose_morale": "morale_afs_drugs" }, - { "u_lose_morale": "morale_social" }, - { "u_lose_morale": "morale_asocial" }, - { "u_lose_morale": "morale_sunrise" }, - { "u_lose_morale": "morale_sunset" }, - { "u_lose_morale": "morale_ate_dross" }, - { "u_lose_morale": "morale_drank_blood" }, - { "u_lose_morale": "morale_craving_lotus_blossom" }, - { "u_lose_morale": "morale_forest_unity" }, - { "u_lose_morale": "morale_broke_fae_ban" }, - { "u_lose_morale": "morale_homullus_self_deception" }, - { "u_lose_morale": "morale_ierde_meditation" }, - { "u_lose_morale": "morale_boring_fruit" } - ] - } - ] - }, + { "run_eocs": "EOC_FULL_MORALE_NEUTRALIZATION" }, { "if": { "not": { "is_season": "summer" } }, "then": [ From ab6a84c4e706dee92e9f441e7dc8cd050b89854e Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Wed, 12 Feb 2025 17:34:43 -0600 Subject: [PATCH 19/19] Remove magical fog phase to prevent outdoor dispersal --- data/mods/Xedra_Evolved/field_type.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/mods/Xedra_Evolved/field_type.json b/data/mods/Xedra_Evolved/field_type.json index c0207e23d7a3d..a15dc9ac93a19 100644 --- a/data/mods/Xedra_Evolved/field_type.json +++ b/data/mods/Xedra_Evolved/field_type.json @@ -229,6 +229,7 @@ { "id": "fd_obscuring_fog", "type": "field_type", + "immune_mtypes": [ "mon_wild_hunt_hound" ], "intensity_levels": [ { "name": "thick fog", @@ -247,7 +248,6 @@ "dirty_transparency_cache": true, "priority": 8, "half_life": "7 minutes", - "phase": "gas", "display_items": false, "display_field": true, "looks_like": "fd_smoke" @@ -255,6 +255,7 @@ { "id": "fd_autumn_lost_fog", "type": "field_type", + "immune_mtypes": [ "mon_wild_hunt_hound" ], "intensity_levels": [ { "name": "obscuring fog", @@ -263,7 +264,7 @@ "transparent": false, "translucency": 0, "color": "dark_gray", - "move_cost": 75, + "move_cost": 50, "scent_neutralization": 9, "light_override": 0, "effects": [ @@ -294,9 +295,7 @@ "percent_spread": 45, "dirty_transparency_cache": true, "priority": 8, - "//": "FIXME: The below half-life makes it last the expected 8-16 minutes.", - "half_life": "24 hours", - "phase": "gas", + "half_life": "12 minutes", "display_items": false, "display_field": true, "looks_like": "fd_smoke"