calorie related math effect (#73136)

* Add `calories()` math function * add assigning function * remove u_val version of the kcal checks * replaces all instances of u_val('kcal') with new function * document change * fix clang tidy error * Update src/math_parser_diag.cpp Co-authored-by: mqrause <[email protected]> * Update src/math_parser_diag.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * resolve the rest of shiv, fix (potentially) few tests * missed the zero * remove percent calories assigning since you can't assign calories as percent anymore * remove math kcal test because it's not a shim * the way this test is made drive me insane * i was told this can fix the test * spare me * now this one is my fault * fix MoM using old syntax * Do floating point math Co-authored-by: anothersimulacrum <[email protected]> * get rid of magic number * revert `Do floating point math` because i don't want static cast all the returns in the function. better approach would be divide this function in two, one for raw value that return int, one for percent value that return double or function that return healthy kcal directly * add `-> double` * Update src/math_parser_diag.cpp Co-authored-by: anothersimulacrum <[email protected]> --------- Co-authored-by: mqrause <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: anothersimulacrum <[email protected]>
CleverRaven · Apr 23, 2024 · 7f16ac8 · 7f16ac8
1 parent a60d305
commit 7f16ac8
Show file tree

Hide file tree

Showing 36 changed files with 291 additions and 280 deletions.
diff --git a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
@@ -390,12 +390,12 @@
       "and": [
         { "u_has_trait": "INK_GLANDS" },
         { "not": { "u_has_effect": "ink_gland_ink", "intensity": 4 } },
-        { "math": [ "u_val('stored_kcal_percentage')", ">", "33" ] },
+        { "math": [ "u_calories('format': 'percent')", ">", "33" ] },
         { "math": [ "u_val('instant_thirst')", "<", "240" ] }
       ]
     },
     "effect": [
-      { "math": [ "u_val('stored_kcal')", "-=", "47" ] },
+      { "math": [ "u_calories()", "-=", "47" ] },
       { "math": [ "u_val('thirst')", "+=", "4" ] },
       {
         "u_add_effect": "ink_gland_ink",

diff --git a/data/json/npcs/TALK_TEST.json b/data/json/npcs/TALK_TEST.json
@@ -1023,12 +1023,7 @@
       {
         "text": "Stored kcal is 118'169.",
         "topic": "TALK_DONE",
-        "condition": { "math": [ "u_val('stored_kcal')", "==", "118169" ] }
-      },
-      {
-        "text": "Stored kcal is at 100% of healthy.",
-        "topic": "TALK_DONE",
-        "condition": { "math": [ "round( u_val('stored_kcal_percentage') )", "==", "100" ] }
+        "condition": { "math": [ "u_calories()", "==", "118169" ] }
       },
       {
         "text": "Has 3 glass bottles.",
@@ -1177,16 +1172,7 @@
         "effect": { "math": [ "u_val('mana_percentage')", "=", "25" ] }
       },
       { "text": "Sets thirst to 22.", "topic": "TALK_DONE", "effect": { "math": [ "u_val('thirst')", "=", "22" ] } },
-      {
-        "text": "Sets stored_kcal to 23.",
-        "topic": "TALK_DONE",
-        "effect": { "math": [ "u_val('stored_kcal')", "=", "23" ] }
-      },
-      {
-        "text": "Sets stored_kcal_percentage to 50.",
-        "topic": "TALK_DONE",
-        "effect": { "math": [ "u_val('stored_kcal_percentage')", "=", "50" ] }
-      },
+      { "text": "Sets calories to 23.", "topic": "TALK_DONE", "effect": { "math": [ "u_calories()", "=", "23" ] } },
       {
         "text": "Sets pew pew's level to -1.",
         "topic": "TALK_DONE",

diff --git a/data/mods/Defense_Mode/effects_on_condition/backend_eocs.json b/data/mods/Defense_Mode/effects_on_condition/backend_eocs.json
@@ -84,7 +84,7 @@
       { "u_lose_effect": "staggered" },
       { "u_lose_effect": "bite" },
       { "u_lose_effect": "bleed" },
-      { "math": [ "u_val('stored_kcal')", "=", "u_val('stored_kcal')" ] },
+      { "math": [ "u_calories()", "=", "u_calories()" ] },
       { "math": [ "u_val('pkill')", "=", "u_val('pkill')" ] },
       { "math": [ "u_val('stim')", "=", "u_val('stim')" ] },
       { "math": [ "u_pain()", "=", "0" ] },

diff --git a/data/mods/Limb_WIP/mod_integration/vitakinesis_eoc.json b/data/mods/Limb_WIP/mod_integration/vitakinesis_eoc.json
@@ -176,7 +176,7 @@
     "id": "EOC_VITA_RESTORE_LIMB_DRAIN",
     "//": "About 2.5 times as costly as the super heal drain, factored for each tick of healing. Assuming you're using super heal at level twelve, it ticks 15 times. 15 * 2.5 = 37.5 times increase for proper scaling in a single tick of this.  You are regrowing a whole body part, you know.",
     "effect": [
-      { "math": [ "u_val('stored_kcal')", "-=", "rng( 1875,9375 )" ] },
+      { "math": [ "u_calories()", "-=", "rng( 1875,9375 )" ] },
       { "math": [ "u_vitamin('iron')", "-=", "rng( 1875,7500 )" ] },
       { "math": [ "u_vitamin('calcium')", "-=", "rng( 3750,7500 )" ] },
       { "math": [ "u_vitamin('vitC')", "-=", "rng( 750,3000 )" ] },

diff --git a/data/mods/Magiclysm/Spells/biomancer.json b/data/mods/Magiclysm/Spells/biomancer.json
@@ -488,7 +488,7 @@
     "effect": [
       { "u_message": "Your body swells and warps as your size increases!", "type": "good" },
       { "u_add_trait": "BIO_GIANT_GROWTH" },
-      { "math": [ "u_val('stored_kcal')", "+=", "100000" ] },
+      { "math": [ "u_calories()", "+=", "100000" ] },
       {
         "queue_eocs": "EOC_GIANT_GROWTH_MUTATION_REMOVE",
         "time_in_future": { "math": [ "(( u_spell_level('biomancer_giant_growth') * 40 ) + 300 )" ] }
@@ -502,7 +502,7 @@
     "effect": [
       { "u_message": "Your body shrinks and warps as your size decreases!", "type": "bad" },
       { "u_lose_trait": "BIO_GIANT_GROWTH" },
-      { "math": [ "u_val('stored_kcal')", "-=", "100000" ] }
+      { "math": [ "u_calories()", "-=", "100000" ] }
     ]
   },
   {

diff --git a/data/mods/Magiclysm/enchantments/Gaias_Chosen.json b/data/mods/Magiclysm/enchantments/Gaias_Chosen.json
@@ -65,7 +65,7 @@
       { "u_add_effect": "incorporeal", "duration": 1 },
       { "u_add_effect": "downed", "duration": 1 },
       { "math": [ "u_hp('ALL')", "=", "999" ] },
-      { "math": [ "u_val('stored_kcal')", "=", "70000" ] },
+      { "math": [ "u_calories()", "=", "70000" ] },
       { "u_spawn_item": "corpse_painful" },
       { "queue_eocs": "EOC_DUST_REBORN_2", "time_in_future": "1 seconds" },
       {

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
@@ -515,7 +515,7 @@
     "eoc_type": "EVENT",
     "required_event": "spellcasting_finish",
     "condition": { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" },
-    "effect": [ { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(_difficulty)" ] } ]
+    "effect": [ { "math": [ "u_calories()", "-=", "psionics_kcal_cost(_difficulty)" ] } ]
   },
   {
     "type": "effect_on_condition",

diff --git a/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json b/data/mods/MindOverMatter/powers/biokinesis_concentration_eocs.json
@@ -62,7 +62,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] },
       { "math": [ "u_spell_exp('biokin_overcome_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -122,7 +122,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] },
       { "math": [ "u_spell_exp('biokin_physical_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -188,7 +188,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] },
       { "math": [ "u_spell_exp('biokin_breathe_skin')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -249,7 +249,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] },
       { "math": [ "u_spell_exp('biokin_climate_control')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -339,7 +339,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(5)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] },
       { "math": [ "u_spell_exp('biokin_enhance_mobility')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -404,7 +404,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(5)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] },
       { "math": [ "u_spell_exp('biokin_hammerhand')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -464,7 +464,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(6)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] },
       { "math": [ "u_spell_exp('biokin_reflex_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -524,7 +524,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "7" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(7)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(7)" ] },
       { "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
@@ -49,7 +49,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] },
       { "math": [ "u_spell_exp('clair_night_vision')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -113,7 +113,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] },
       { "math": [ "u_spell_exp('clair_speed_reading')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -173,7 +173,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] },
       { "math": [ "u_spell_exp('clair_see_auras')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -233,7 +233,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "2" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(2)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(2)" ] },
       { "math": [ "u_spell_exp('clair_danger_sense')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -293,7 +293,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] },
       { "math": [ "u_spell_exp('clair_ranged_enhance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -353,7 +353,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(6)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] },
       { "math": [ "u_spell_exp('clair_dodge_power')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -437,7 +437,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "6" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(6)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(6)" ] },
       { "math": [ "u_spell_exp('clair_craft_bonus')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -497,7 +497,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "8" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(8)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(8)" ] },
       { "math": [ "u_spell_exp('clair_clear_sight')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -563,7 +563,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "9" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(9)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(9)" ] },
       { "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
@@ -38,7 +38,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] },
       { "math": [ "u_spell_exp('electrokinetic_see_electric')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -135,7 +135,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] },
       {
         "math": [ "u_spell_exp('electrokinetic_hacking_interface')", "+=", "(maintenance_exp_factor(u_val('focus')))" ]
       },
@@ -236,7 +236,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] },
       {
         "math": [ "u_spell_exp('electrokinetic_personal_battery')", "+=", "(maintenance_exp_factor(u_val('focus')))" ]
       },
@@ -298,7 +298,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] },
       { "math": [ "u_spell_exp('electrokinetic_reduce_pain')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -363,7 +363,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "8" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(8)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(8)" ] },
       { "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
@@ -37,7 +37,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "1" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(1)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(1)" ] },
       { "math": [ "u_spell_exp('photokinetic_light_local')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -97,7 +97,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] },
       { "math": [ "u_spell_exp('photokinetic_rad_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -166,7 +166,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] },
       { "math": [ "u_spell_exp('photokinetic_camouflage')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -253,7 +253,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] },
       { "math": [ "u_spell_exp('photokinetic_hide_ugly')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -319,7 +319,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(5)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] },
       { "math": [ "u_spell_exp('photokinetic_radio')", "+=", "(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
@@ -44,7 +44,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "3" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(3)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(3)" ] },
       { "math": [ "u_spell_exp('pyrokinetic_call_flames')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -104,7 +104,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "4" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(4)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(4)" ] },
       { "math": [ "u_spell_exp('pyrokinetic_cloak')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -170,7 +170,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "5" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(5)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(5)" ] },
       { "math": [ "u_spell_exp('pyrokinetic_lance')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {
@@ -230,7 +230,7 @@
     "effect": [
       { "math": [ "u_latest_channeled_power_difficulty", "=", "7" ] },
       { "run_eocs": "EOC_PSIONICS_GAIN_NETHER_ATTUNEMENT_2" },
-      { "math": [ "u_val('stored_kcal')", "-=", "psionics_kcal_cost(7)" ] },
+      { "math": [ "u_calories()", "-=", "psionics_kcal_cost(7)" ] },
       { "math": [ "u_spell_exp('pyrokinetic_flame_immunity')", "+=", "(maintenance_exp_factor(u_val('focus')))" ] },
       { "run_eocs": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK" },
       {