From cbb7188e7919cae4750a3172862d10215d173720 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: Thu, 30 Jan 2025 10:22:36 -0600 Subject: [PATCH 1/6] Initial commit --- .../paraclesians/arvore_mutation_spells.json | 1 + ...paraclesian_magic_terrain_adjustments.json | 173 ++++++------------ 2 files changed, 59 insertions(+), 115 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json index 5c457509b9aed..b8d7804d8de6d 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json @@ -852,6 +852,7 @@ "flags": [ "VERBAL", "SOMATIC" ], "valid_targets": [ "ground" ], "skill": "deduction", + "spell_class": "ARVORE", "max_level": { "math": [ "int_to_level(1)" ] }, "difficulty": 3, "effect": "ter_transform", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json index 450cbdfbb28b5..35abbb5f8dc86 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json @@ -16,59 +16,11 @@ { "u_has_trait": "ARVORE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'ARVORE' ) = -2" ] } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_ARVORE_ELEMENTAL_MAGIC_ADJUSTMENT_HEAVY_FOREST", - "eoc_type": "EVENT", - "required_event": "opens_spellbook", - "condition": { - "and": [ - { - "and": [ - { "or": [ "u_is_outside", { "u_is_on_terrain": "t_barkfloor" } ] }, - { - "or": [ - { "u_at_om_location": "forest_thick" }, - { "u_at_om_location": "arvore_genius_loci_NW" }, - { "u_at_om_location": "arvore_genius_loci_NE" }, - { "u_at_om_location": "arvore_genius_loci_SW" }, - { "u_at_om_location": "arvore_genius_loci_SE" }, - { "u_near_om_location": "great_tree_z0_nw", "range": 2 }, - { "u_near_om_location": "great_tree_z0_se", "range": 2 }, - { "u_near_om_location": "great_tree_z1_nw", "range": 2 }, - { "u_near_om_location": "great_tree_z1_se", "range": 2 }, - { "u_near_om_location": "great_tree_z2_nw", "range": 2 }, - { "u_near_om_location": "great_tree_z2_se", "range": 2 }, - { "u_near_om_location": "great_tree_z3_06", "range": 2 }, - { "u_near_om_location": "great_tree_z3_11", "range": 2 }, - { "u_near_om_location": "great_tree_z4_06", "range": 2 }, - { "u_near_om_location": "great_tree_z4_11", "range": 2 }, - { "u_near_om_location": "great_tree_z5_06", "range": 2 }, - { "u_near_om_location": "great_tree_z5_11", "range": 2 }, - { "u_near_om_location": "great_tree_z6_nw", "range": 2 }, - { "u_near_om_location": "great_tree_z6_se", "range": 2 }, - { "u_near_om_location": "great_tree_z6_n2", "range": 2 }, - { "u_near_om_location": "great_tree_z6_se", "range": 2 }, - { "u_near_om_location": "great_tree_z7_nw", "range": 2 }, - { "u_near_om_location": "great_tree_z7_se", "range": 2 }, - { "u_near_om_location": "great_tree_crown_06", "range": 2 }, - { "u_near_om_location": "great_tree_crown_11", "range": 2 }, - { "u_near_om_location": "great_tree_crown_top_01", "range": 2 }, - { "u_near_om_location": "great_tree_crown_top_04", "range": 2 }, - { "u_near_om_location": "great_tree_roots", "range": 2 }, - { "u_near_om_location": "great_tree_roots_se", "range": 2 }, - { "u_near_om_location": "great_tree_roots_nw", "range": 2 } - ] - }, - { "test_eoc": "EOC_CONDITION_CHECK_ARVORE_IN_THE_WILD" } - ] - }, - { "u_has_trait": "ARVORE" } - ] - }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'ARVORE' ) = -2" ] } ] + "effect": [ + { + "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'ARVORE' ) = (u_sum_traits_of_category_char_has('ARVORE') / -2)" ] + } + ] }, { "type": "effect_on_condition", @@ -113,7 +65,7 @@ { "u_has_trait": "ARVORE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'ARVORE' ) = 3" ] } ] + "effect": [ { "math": [ "u_school_level_adjustment('ARVORE')", "-=", "4" ] } ] }, { "type": "effect_on_condition", @@ -121,21 +73,13 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "test_eoc": "EOC_HOMULLUS_IN_CIVILIZATION_CHECKER_CONDITION" }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'HOMULLUS' ) = -2" ] } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_HOMULLUS_MAGIC_ADJUSTMENT_NEARBY_PEOPLE", - "eoc_type": "EVENT", - "required_event": "opens_spellbook", - "condition": { - "math": [ - "(u_characters_nearby('radius': 30, 'attitude': 'any') + u_monsters_nearby('mon_feral_cop', 'mon_feral_human_pipe', 'mon_feral_human_crowbar', 'mon_feral_jackboot', 'mon_feral_marine_bayonet', 'mon_feral_soldier', 'mon_feral_prepper_knife', 'mon_feral_sailor_axe', 'mon_feral_maid_knife', 'mon_feral_maid_candlestick', 'mon_feral_officer', 'mon_feral_sailor_lug_wrench', 'mon_feral_sailor_mop', 'mon_feral_maid_broom', 'mon_feral_sailor_wrench', 'mon_feral_swimmer_kickboard', 'mon_feral_armored_battleaxe', 'mon_feral_sapien_spear', 'mon_feral_armored_mace', 'mon_feral_human_tool', 'mon_feral_militia', 'mon_feral_fancy_rapier_fake', 'mon_feral_fancy_rapier', 'mon_feral_human_axe', 'mon_feral_labsecurity_flashlight', 'mon_feral_labsecurity_9mm', 'mon_feral_survivalist', 'mon_feral_scientist_scalpel', 'mon_feral_zebra_agent', 'mon_renfield', 'mon_renfield_9mm', 'mon_renfield_shotgun', 'mon_renfield_flamethrower', 'radius': 30, 'attitude': 'both'))", - ">=", - "10" - ] - }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'HOMULLUS' ) = -2" ] } ] + "effect": [ + { + "math": [ + "u_spellcasting_adjustment('difficulty', 'school': 'HOMULLUS' ) = (u_sum_traits_of_category_char_has('HOMULLUS') / -2)" + ] + } + ] }, { "type": "effect_on_condition", @@ -153,25 +97,18 @@ { "u_has_trait": "HOMULLUS" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'HOMULLUS' ) = 3" ] } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_IERDE_ELEMENTAL_MAGIC_ADJUSTMENT_UNDERGROUND", - "eoc_type": "EVENT", - "required_event": "opens_spellbook", - "condition": { "and": [ { "math": [ "u_val('pos_z') <= -1" ] }, { "u_has_trait": "IERDE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'IERDE' ) = -2" ] } ] + "effect": [ { "math": [ "u_school_level_adjustment('HOMULLUS')", "-=", "4" ] } ] }, { "type": "effect_on_condition", - "id": "EOC_IERDE_ELEMENTAL_MAGIC_ADJUSTMENT_ON_DIRT_OR_STONE", + "id": "EOC_IERDE_ELEMENTAL_MAGIC_ADJUSTMENT_UNDERGROUND_OR_ON_DIRT", "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "or": [ + { "math": [ "u_val('pos_z') <= -1" ] }, { "u_is_on_terrain_with_flag": "DIGGABLE" }, { "u_is_on_terrain": "t_rock_floor" }, { "u_is_on_terrain": "t_railroad_rubble" }, @@ -188,7 +125,11 @@ { "u_has_trait": "IERDE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'IERDE' ) = -2" ] } ] + "effect": [ + { + "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'IERDE' ) = (u_sum_traits_of_category_char_has('IERDE') / -2)" ] + } + ] }, { "type": "effect_on_condition", @@ -196,19 +137,11 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "math": [ "u_val('pos_z') >= 1" ] }, { "u_has_trait": "IERDE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'IERDE' ) = 3" ] } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_SALAMANDER_ELEMENTAL_MAGIC_ADJUSTMENT_IN_FIRE", - "eoc_type": "EVENT", - "required_event": "opens_spellbook", - "condition": { "and": [ { "u_is_in_field": "fd_fire" }, { "u_has_trait": "SALAMANDER" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SALAMANDER' ) = -2" ] } ] + "effect": [ { "math": [ "u_school_level_adjustment('IERDE')", "-=", "4" ] } ] }, { "type": "effect_on_condition", - "id": "EOC_SALAMANDER_ELEMENTAL_MAGIC_ADJUSTMENT_IN_HEAT", + "id": "EOC_SALAMANDER_ELEMENTAL_MAGIC_ADJUSTMENT_IN_FIRE_OR_HEAT", "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { @@ -219,13 +152,20 @@ { "u_is_in_field": "fd_hot_air2" }, { "u_is_in_field": "fd_hot_air3" }, { "u_is_in_field": "fd_hot_air4" }, + { "u_is_in_field": "fd_fire" }, { "math": [ "weather('temperature') >= from_fahrenheit( 80 )" ] } ] }, { "u_has_trait": "SALAMANDER" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SALAMANDER' ) = -2" ] } ] + "effect": [ + { + "math": [ + "u_spellcasting_adjustment('difficulty', 'school': 'SALAMANDER' ) = (u_sum_traits_of_category_char_has('SALAMANDER') / -2)" + ] + } + ] }, { "type": "effect_on_condition", @@ -253,23 +193,29 @@ { "u_has_trait": "SALAMANDER" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SALAMANDER' ) = 3" ] } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_SYLPH_ELEMENTAL_MAGIC_ADJUSTMENT_UP_HIGH", - "eoc_type": "EVENT", - "required_event": "opens_spellbook", - "condition": { "and": [ { "math": [ "u_val('pos_z') >= 3" ] }, { "u_has_trait": "SYLPH" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SYLPH' ) = -2" ] } ] + "effect": [ { "math": [ "u_school_level_adjustment('SALAMANDER')", "-=", "4" ] } ] }, { "type": "effect_on_condition", - "id": "EOC_SYLPH_ELEMENTAL_MAGIC_ADJUSTMENT_UNDER_THE_SKY", + "id": "EOC_SYLPH_ELEMENTAL_MAGIC_ADJUSTMENT_UP_HIGH_OR_UNDER_THE_SKY", "eoc_type": "EVENT", "required_event": "opens_spellbook", - "condition": { "and": [ "u_is_outside", { "u_has_trait": "SYLPH" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SYLPH' ) = -2" ] } ] + "condition": { + "and": [ + { + "or": [ + { "and": [ { "math": [ "u_val('pos_z') >= 1" ] }, "u_is_outside" ] }, + { "and": [ { "math": [ "weather('windpower') >= 15" ] }, "u_is_outside" ] } + ] + }, + { "u_has_trait": "SYLPH" } + ] + }, + "effect": [ + { + "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SYLPH' ) = (u_sum_traits_of_category_char_has('SYLPH') / -2)" ] + } + ] }, { "type": "effect_on_condition", @@ -277,17 +223,18 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "math": [ "u_val('pos_z') <= -1" ] }, { "not": "u_is_outside" }, { "u_has_trait": "SYLPH" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SYLPH' ) = 3" ] } ] + "effect": [ { "math": [ "u_school_level_adjustment('SYLPH')", "-=", "4" ] } ] }, { "type": "effect_on_condition", - "id": "EOC_UNDINE_ELEMENTAL_MAGIC_ADJUSTMENT_NEAR_WATER", + "id": "EOC_UNDINE_ELEMENTAL_MAGIC_ADJUSTMENT_NEAR_OR_IN_WATER", "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "or": [ + "u_is_underwater", { "u_is_on_terrain": "t_water_dp" }, { "u_is_on_terrain": "t_water_sh" }, { "u_is_on_terrain": "t_swater_dp" }, @@ -322,15 +269,11 @@ { "u_has_trait": "UNDINE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'UNDINE' ) = -2" ] } ] - }, - { - "type": "effect_on_condition", - "id": "EOC_UNDINE_ELEMENTAL_MAGIC_ADJUSTMENT_UNDERWATER", - "eoc_type": "EVENT", - "required_event": "opens_spellbook", - "condition": { "and": [ "u_is_underwater", { "u_has_trait": "UNDINE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'UNDINE' ) = -2" ] } ] + "effect": [ + { + "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'UNDINE' ) = (u_sum_traits_of_category_char_has('UNDINE') / -2)" ] + } + ] }, { "type": "effect_on_condition", @@ -383,6 +326,6 @@ "eoc_type": "EVENT", "required_event": "opens_spellbook", "condition": { "and": [ { "math": [ "time_since(u_timer_undine_last_in_water) >= time('6 h')" ] }, { "u_has_trait": "UNDINE" } ] }, - "effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'UNDINE' ) = 3" ] } ] + "effect": [ { "math": [ "u_school_level_adjustment('UNDINE')", "-=", "4" ] } ] } ] From ae670413935335dd612e824c5c411dd1b9654ad7 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: Thu, 30 Jan 2025 10:39:49 -0600 Subject: [PATCH 2/6] Split Wind Blows, Willow Bends --- .../paraclesian_mutation_spells.json | 27 ++++++++++++++++--- .../paraclesians/paraclesian_mutations.json | 17 +++++++++--- .../obsoletion_and_migration/eocs.json | 24 +++++++++++++++++ .../obsoletion_and_migration/mutations.json | 9 +++++++ .../obsoletion_and_migration/spells.json | 25 +++++++++++++++++ 5 files changed, 96 insertions(+), 6 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json index c350da5809f1c..71108cbba0e99 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json @@ -135,7 +135,7 @@ "max_damage": 1 }, { - "id": "paraclesian_spell_dodge_bonus", + "id": "paraclesian_spell_dodge_bonus_arvore", "type": "SPELL", "name": "The Wind Blows, the Willow Bends", "description": "Like the flitting wind or the flexible willow, the spell allows you to avoid attacks much more easily. It has reduced effects away from your natural environment (indoors for Sylph, non-natural terrain for Arvore).", @@ -145,13 +145,18 @@ "max_level": 25, "effect": "effect_on_condition", "effect_str": "EOC_APPLY_PARACLESIAN_DODGE_BONUS", + "spell_class": "ARVORE", "shape": "blast", "difficulty": 5, "min_duration": { - "math": [ "( ( (u_spell_level('paraclesian_spell_dodge_bonus') * 1800) + 21000) * (scaling_factor(u_val('perception') ) ) )" ] + "math": [ + "( ( (u_spell_level('paraclesian_spell_dodge_bonus_arvore') * 1800) + 21000) * (scaling_factor(u_val('perception') ) ) )" + ] }, "max_duration": { - "math": [ "( ( (u_spell_level('paraclesian_spell_dodge_bonus') * 4200) + 39000) * (scaling_factor(u_val('perception') ) ) )" ] + "math": [ + "( ( (u_spell_level('paraclesian_spell_dodge_bonus_arvore') * 4200) + 39000) * (scaling_factor(u_val('perception') ) ) )" + ] }, "magic_type": "xe_fey_magick", "base_energy_cost": 600, @@ -159,6 +164,22 @@ "energy_increment": -12, "base_casting_time": 150 }, + { + "id": "paraclesian_spell_dodge_bonus_sylph", + "type": "SPELL", + "copy-from": "paraclesian_spell_dodge_bonus_arvore", + "spell_class": "SYLPH", + "min_duration": { + "math": [ + "( ( (u_spell_level('paraclesian_spell_dodge_bonus_sylph') * 1800) + 21000) * (scaling_factor(u_val('perception') ) ) )" + ] + }, + "max_duration": { + "math": [ + "( ( (u_spell_level('paraclesian_spell_dodge_bonus_sylph') * 4200) + 39000) * (scaling_factor(u_val('perception') ) ) )" + ] + } + }, { "id": "paraclesian_spell_make_gossamer", "type": "SPELL", diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json index 7d5275cd936a4..74866409c7f7b 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutations.json @@ -652,15 +652,26 @@ }, { "type": "mutation", - "id": "WIND_BLOWS_WILLOW_BENDS", + "id": "WIND_BLOWS_WILLOW_BENDS_ARVORE", "name": { "str": "The Wind Blows, the Willow Bends" }, "points": 4, "visibility": 0, "ugliness": 0, "description": "Upon gaining this ability, you gain the ability to enhance your dodge capabilities.", - "category": [ "ARVORE", "SYLPH" ], + "category": [ "ARVORE" ], "leads_to": [ "ARVORE_DEX_BONUS" ], - "spells_learned": [ [ "paraclesian_spell_dodge_bonus", 1 ] ] + "spells_learned": [ [ "paraclesian_spell_dodge_bonus_arvore", 1 ] ] + }, + { + "type": "mutation", + "id": "WIND_BLOWS_WILLOW_BENDS_SYLPH", + "name": { "str": "The Wind Blows, the Willow Bends" }, + "points": 4, + "visibility": 0, + "ugliness": 0, + "description": "Upon gaining this ability, you gain the ability to enhance your dodge capabilities.", + "category": [ "SYLPH" ], + "spells_learned": [ [ "paraclesian_spell_dodge_bonus_sylph", 1 ] ] }, { "type": "mutation", diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/eocs.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/eocs.json index 6f8958360d816..e8e35383c2f4f 100644 --- a/data/mods/Xedra_Evolved/obsoletion_and_migration/eocs.json +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/eocs.json @@ -6,5 +6,29 @@ "required_event": "game_load", "condition": { "not": { "u_has_trait": "LILIN_TRAITS" } }, "effect": [ { "u_lose_effect": "effect_lilin_no_ruach" } ] + }, + { + "type": "effect_on_condition", + "id": "EOC_PARACLESIAN_WIND_BLOWS_MUTATION_DIVIDER", + "eoc_type": "EVENT", + "required_event": "game_load", + "condition": { "u_has_trait": "WIND_BLOWS_WILLOW_BENDS" }, + "effect": [ + { + "if": { "u_has_trait": "ARVORE" }, + "then": [ + { "math": [ "u_migration_spell_level", "=", "u_spell_level('paraclesian_spell_dodge_bonus')" ] }, + { "u_lose_trait": "WIND_BLOWS_WILLOW_BENDS" }, + { "u_add_trait": "WIND_BLOWS_WILLOW_BENDS_ARVORE" }, + { "math": [ "paraclesian_spell_dodge_bonus_arvore", "=", "u_migration_spell_level" ] } + ], + "else": [ + { "math": [ "u_migration_spell_level", "=", "u_spell_level('paraclesian_spell_dodge_bonus')" ] }, + { "u_lose_trait": "WIND_BLOWS_WILLOW_BENDS" }, + { "u_add_trait": "WIND_BLOWS_WILLOW_BENDS_SYLPH" }, + { "math": [ "paraclesian_spell_dodge_bonus_sylph", "=", "u_migration_spell_level" ] } + ] + } + ] } ] diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json index f14138a68c3fd..49442bd99cbb0 100644 --- a/data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/mutations.json @@ -94,5 +94,14 @@ "id": "ARVORE_ROOTS_SPELL", "trait": "ARVORE_SUMMON_GRASS_FIELD", "//": "remove after 0.I" + }, + { + "type": "mutation", + "id": "WIND_BLOWS_WILLOW_BENDS", + "name": { "str": "The Wind Blows, the Willow Bends" }, + "points": 4, + "visibility": 0, + "ugliness": 0, + "description": "Upon gaining this ability, you gain the ability to enhance your dodge capabilities." } ] diff --git a/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json b/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json index dd2a0c1b755a7..04d791b47bf7d 100644 --- a/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json +++ b/data/mods/Xedra_Evolved/obsoletion_and_migration/spells.json @@ -657,5 +657,30 @@ "effect": "effect_on_condition", "effect_str": "EOC_ARVORE_TREE_REDUCE_THIRST_DEP", "shape": "blast" + }, + { + "id": "paraclesian_spell_dodge_bonus", + "type": "SPELL", + "name": "The Wind Blows, the Willow Bends", + "description": "Like the flitting wind or the flexible willow, the spell allows you to avoid attacks much more easily. It has reduced effects away from your natural environment (indoors for Sylph, non-natural terrain for Arvore).", + "flags": [ "SOMATIC", "VERBAL", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ], + "valid_targets": [ "self" ], + "skill": "deduction", + "max_level": 25, + "effect": "effect_on_condition", + "effect_str": "EOC_APPLY_PARACLESIAN_DODGE_BONUS", + "shape": "blast", + "difficulty": 5, + "min_duration": { + "math": [ "( ( (u_spell_level('paraclesian_spell_dodge_bonus') * 1800) + 21000) * (scaling_factor(u_val('perception') ) ) )" ] + }, + "max_duration": { + "math": [ "( ( (u_spell_level('paraclesian_spell_dodge_bonus') * 4200) + 39000) * (scaling_factor(u_val('perception') ) ) )" ] + }, + "magic_type": "xe_fey_magick", + "base_energy_cost": 600, + "final_energy_cost": 400, + "energy_increment": -12, + "base_casting_time": 150 } ] From 919dd3727e34da1181c6daea9ec7dad049c9c706 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: Thu, 30 Jan 2025 11:06:31 -0600 Subject: [PATCH 3/6] Does this fix copy-from? --- .../mutations/paraclesians/paraclesian_mutation_spells.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json index 71108cbba0e99..be3118a0e30c2 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json @@ -138,7 +138,7 @@ "id": "paraclesian_spell_dodge_bonus_arvore", "type": "SPELL", "name": "The Wind Blows, the Willow Bends", - "description": "Like the flitting wind or the flexible willow, the spell allows you to avoid attacks much more easily. It has reduced effects away from your natural environment (indoors for Sylph, non-natural terrain for Arvore).", + "description": "Like the flitting wind or the flexible willow, the spell allows you to avoid attacks much more easily. It has reduced effects when on artificial terrain.", "flags": [ "SOMATIC", "VERBAL", "NO_EXPLOSION_SFX", "RANDOM_DURATION" ], "valid_targets": [ "self" ], "skill": "deduction", @@ -168,6 +168,8 @@ "id": "paraclesian_spell_dodge_bonus_sylph", "type": "SPELL", "copy-from": "paraclesian_spell_dodge_bonus_arvore", + "name": "The Wind Blows, the Willow Bends", + "description": "Like the flitting wind or the flexible willow, the spell allows you to avoid attacks much more easily. It has reduced effects indoors.", "spell_class": "SYLPH", "min_duration": { "math": [ From 9d5af079802eb0fae18f06f03a695fd044239315 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: Thu, 30 Jan 2025 11:50:32 -0600 Subject: [PATCH 4/6] Adjust spell learning EoCs --- .../paraclesians/arvore_spell_learning_eocs.json | 10 +++++----- .../paraclesians/sylph_spell_learning_eocs.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_spell_learning_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_spell_learning_eocs.json index 4ed7789c0d65c..e6559f889908e 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_spell_learning_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_spell_learning_eocs.json @@ -24,7 +24,7 @@ "ARVORE_CLIMBING_VINE_SPELL", "ARVORE_ANTI_PLANT_SPELL", "ARVORE_CULTIVATE_GOBLIN_FRUIT", - "WIND_BLOWS_WILLOW_BENDS", + "WIND_BLOWS_WILLOW_BENDS_ARVORE", "PARACLESIAN_MAKE_GOSSAMER" ] }, @@ -85,7 +85,7 @@ { "math": [ "u_spell_level('arvore_turn_into_tree') < int_to_level(1)" ] }, { "math": [ "u_spell_level('arvore_tree_singing_spell') < int_to_level(1)" ] }, { "math": [ "u_spell_level('arvore_cultivate_goblin_fruit') < int_to_level(1)" ] }, - { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus') < 25" ] }, + { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus_arvore') < 25" ] }, { "math": [ "u_spell_level('paraclesian_spell_make_gossamer') < 8" ] } ] }, @@ -538,8 +538,8 @@ "id": "EOC_LEVELER_ARVORE_WIND_BLOWS_WILLOW_BENDS", "condition": { "and": [ - { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus') >= 0" ] }, - { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus') < 15" ] } + { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus_arvore') >= 0" ] }, + { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus_arvore') < 15" ] } ] }, "effect": [ @@ -547,7 +547,7 @@ "u_message": "Your time spent under the shadows of the trees has increased your facility with your fae magicks.", "type": "good" }, - { "math": [ "u_spell_exp('paraclesian_spell_dodge_bonus')", "+=", "paraclesian_passive_spell_exp(1)" ] } + { "math": [ "u_spell_exp('paraclesian_spell_dodge_bonus_arvore')", "+=", "paraclesian_passive_spell_exp(1)" ] } ], "false_effect": [ { "run_eocs": "EOC_ARVORE_SPELL_EXPERIENCE_INCREASER_SELECTOR" } ] }, diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json index e34e54cfb685d..45f0a7531814a 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/sylph_spell_learning_eocs.json @@ -22,7 +22,7 @@ "CLOUD_OF_STEAM_SYLPH", "CREATE_LIGHT_SYLPH", "SYLPH_MASSIVE_LIGHTNING_BLAST", - "WIND_BLOWS_WILLOW_BENDS", + "WIND_BLOWS_WILLOW_BENDS_SYLPH", "SYLPH_WIND_TRANSLOCATION", "SYLPH_CULTIVATE_GOBLIN_FRUIT", "PARACLESIAN_MAKE_GOSSAMER" @@ -78,7 +78,7 @@ { "math": [ "u_spell_level('sylph_crash_of_lightning') < dex_to_level(1)" ] }, { "math": [ "u_spell_level('sylph_massive_lightning_bolt_spell') < int_to_level(1)" ] }, { "math": [ "u_spell_level('sylph_wind_translocation_spell') < dex_to_level(1)" ] }, - { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus') < 25" ] }, + { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus_sylph') < 25" ] }, { "math": [ "u_spell_level('sylph_cultivate_goblin_fruit') < dex_to_level(1)" ] }, { "math": [ "u_spell_level('paraclesian_spell_make_gossamer') < 8" ] } ] @@ -375,8 +375,8 @@ "id": "EOC_LEVELER_SLYPH_WIND_BLOWS_WILLOW_BENDS", "condition": { "and": [ - { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus') >= 0" ] }, - { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus') < 25" ] } + { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus_sylph') >= 0" ] }, + { "math": [ "u_spell_level('paraclesian_spell_dodge_bonus_sylph') < 25" ] } ] }, "effect": [ @@ -384,7 +384,7 @@ "u_message": "Your time spent among the blowing winds has increased your facility with your fae magicks.", "type": "good" }, - { "math": [ "u_spell_exp('paraclesian_spell_dodge_bonus')", "+=", "paraclesian_passive_spell_exp(1)" ] } + { "math": [ "u_spell_exp('paraclesian_spell_dodge_bonus_sylph')", "+=", "paraclesian_passive_spell_exp(1)" ] } ], "false_effect": [ { "run_eocs": "EOC_SYLPH_SPELL_EXPERIENCE_INCREASER_SELECTOR" } ] }, From f1dc618a178fdb5fd05ec042173736b9269f88cc 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: Thu, 30 Jan 2025 14:49:27 -0600 Subject: [PATCH 5/6] Kick tests From 03f843143691a4aa0fa43b4d2ecce0c5e50de8ca 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: Thu, 30 Jan 2025 15:31:12 -0600 Subject: [PATCH 6/6] Fix Supple As a Reed prerequisites --- .../Xedra_Evolved/mutations/paraclesians/arvore_mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json index 8f384123754fc..65dc32aaffe65 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json @@ -675,7 +675,7 @@ "visibility": 3, "ugliness": 1, "prereqs": [ "GREENSTRIDE" ], - "prereqs2": [ "WIND_BLOWS_WILLOW_BENDS" ], + "prereqs2": [ "WIND_BLOWS_WILLOW_BENDS_ARVORE" ], "description": "Like green wood, you can bend your limbs easily. You gain a +4 bonus to Dexterity.", "category": [ "ARVORE" ], "types": [ "DEX" ],