Skip to content

Commit

Permalink
Merge pull request #78161 from Standing-Storm/homullus-deactivate
Browse files Browse the repository at this point in the history
[MoM/XE] Add deactivate_conditions to recurring EoCs that don't need to recur for everyone
  • Loading branch information
Anton Burmistrov authored Nov 28, 2024
2 parents 7df1b91 + dd337fd commit 75431d4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions data/mods/MindOverMatter/effectoncondition/eoc_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"id": "EOC_RESET_TELEPATHIC_STEALING_TIMER",
"recurrence": [ "20 hours", "28 hours" ],
"condition": { "math": [ "telepathically_stole_recently >= 1" ] },
"deactivate_condition": { "not": { "u_has_trait": "TELEPATH" } },
"effect": [ { "math": [ "telepathically_stole_recently = 0" ] } ]
},
{
Expand Down
1 change: 1 addition & 0 deletions data/mods/MindOverMatter/powers/clairsentience_eoc.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"type": "effect_on_condition",
"id": "EOC_CLAIR_RAD_SENSE_OUTSIDE_RECURRING",
"condition": { "u_has_effect": "effect_clair_sense_rads_self" },
"deactivate_condition": { "not": { "u_has_trait": "CLAIRSENTIENT" } },
"recurrence": 10,
"effect": [
{ "u_remove_item_with": "clair_sense_rad_item" },
Expand Down
1 change: 1 addition & 0 deletions data/mods/Xedra_Evolved/eocs/initialization.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"//": "Gives you the very first research recipe for your class.",
"recurrence": [ "20 hours", "28 hours" ],
"condition": { "u_has_trait": "INVENTOR" },
"deactivate_condition": { "not": { "u_has_trait": "INVENTOR" } },
"effect": [ { "u_roll_remainder": [ "inventor_research_base_1" ], "type": "recipe" } ]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,6 +744,7 @@
}
]
},
"deactivate_condition": { "not": { "u_has_trait": "ARVORE" } },
"effect": [
{
"u_roll_remainder": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@
"id": "EOC_HOMULLUS_GAIN_BIONIC_POWER_IN_CITIES",
"recurrence": "30 seconds",
"condition": { "or": [ { "u_has_any_trait": [ "HOMULLUS_GAIN_BIONIC_POWER", "HOMULLUS_GAIN_BIONIC_POWER_AND_MANA" ] } ] },
"deactivate_condition": { "not": { "u_has_any_trait": [ "HOMULLUS_GAIN_BIONIC_POWER", "HOMULLUS_GAIN_BIONIC_POWER_AND_MANA" ] } },
"effect": [ { "math": [ "u_val('power')", "+=", "energy('1 kJ') + (energy('1 kJ') * u_has_trait('THRESH_HOMULLUS'))" ] } ]
},
{
Expand Down Expand Up @@ -219,6 +220,7 @@
"id": "EOC_HOMULLUS_DOLL_FORM_MOVEMENT_COUNTER_ZERO_CHECKER",
"recurrence": "1 s",
"condition": { "u_has_trait": "HOMULLUS_DOLL_FORM_TRAITS" },
"deactivate_condition": { "not": { "u_has_trait": "HOMULLUS_DOLL_FORM_TRAITS" } },
"effect": [
{
"run_eocs": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@
{ "not": { "u_has_effect": "sleep" } }
]
},
"deactivate_condition": { "not": { "u_has_trait": "BROWNIE_HOMEBODY" } },
"effect": [ { "math": [ "u_brownie_homebody_speed_bonus", "++" ] }, { "math": [ "u_brownie_sense_intruders", "++" ] } ]
},
{
Expand Down
1 change: 1 addition & 0 deletions data/mods/Xedra_Evolved/spells/hedge_magic_eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@
"id": "EOC_HEDGE_ACTIVITY_LEVEL_BREAKS_INCREASE_HEALING_RATE",
"recurrence": 1,
"condition": { "and": [ { "u_has_effect": "effect_hedge_increase_healing_rate" }, { "math": [ "u_val('activity_level') >= 3" ] } ] },
"deactivate_condition": { "not": { "u_has_trait": "HEDGE_MAGIC" } },
"effect": [ { "u_lose_effect": "effect_hedge_increase_healing_rate" } ]
},
{
Expand Down

0 comments on commit 75431d4

Please sign in to comment.