[MoM] Chameleoflage update (#71999)

* Initial commit * Initial commit * Change scaling * Correct documentation
CleverRaven · Feb 27, 2024 · 2f576bd · 2f576bd
1 parent efec09a
commit 2f576bd
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 96 deletions.
diff --git a/data/mods/MindOverMatter/PowerDescriptionSpoilers.md b/data/mods/MindOverMatter/PowerDescriptionSpoilers.md
@@ -500,7 +500,7 @@ Powers causing photokinetic damage have a 40% chance to blind the target for 3 s
 *Duration*: 11 minutes and 30 seconds to 23 minutes and 50 seconds, plus 48 seconds to 1 minute and 53 seconds per power level<br />
 *Stamina Cost*: 3500, minus 75 per level to a minimum of 1500<br />
 *Channeling Time*: 150 moves, minus 8 moves per level to a minimum of 75<br />
-*Effects*: Warp light around the psion, making them blend into the nearby background.  This reduces the range at which monsters or hostile NPCs can see them by 15% from levels 1-3, 25% from levels 4-7, 35% from levels 8-11, 43% from levels 12-15, 50% from levels 16-19, and 55% at level 20+.<br />
+*Effects*: Warp light around the psion, making them blend into the nearby background.  This reduces the range at which monsters or hostile NPCs can see them by 10% plus 3% per power level to a maximum of 60%.<br />
 *Prerequisites*: Trick of the Light 6<br />
 
 ## Lucent Barrier (C)

diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -1227,7 +1227,21 @@
     "apply_message": "",
     "remove_message": "You stop bending light around your location.",
     "rating": "good",
-    "max_duration": "7 days"
+    "max_duration": "7 days",
+    "enchantments": [
+      {
+        "values": [
+          {
+            "value": "STEALTH_MODIFIER",
+            "add": {
+              "math": [
+                "min((( 10 + ( u_spell_level('photokinetic_camouflage') * 3 ) * (scaling_factor(u_val('intelligence') ) ) ) * u_nether_attunement_power_scaling), 60)"
+              ]
+            }
+          }
+        ]
+      }
+    ]
   },
   {
     "type": "effect_type",

diff --git a/data/mods/MindOverMatter/mutations/temporary.json b/data/mods/MindOverMatter/mutations/temporary.json
@@ -111,66 +111,6 @@
       [ "fabrication", 6 ]
     ]
   },
