Merge pull request #79038 from Standing-Storm/fix-stacking-speed

[MoM] Fix infinite speed
CleverRaven · Jan 10, 2025 · 47cfe9a · 47cfe9a
2 parents 0df6e42 + a49ca34
commit 47cfe9a
Showing 1 changed file with 68 additions and 6 deletions.
diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -763,7 +763,6 @@
               ]
             }
           },
-          { "value": "MOVE_COST", "multiply": -0.1 },
           { "value": "RECOIL_MODIFIER", "multiply": -0.3 },
           {
             "value": "MELEE_DAMAGE",
@@ -782,6 +781,10 @@
             }
           }
         ]
+      },
+      {
+        "condition": { "not": { "u_has_effect": "effect_biokin_perfected_motion" } },
+        "values": [ { "value": "MOVE_COST", "multiply": -0.1 } ]
       }
     ]
   },
@@ -801,6 +804,9 @@
     "removes_effects": [ "slippery_terrain", "effect_biokin_hurricane_blows" ],
     "enchantments": [
       {
+        "condition": {
+          "and": [ { "not": { "u_has_effect": "effect_teleport_stride" } }, { "not": { "u_has_effect": "effect_telekin_momentum" } } ]
+        },
         "values": [
           {
             "value": "MOVE_COST",
@@ -811,6 +817,45 @@
             }
           }
         ]
+      },
+      {
+        "condition": { "and": [ { "u_has_effect": "effect_teleport_stride" }, { "not": { "u_has_effect": "effect_telekin_momentum" } } ] },
+        "values": [
+          {
+            "value": "MOVE_COST",
+            "multiply": {
+              "math": [
+                "max( ( ( ( -0.5 + ( u_spell_level('biokin_perfected_motion') * -0.015) ) + ( ( u_spell_level('teleport_stride') * -0.02 ) - 0.05 ) ) * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling), -0.96)"
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "condition": { "and": [ { "u_has_effect": "effect_telekin_momentum" }, { "not": { "u_has_effect": "effect_teleport_stride" } } ] },
+        "values": [
+          {
+            "value": "MOVE_COST",
+            "multiply": {
+              "math": [
+                "max( ( ( ( -0.5 + ( u_spell_level('biokin_perfected_motion') * -0.015) ) + ( u_spell_level('telekinetic_momentum') * -0.005 ) ) * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling), -0.96)"
+              ]
+            }
+          }
+        ]
+      },
+      {
+        "condition": { "and": [ { "u_has_effect": "effect_teleport_stride" }, { "u_has_effect": "effect_telekin_momentum" } ] },
+        "values": [
+          {
+            "value": "MOVE_COST",
+            "multiply": {
+              "math": [
+                "max( ( ( ( -0.5 + ( u_spell_level('biokin_perfected_motion') * -0.015) ) + ( u_spell_level('telekinetic_momentum') * -0.005 ) + ( u_spell_level('telekinetic_momentum') * -0.005 ) ) * scaling_factor(u_val('intelligence') ) * u_nether_attunement_power_scaling), -0.96)"
+              ]
+            }
+          }
+        ]
       }
     ],
     "flags": [ "HARDTOHIT", "UNCANNY_DODGE", "WATERWALKING", "ITEM_WATERPROOFING" ]
@@ -1193,6 +1238,7 @@
     "remove_message": "",
     "rating": "good",
     "base_mods": { "stamina_min": [ -50 ], "stamina_chance": [ 1 ] },
+    "removes_effects": [ "effect_biokin_perfected_motion" ],
     "enchantments": [
       {
         "values": [
@@ -2058,18 +2104,28 @@
         ],
         "values": [
           {
-            "value": "MOVE_COST",
+            "value": "ATTACK_SPEED",
             "multiply": {
               "math": [
-                "max((( ( u_spell_level('telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.15)"
+                "( ( u_spell_level('telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling"
               ]
             }
-          },
+          }
+        ]
+      },
+      {
+        "condition": {
+          "and": [
+            { "not": { "u_has_effect": "effect_clair_astral_projection" } },
+            { "not": { "u_has_effect": "effect_biokin_perfected_motion" } }
+          ]
+        },
+        "values": [
           {
-            "value": "ATTACK_SPEED",
+            "value": "MOVE_COST",
             "multiply": {
               "math": [
-                "( ( u_spell_level('telekinetic_momentum') * -0.01 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling"
+                "max((( ( u_spell_level('telekinetic_momentum') * -0.005 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -0.15)"
               ]
             }
           }
@@ -2516,6 +2572,12 @@
     "max_duration": "7 days",
     "enchantments": [
       {
+        "condition": {
+          "and": [
+            { "not": { "u_has_effect": "effect_clair_astral_projection" } },
+            { "not": { "u_has_effect": "effect_biokin_perfected_motion" } }
+          ]
+        },
         "values": [
           {
             "value": "MOVE_COST",