[MoM] Various maintenance tasks (#69753)

* Initial commit * Update data/mods/MindOverMatter/powers/clairsentience_eoc.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/MindOverMatter/powers/clairsentience_eoc.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/MindOverMatter/powers/clairsentience_eoc.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * link remaining effects that scale into jmath * Manual linting * Nether-attunement and integrate electrokinesis * Fixes * Further Nether-Attuned wording changes * Fix Health effect * Kick tests --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Nov 28, 2023 · 1beba4c · 1beba4c
1 parent 7eceecd
commit 1beba4c
Show file tree

Hide file tree

Showing 28 changed files with 869 additions and 784 deletions.
diff --git a/...r/effectoncondition/eoc_drain_events.json → ...ndition/eoc_nether_attunement_events.json b/...r/effectoncondition/eoc_drain_events.json → ...ndition/eoc_nether_attunement_events.json
@@ -7,12 +7,23 @@
     "condition": {
       "and": [
         {
-          "u_has_any_trait": [ "BIOKINETIC", "CLAIRSENTIENT", "PHOTOKINETIC", "PYROKINETIC", "TELEKINETIC", "TELEPATH", "TELEPORTER", "VITAKINETIC" ]
+          "u_has_any_trait": [
+            "BIOKINETIC",
+            "CLAIRSENTIENT",
+            "ELECTROKINETIC",
+            "PHOTOKINETIC",
+            "PYROKINETIC",
+            "TELEKINETIC",
+            "TELEPATH",
+            "TELEPORTER",
+            "VITAKINETIC"
+          ]
         },
         {
           "or": [
             { "compare_string": [ "BIOKINETIC", { "context_val": "school" } ] },
             { "compare_string": [ "CLAIRSENTIENT", { "context_val": "school" } ] },
+            { "compare_string": [ "ELECTROKINETIC", { "context_val": "school" } ] },
             { "compare_string": [ "PHOTOKINETIC", { "context_val": "school" } ] },
             { "compare_string": [ "PYROKINETIC", { "context_val": "school" } ] },
             { "compare_string": [ "TELEKINETIC", { "context_val": "school" } ] },
@@ -25,12 +36,15 @@
       ]
     },
     "effect": [
+      { "math": [ "u_latest_channeled_power_difficulty", "=", "_difficulty" ] },
       {
         "run_eocs": [
           "EOC_DRAIN_EFFECT_CHECK_HEADACHE",
-          "EOC_DRAIN_EFFECT_CHECK_EXTRA_DRAIN",
+          "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT",
+          "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE",
           "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED",
           "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS",
+          "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE",
           "EOC_DRAIN_EFFECT_CHECK_FATIGUE",
           "EOC_DRAIN_EFFECT_CHECK_WEAKNESS"
         ]
@@ -47,7 +61,7 @@
           "x_in_y_chance": {
             "x": {
               "math": [
-                "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 60), 0, 160) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 375) + 5)"
+                "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 60), 0, 160) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 375) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 5)"
               ]
             },
             "y": 1000
@@ -69,20 +83,59 @@
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_DRAIN_EFFECT_CHECK_EXTRA_DRAIN",
+    "id": "EOC_DRAIN_EFFECT_CHECK_EXTRA_ATTUNEMENT",
     "condition": {
       "and": [
         { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "15" ] },
         {
-          "x_in_y_chance": { "x": { "math": [ "clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 75), 0, 80) + 20" ] }, "y": 1000 }
+          "x_in_y_chance": {
+            "x": {
+              "math": [
+                "clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 75), 0, 80) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20"
+              ]
+            },
+            "y": 1000
+          }
         }
       ]
     },
     "effect": [
-      { "u_message": "You feel a sudden fatigue as your powers are unleashed.", "type": "bad" },
+      { "u_message": "You feel a strange tingling sensation as your powers are unleashed.", "type": "mixed" },
       { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", "+=", "rng( 2,6 )" ] }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE",
+    "condition": {
+      "and": [
+        { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "25" ] },
+        {
+          "x_in_y_chance": {
+            "x": {
+              "math": [
+                "( clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 70), 0, 50) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 150) * 1.5 ), 0, 310) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 15)"
+              ]
+            },
+            "y": 1000
+          }
+        }
+      ]
+    },
+    "effect": [
+      { "u_message": "As you unleash your powers, an electric feeling passes through your whole body!", "type": "mixed" },
+      {
+        "run_eocs": [
+          {
+            "id": "EOC_DRAIN_EFFECT_CHECK_HEALTH_CHANGE_2",
+            "condition": { "math": [ "rand(1)", ">=", "1" ] },
+            "effect": [ { "u_add_effect": "effect_nether_attunement_health_bonus", "duration": "30 seconds" } ],
+            "false_effect": [ { "u_add_effect": "effect_nether_attunement_health_penalty", "duration": "30 seconds" } ]
+          }
+        ]
+      }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_DRAIN_EFFECT_CHECK_NOSEBLEED",
@@ -93,7 +146,7 @@
           "x_in_y_chance": {
             "x": {
               "math": [
-                "( clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 60), 0, 50) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 300) + 10)"
+                "( clamp( ( ( u_val('vitamin', 'name:vitamin_psionic_drain') / 2) - 60), 0, 50) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.5 ), 0, 300) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10)"
               ]
             },
             "y": 1000
@@ -112,12 +165,12 @@
     "id": "EOC_DRAIN_EFFECT_CHECK_STAMINA_LOSS",
     "condition": {
       "and": [
-        { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "60" ] },
+        { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "50" ] },
         {
           "x_in_y_chance": {
             "x": {
               "math": [
-                "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 100), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.8 ), 0, 250) + 20)"
+                "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 100), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 160) * 1.8 ), 0, 250) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)"
               ]
             },
             "y": 1000
@@ -135,12 +188,12 @@
     "id": "EOC_DRAIN_EFFECT_CHECK_FATIGUE",
     "condition": {
       "and": [
-        { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "75" ] },
+        { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "70" ] },
         {
           "x_in_y_chance": {
             "x": {
               "math": [
-                "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 125), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 175) * 2 ), 0, 150) + 20)"
+                "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 125), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 175) * 2 ), 0, 150) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 20)"
               ]
             },
             "y": 1000
@@ -153,14 +206,47 @@
       { "math": [ "u_val('fatigue')", "+=", "rng(30,90)" ] }
     ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_DRAIN_EFFECT_CHECK_POWER_SURGE",
+    "condition": {
+      "and": [
+        { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "85" ] },
+        {
+          "x_in_y_chance": {
+            "x": {
+              "math": [
+                "( clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 120), 0, 100) + clamp( ( (u_val('vitamin', 'name:vitamin_psionic_drain') - 180) * 3 ), 0, 250) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 15)"
+              ]
+            },
+            "y": 1000
+          }
+        }
+      ]
+    },
+    "effect": [
+      { "u_message": "As you unleash your powers, you feel a surge of energy!", "type": "good" },
+      {
+        "u_add_effect": "effect_nether_attunement_power_surge",
+        "duration": { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain') * rng(1,10)" ] }
+      }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_DRAIN_EFFECT_CHECK_WEAKNESS",
     "condition": {
       "and": [
         { "math": [ "u_val('vitamin', 'name:vitamin_psionic_drain')", ">=", "100" ] },
         {
-          "x_in_y_chance": { "x": { "math": [ "clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 200), 0, 50) + 10" ] }, "y": 1000 }
+          "x_in_y_chance": {
+            "x": {
+              "math": [
+                "clamp( (u_val('vitamin', 'name:vitamin_psionic_drain') - 200), 0, 50) + (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) + 10"
+              ]
+            },
+            "y": 1000
+          }
         }
       ]
     },

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
@@ -741,8 +741,8 @@
     "condition": {
       "math": [
         "u_val('vitamin', 'name:vitamin_maintained_powers')",
-        ">",
-        "( u_val('intelligence') / 4) + (u_bonus_concentration_powers)"
+        "==",
+        "( u_val('intelligence') / 4) + (u_bonus_concentration_powers) + 1"
       ]
     },
     "effect": [

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json b/data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json
@@ -71,6 +71,24 @@
     "condition": { "and": [ { "u_has_trait": "VITAKINETIC" }, { "u_has_wielded_with_flag": "MATRIX_CRYSTAL_VITAKINESIS" } ] },
     "effect": [ { "math": [ "u_val('spell_level_adjustment', 'school: VITAKINETIC')", "=", "4" ] } ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_NETHER_ATTUNEMENT_BOOST",
+    "eoc_type": "EVENT",
+    "required_event": "opens_spellbook",
+    "condition": { "u_has_effect": "effect_nether_attunement_power_surge" },
+    "effect": [
+      { "math": [ "u_val('spell_level_adjustment', 'school: BIOKINETIC')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: CLAIRSENTIENT')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: ELECTROKINETIC')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: PHOTOKINETIC')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: PYROKINETIC')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: TELEKINETIC')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: TELEPATH')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: TELEPORTER')", "=", "3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: VITAKINETIC')", "=", "3" ] }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "EOC_DRAIN_RESIST_POTION_COMEDOWN_PENALTY",
@@ -80,6 +98,8 @@
     "effect": [
       { "math": [ "u_val('spell_level_adjustment', 'school: BIOKINETIC')", "=", "-3" ] },
       { "math": [ "u_val('spell_level_adjustment', 'school: CLAIRSENTIENT')", "=", "-3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: ELECTROKINETIC')", "=", "-3" ] },
+      { "math": [ "u_val('spell_level_adjustment', 'school: PHOTOKINETIC')", "=", "-3" ] },
       { "math": [ "u_val('spell_level_adjustment', 'school: PYROKINETIC')", "=", "-3" ] },
       { "math": [ "u_val('spell_level_adjustment', 'school: TELEKINETIC')", "=", "-3" ] },
       { "math": [ "u_val('spell_level_adjustment', 'school: TELEPATH')", "=", "-3" ] },
@@ -189,72 +209,27 @@
     "effect": [
       {
         "run_eocs": [
+          "EOC_BIOKIN_REMOVE_OVERCOME_PAIN",
+          "EOC_BIOKIN_REMOVE_CLIMATE_CONTROL",
+          "EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY",
+          "EOC_BIOKIN_REMOVE_HAMMERHAND",
+          "EOC_CLAIR_REMOVE_NIGHT_EYES",
           "EOC_CLAIR_REMOVE_SPEED_READ",
-          "EOC_PHOTO_REMOVE_LIGHT_LOCAL",
+          "EOC_ELECTROKIN_REMOVE_PERSONAL_BATTERY",
+          "EOC_PHOTOKIN_REMOVE_LIGHT_LOCAL",
+          "EOC_PHOTOKIN_REMOVE_RAD_IMMUNITY",
           "EOC_PHOTOKIN_REMOVE_RADIO",
           "EOC_PYRO_REMOVE_FIRE_TOOL",
+          "EOC_PYRO_REMOVE_WARMTH_CLOAK",
           "EOC_PYRO_REMOVE_TORCH_WELD",
           "EOC_TELEKIN_REMOVE_TELEKINETIC_STRENGTH",
           "EOC_TELEKIN_REMOVE_JACKING_TOOL",
           "EOC_TELEKIN_REMOVE_LEVITATION",
-          "EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION"
+          "EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION",
+          "EOC_TELEPATH_REMOVE_TELEPATHIC_MORALE",
+          "EOC_VITAKIN_REMOVE_HEALTH_POWER"
         ]
       },
-      { "u_lose_effect": "effect_biokin_pkill_1" },
-      { "u_lose_effect": "effect_biokin_pkill_2" },
-      { "u_lose_effect": "effect_biokin_pkill_3" },
-      { "u_lose_effect": "effect_biokin_pkill_4" },
-      { "u_lose_effect": "effect_biokin_pkill_5" },
-      { "u_lose_effect": "effect_biokin_pkill_6" },
-      { "u_lose_effect": "effect_biokin_hammerhand" },
-      { "u_remove_item_with": "biokin_hammerhand_item" },
-      { "u_lose_effect": "effect_biokin_enhance_mobility" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_1" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_2" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_3" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_4" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_5" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_6" },
-      { "u_lose_effect": "effect_biokin_climate_control" },
-      { "u_lose_effect": "effect_clair_night_eyes_1" },
-      { "u_lose_effect": "effect_clair_night_eyes_2" },
-      { "u_lose_effect": "effect_clair_night_eyes_3" },
-      { "u_lose_effect": "effect_clair_night_eyes_4" },
-      { "u_lose_effect": "effect_clair_night_eyes_5" },
-      { "u_lose_effect": "effect_clair_night_eyes_6" },
-      { "u_lose_effect": "effect_clair_night_eyes_7" },
-      { "u_lose_effect": "effect_clair_night_eyes_8" },
-      { "u_lose_effect": "effect_clair_premonition" },
-      { "u_remove_item_with": "photokinetic_rad_aura" },
-      { "u_lose_effect": "effect_pyrokinetic_cloak" },
-      { "u_remove_item_with": "pyrokinetic_fire_tool" },
-      { "u_remove_item_with": "pyrokinetic_torch_weld" },
-      { "u_lose_effect": "effect_pyrokinetic_aura" },
-      { "u_lose_effect": "effect_telekinetic_strength" },
-      { "u_remove_item_with": "telekin_lifting_jack_1" },
-      { "u_remove_item_with": "telekin_lifting_jack_2" },
-      { "u_remove_item_with": "telekin_lifting_jack_3" },
-      { "u_remove_item_with": "telekin_lifting_jack_4" },
-      { "u_remove_item_with": "telekin_lifting_jack_5" },
-      { "u_remove_item_with": "telekin_lifting_jack_6" },
-      { "u_remove_item_with": "telekin_lifting_jack_7" },
-      { "u_remove_item_with": "telekin_lifting_jack_8" },
-      { "u_remove_item_with": "telekin_lifting_jack_9" },
-      { "u_remove_item_with": "telekin_lifting_jack_10" },
-      { "u_remove_item_with": "telekin_lifting_jack_11" },
-      { "u_remove_item_with": "telekin_lifting_jack_12" },
-      { "u_remove_item_with": "telekin_lifting_jack_13" },
-      { "u_remove_item_with": "telekin_lifting_jack_14" },
-      { "u_remove_item_with": "telekin_lifting_jack_15" },
-      { "u_remove_item_with": "telekin_lifting_jack_16" },
-      { "u_remove_item_with": "telekin_lifting_jack_17" },
-      { "u_remove_item_with": "telekin_lifting_jack_18" },
-      { "u_remove_item_with": "telekin_lifting_jack_19" },
-      { "u_remove_item_with": "telekin_lifting_jack_20" },
-      { "u_lose_effect": "effect_telekinetic_levitation" },
-      { "u_lose_effect": "effect_telepathic_learning_bonus" },
-      { "u_lose_effect": "effect_telepathic_morale" },
-      { "u_lose_effect": "effect_vita_health" },
       { "math": [ "u_val('vitamin', 'name:vitamin_maintained_powers')", "=", "0" ] },
       { "u_lose_effect": "effect_psi_intense_concentration" }
     ]

diff --git a/data/mods/MindOverMatter/effects/effects_nether_attunement.json b/data/mods/MindOverMatter/effects/effects_nether_attunement.json
@@ -0,0 +1,61 @@
+[
+  {
+    "type": "effect_type",
+    "id": "effect_disease_psionic_drain",
+    "name": [ "Nether-Attunement" ],
+    "desc": [
+      "You feel a little odd and your control over your powers isn't as sure as it was.  There might be unexpected results of you channeling psionics now."
+    ],
+    "apply_message": [
+      [
+        "You feel a little odd, like you've just awoken from a dream.  All that psionic channeling might have unexpected effects.",
+        "mixed"
+      ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ],
+      [ "", "mixed" ]
+    ],
+    "remove_message": "You take a deep breath as the strange feelings fade.  You are in full control of your powers once again.",
+    "max_intensity": 12
+  },
+  {
+    "type": "effect_type",
+    "id": "psi_nether_attention",
+    "name": [ "Observed" ],
+    "desc": [ "You have the strong impression that someone, or something, is watching you." ],
+    "remove_message": "The endless feeling of being watched finally fades away.",
+    "rating": "bad",
+    "show_intensity": false,
+    "max_intensity": 10,
+    "max_duration": "21 days",
+    "dur_add_perc": 25,
+    "int_dur_factor": "3 days"
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_nether_attunement_health_bonus",
+    "//": "Hidden effect, used as a tracker",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "rating": "good",
+    "max_duration": "30 seconds",
+    "base_mods": { "health_min": [ 1 ], "health_chance": [ 2 ] }
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_nether_attunement_health_penalty",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "rating": "bad",
+    "max_duration": "30 seconds",
+    "base_mods": { "health_min": [ -1 ], "health_chance": [ 2 ] }
+  }
+]