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.

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

[Sky Island] Death EoC cures modded conditions too #78644

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion data/mods/Sky_Island/EOCs.json
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,27 @@
{ "u_lose_effect": "fetid_goop" },
{ "u_lose_effect": "sap" },
{ "u_lose_effect": "nausea" },
{ "u_lose_effect": "bleed" }
{ "u_lose_effect": "bleed" },
{
"run_eocs": [ "EOC_FIX_MAGICLYSM_PROBLEMS", "EOC_FIX_MIND_OVER_MATTER_PROBLEMS", "EOC_FIX_XEDRA_EVOLVED_PROBLEMS" ]
}
]
},
{
"type": "effect_on_condition",
"id": "EOC_FIX_MAGICLYSM_PROBLEMS",
"effect": [ ]
},
{
"type": "effect_on_condition",
"id": "EOC_FIX_MIND_OVER_MATTER_PROBLEMS",
"effect": [ ]
},
{
"type": "effect_on_condition",
"id": "EOC_FIX_XEDRA_EVOLVED_PROBLEMS",
"effect": [ ]
},
{
"type": "effect_on_condition",
"id": "EOC_death_heal",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"type": "effect_on_condition",
"id": "EOC_FIX_MAGICLYSM_PROBLEMS",
"effect": [ { "u_add_effect": "effect_disjunction", "duration": 2 } ]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[
{
"type": "effect_on_condition",
"id": "EOC_FIX_MIND_OVER_MATTER_PROBLEMS",
"effect": [
{ "math": [ "u_vitamin('vitamin_psionic_drain') = 0" ] },
{ "u_lose_effect": "psi_nether_attention" },
{ "u_lose_effect": "effect_nether_attunement_raiser" },
{ "u_lose_effect": "effect_nether_attunement_attenuation" },
{ "u_lose_effect": "effect_nether_attunement_feedback" },
{ "u_lose_effect": "psi_blind" },
{ "u_lose_effect": "psi_dazed" },
{ "u_lose_effect": "psi_deaf" },
{ "u_lose_effect": "effect_photokinetic_illuminate_enemy" },
{ "u_lose_effect": "effect_photokinetic_illumination" },
{ "u_lose_effect": "effect_riftwalker_teleport" },
{ "u_lose_effect": "effect_teleporting_lock" },
{ "u_lose_effect": "effect_vitakinetic_health_down" },
{ "u_lose_effect": "effect_vitakinetic_healing_down" },
{ "u_lose_effect": "effect_vitakinetic_healing_down_super" },
{ "u_lose_effect": "psi_vitakinetic_degeneration" },
{ "u_lose_effect": "psionic_overload" },
{ "u_lose_effect": "effect_psi_null_unbound" },
{ "u_lose_effect": "effect_biokin_overload" },
{ "u_lose_effect": "blind_clair_overload" },
{ "u_lose_effect": "deaf_clair_overload" },
{ "u_lose_effect": "effect_electrokin_overload" },
{ "u_lose_effect": "effect_photokin_lumination_overload" },
{ "u_lose_effect": "effect_photokin_myopia_overload" },
{ "u_lose_effect": "blind_photokin_overload" },
{ "u_lose_effect": "effect_pyrokin_overload" },
{ "u_lose_effect": "effect_pyrokin_fever_burning" },
{ "u_lose_effect": "effect_portal_storm_teleport" },
{ "u_lose_effect": "effect_teleporter_overload" },
{ "u_lose_effect": "effect_psi_teleport_lock" },
{ "u_lose_effect": "effect_telekin_overload" },
{ "u_lose_effect": "effect_vitakin_overload" }
]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"id": "effect_si_lilin_no_ruach_upgrades",
"type": "effect_type",
"name": [ "Fragile Spirit" ],
"desc": [ "Your ruach is too fragile to spend it frivolously." ]
}
]
21 changes: 21 additions & 0 deletions data/mods/Sky_Island/mod_interactions/xedra_evolved/eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,26 @@
{ "if": { "u_has_trait": "HOMULLUS" }, "then": { "math": [ "u_vitamin('mutagen_dollkin')", "+=", "550 " ] } },
{ "if": { "u_has_trait": "ARVORE" }, "then": { "math": [ "u_vitamin('mutagen_plantkin')", "+=", "550 " ] } }
]
},
{
"type": "effect_on_condition",
"id": "EOC_LILIN_SPEND_RUACH_FOR_POWERS",
"condition": { "math": [ "u_vitamin('lilin_ruach_vitamin') >= 240" ] },
"effect": [
{
"if": { "not": { "u_has_effect": "effect_si_lilin_no_ruach_upgrades" } },
"then": [
{ "math": [ "u_vitamin('lilin_ruach_vitamin')", "-=", "240" ] },
{ "math": [ "u_lilin_amount_of_ruach_spent_for_powers_increaser", "+=", "0.75" ] },
{
"math": [ "u_lilin_amount_of_ruach_spent_for_powers", "+=", "u_lilin_amount_of_ruach_spent_for_powers_increaser" ]
}
],
"else": [
{ "u_message": "Your spirit is still fragile after your brush with death. You have no ruach to spare.", "type": "bad" }
]
}
],
"false_effect": [ { "u_message": "You don't have enough ruach to dedicate any to increasing your powers!", "type": "bad" } ]
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
[
{
"type": "effect_on_condition",
"id": "EOC_FIX_XEDRA_EVOLVED_PROBLEMS",
"effect": [
{
"if": { "and": [ { "u_has_trait": "LILIN_TRAITS" }, { "math": [ "u_vitamin('lilin_ruach_vitamin') == 0" ] } ] },
"then": [
{ "math": [ "u_vitamin('lilin_ruach_vitamin')", "=", "720" ] },
{ "u_add_effect": "effect_si_lilin_no_ruach_upgrades", "duration": 259200 }
]
},
{
"if": { "and": [ { "u_has_trait": "VAMPIRE" }, { "math": [ "u_vitamin('human_blood_vitamin') <= -4800" ] } ] },
"then": { "math": [ "u_vitamin('human_blood_vitamin')", "=", "0" ] }
},
{ "u_lose_effect": "blood_spiders" },
{ "u_lose_effect": "visuals" },
{ "u_lose_effect": "effect_dread_weight" },
{ "u_lose_effect": "poisoned_blood" },
{ "u_lose_effect": "poisoned_blood2" },
{ "u_lose_effect": "effect_broke_fae_ban" },
{ "u_lose_effect": "effect_evil_eye" }
]
}
]
Loading