[MoM] Move Mirror-mask bonus to effect, obsolete mutations (#72370)

* Obsolete old mutations * Obsolete switcher EoC * Move switcher EoC * Move effect to enchantment * Remove rather than obsolete mutations * lint * Fixes + documentation * Linting
CleverRaven · Oct 30, 2024 · 70cffec · 70cffec
1 parent 985cd6f
commit 70cffec
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 86 deletions.
diff --git a/data/mods/MindOverMatter/PowerDescriptionSpoilers.md b/data/mods/MindOverMatter/PowerDescriptionSpoilers.md
@@ -545,7 +545,7 @@ Powers causing photokinetic damage have a 40% chance to blind the target for 3 s
 *Duration*: 7 minutes and 30 seconds to 14 minutes and 50 seconds, plus 22.5 seconds to 55 seconds per power level<br />
 *Stamina Cost*: 6500, minus 150 per level to a minimum of 2000<br />
 *Channeling Time*: 1500 moves, minus 75 moves per level to a minimum of 150<br />
-*Effects*: Wrap the psion in illusions, concealing any mutations or visible bionics they may have. NPCs will react to them better, and certain people who might refuse to talk to a mutant will be happy to talk to them.<br />
+*Effects*: Wrap the psion in illusions, concealing any mutations or visible bionics they may have. NPCs will react to them better, and certain people who might refuse to talk to a mutant will be happy to talk to them.  Their total Ugliness is reduced by 60% plus 1.5% per level, to a maximum of 100% Ugliness reduction.<br />
 *Prerequisites*: Chameleoflage 8, Lucent Barrier 5<br />
 
 ## Lucid Shadows

diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -1247,7 +1247,21 @@
     "desc": [ "You're just another survivor.  There's definitely nothing odd about you at all." ],
     "rating": "good",
     "remove_message": "The illusions around you fall away.",
-    "max_duration": "7 days"
+    "max_duration": "7 days",
+    "enchantments": [
+      {
+        "values": [
+          {
+            "value": "UGLINESS",
+            "multiply": {
+              "math": [
+                "max(((( -0.6 + ( u_spell_level('photokinetic_hide_ugly') * -1.5 )) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), -1)"
+              ]
+            }
+          }
+        ]
+      }
+    ]
   },
   {
     "type": "effect_type",

diff --git a/data/mods/MindOverMatter/mutations/temporary.json b/data/mods/MindOverMatter/mutations/temporary.json
@@ -227,72 +227,6 @@
       [ "fabrication", 6 ]
     ]
   },
