From 212dd6938335ddef2fc43f52b5706c329cfdd04c Mon Sep 17 00:00:00 2001
From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com>
Date: Fri, 15 Dec 2023 12:30:01 -0600
Subject: [PATCH] [MoM] Change electrokinetic overload (#70216)

* Change electrokin overload to remove lightning

* Add zapping to electrokinetic overload

* Remove overload

* Obsolete enchant

* Add motor seizure

* Updates

* Kick tests

* Kick tests
---
 .../effectoncondition/eoc_awakening.json          | 13 +------------
 .../eoc_on_power_use_events.json                  | 15 ++++++++++++++-
 .../MindOverMatter/effects/effects_penalty.json   |  9 ++++-----
 .../enchantments/enchantments_baneful.json        |  7 -------
 .../mods/MindOverMatter/obsolete/enchantment.json |  9 +++++++++
 data/mods/MindOverMatter/obsolete/eoc.json        | 14 ++++++++++++++
 6 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 data/mods/MindOverMatter/obsolete/enchantment.json
 create mode 100644 data/mods/MindOverMatter/obsolete/eoc.json

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json
index b3135d7c3374a..aa39c253f8c1e 100644
--- a/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json
+++ b/data/mods/MindOverMatter/effectoncondition/eoc_awakening.json
@@ -1194,21 +1194,10 @@
       },
       { "u_add_effect": "psionic_overload", "duration": { "math": [ "ps_str * u_val('time: 1 h')" ] } },
       { "u_add_effect": "effect_electrokin_overload", "duration": { "math": [ "ps_str * u_val('time: 2 h')" ] } },
-      { "run_eocs": "EOC_PORTAL_ELECTRO_AWAKENING_FAILED_ZAP" },
+      { "run_eocs": "EOC_ELECTRO_OVERLOAD_ZAP" },
       { "math": [ "u_val('stamina')", "-=", "4000" ] }
     ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_PORTAL_ELECTRO_AWAKENING_FAILED_ZAP",
-    "condition": { "u_has_effect": "effect_electrokin_overload" },
-    "effect": [
-      { "u_message": "Your muscles suddenly seize up!", "type": "bad" },
-      { "u_add_effect": "downed", "duration": 5 },
-      { "u_add_effect": "stunned", "duration": 1 },
-      { "queue_eocs": "EOC_PORTAL_ELECTRO_AWAKENING_FAILED_ZAP", "time_in_future": [ "1 minutes", "45 minutes" ] }
-    ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_PORTAL_PHOTOKIN_AWAKENING",
diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
index 20bacaa2f89c2..7fffdbf723650 100644
--- a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
+++ b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
@@ -471,7 +471,8 @@
         "duration": {
           "math": [ "u_val('time: 5 s') * (1 + ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2 ) ) * rng(1, _difficulty)" ]
         }
-      }
+      },
+      { "run_eocs": "EOC_ELECTRO_OVERLOAD_ZAP" }
     ]
   },
   {
@@ -765,6 +766,18 @@
       }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ELECTRO_OVERLOAD_ZAP",
+    "condition": { "u_has_effect": "effect_electrokin_overload" },
+    "effect": [
+      { "u_message": "Your muscles suddenly seize up!", "type": "bad" },
+      { "u_add_effect": "downed", "duration": 5 },
+      { "u_add_effect": "motor_seizure", "duration": 4 },
+      { "u_add_effect": "stunned", "duration": 1 },
+      { "queue_eocs": "EOC_ELECTRO_OVERLOAD_ZAP", "time_in_future": [ "1 minutes", "45 minutes" ] }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_PSIONICS_KCAL_COST",
diff --git a/data/mods/MindOverMatter/effects/effects_penalty.json b/data/mods/MindOverMatter/effects/effects_penalty.json
index 136d38aab4ff1..a58569f23513c 100644
--- a/data/mods/MindOverMatter/effects/effects_penalty.json
+++ b/data/mods/MindOverMatter/effects/effects_penalty.json
@@ -274,17 +274,16 @@
   {
     "type": "effect_type",
     "id": "effect_electrokin_overload",
-    "name": [ "Electrified" ],
-    "desc": [ "Your skin is emitting sparks." ],
-    "apply_message": "Your skin begins to tingle!",
-    "remove_message": "The tingling sensation stops",
+    "name": [ "Jerky" ],
+    "desc": [ "You muscles don't seem to be reacting exactly the way you want them to." ],
+    "apply_message": "Your limbs twitch involuntarily!",
+    "remove_message": "The twitching stops",
     "rating": "bad",
     "limb_score_mods": [
       { "limb_score": "reaction", "modifier": 0.9, "scaling": -0.2 },
       { "limb_score": "grip", "modifier": 0.8 },
       { "limb_score": "block", "modifier": 0.9 }
     ],
-    "enchantments": [ "enchant_electrokin_overload" ],
     "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
   },
   {
diff --git a/data/mods/MindOverMatter/enchantments/enchantments_baneful.json b/data/mods/MindOverMatter/enchantments/enchantments_baneful.json
index eb6da336532ad..519c4f99b2641 100644
--- a/data/mods/MindOverMatter/enchantments/enchantments_baneful.json
+++ b/data/mods/MindOverMatter/enchantments/enchantments_baneful.json
@@ -6,13 +6,6 @@
     "has": "HELD",
     "intermittent_activation": { "effects": [ { "frequency": "3 seconds", "spell_effects": [ { "id": "teleport_blink_monster" } ] } ] }
   },
-  {
-    "type": "enchantment",
-    "id": "enchant_electrokin_overload",
-    "condition": "ALWAYS",
-    "has": "HELD",
-    "emitter": "emit_shock_burst_electrokin_overload"
-  },
   {
     "type": "enchantment",
     "id": "enchant_pyrokin_fever",
diff --git a/data/mods/MindOverMatter/obsolete/enchantment.json b/data/mods/MindOverMatter/obsolete/enchantment.json
new file mode 100644
index 0000000000000..6ccd33b0503a8
--- /dev/null
+++ b/data/mods/MindOverMatter/obsolete/enchantment.json
@@ -0,0 +1,9 @@
+[
+  {
+    "type": "enchantment",
+    "id": "enchant_electrokin_overload",
+    "condition": "ALWAYS",
+    "has": "HELD",
+    "emitter": "emit_shock_burst_electrokin_overload"
+  }
+]
diff --git a/data/mods/MindOverMatter/obsolete/eoc.json b/data/mods/MindOverMatter/obsolete/eoc.json
new file mode 100644
index 0000000000000..70f45caba5021
--- /dev/null
+++ b/data/mods/MindOverMatter/obsolete/eoc.json
@@ -0,0 +1,14 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PORTAL_ELECTRO_AWAKENING_FAILED_ZAP",
+    "condition": { "u_has_effect": "effect_electrokin_overload" },
+    "effect": [
+      { "u_message": "Your muscles suddenly seize up!", "type": "bad" },
+      { "u_add_effect": "downed", "duration": 5 },
+      { "u_add_effect": "motor_seizure", "duration": 4 },
+      { "u_add_effect": "stunned", "duration": 1 },
+      { "queue_eocs": "EOC_PORTAL_ELECTRO_AWAKENING_FAILED_ZAP", "time_in_future": [ "1 minutes", "45 minutes" ] }
+    ]
+  }
+]