Merge pull request #72737 from Standing-Storm/too-much-pain-no-psi

[MoM] Can't think, head hurts too much
CleverRaven · Apr 4, 2024 · 18cd77d · 18cd77d
2 parents a6604d0 + 3c41dfc
commit 18cd77d
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 3 deletions.
diff --git 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()",
+            ">=",
+            "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)))"
+          ]
+        }
+      ]
+    },
+    "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
@@ -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",