From 801fdaf02ff1d85f22c887d993af17d3fe562c56 Mon Sep 17 00:00:00 2001
From: Standing-Storm <120433252+Standing-Storm@users.noreply.github.com>
Date: Fri, 3 May 2024 22:42:06 -0500
Subject: [PATCH] [MoM] Tweak formula for gaining Observed so repeated
 channeling is the most important factor (#73464)

* Initial commit

* Kick tests

* Kick tests
---
 .../effectoncondition/eoc_observed.json             | 13 +++++++++++--
 .../effects/effects_nether_attunement.json          |  7 +++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_observed.json b/data/mods/MindOverMatter/effectoncondition/eoc_observed.json
index 74aae0a21eaf1..8dd518dda355c 100644
--- a/data/mods/MindOverMatter/effectoncondition/eoc_observed.json
+++ b/data/mods/MindOverMatter/effectoncondition/eoc_observed.json
@@ -6,6 +6,7 @@
     "required_event": "spellcasting_finish",
     "condition": {
       "and": [
+        { "not": { "u_has_effect": "effect_observed_rate_limiter" } },
         { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" },
         {
           "or": [
@@ -28,7 +29,7 @@
                   "x_in_y_chance": {
                     "x": {
                       "math": [
-                        "rand(50 * (1 +  (nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) - ( u_skill('metaphysics') / 2 ) ) )"
+                        "rand(((1 + nether_attune_difficulty_scaler(u_latest_channeled_power_difficulty)) * 4) + (u_nether_conduit_repeated_channeling_value * 12))"
                       ]
                     },
                     "y": 1000
@@ -41,7 +42,15 @@
                 "u_message": "The hairs stand up on the back of your neck.  You have a strong feeling that you're being watched.",
                 "type": "bad"
               },
-              { "u_add_effect": "psi_nether_attention", "duration": "7 days" }
+              { "u_add_effect": "psi_nether_attention", "duration": "7 days" },
+              {
+                "u_add_effect": "effect_observed_rate_limiter",
+                "duration": {
+                  "math": [
+                    "3600 - (u_latest_channeled_power_difficulty * rng(10,200)) - (u_effect_intensity('psi_nether_attention') * rng(10,200))"
+                  ]
+                }
+              }
             ]
           }
         ]
diff --git a/data/mods/MindOverMatter/effects/effects_nether_attunement.json b/data/mods/MindOverMatter/effects/effects_nether_attunement.json
index 4ea871f2c2126..a3c6ab8497bc3 100644
--- a/data/mods/MindOverMatter/effects/effects_nether_attunement.json
+++ b/data/mods/MindOverMatter/effects/effects_nether_attunement.json
@@ -80,5 +80,12 @@
     "name": [ "Feedback" ],
     "desc": [ "You feel a persistent itching that will not go away." ],
     "rating": "bad"
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_observed_rate_limiter",
+    "//": "Hidden effect, used as a tracker",
+    "name": [ "" ],
+    "desc": [ "" ]
   }
 ]