From 9c56a94c4be40e929926f0029486b39aadb0d41e Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Thu, 10 Oct 2024 18:51:10 -0500 Subject: [PATCH] [MoM] Centralize calorie EoC in one place and refer to it elsewhere (#76928) * Update eoc_power_recurring.json * Rework initial channeling EoC to reference main EoC * Add EOC_PSIONICS_KCAL_COST * Update biokinesis_concentration_eocs.json * Update clairsentience_concentration_eocs.json * Update electrokinesis_concentration_eocs.json * Update photokinesis_concentration_eoc.json * Update pyrokinesis_concentration_eoc.json * Update telekinesis_concentration_eoc.json * Update telepathy_concentration_eoc.json * Update teleportation_concentration_eoc.json * Update vitakinesis_concentration_eoc.json * Update data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../eoc_on_power_use_events.json | 4 +-- .../effectoncondition/eoc_power_effects.json | 5 ++++ .../eoc_power_recurring.json | 5 ++++ .../powers/biokinesis_concentration_eocs.json | 27 +++++++------------ .../clairsentience_concentration_eocs.json | 27 +++++++------------ .../electrokinesis_concentration_eocs.json | 24 ++++++----------- .../photokinesis_concentration_eoc.json | 24 ++++++----------- .../powers/pyrokinesis_concentration_eoc.json | 15 ++++------- .../powers/telekinesis_concentration_eoc.json | 18 +++++-------- .../powers/telepathy_concentration_eoc.json | 15 ++++------- .../teleportation_concentration_eoc.json | 6 ++--- .../powers/vitakinesis_concentration_eoc.json | 18 +++++-------- 12 files changed, 70 insertions(+), 118 deletions(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json index 4e3dccb6d1846..f509e8d53344b 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json @@ -532,11 +532,11 @@ }, { "type": "effect_on_condition", - "id": "EOC_PSIONICS_KCAL_COST", + "id": "EOC_PSIONICS_INITIAL_KCAL_COST", "eoc_type": "EVENT", "required_event": "spellcasting_finish", "condition": { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }, - "effect": [ { "math": [ "u_calories()", "-=", "psionics_kcal_cost(_difficulty)" ] } ] + "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "_difficulty" ] }, { "run_eocs": "EOC_PSIONICS_KCAL_COST" } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index 6fba2eaa296a5..106e768949f20 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -32,6 +32,11 @@ }, "effect": [ { "u_add_effect": "effect_psi_too_much_pain_cant_channel", "duration": "0 seconds" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_PSIONICS_KCAL_COST", + "effect": [ { "math": [ "u_calories()", "-=", "psionics_kcal_cost(u_latest_channeled_power_difficulty)" ] } ] + }, { "type": "effect_on_condition", "id": "EOC_BIOKIN_MATRIX_BOOST", diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json index d97c6f80d4725..cdd38944b13b3 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json @@ -1,4 +1,9 @@ [ + { + "type": "effect_on_condition", + "id": "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR", + "effect": [ { "run_eocs": "EOC_PSIONICS_KCAL_COST" } ] + }, { "type": "effect_on_condition", "id": "EOC_PSI_NETHER_ATTUNEMENT_PERIODIC_ADJUSTMENT", diff --git a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json index 0504267f9f10a..a69263718ed73 100644 --- a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json @@ -61,8 +61,7 @@ "condition": { "u_has_effect": "effect_biokin_overcome_pain" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_overcome_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -121,8 +120,7 @@ "condition": { "u_has_effect": "effect_biokin_physical" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_physical_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -187,8 +185,7 @@ "condition": { "u_has_effect": "effect_biokin_breathe_skin" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_breathe_skin')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -247,8 +244,7 @@ "condition": { "u_has_effect": "effect_biokin_armor_skin" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_armor_skin')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -308,8 +304,7 @@ "condition": { "u_has_effect": "effect_biokin_climate_control" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_climate_control')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -398,8 +393,7 @@ "condition": { "u_has_effect": "effect_biokin_enhance_mobility" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_enhance_mobility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -463,8 +457,7 @@ "condition": { "u_has_effect": "biokin_hammerhand" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_hammerhand')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -523,8 +516,7 @@ "condition": { "u_has_effect": "effect_biokin_reflex" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_reflex_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -583,8 +575,7 @@ "condition": { "u_has_effect": "effect_biokin_metabolism_enhance" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "7" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(7)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('biokin_metabolism_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "math": [ "u_val('sleep_deprivation')", "-=", "10" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, diff --git a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json index 89b3b57482aed..1d270a36de3dd 100644 --- a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json @@ -48,8 +48,7 @@ "condition": { "u_has_effect": "effect_clair_night_eyes" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_night_vision')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -112,8 +111,7 @@ "condition": { "u_has_effect": "effect_clair_speed_reader" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_speed_reading')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -172,8 +170,7 @@ "condition": { "u_has_effect": "effect_clair_see_auras" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_see_auras')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -232,8 +229,7 @@ "condition": { "u_has_effect": "effect_clair_premonition" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_danger_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -295,8 +291,7 @@ "condition": { "u_has_effect": "effect_clair_ranged_enhance" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_ranged_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -355,8 +350,7 @@ "condition": { "u_has_effect": "effect_clair_dodge" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_dodge_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -439,8 +433,7 @@ "condition": { "u_has_effect": "effect_clair_craft_bonus" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_craft_bonus')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -499,8 +492,7 @@ "condition": { "u_has_effect": "effect_clair_clear_sight" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "8" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(8)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_clear_sight')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -565,8 +557,7 @@ "condition": { "u_has_effect": "effect_clair_group_tactics_self" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "9" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(9)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('clair_group_tactics')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { diff --git a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json index a9a882ce060ec..2227fa68ef89a 100644 --- a/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json +++ b/data/mods/MindOverMatter/powers/electrokinesis_concentration_eocs.json @@ -37,8 +37,7 @@ "condition": { "u_has_effect": "effect_electrokin_see_electricity" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_see_electric')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -97,8 +96,7 @@ "condition": { "u_has_effect": "effect_electrokin_zap_enemies" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_zap_enemies')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -157,8 +155,7 @@ "condition": { "u_has_effect": "effect_electrokin_melee_attacks" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_melee_attacks')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -254,8 +251,7 @@ "condition": { "u_has_effect": "effect_electrokin_hacking_interface" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_hacking_interface')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, @@ -362,8 +358,7 @@ "condition": { "u_has_effect": "effect_electrokin_personal_battery" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_personal_battery')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, @@ -424,8 +419,7 @@ "condition": { "u_has_effect": "effect_electrokin_reduce_pain" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_reduce_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -484,8 +478,7 @@ "condition": { "u_has_effect": "effect_electrokinetic_speed_boost" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_speed_boost')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -549,8 +542,7 @@ "condition": { "u_has_effect": "effect_electrokinetic_lightning_aura" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "8" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(8)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('electrokinetic_lightning_aura')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { diff --git a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json index 4c40a6da8a15c..4bb5bc07c2d0f 100644 --- a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json @@ -37,8 +37,7 @@ "condition": { "u_has_effect": "effect_photokin_light_local" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_light_local')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -97,8 +96,7 @@ "condition": { "u_has_effect": "effect_photokin_dodge" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_light_dodge')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -157,8 +155,7 @@ "condition": { "u_has_effect": "effect_photokin_light_barrier" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_rad_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -226,8 +223,7 @@ "condition": { "u_has_effect": "effect_photokin_camouflage" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_camouflage')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -313,8 +309,7 @@ "condition": { "u_has_effect": "effect_photokin_hide_ugly" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_hide_ugly')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -379,8 +374,7 @@ "condition": { "u_has_effect": "effect_photokinetic_radio" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_radio')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -442,8 +436,7 @@ "condition": { "u_has_effect": "effect_photokin_invisibility" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_invisibility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -502,8 +495,7 @@ "condition": { "u_has_effect": "effect_photokin_blinding_glare" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "7" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(7)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('photokinetic_blinding_glare')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { diff --git a/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json index 3d0b542b6bcf7..34fffc7110baf 100644 --- a/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/pyrokinesis_concentration_eoc.json @@ -74,8 +74,7 @@ "condition": { "u_has_effect": "effect_pyrokinetic_fire_tool" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('pyrokinetic_call_flames')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -134,8 +133,7 @@ "condition": { "u_has_effect": "effect_pyrokinetic_cloak" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('pyrokinetic_cloak')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -200,8 +198,7 @@ "condition": { "u_has_item": "pyrokinetic_torch_weld" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('pyrokinetic_lance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -260,8 +257,7 @@ "condition": { "u_has_effect": "effect_pyrokinetic_aura" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -320,8 +316,7 @@ "condition": { "u_has_effect": "effect_pyrokinetic_flame_immunity" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "7" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(7)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { diff --git a/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json index d2a80f2f4aad0..e675ebf222399 100644 --- a/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/telekinesis_concentration_eoc.json @@ -37,8 +37,7 @@ "condition": { "u_has_effect": "effect_telekinetic_momentum" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telekinetic_momentum')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -178,8 +177,7 @@ "condition": { "u_has_effect": "effect_telekinetic_lifting_field" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telekinetic_lifting_field')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -238,8 +236,7 @@ "condition": { "u_has_effect": "effect_telekinetic_strength" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telekinetic_strength')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -298,8 +295,7 @@ "condition": { "u_has_effect": "effect_telekinetic_armor" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telekinetic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -468,8 +464,7 @@ "condition": { "u_has_effect": "effect_telekinetic_vehicle_lift" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telekinetic_vehicle_lift')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -531,8 +526,7 @@ "condition": { "u_has_effect": "effect_telekinetic_levitation" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "7" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(7)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telekinetic_levitation')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { diff --git a/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json b/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json index 5350eb8b9ebb1..32734bf7d1573 100644 --- a/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/telepathy_concentration_eoc.json @@ -37,9 +37,7 @@ "condition": { "u_has_effect": "effect_telepathic_learning_bonus" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "u_cast_spell": { "id": "psionic_maintenance_drained_difficulty_one", "hit_self": true } }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telepathic_concentration')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -98,8 +96,7 @@ "condition": { "u_has_effect": "effect_telepathic_psi_armor" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telepathic_shield')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -158,8 +155,7 @@ "condition": { "u_has_effect": "effect_telepath_sense_minds" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telepathic_mind_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -237,10 +233,9 @@ "condition": { "u_has_effect": "effect_telepathic_morale" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('telepathic_morale')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, + { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { "u_add_morale": "morale_telepathy", "bonus": { diff --git a/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json b/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json index 487239b985576..ccff973172fee 100644 --- a/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/teleportation_concentration_eoc.json @@ -37,8 +37,7 @@ "condition": { "u_has_effect": "effect_teleport_stride" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('teleport_stride')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -97,8 +96,7 @@ "condition": { "u_has_effect": "effect_teleport_ephemeral_walk" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('teleport_ephemeral_walk')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { diff --git a/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json index a0061bf7825ff..a78f69077d469 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_concentration_eoc.json @@ -55,8 +55,7 @@ "condition": { "u_has_effect": "effect_vitakin_slow_bleeding" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('vita_slow_bleeding')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -115,8 +114,7 @@ "condition": { "u_has_effect": "effect_vita_health" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('vita_health_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -374,8 +372,7 @@ "condition": { "u_has_effect": "effect_vita_concentrated_healing" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('vita_slow_bleeding')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -441,8 +438,7 @@ "condition": { "u_has_effect": "effect_vita_cure_disease" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('vita_cure_disease')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -504,8 +500,7 @@ "condition": { "u_has_effect": "effect_vita_super_heal" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "9" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(9)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_spell_exp('vita_super_heal')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" }, { @@ -574,8 +569,7 @@ "condition": { "u_has_effect": "effect_vita_return_from_death" }, "effect": [ { "math": [ "u_latest_channeled_power_difficulty", "=", "10" ] }, - { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" }, - { "math": [ "u_calories()", "-=", "psionics_kcal_cost(10)" ] }, + { "run_eocs": [ "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2", "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR" ] }, { "math": [ "u_vitakin_return_from_death_kcal", "=", "u_calories()" ] }, { "math": [ "u_spell_exp('vita_return_from_death')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] }, { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },