Merge pull request #78447 from Standing-Storm/passives-turn-off-

[MoM] Psi passives turn off if you can't use psionics
CleverRaven · Dec 11, 2024 · 4049f3e · 4049f3e
2 parents bd37343 + f51a947
commit 4049f3e
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/data/mods/MindOverMatter/mutations/psi_passives.json b/data/mods/MindOverMatter/mutations/psi_passives.json
@@ -30,6 +30,7 @@
     "purifiable": false,
     "enchantments": [
       {
+        "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
         "values": [
           { "value": "HUNGER", "multiply": { "math": [ "(-0.03 - (0.00075 * u_spell_level_sum('school': 'BIOKINETIC')))" ] } },
           {
@@ -63,7 +64,12 @@
         "special_vision": [
           {
             "condition": {
-              "or": [ { "npc_has_species": "HORROR" }, { "npc_has_species": "NETHER" }, { "npc_has_species": "nether_player_hate" } ]
+              "and": [
+                { "not": { "u_has_flag": "NO_PSIONICS" } },
+                {
+                  "or": [ { "npc_has_species": "HORROR" }, { "npc_has_species": "NETHER" }, { "npc_has_species": "nether_player_hate" } ]
+                }
+              ]
             },
             "distance": { "math": [ "2 + (0.075 * u_spell_level_sum('school': 'CLAIRSENTIENT'))" ] },
             "descriptions": [ { "id": "nether_creature_sense", "symbol": "?", "color": "c_pink", "text": "You sense an otherworldy danger here." } ]
@@ -83,6 +89,7 @@
     "purifiable": false,
     "enchantments": [
       {
+        "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
         "values": [
           { "value": "ARMOR_ELEC", "add": { "math": [ "u_spell_level_sum('school': 'ELECTROKINETIC') / -0.2" ] } },
           { "value": "PAIN", "multiply": { "math": [ "u_spell_level_sum('school': 'ELECTROKINETIC') * -0.00035" ] } }
@@ -111,6 +118,7 @@
     "bodytemp_modifiers": [ 250, 750 ],
     "enchantments": [
       {
+        "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
         "values": [ { "value": "BODYTEMP_SLEEP", "add": { "math": [ "0.05 * u_spell_level_sum('school': 'PYROKINETIC')" ] } } ]
       }
     ],
@@ -141,6 +149,7 @@
     "purifiable": false,
     "enchantments": [
       {
+        "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
         "values": [
           {
             "value": "OBTAIN_COST_MULTIPLIER",
@@ -161,6 +170,7 @@
     "purifiable": false,
     "enchantments": [
       {
+        "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
         "values": [
           { "value": "SOCIAL_INTIMIDATE", "add": { "math": [ "(5 + (0.075 * u_spell_level_sum('school': 'TELEPATH')))" ] } },
           { "value": "SOCIAL_LIE", "add": { "math": [ "(5 + (0.075 * u_spell_level_sum('school': 'TELEPATH')))" ] } },
@@ -184,6 +194,7 @@
     "purifiable": false,
     "enchantments": [
       {
+        "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
         "values": [ { "value": "EVASION", "add": { "math": [ "(0.01 + (0.00025 * u_spell_level_sum('school': 'TELEPORTER')))" ] } } ]
       }
     ]
@@ -201,6 +212,7 @@
     "purifiable": false,
     "enchantments": [
       {
+        "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
         "values": [
           { "value": "REGEN_HP", "multiply": { "math": [ "(0.1 + (0.0005 * u_spell_level_sum('school': 'VITAKINETIC')))" ] } },
           {