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] Make Paraclesian fae's magic harder in some circumstances #74029

Merged
merged 6 commits into from
May 26, 2024
Merged

[Xedra Evolved] Make Paraclesian fae's magic harder in some circumstances #74029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c0e691
Initial commit
Standing-Storm May 24, 2024
e23d26c
Sylphs in valleys or craters aren't penalized
Standing-Storm May 24, 2024
6fd0e74
Add descriptions for each spirit
Standing-Storm May 24, 2024
4bc1e5c
Spelling
Standing-Storm May 24, 2024
308e493
Merge branch 'master' of https://github.com/Standing-Storm/Cataclysm-…
Standing-Storm May 24, 2024
34e8384
Homullus event checks for HOMULLUS
Standing-Storm May 24, 2024
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
198 changes: 197 additions & 1 deletion 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 @@ -96,6 +96,65 @@
},
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'ARVORE' )", "=", "-2" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_ARVORE_ELEMENTAL_MAGIC_PENALTY_IN_BUILDING",
"eoc_type": "EVENT",
"required_event": "opens_spellbook",
"condition": {
"and": [
{
"or": [
{
"and": [
{ "not": "u_is_outside" },
{ "or": [ { "u_is_on_terrain_with_flag": "FLAT" }, { "u_is_on_terrain_with_flag": "ROAD" } ] },
{ "not": { "u_is_on_terrain": "t_barkfloor" } },
{ "not": { "u_is_on_terrain": "t_floor" } },
{ "not": { "u_is_on_terrain": "t_wood_stairs_down" } },
{ "not": { "u_is_on_terrain": "t_wood_stairs_up" } },
{ "not": { "u_is_on_terrain": "t_door_o" } },
{ "not": { "u_is_on_terrain": "t_dirt_underground" } },
{ "not": { "u_is_on_terrain": "t_dirtfloor_thatchroof" } }
]
},
{
"and": [
{
"or": [
{ "u_is_on_terrain": "t_barkfloor" },
{ "u_is_on_terrain": "t_floor" },
{ "u_is_on_terrain": "t_wood_stairs_down" },
{ "u_is_on_terrain": "t_wood_stairs_up" },
{ "u_is_on_terrain": "t_door_o" },
{ "u_is_on_terrain": "t_dirt_underground" },
{ "u_is_on_terrain": "t_dirtfloor_thatchroof" }
]
},
{
"or": [
{ "u_near_om_location": "road_curved", "range": 1 },
{ "u_near_om_location": "road_four_way", "range": 1 },
{ "u_near_om_location": "road_tee", "range": 1 },
{ "u_near_om_location": "road_straight", "range": 1 },
{ "u_near_om_location": "road_end", "range": 1 },
{ "u_near_om_location": "road_sw", "range": 1 },
{ "u_near_om_location": "road_ne", "range": 1 },
{ "u_near_om_location": "road_ew", "range": 1 },
{ "u_near_om_location": "road_ns", "range": 1 },
{ "u_near_om_location": "road_nesw", "range": 1 },
{ "u_near_om_location": "road", "range": 1 }
]
}
]
}
]
},
{ "u_has_trait": "ARVORE" }
]
},
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'ARVORE' )", "=", "3" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_HOMULLUS_MAGIC_ADJUSTMENT_IN_CIVILIZATION",
Expand Down Expand Up @@ -142,6 +201,41 @@
},
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'HOMULLUS' )", "=", "-2" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_HOMULLUS_ELEMENTAL_MAGIC_PENALTY_IN_THE_WILDERNESS",
"eoc_type": "EVENT",
"required_event": "opens_spellbook",
"condition": {
"and": [
{
"and": [
"u_is_outside",
{
"or": [
{ "u_is_on_terrain_with_flag": "SHRUB" },
{ "u_is_on_terrain_with_flag": "DIGGABLE" },
{ "u_is_on_terrain_with_flag": "YOUNG" }
]
},
{ "not": { "u_near_om_location": "road_curved", "range": 1 } },
{ "not": { "u_near_om_location": "road_four_way", "range": 1 } },
{ "not": { "u_near_om_location": "road_tee", "range": 1 } },
{ "not": { "u_near_om_location": "road_straight", "range": 1 } },
{ "not": { "u_near_om_location": "road_end", "range": 1 } },
{ "not": { "u_near_om_location": "road_sw", "range": 1 } },
{ "not": { "u_near_om_location": "road_ne", "range": 1 } },
{ "not": { "u_near_om_location": "road_ew", "range": 1 } },
{ "not": { "u_near_om_location": "road_ns", "range": 1 } },
{ "not": { "u_near_om_location": "road_nesw", "range": 1 } },
{ "not": { "u_near_om_location": "road", "range": 1 } }
]
},
{ "u_has_trait": "HOMULLUS" }
]
},
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'HOMULLUS' )", "=", "3" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_IERDE_ELEMENTAL_MAGIC_ADJUSTMENT_UNDERGROUND",
Expand Down Expand Up @@ -177,6 +271,14 @@
},
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': '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",
Expand All @@ -198,7 +300,6 @@
{ "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 )" ] }
]
},
Expand All @@ -207,6 +308,34 @@
},
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'SALAMANDER' )", "=", "-2" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_SALAMANDER_ELEMENTAL_MAGIC_PENALTY_IN_CHILL",
"eoc_type": "EVENT",
"required_event": "opens_spellbook",
"condition": {
"and": [
{ "math": [ "weather('temperature')", "<=", "from_fahrenheit( 32 )" ] },
{
"and": [
{ "not": { "u_is_in_field": "fd_hot_air1" } },
{ "not": { "u_is_in_field": "fd_hot_air2" } },
{ "not": { "u_is_in_field": "fd_hot_air3" } },
{ "not": { "u_is_in_field": "fd_hot_air4" } },
{ "not": { "u_is_in_field": "fd_fire" } },
{ "not": { "u_has_item": "torch_lit" } },
{ "not": { "u_has_item": "candle_lit" } },
{ "not": { "u_has_item": "oil_lamp_on" } },
{ "not": { "u_has_item": "oil_lamp_clay_on" } },
{ "not": { "u_has_item": "cigar_lit" } },
{ "not": { "u_has_item": "cig_lit" } }
]
},
{ "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",
Expand All @@ -223,6 +352,14 @@
"condition": { "and": [ "u_is_outside", { "u_has_trait": "SYLPH" } ] },
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': '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" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_UNDINE_ELEMENTAL_MAGIC_ADJUSTMENT_NEAR_WATER",
Expand Down Expand Up @@ -279,5 +416,64 @@
"required_event": "opens_spellbook",
"condition": { "and": [ "u_is_underwater", { "u_has_trait": "UNDINE" } ] },
"effect": [ { "math": [ "u_spellcasting_adjustment('difficulty', 'school': 'UNDINE' )", "=", "-2" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_UNDINE_ELEMENTAL_MAGIC_PENALTY_TOO_DRY_TIMER",
"eoc_type": "EVENT",
"required_event": "avatar_moves",
"condition": {
"and": [
{
"or": [
{ "u_is_on_terrain": "t_water_dp" },
{ "u_is_on_terrain": "t_water_sh" },
{ "u_is_on_terrain": "t_swater_dp" },
{ "u_is_on_terrain": "t_swater_dp_underground" },
{ "u_is_on_terrain": "t_water_dp_underground" },
{ "u_is_on_terrain": "t_water_pool" },
{ "u_is_on_terrain": "t_water_pool_outdoors" },
{ "u_is_on_terrain": "t_swater_dp_underground" },
{ "u_is_on_terrain": "t_water_hot" },
{ "u_is_on_terrain": "t_water_murky" },
{ "u_is_on_terrain": "t_water_sh_underground" },
{ "u_is_on_terrain": "t_swater_dp_underground" },
{ "u_is_on_terrain": "t_swater_sh_underground" },
{ "u_is_on_terrain": "t_swater_sh" },
{ "u_is_on_terrain": "t_water_pool_shallow" },
{ "u_is_on_terrain": "t_water_pool_shallow_outdoors" },
{ "u_is_on_terrain": "t_water_moving_dp" },
{ "u_is_on_terrain": "t_water_moving_dp_underground" },
{ "u_is_on_terrain": "t_water_sh_murky_underground" },
{ "u_at_om_location": "generic_river_bank" },
{ "u_at_om_location": "generic_river" },
{ "u_at_om_location": "river_center" },
{ "u_at_om_location": "river" },
{ "u_at_om_location": "river_c_not_ne" },
{ "u_at_om_location": "river_c_not_nw" },
{ "u_at_om_location": "river_c_not_se" },
{ "u_at_om_location": "river_c_not_sw" },
{ "u_at_om_location": "river_ne" },
{ "u_at_om_location": "river_se" },
{ "u_at_om_location": "river_sw" },
{ "u_at_om_location": "river_nw" },
{ "u_at_om_location": "lake_shore" },
{ "u_at_om_location": "lake_surface" }
]
},
{ "u_has_trait": "UNDINE" }
]
},
"effect": [ { "math": [ "u_timer_undine_last_in_water", "=", "time('now')" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_UNDINE_ELEMENTAL_MAGIC_PENALTY_TOO_DRY",
"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" ] } ]
}
]
12 changes: 6 additions & 6 deletions data/mods/Xedra_Evolved/player/professions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
"type": "profession",
"id": "paraclesian_ierde",
"name": { "male": "Ierde", "female": "Ierda" },
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.",
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.\n\nAs a spirit of the earth, your powers are strengthened by contact with the soil and the rock and weakened by separation from the living earth.",
"points": 5,
"traits": [ "IERDE" ],
"pets": [ { "name": "mon_stoneling", "amount": 1 } ],
Expand All @@ -523,7 +523,7 @@
"type": "profession",
"id": "paraclesian_arvore",
"name": { "male": "Arvi", "female": "Arvori" },
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.",
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.\n\nAs a spirit of the forest, your powers are strengthened by the wild places and weakened within the constructs of humanity.",
"points": 5,
"traits": [ "ARVORE" ],
"pets": [ { "name": "mon_vineling", "amount": 1 } ],
Expand All @@ -549,7 +549,7 @@
"type": "profession",
"id": "paraclesian_undine",
"name": { "male": "Onduine", "female": "Ondua" },
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.",
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.\n\nAs a spirit of the lakes and rivers, your powers are strengthened when you are surrounded by water and weakened when you spend too long away from the water.",
"points": 5,
"traits": [ "UNDINE" ],
"pets": [ { "name": "mon_spitting_lizard", "amount": 1 } ],
Expand All @@ -575,7 +575,7 @@
"type": "profession",
"id": "paraclesian_salamander",
"name": { "male": "Kéményseprő", "female": "Bejárónő" },
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.",
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.\n\nAs a spirit of the flames, your powers are strengthened when among heat and fire and weakened by the cold.",
"points": 5,
"traits": [ "SALAMANDER" ],
"pets": [ { "name": "mon_salamander_tiny", "amount": 1 } ],
Expand All @@ -601,7 +601,7 @@
"type": "profession",
"id": "paraclesian_homullus",
"name": { "male": "Dúln", "female": "Dúkka" },
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.",
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.\n\nAs a spirit of humanity, your powers are strengthened when among humankind or in the remnants of civilization and weakened when in the wilderness.",
"points": 5,
"traits": [ "HOMULLUS", "HOMULLUS_MINIMIZED_MUTATIONS" ],
"pets": [ { "name": "mon_zoomorphic_figure_small", "amount": 1 } ],
Expand All @@ -627,7 +627,7 @@
"type": "profession",
"id": "paraclesian_sylph",
"name": { "male": "Silvestris", "female": "Silvestra" },
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.",
"description": "With the dimensional spillage that preceded the Cataclysm you are the spirit of a place that slowly gained sentience, a genius loci. As the world reshapes itself you have decided to wander from your birthplace and determine where you will end up.\n\nAs a spirit of the winds, your powers are strengthened when under the open sky and weakened when indoors or underground.",
"points": 5,
"traits": [ "SYLPH" ],
"pets": [ { "name": "mon_dragonfly_fae", "amount": 1 } ],
Expand Down
Loading