Merge pull request #72939 from Standing-Storm/fix-pain-error

[MoM] Account for painkiller in pain disabling powers
CleverRaven · Apr 10, 2024 · 155bd72 · 155bd72
2 parents 5c567ac + 063818f
commit 155bd72
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
@@ -23,7 +23,7 @@
         { "not": { "u_has_effect": "effect_psi_too_much_pain_cant_channel" } },
         {
           "math": [
-            "u_pain()",
+            "u_pain() - u_val('pkill')",
             ">=",
             "40 + ( 15 * ((u_has_trait('CONCENTRATION_GOOD')) + (u_has_trait('CONCENTRATION_BAD') ? -1 : 0) + (u_has_trait('INT_ALPHA')) + (u_has_trait('CONCENTRATION_DEBUG') ? 50 : 0) + (u_has_proficiency('prof_concentration_basic') ? 1 : 0) + (u_has_proficiency('prof_concentration_intermediate') ? 2 : 0) + (u_has_proficiency('prof_concentration_master') ? 3 : 0)))"
           ]