From a70ec31cbcc7cd489ae6f4caf7b95c225d3a38f5 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"
 <dorchadas@gmail.com>
Date: Sat, 30 Mar 2024 20:33:22 -0500
Subject: [PATCH 1/3] Initial commit

---
 .../effectoncondition/eoc_power_effects.json  | 33 +++++++++++++++++++
 .../effects/effects_penalty.json              | 16 +++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
index 1218117a6270d..d8f4add785451 100644
--- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
+++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
@@ -1,4 +1,37 @@
 [
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PAIN_DISABLES_PSI",
+    "eoc_type": "EVENT",
+    "required_event": "opens_spellbook",
+    "condition": {
+      "and": [
+        {
+          "u_has_any_trait": [
+            "BIOKINETIC",
+            "CLAIRSENTIENT",
+            "ELECTROKINETIC",
+            "PHOTOKINETIC",
+            "PYROKINETIC",
+            "TELEKINETIC",
+            "TELEPATH",
+            "TELEPORTER",
+            "VITAKINETIC"
+          ]
+        },
+        { "not": { "u_has_flag": "PAIN_IMMUNE" } },
+        { "not": { "u_has_effect": "effect_psi_too_much_pain_cant_channel" } },
+        {
+          "math": [
+            "u_pain() + ( 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))",
+            ">=",
+            "40"
+          ]
+        }
+      ]
+    },
+    "effect": [ { "u_add_effect": "effect_psi_too_much_pain_cant_channel", "duration": "0 seconds" } ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_BIOKIN_MATRIX_BOOST",
diff --git a/data/mods/MindOverMatter/effects/effects_penalty.json b/data/mods/MindOverMatter/effects/effects_penalty.json
index 9278bf316eb93..211d019f3cd15 100644
--- a/data/mods/MindOverMatter/effects/effects_penalty.json
+++ b/data/mods/MindOverMatter/effects/effects_penalty.json
@@ -42,10 +42,11 @@
       "per_mod": [ -1 ],
       "pain_chance": [ 100 ],
       "pain_min": [ 1 ],
-      "pain_max": [ 2 ],
-      "pain_max_val": [ 40 ],
+      "pain_max": [ 1 ],
+      "pain_max_val": [ 20 ],
       "pain_tick": [ 200 ],
       "vomit_chance": [ 100 ],
+      "vomit_tick": [ 200 ],
       "hurt_chance": [ 300 ],
       "hurt_amount": [ 0 ],
       "hurt_tick": [ 200 ]
@@ -55,7 +56,7 @@
       "int_mod": [ -0.6 ],
       "pain_min": [ 0 ],
       "pain_max": [ 0 ],
-      "pain_max_val": [ 20 ],
+      "pain_max_val": [ 5 ],
       "vomit_chance": [ -2 ],
       "hurt_chance": [ -5 ],
       "hurt_amount": [ 2, 1 ],
@@ -213,6 +214,15 @@
     "max_duration": "24 hours",
     "flags": [ "NO_PSIONICS" ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_psi_too_much_pain_cant_channel",
+    "name": [ "Can't Concentrate" ],
+    "desc": [ "You can't use your powers." ],
+    "apply_message": "You're in so much pain you can't concentrate to use your powers!",
+    "rating": "bad",
+    "flags": [ "NO_PSIONICS" ]
+  },
   {
     "type": "effect_type",
     "id": "effect_psi_reduced_breathing",

From fb99bfd1226289bfb4fee0cc6d50e753ad21e8d2 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"
 <dorchadas@gmail.com>
Date: Sat, 30 Mar 2024 20:58:13 -0500
Subject: [PATCH 2/3] Fix pain equation

---
 .../MindOverMatter/effectoncondition/eoc_power_effects.json   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
index d8f4add785451..8ba59b53f691e 100644
--- a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
+++ b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
@@ -23,9 +23,9 @@
         { "not": { "u_has_effect": "effect_psi_too_much_pain_cant_channel" } },
         {
           "math": [
-            "u_pain() + ( 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))",
+            "u_pain()",
             ">=",
-            "40"
+            "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)))"
           ]
         }
       ]

From 3c41dfce4a68c94b88cabc1176cf11a79a3ed99b 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"
 <dorchadas@gmail.com>
Date: Mon, 1 Apr 2024 16:58:48 -0500
Subject: [PATCH 3/3] Kick