-  {
-    "id": "PHOTOKIN_HIDE_UGLY_01",
-    "type": "mutation",
-    "name": { "str": "Mirror-Mask" },
-    "description": "You're just an average Joe.",
-    "points": 0,
-    "visibility": 0,
-    "ugliness": -2,
-    "player_display": false,
-    "valid": false
-  },
-  {
-    "id": "PHOTOKIN_HIDE_UGLY_02",
-    "type": "mutation",
-    "name": { "str": "Mirror-Mask" },
-    "description": "You're just an average Joe.",
-    "points": 0,
-    "visibility": 0,
-    "ugliness": -4,
-    "player_display": false,
-    "valid": false
-  },
-  {
-    "id": "PHOTOKIN_HIDE_UGLY_03",
-    "type": "mutation",
-    "name": { "str": "Mirror-Mask" },
-    "description": "You're just an average Joe.",
-    "points": 0,
-    "visibility": 0,
-    "ugliness": -6,
-    "player_display": false,
-    "valid": false
-  },
-  {
-    "id": "PHOTOKIN_HIDE_UGLY_04",
-    "type": "mutation",
-    "name": { "str": "Mirror-Mask" },
-    "description": "You're just an average Joe.",
-    "points": 0,
-    "visibility": 0,
-    "ugliness": -8,
-    "player_display": false,
-    "valid": false
-  },
-  {
-    "id": "PHOTOKIN_HIDE_UGLY_05",
-    "type": "mutation",
-    "name": { "str": "Mirror-Mask" },
-    "description": "You're just an average Joe.",
-    "points": 0,
-    "visibility": 0,
-    "ugliness": -10,
-    "player_display": false,
-    "valid": false
-  },
-  {
-    "id": "PHOTOKIN_HIDE_UGLY_06",
-    "type": "mutation",
-    "name": { "str": "Mirror-Mask" },
-    "description": "You're just an average Joe.",
-    "points": 0,
-    "visibility": 0,
-    "ugliness": -12,
-    "player_display": false,
-    "valid": false
-  },
   {
     "type": "mutation",
     "id": "TELEKINETIC_LIFTER_1",

diff --git a/data/mods/MindOverMatter/obsolete/eocs.json b/data/mods/MindOverMatter/obsolete/eocs.json
@@ -59,5 +59,20 @@
     "type": "effect_on_condition",
     "id": "EOC_VITAKIN_LEARNING_PAIN_SPLIT",
     "effect": [  ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PHOTOKIN_HIDE_UGLY_SWITCHER",
+    "effect": {
+      "switch": { "math": [ "u_spell_level('photokinetic_hide_ugly')" ] },
+      "cases": [
+        { "case": 0, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_01" } },
+        { "case": 4, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_02" } },
+        { "case": 8, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_03" } },
+        { "case": 12, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_04" } },
+        { "case": 16, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_05" } },
+        { "case": 20, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_06" } }
+      ]
+    }
   }
 ]
diff --git a/data/mods/MindOverMatter/obsolete/temporary.json b/data/mods/MindOverMatter/obsolete/temporary.json
@@ -46,5 +46,41 @@
     "id": "PSI_EXTENDED_CHANNELING_ON",
     "//": "remove after 0.I",
     "trait": "PSI_EXTENDED_CHANNELING"
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "PHOTOKIN_HIDE_UGLY_01",
+    "//": "remove after 0.J",
+    "remove": true
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "PHOTOKIN_HIDE_UGLY_02",
+    "//": "remove after 0.J",
+    "remove": true
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "PHOTOKIN_HIDE_UGLY_03",
+    "//": "remove after 0.J",
+    "remove": true
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "PHOTOKIN_HIDE_UGLY_04",
+    "//": "remove after 0.J",
+    "remove": true
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "PHOTOKIN_HIDE_UGLY_05",
+    "//": "remove after 0.J",
+    "remove": true
+  },
+  {
+    "type": "TRAIT_MIGRATION",
+    "id": "PHOTOKIN_HIDE_UGLY_06",
+    "//": "remove after 0.J",
+    "remove": true
   }
 ]
diff --git a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json
@@ -250,9 +250,7 @@
     "condition": { "not": { "u_has_effect": "effect_photokin_hide_ugly" } },
     "effect": [
       { "u_message": "You shroud your true form behind unassuming illusions.", "type": "good" },
-      {
-        "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PHOTOKIN_HIDE_UGLY_SWITCHER", "EOC_PHOTOKIN_HIDE_UGLY_REMOVE_GODCO_VARS" ]
-      },
+      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PHOTOKIN_HIDE_UGLY_REMOVE_GODCO_VARS" ] },
       { "u_add_effect": "effect_photokin_hide_ugly", "duration": "PERMANENT" },
       {
         "queue_eocs": "EOC_PHOTOKIN_HIDE_UGLY_DRAIN",
@@ -272,21 +270,6 @@
     ],
     "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_HIDE_UGLY" } ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_PHOTOKIN_HIDE_UGLY_SWITCHER",
-    "effect": {
-      "switch": { "math": [ "u_spell_level('photokinetic_hide_ugly')" ] },
-      "cases": [
-        { "case": 0, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_01" } },
-        { "case": 4, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_02" } },
-        { "case": 8, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_03" } },
-        { "case": 12, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_04" } },
-        { "case": 16, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_05" } },
-        { "case": 20, "effect": { "u_add_trait": "PHOTOKIN_HIDE_UGLY_06" } }
-      ]
-    }
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_PHOTOKIN_REMOVE_HIDE_UGLY",