From 9ed0b7f632aaeb997c5ba164ce83d1ba00511d2e Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:33:50 -0600 Subject: [PATCH 1/9] Add check for high Attunement to maintenance kcal EoC --- .../effectoncondition/eoc_power_recurring.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json index cdd38944b13b3..1ccc81be034c7 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json @@ -2,7 +2,11 @@ { "type": "effect_on_condition", "id": "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR", - "effect": [ { "run_eocs": "EOC_PSIONICS_KCAL_COST" } ] + "effect": [ + { "run_eocs": "EOC_PSIONICS_KCAL_COST" } + { "if": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 135" ] }, + "then": { "run_eocs": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_KCAL_COST" } + ] }, { "type": "effect_on_condition", From 6f1c032663bd73333274527844ed19705310ac74 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:36:43 -0600 Subject: [PATCH 2/9] Change name, add missing } --- .../MindOverMatter/effectoncondition/eoc_power_recurring.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json index 1ccc81be034c7..cf6053ac1f1d1 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json @@ -5,7 +5,8 @@ "effect": [ { "run_eocs": "EOC_PSIONICS_KCAL_COST" } { "if": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 135" ] }, - "then": { "run_eocs": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_KCAL_COST" } + "then": { "run_eocs": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES" } + } ] }, { From d2667691c4fcb483d2297476073fec18d4393090 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:43:48 -0600 Subject: [PATCH 3/9] Add weariness EoC --- .../effectoncondition/eoc_power_effects.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index c78bb3b4595e0..f870717e3c297 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -37,6 +37,15 @@ "id": "EOC_PSIONICS_KCAL_COST", "effect": [ { "math": [ "u_calories()", "-=", "psionics_kcal_cost(u_latest_channeled_power_difficulty)" ] } ] }, + { + "type": "effect_on_condition", + "id": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES", + "effect": [ + { "math": [ "u_maintenance_high_attunement_weariness_penalty", "=", "psionics_kcal_cost(u_latest_channeled_power_difficulty) * (u_nether_attunement_power_scaling - 1)" ] }, + { "math": [ "u_calories()", "-=", "u_maintenance_high_attunement_weariness_penalty" ] }, + { "math": [ "u_calories('dont_affect_weariness': true)", "+=", "u_maintenance_high_attunement_weariness_penalty" ] } + ] + }, { "type": "effect_on_condition", "id": "EOC_BIOKIN_MATRIX_BOOST", From 8dce4f6a2928505e1aa445222a5f51572818b8f4 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:53:01 -0600 Subject: [PATCH 4/9] Update data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../MindOverMatter/effectoncondition/eoc_power_effects.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index f870717e3c297..187385a8c8a7a 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -43,7 +43,9 @@ "effect": [ { "math": [ "u_maintenance_high_attunement_weariness_penalty", "=", "psionics_kcal_cost(u_latest_channeled_power_difficulty) * (u_nether_attunement_power_scaling - 1)" ] }, { "math": [ "u_calories()", "-=", "u_maintenance_high_attunement_weariness_penalty" ] }, - { "math": [ "u_calories('dont_affect_weariness': true)", "+=", "u_maintenance_high_attunement_weariness_penalty" ] } + { + "math": [ "u_calories('dont_affect_weariness': true)", "+=", "u_maintenance_high_attunement_weariness_penalty" ] + } ] }, { From 1151825bce9140fa692155fecc421b99063d6e21 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:53:09 -0600 Subject: [PATCH 5/9] Update data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../effectoncondition/eoc_power_effects.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index 187385a8c8a7a..8a0c4716a4d8a 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -40,8 +40,14 @@ { "type": "effect_on_condition", "id": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES", - "effect": [ - { "math": [ "u_maintenance_high_attunement_weariness_penalty", "=", "psionics_kcal_cost(u_latest_channeled_power_difficulty) * (u_nether_attunement_power_scaling - 1)" ] }, + "effect": [ + { + "math": [ + "u_maintenance_high_attunement_weariness_penalty", + "=", + "psionics_kcal_cost(u_latest_channeled_power_difficulty) * (u_nether_attunement_power_scaling - 1)" + ] + }, { "math": [ "u_calories()", "-=", "u_maintenance_high_attunement_weariness_penalty" ] }, { "math": [ "u_calories('dont_affect_weariness': true)", "+=", "u_maintenance_high_attunement_weariness_penalty" ] From f2f36ddc72c10bd3f1cc22fc557884bff1006d28 Mon Sep 17 00:00:00 2001 From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:53:34 -0600 Subject: [PATCH 6/9] Fix vitamin level --- .../MindOverMatter/effectoncondition/eoc_power_recurring.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json index cf6053ac1f1d1..fba98a95fde46 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json @@ -4,7 +4,7 @@ "id": "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR", "effect": [ { "run_eocs": "EOC_PSIONICS_KCAL_COST" } - { "if": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 135" ] }, + { "if": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 115" ] }, "then": { "run_eocs": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES" } } ] From 2c5a7acf0b56c45b9febcde1ce351ad23141c4a7 Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Tue, 24 Dec 2024 16:56:44 -0600 Subject: [PATCH 7/9] Fixes --- .../effectoncondition/eoc_power_effects.json | 11 +++++++++-- .../effectoncondition/eoc_power_recurring.json | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index 8a0c4716a4d8a..7b1945c26f0bc 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -40,7 +40,9 @@ { "type": "effect_on_condition", "id": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES", + "condition": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 115" ] }, "effect": [ + { "u_message": "draining calories!" }, { "math": [ "u_maintenance_high_attunement_weariness_penalty", @@ -48,9 +50,14 @@ "psionics_kcal_cost(u_latest_channeled_power_difficulty) * (u_nether_attunement_power_scaling - 1)" ] }, - { "math": [ "u_calories()", "-=", "u_maintenance_high_attunement_weariness_penalty" ] }, { - "math": [ "u_calories('dont_affect_weariness': true)", "+=", "u_maintenance_high_attunement_weariness_penalty" ] + "if": { "math": [ "u_maintenance_high_attunement_weariness_penalty >= 0" ] }, + "then": [ + { "math": [ "u_calories()", "-=", "u_maintenance_high_attunement_weariness_penalty" ] }, + { + "math": [ "u_calories('dont_affect_weariness': true)", "+=", "u_maintenance_high_attunement_weariness_penalty" ] + } + ] } ] }, diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json index fba98a95fde46..9200724da1d6d 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json @@ -3,8 +3,9 @@ "type": "effect_on_condition", "id": "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR", "effect": [ - { "run_eocs": "EOC_PSIONICS_KCAL_COST" } - { "if": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 115" ] }, + { "run_eocs": "EOC_PSIONICS_KCAL_COST" }, + { + "if": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 115" ] }, "then": { "run_eocs": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES" } } ] From 893ef497308a131e74bf7e0f819a69b6e3ed2b3f Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Tue, 24 Dec 2024 17:45:59 -0600 Subject: [PATCH 8/9] Switch to Jmath version --- .../effectoncondition/eoc_power_effects.json | 22 +------------------ .../eoc_power_recurring.json | 8 +------ data/mods/MindOverMatter/jmath.json | 2 +- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index 7b1945c26f0bc..227d3c9f1b3a4 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -35,29 +35,9 @@ { "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_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES", - "condition": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 115" ] }, "effect": [ - { "u_message": "draining calories!" }, { - "math": [ - "u_maintenance_high_attunement_weariness_penalty", - "=", - "psionics_kcal_cost(u_latest_channeled_power_difficulty) * (u_nether_attunement_power_scaling - 1)" - ] - }, - { - "if": { "math": [ "u_maintenance_high_attunement_weariness_penalty >= 0" ] }, - "then": [ - { "math": [ "u_calories()", "-=", "u_maintenance_high_attunement_weariness_penalty" ] }, - { - "math": [ "u_calories('dont_affect_weariness': true)", "+=", "u_maintenance_high_attunement_weariness_penalty" ] - } - ] + "math": [ "u_calories()", "-=", "psionics_kcal_cost(u_latest_channeled_power_difficulty) * u_nether_attunement_power_scaling" ] } ] }, diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json index 9200724da1d6d..cdd38944b13b3 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_recurring.json @@ -2,13 +2,7 @@ { "type": "effect_on_condition", "id": "EOC_PSI_MAINTENANCE_CALORIE_COST_CALCULATOR", - "effect": [ - { "run_eocs": "EOC_PSIONICS_KCAL_COST" }, - { - "if": { "math": [ "u_vitamin('vitamin_psionic_drain') >= 115" ] }, - "then": { "run_eocs": "EOC_PSIONICS_MAINTAINED_HIGH_ATTUNEMENT_PENALTIES" } - } - ] + "effect": [ { "run_eocs": "EOC_PSIONICS_KCAL_COST" } ] }, { "type": "effect_on_condition", diff --git a/data/mods/MindOverMatter/jmath.json b/data/mods/MindOverMatter/jmath.json index 7c10fc9cc645f..68c454b94e462 100644 --- a/data/mods/MindOverMatter/jmath.json +++ b/data/mods/MindOverMatter/jmath.json @@ -27,7 +27,7 @@ "type": "jmath_function", "id": "psionics_kcal_cost", "num_args": 1, - "return": "(4 * _0) * rng( 0.3, 1.7)" + "return": "(4 * _0) * rng( 0.3, 1.7) * u_nether_attunement_power_scaling" }, { "type": "jmath_function", From e5fd8e604becedae18c804781729f23a7def23ad Mon Sep 17 00:00:00 2001 From: "Standing-StormStanding-Storm git config --global user.name Standing-Storm git config --global user.name Standing-Storm" Date: Tue, 24 Dec 2024 17:48:50 -0600 Subject: [PATCH 9/9] Don't double-charge --- .../MindOverMatter/effectoncondition/eoc_power_effects.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json index 227d3c9f1b3a4..c78bb3b4595e0 100644 --- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json +++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json @@ -35,11 +35,7 @@ { "type": "effect_on_condition", "id": "EOC_PSIONICS_KCAL_COST", - "effect": [ - { - "math": [ "u_calories()", "-=", "psionics_kcal_cost(u_latest_channeled_power_difficulty) * u_nether_attunement_power_scaling" ] - } - ] + "effect": [ { "math": [ "u_calories()", "-=", "psionics_kcal_cost(u_latest_channeled_power_difficulty)" ] } ] }, { "type": "effect_on_condition",