[MoM] Further concentration updates (CleverRaven#75851)

* Initial commit

* Buff master concentration

* Remove duplicates

* Reduce smoke penalties

Author: Standing-Storm

data/mods/MindOverMatter/effectoncondition/eoc_misc.json

@@ -114,44 +114,6 @@
       { "run_eocs": [ "EOC_END_PSI_POWERS_MAINTAINED" ] }
     ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_PSIONICS_DAZED_ENDS_POWERS",
-    "eoc_type": "EVENT",
-    "required_event": "character_gains_effect",
-    "condition": {
-      "and": [
-        {
-          "or": [
-            { "compare_string": [ "dazed", { "context_val": "effect" } ] },
-            { "compare_string": [ "psi_dazed", { "context_val": "effect" } ] },
-            { "compare_string": [ "psi_dazed_zap", { "context_val": "effect" } ] },
-            { "compare_string": [ "downed", { "context_val": "effect" } ] }
-          ]
-        },
-        { "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "1" ] }
-      ]
-    },
-    "effect": [
-      {
-        "run_eocs": [
-          {
-            "id": "EOC_PSIONICS_DAZED_ENDS_POWERS_2",
-            "condition": {
-              "roll_contested": { "math": [ "(u_val('intelligence') / 2) + u_skill('metaphysics') + concentration_trait_bonuses()" ] },
-              "difficulty": 20,
-              "die_size": 15
-            },
-            "effect": [  ],
-            "false_effect": [
-              { "u_message": "Your head is swimming.  You can no longer maintain your powers!", "type": "bad" },
-              { "run_eocs": [ "EOC_END_PSI_POWERS_MAINTAINED" ] }
-            ]
-          }
-        ]
-      }
-    ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_PSIONICS_WEARINESS_ENDS_POWERS",
@@ -216,7 +178,11 @@
             { "compare_string": [ "zapped", { "context_val": "effect" } ] },
             { "compare_string": [ "effect_psi_reduced_breathing", { "context_val": "effect" } ] },
             { "compare_string": [ "effect_psi_null", { "context_val": "effect" } ] },
-            { "compare_string": [ "effect_psi_null_unbound", { "context_val": "effect" } ] }
+            { "compare_string": [ "effect_psi_null_unbound", { "context_val": "effect" } ] },
+            { "compare_string": [ "dazed", { "context_val": "effect" } ] },
+            { "compare_string": [ "psi_dazed", { "context_val": "effect" } ] },
+            { "compare_string": [ "psi_dazed_zap", { "context_val": "effect" } ] },
+            { "compare_string": [ "downed", { "context_val": "effect" } ] }
           ]
         },
         { "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "1" ] }

data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json

@@ -568,9 +568,16 @@
     "id": "EOC_POWER_MAINTENANCE_CONCENTRATION_CHECK",
     "condition": {
       "and": [
-        { "math": [ "u_vitamin('vitamin_maintained_powers')", ">", "concentration_calculations()" ] },
+        { "math": [ "u_vitamin('vitamin_maintained_powers')", ">=", "concentration_calculations()" ] },
         {
-          "x_in_y_chance": { "x": { "math": [ "(u_vitamin('vitamin_maintained_powers') / max(concentration_calculations(),1)) * 5" ] }, "y": 100 }
+          "x_in_y_chance": {
+            "x": {
+              "math": [
+                "((u_vitamin('vitamin_maintained_powers') / max(concentration_calculations(),1)) * 5) + (clamp(concentration_calculations(), -10, 0) * -10)"
+              ]
+            },
+            "y": 100
+          }
         }
       ]
     },

data/mods/MindOverMatter/jmath.json

@@ -51,7 +51,8 @@
     "type": "jmath_function",
     "id": "concentration_trait_bonuses",
     "num_args": 0,
-    "return": "(u_has_trait('CONCENTRATION_GOOD')) + (u_has_trait('CONCENTRATION_BAD') ? -1 : 0) + (u_has_trait('INT_ALPHA')) + (u_has_trait('NOMAD2') ? -1 : 0) + (u_has_trait('NOMAD3') ? -1 : 0) + (u_has_trait('CONCENTRATION_DEBUG') ? 50 : 0) + (u_has_proficiency('prof_concentration_basic')) + (u_has_proficiency('prof_concentration_intermediate')) + (u_has_proficiency('prof_concentration_master')) + (u_effect_intensity('hallu') > 0 ? -1 : 0) + (u_effect_intensity('winded') > 0 ? -2 : 0) + (u_effect_intensity('nausea') > 0 ? -1 : 0) + (u_effect_intensity('nausea') > 3 ? -1 : 0) +  (u_effect_intensity('cold') > 1 ? -1 : 0) + (u_effect_intensity('hot') > 1 ? -1 : 0) + (u_effect_intensity('asthma') > 0 ? -3 : 0) + (u_effect_intensity('datura') > 0 ? -3 : 0)"
+    "//": "Effects with an intelligence penalty have not been included below to avoid double counting",
+    "return": "(u_has_trait('CONCENTRATION_GOOD')) + (u_has_trait('CONCENTRATION_BAD') ? -1 : 0) + (u_has_trait('INT_ALPHA')) + (u_has_trait('NOMAD2') ? -1 : 0) + (u_has_trait('NOMAD3') ? -1 : 0) + (u_has_trait('CONCENTRATION_DEBUG') ? 50 : 0) + (u_has_proficiency('prof_concentration_basic')) + (u_has_proficiency('prof_concentration_intermediate')) + (u_has_proficiency('prof_concentration_master') * 2) + (u_effect_intensity('hallu') > 0 ? -1 : 0) + (u_effect_intensity('winded') > 0 ? -2 : 0) + (u_effect_intensity('nausea') > 0 ? -1 : 0) + (u_effect_intensity('nausea') > 3 ? -1 : 0) +  (u_effect_intensity('cold') > 1 ? -1 : 0) + (u_effect_intensity('hot') > 1 ? -1 : 0) + (u_effect_intensity('asthma') > 0 ? -3 : 0) + (u_effect_intensity('datura') > 0 ? -3 : 0) + (u_effect_intensity('dazed') > 0 ? -2 : 0) + (u_effect_intensity('psi_dazed') > 0 ? -2 : 0) + (u_effect_intensity('psi_dazed_zap') > 0 ? -1 : 0) + (u_effect_intensity('downed') > 0 ? -2 : 0) + (u_effect_intensity('boomered') > 0 ? -1 : 0) + (u_effect_intensity('conjunctivitis') > 0 ? -1 : 0) + (u_effect_intensity('teargas') > 0 ? -3 : 0) + (u_effect_intensity('smoke_eyes') > 0 ? -1 : 0) + (u_effect_intensity('smoke_lungs') > 0 ? -2 : 0)"
   },
   {
     "type": "jmath_function",