-  {
-    "type": "mutation",
-    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
-    "id": "PHOTOKINETIC_CAMOUFLAGE_1",
-    "name": { "str": "Chameleoflage" },
-    "points": 1,
-    "description": "Your powers are blending nearby light to make you harder to spot.",
-    "stealth_modifier": 15,
-    "valid": false
-  },
-  {
-    "type": "mutation",
-    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
-    "id": "PHOTOKINETIC_CAMOUFLAGE_2",
-    "name": { "str": "Chameleoflage" },
-    "points": 1,
-    "description": "Your powers are blending nearby light to make you harder to spot.",
-    "stealth_modifier": 25,
-    "valid": false
-  },
-  {
-    "type": "mutation",
-    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
-    "id": "PHOTOKINETIC_CAMOUFLAGE_3",
-    "name": { "str": "Chameleoflage" },
-    "points": 1,
-    "description": "Your powers are blending nearby light to make you harder to spot.",
-    "stealth_modifier": 35,
-    "valid": false
-  },
-  {
-    "type": "mutation",
-    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
-    "id": "PHOTOKINETIC_CAMOUFLAGE_4",
-    "name": { "str": "Chameleoflage" },
-    "points": 1,
-    "description": "Your powers are blending nearby light to make you harder to spot.",
-    "stealth_modifier": 43,
-    "valid": false
-  },
-  {
-    "type": "mutation",
-    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
-    "id": "PHOTOKINETIC_CAMOUFLAGE_5",
-    "name": { "str": "Chameleoflage" },
-    "points": 1,
-    "description": "Your powers are blending nearby light to make you harder to spot.",
-    "stealth_modifier": 50,
-    "valid": false
-  },
-  {
-    "type": "mutation",
-    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
-    "id": "PHOTOKINETIC_CAMOUFLAGE_6",
-    "name": { "str": "Chameleoflage" },
-    "points": 1,
-    "description": "Your powers are blending nearby light to make you harder to spot.",
-    "stealth_modifier": 55,
-    "valid": false
-  },
   {
     "id": "PHOTOKIN_HIDE_UGLY_01",
     "type": "mutation",

diff --git a/data/mods/MindOverMatter/obsolete/eocs.json b/data/mods/MindOverMatter/obsolete/eocs.json
@@ -0,0 +1,19 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PHOTOKIN_CAMOUFLAGE_SWITCHER",
+    "effect": [
+      {
+        "switch": { "math": [ "u_spell_level('photokinetic_camouflage')" ] },
+        "cases": [
+          { "case": 0, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_1" } },
+          { "case": 4, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_2" } },
+          { "case": 8, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_3" } },
+          { "case": 12, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_4" } },
+          { "case": 16, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_5" } },
+          { "case": 20, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_6" } }
+        ]
+      }
+    ]
+  }
+]
diff --git a/data/mods/MindOverMatter/obsolete/temporary.json b/data/mods/MindOverMatter/obsolete/temporary.json
@@ -0,0 +1,62 @@
+[
+  {
+    "type": "mutation",
+    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
+    "id": "PHOTOKINETIC_CAMOUFLAGE_1",
+    "name": { "str": "Chameleoflage" },
+    "points": 1,
+    "description": "Your powers are blending nearby light to make you harder to spot.",
+    "stealth_modifier": 15,
+    "valid": false
+  },
+  {
+    "type": "mutation",
+    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
+    "id": "PHOTOKINETIC_CAMOUFLAGE_2",
+    "name": { "str": "Chameleoflage" },
+    "points": 1,
+    "description": "Your powers are blending nearby light to make you harder to spot.",
+    "stealth_modifier": 25,
+    "valid": false
+  },
+  {
+    "type": "mutation",
+    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
+    "id": "PHOTOKINETIC_CAMOUFLAGE_3",
+    "name": { "str": "Chameleoflage" },
+    "points": 1,
+    "description": "Your powers are blending nearby light to make you harder to spot.",
+    "stealth_modifier": 35,
+    "valid": false
+  },
+  {
+    "type": "mutation",
+    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
+    "id": "PHOTOKINETIC_CAMOUFLAGE_4",
+    "name": { "str": "Chameleoflage" },
+    "points": 1,
+    "description": "Your powers are blending nearby light to make you harder to spot.",
+    "stealth_modifier": 43,
+    "valid": false
+  },
+  {
+    "type": "mutation",
+    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
+    "id": "PHOTOKINETIC_CAMOUFLAGE_5",
+    "name": { "str": "Chameleoflage" },
+    "points": 1,
+    "description": "Your powers are blending nearby light to make you harder to spot.",
+    "stealth_modifier": 50,
+    "valid": false
+  },
+  {
+    "type": "mutation",
+    "//": "This and following are all necessary because stealth_modifier is mutation only.  Redo the whole thing once it isn't.",
+    "id": "PHOTOKINETIC_CAMOUFLAGE_6",
+    "name": { "str": "Chameleoflage" },
+    "points": 1,
+    "description": "Your powers are blending nearby light to make you harder to spot.",
+    "stealth_modifier": 55,
+    "valid": false
+  }
+]
diff --git a/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json b/data/mods/MindOverMatter/powers/clairsentience_concentration_eocs.json
@@ -399,7 +399,7 @@
     "condition": { "not": { "u_has_effect": "effect_clair_craft_bonus" } },
     "effect": [
       { "u_message": "You can see how it all fits together, and how it *should* fit together.", "type": "good" },
-      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_CLAIR_CRAFT_BONUS_SWITCHER" ] },
+      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE" ] },
       { "u_add_effect": "effect_clair_craft_bonus", "duration": "PERMANENT" },
       { "u_cast_spell": { "id": "psionic_drained_difficulty_six", "hit_self": true } },
       {
@@ -420,21 +420,6 @@
     ],
     "false_effect": [ { "run_eocs": "EOC_CLAIR_REMOVE_CRAFT_BONUS" } ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_CLAIR_CRAFT_BONUS_SWITCHER",
-    "effect": {
-      "switch": { "math": [ "u_spell_level('clair_craft_bonus')" ] },
-      "cases": [
-        { "case": 0, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_01" } },
-        { "case": 4, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_02" } },
-        { "case": 8, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_03" } },
-        { "case": 12, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_04" } },
-        { "case": 16, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_05" } },
-        { "case": 20, "effect": { "u_add_trait": "CLAIR_CRAFT_BONUS_06" } }
-      ]
-    }
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_CLAIR_REMOVE_CRAFT_BONUS",

diff --git a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json
@@ -125,7 +125,7 @@
     "effect": [
       { "u_message": "You twist nearby light to help conceal you from distant observers.", "type": "good" },
       { "u_add_effect": "effect_photokin_camouflage", "duration": "PERMANENT" },
-      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE", "EOC_PHOTOKIN_CAMOUFLAGE_SWITCHER" ] },
+      { "run_eocs": [ "EOC_POWER_MAINTENANCE_PLUS_ONE" ] },
       { "u_cast_spell": { "id": "psionic_drained_difficulty_three", "hit_self": true } },
       {
         "queue_eocs": "EOC_PHOTOKIN_CAMOUFLAGE_DRAIN",
@@ -145,23 +145,6 @@
     ],
     "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_CAMOUFLAGE" } ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_PHOTOKIN_CAMOUFLAGE_SWITCHER",
-    "effect": [
-      {
-        "switch": { "math": [ "u_spell_level('photokinetic_camouflage')" ] },
-        "cases": [
-          { "case": 0, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_1" } },
-          { "case": 4, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_2" } },
-          { "case": 8, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_3" } },
-          { "case": 12, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_4" } },
-          { "case": 16, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_5" } },
-          { "case": 20, "effect": { "u_add_trait": "PHOTOKINETIC_CAMOUFLAGE_6" } }
-        ]
-      }
-    ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_PHOTOKIN_REMOVE_CAMOUFLAGE",