Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Xedra Evolved] Rework how elemental fae gain terrain bonuses #79427

Merged
merged 7 commits into from
Jan 31, 2025
Merged

[Xedra Evolved] Rework how elemental fae gain terrain bonuses #79427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbb7188
Initial commit
Standing-Storm Jan 30, 2025
ae67041
Split Wind Blows, Willow Bends
Standing-Storm Jan 30, 2025
919dd37
Does this fix copy-from?
Standing-Storm Jan 30, 2025
9d5af07
Adjust spell learning EoCs
Standing-Storm Jan 30, 2025
f1dc618
Kick tests
Standing-Storm Jan 30, 2025
03f8431
Fix Supple As a Reed prerequisites
Standing-Storm Jan 30, 2025
c7caae2
Merge branch 'CleverRaven:master' into paraclesian-success
Standing-Storm Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutation_spells.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand Down
10 changes: 5 additions & 5 deletions data/mods/Xedra_Evolved/mutations/paraclesians/arvore_spell_learning_eocs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
Expand Down Expand Up @@ -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" ] }
]
},
Expand Down Expand Up @@ -538,16 +538,16 @@
"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": [
{
"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" } ]
},
Expand Down
173 changes: 58 additions & 115 deletions data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_magic_terrain_adjustments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -113,29 +65,21 @@
{ "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",
"id": "EOC_HOMULLUS_MAGIC_ADJUSTMENT_IN_CIVILIZATION",
"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",
Expand All @@ -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" },
Expand All @@ -188,27 +125,23 @@
{ "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",
"id": "EOC_IERDE_ELEMENTAL_MAGIC_PENALTY_TOO_HIGH",
"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": {
Expand All @@ -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",
Expand Down Expand Up @@ -253,41 +193,48 @@
{ "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",
"id": "EOC_SYLPH_ELEMENTAL_MAGIC_PENALTY_UNDERGROUND",
"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" },
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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" ] } ]
}
]
31 changes: 27 additions & 4 deletions data/mods/Xedra_Evolved/mutations/paraclesians/paraclesian_mutation_spells.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,30 +135,53 @@
"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 <color_yellow>reduced effects</color> 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 <color_yellow>reduced effects</color> when on artificial terrain.",
"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",
"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,
"final_energy_cost": 400,
"energy_increment": -12,
"base_casting_time": 150
},
{
"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 <color_yellow>reduced effects</color> indoors.",
"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",
Expand Down
Loading
Loading