Merge pull request #82695 from Standing-Storm/silent-one-adjustments

[MoM] Silent One adjustments

Author: Standing-Storm

data/mods/MindOverMatter/effects/effects_monster.json

@@ -494,7 +494,15 @@
     "id": "effect_nether_silent_one_resistances",
     "name": [ "" ],
     "desc": [ "" ],
-    "enchantments": [ { "incoming_damage_mod": [ { "type": "head", "multiply": -0.8 }, { "type": "electric", "multiply": -0.95 } ] } ]
+    "enchantments": [
+      {
+        "incoming_damage_mod": [
+          { "type": "head", "multiply": -0.45 },
+          { "type": "electric", "multiply": -0.95 },
+          { "type": "psi_telepathic_damage", "multiply": -0.5 }
+        ]
+      }
+    ]
   },
   {
     "type": "effect_type",

data/mods/MindOverMatter/monsters/monster_eoc_spells.json

@@ -628,9 +628,14 @@
         "decay_start": "12 hours"
       },
       { "u_add_effect": "effect_nether_attunement_health_penalty", "duration": "10 seconds" },
-      { "math": [ "u_calories()", "-=", "125" ] },
+      {
+        "if": { "math": [ "u_vitamin('vitamin_maintained_powers') >= 1" ] },
+        "then": { "math": [ "u_calories()", "-=", "rand(125) + 250" ] },
+        "else": { "math": [ "u_calories()", "-=", "125" ] }
+      },
       { "math": [ "u_calories('dont_affect_weariness': true)", "+=", "125" ] },
-      { "u_message": "You feel a sudden wave of fatigue!", "type": "bad" }
+      { "u_message": "You feel a sudden wave of fatigue!", "type": "bad" },
+      { "math": [ "n_val('anger')", "-=", "rand(5) + 2" ] }
     ],
     "false_effect": [
       { "math": [ "u_val('anger')", "-=", "rand(5) + 5" ] },
@@ -713,5 +718,37 @@
     "min_damage": 500,
     "max_damage": 500,
     "targeted_monster_ids": [ "mon_nether_silent_one_passive" ]
+  },
+  {
+    "id": "silent_one_detect_psionic_activity_aggressive",
+    "type": "SPELL",
+    "name": { "str": "[Ψ]Silent One Detect Psi Aggressive", "//~": "NO_I18N" },
+    "description": {
+      "str": "Silent One's detecting of psionic activity when it's already angry.  It's a bug if you have it.",
+      "//~": "NO_I18N"
+    },
+    "valid_targets": [ "ally", "hostile", "self" ],
+    "message": "",
+    "flags": [ "NO_PROJECTILE", "NO_EXPLOSION_SFX", "IGNORE_WALLS" ],
+    "effect": "effect_on_condition",
+    "effect_str": "EOC_SILENT_ONE_DETECT_PSIONIC_ACTIVITY_AGGRESSIVE",
+    "shape": "blast",
+    "min_aoe": 15,
+    "max_aoe": 15
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_SILENT_ONE_DETECT_PSIONIC_ACTIVITY_AGGRESSIVE",
+    "condition": "u_is_character",
+    "effect": [
+      {
+        "if": { "math": [ "u_vitamin('vitamin_maintained_powers') >= 1" ] },
+        "then": [
+          { "math": [ "n_val('anger')", "+=", "rand(10) + 2" ] },
+          { "u_message": "A chill aura emanates from the silent one.", "type": "bad" }
+        ],
+        "else": [ { "math": [ "n_val('anger')", "-=", "rand(25) + 25" ] } ]
+      }
+    ]
   }
 ]

data/mods/MindOverMatter/monsters/nether.json

@@ -94,7 +94,7 @@
     "melee_dice": 1,
     "melee_dice_sides": 1,
     "dodge": 4,
-    "armor": { "bash": 10, "stab": 85, "cut": 50, "bullet": 1000, "psi_telekinetic_damage": 300 },
+    "armor": { "bash": 10, "stab": 85, "cut": 50 },
     "bleed_rate": 0,
     "vision_day": 0,
     "vision_night": 0,
@@ -143,6 +143,7 @@
       "NOHEAD",
       "FLIES",
       "BIOLOGICALPROOF",
+      "BULLETPROOF",
       "COLDPROOF",
       "HAS_MIND",
       "NO_FUNG_DMG",
@@ -189,6 +190,14 @@
         "allow_no_target": true,
         "cooldown": 1,
         "monster_message": ""
+      },
+      {
+        "id": "silent_one_detect_psionic_activity",
+        "type": "spell",
+        "spell_data": { "id": "silent_one_detect_psionic_activity_aggressive", "hit_self": true },
+        "cooldown": { "math": [ "6 + rand(10)" ] },
+        "allow_no_target": true,
+        "monster_message": ""
       }
     ]
   }