[Xedra Evolved] Moroi rework (#82541)

* Initial commit

* More moroi updates

* Add fear gaze

* Fix tough moroi

* Kick tests

* Update data/mods/Xedra_Evolved/monsters/bloodsuckers.json

---------

Co-authored-by: Maleclypse <[email protected]>

Author: Standing-Storm

data/mods/Xedra_Evolved/effects/effects_monster_only.json

@@ -2,7 +2,7 @@
   {
     "type": "effect_type",
     "id": "effect_vampire_monster_strength",
-    "//": "No enchantment to actually increase monsters damage so we have to use this as a condition for an attack",
+    "//": "No enchantment to actually increase monsters' damage so we have to use this as a condition for an attack",
     "name": [ "Vigor Mortis" ],
     "desc": [ "" ],
     "show_in_info": true
@@ -27,8 +27,8 @@
         "incoming_damage_mod": [
           { "type": "bash", "multiply": -0.35 },
           { "type": "stab", "multiply": -0.2 },
-          { "type": "cut", "add": -0.25 },
-          { "type": "bullet", "add": -0.5 }
+          { "type": "cut", "multiply": -0.25 },
+          { "type": "bullet", "multiply": -0.5 }
         ]
       }
     ]

data/mods/Xedra_Evolved/mapgen/nested/vampires.json

@@ -5,7 +5,7 @@
     "object": {
       "place_monster": [
         { "monster": "mon_vampire_strigoi", "x": 12, "y": 12, "spawn_data": { "patrol": [ { "x": 12, "y": 12 } ] } },
-        { "monster": "mon_vampire_moroi", "x": 4, "y": 4, "repeat": [ 6, 10 ] }
+        { "group": "GROUP_VAMPIRE_MOROI_TYPES", "x": 4, "y": 4, "repeat": [ 6, 10 ] }
       ]
     }
   },
@@ -32,7 +32,7 @@
       ],
       "place_monster": [
         { "monster": "mon_vampire_strigoi", "x": [ 0, 4 ], "y": [ 0, 4 ], "chance": 8 },
-        { "monster": "mon_vampire_moroi", "x": [ 0, 4 ], "y": [ 0, 4 ], "chance": 16 }
+        { "group": "GROUP_VAMPIRE_MOROI_TYPES", "x": [ 0, 4 ], "y": [ 0, 4 ], "chance": 16 }
       ]
     }
   },

data/mods/Xedra_Evolved/mod_interactions/innawood/monstergroups/monstergroups_new.json

@@ -35,7 +35,7 @@
     "monsters": [
       { "monster": "mon_renfield", "weight": 200 },
       { "monster": "mon_renfield", "weight": 50, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_vampire_moroi", "weight": 35 },
+      { "group": "GROUP_VAMPIRE_MOROI_TYPES", "weight": 35 },
       { "monster": "mon_vampire_strigoi", "weight": 25 },
       { "monster": "mon_vampire_strigoi", "weight": 5, "pack_size": [ 2, 4 ] },
       { "monster": "xe_mon_bat", "weight": 100, "pack_size": [ 2, 4 ] },

data/mods/Xedra_Evolved/monsters/bloodsuckers.json

@@ -29,6 +29,8 @@
     "bleed_rate": 80,
     "vision_day": 45,
     "vision_night": 15,
+    "regenerates": 0,
+    "regeneration_modifiers": [ [ "star_vampire_blood_drank", 2 ] ],
     "harvest": "vampire",
     "path_settings": { "max_dist": 5 },
     "grab_strength": 30,
@@ -132,6 +134,7 @@
     "condition": "npc_is_character",
     "effect": [
       { "math": [ "_vampire_amount_drained", "=", "400 + rand(100)" ] },
+      { "u_add_effect": "star_vampire_blood_drank", "duration": 30 },
       {
         "if": { "npc_has_flag": "BLEEDSLOW2" },
         "then": [
@@ -179,50 +182,256 @@
     }
   },
   {
-    "id": "mon_vampire_moroi",
+    "id": "mon_vampire_moroi_fast",
+    "looks_like": "mon_vampire_moroi",
     "type": "MONSTER",
+    "copy-from": "mon_vampire_generic",
     "name": { "str_sp": "moroi" },
-    "description": "This creature looks more aware than most of the ferals you have seen and in fact you might even suspect them of being normal if it weren't for the dried blood caked around their mouth and down the front of their clothes.  The light glints against what look to be sharp fangs in their mouth.",
-    "default_faction": "vampire",
-    "bodytype": "human",
-    "species": [ "VAMPIRE", "HUMAN" ],
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 90,
+    "description": "This creature looks more aware than most of the ferals you have seen and in fact you might even suspect them of being normal if it weren't for the dried blood caked around their mouth and down the front of their clothes.  The light glints against what look to be sharp fangs in their mouth.  They move with inhuman speed and fluidity.",
+    "speed": 95,
+    "melee_skill": 4,
+    "melee_dice": 2,
+    "melee_dice_sides": 4,
+    "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
+    "extend": {
+      "special_attacks": [
+        {
+          "id": "bite_humanoid",
+          "cooldown": 10,
+          "damage_max_instance": [ { "damage_type": "stab", "amount": 10, "armor_multiplier": 0.2 } ],
+          "eoc": [ "EOC_VAMPIRE_DRINK_BLOOD" ]
+        },
+        {
+          "type": "monster_attack",
+          "attack_type": "melee",
+          "id": "moroi_vampire_blood_driven_speed_buff",
+          "cooldown": 60,
+          "move_cost": 10,
+          "range": 10,
+          "damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
+          "self_effects_always": [ { "id": "effect_vampire_monster_speed", "duration": [ 25, 45 ] } ],
+          "condition": { "not": { "u_has_effect": "effect_vampire_monster_speed" } },
+          "hit_dmg_u": "%1$s moves with inhuman speed.",
+          "hit_dmg_npc": "%1$s moves with inhuman speed.",
+          "miss_msg_u": "",
+          "miss_msg_npc": "",
+          "no_dmg_msg_u": "%1$s moves with inhuman speed.",
+          "no_dmg_msg_npc": "%1$s moves with inhuman speed.",
+          "dodgeable": false,
+          "uncanny_dodgeable": false,
+          "blockable": false
+        },
+        {
+          "type": "monster_attack",
+          "attack_type": "melee",
+          "id": "moroi_vampire_sanguine_agility_buff",
+          "cooldown": 45,
+          "move_cost": 10,
+          "range": 10,
+          "damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
+          "self_effects_always": [ { "id": "effect_vampire_monster_agility", "duration": [ 25, 45 ] } ],
+          "condition": { "not": { "u_has_effect": "effect_vampire_monster_agility" } },
+          "hit_dmg_u": "%1$s begins moving with inhuman agility.",
+          "hit_dmg_npc": "%1$s begins moving with inhuman agility.",
+          "miss_msg_u": "",
+          "miss_msg_npc": "",
+          "no_dmg_msg_u": "%1$s begins moving with inhuman agility.",
+          "no_dmg_msg_npc": "%1$s begins moving with inhuman agility.",
+          "dodgeable": false,
+          "uncanny_dodgeable": false,
+          "blockable": false
+        }
+      ]
+    },
+    "death_drops": "default_moroi_death_drops"
+  },
+  {
+    "id": "mon_vampire_moroi_tough",
+    "looks_like": "mon_vampire_moroi",
+    "type": "MONSTER",
+    "copy-from": "mon_vampire_generic",
+    "name": { "str_sp": "moroi" },
+    "description": "This creature looks more aware than most of the ferals you have seen and in fact you might even suspect them of being normal if it weren't for the dried blood caked around their mouth and down the front of their clothes.  The light glints against what look to be sharp fangs in their mouth.  Their skin has a waxen appearance and their muscles bulge oddly.",
+    "hp": 145,
+    "melee_skill": 4,
+    "melee_dice": 2,
+    "melee_dice_sides": 4,
+    "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
+    "extend": {
+      "special_attacks": [
+        {
+          "id": "bite_humanoid",
+          "cooldown": 10,
+          "damage_max_instance": [ { "damage_type": "stab", "amount": 10, "armor_multiplier": 0.2 } ],
+          "eoc": [ "EOC_VAMPIRE_DRINK_BLOOD" ]
+        },
+        {
+          "type": "monster_attack",
+          "attack_type": "melee",
+          "id": "moroi_vampire_vigor_mortis_buff",
+          "cooldown": 30,
+          "move_cost": 10,
+          "range": 10,
+          "damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
+          "self_effects_always": [ { "id": "effect_vampire_monster_strength", "duration": [ 25, 45 ] } ],
+          "condition": { "not": { "u_has_effect": "effect_vampire_monster_strength" } },
+          "hit_dmg_u": "%1$s flexes their fingers with an audible crack.",
+          "hit_dmg_npc": "%1$s flexes their fingers with an audible crack.",
+          "miss_msg_u": "",
+          "miss_msg_npc": "",
+          "no_dmg_msg_u": "%1$s flexes their fingers with an audible crack.",
+          "no_dmg_msg_npc": "%1$s flexes their fingers with an audible crack.",
+          "dodgeable": false,
+          "uncanny_dodgeable": false,
+          "blockable": false
+        },
+        {
+          "type": "monster_attack",
+          "attack_type": "melee",
+          "id": "moroi_vampire_sanguine_resilience_buff",
+          "cooldown": 35,
+          "move_cost": 10,
+          "range": 10,
+          "damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
+          "self_effects_always": [ { "id": "effect_vampire_monster_resilience", "duration": [ 25, 45 ] } ],
+          "condition": { "not": { "u_has_effect": "effect_vampire_monster_resilience" } },
+          "hit_dmg_u": "%1$s' s skin takes on a waxen sheen.",
+          "hit_dmg_npc": "%1$s' s skin takes on a waxen sheen.",
+          "miss_msg_u": "",
+          "miss_msg_npc": "",
+          "no_dmg_msg_u": "%1$s's skin takes on a waxen sheen.",
+          "no_dmg_msg_npc": "%1$s' s skin takes on a waxen sheen.",
+          "dodgeable": false,
+          "uncanny_dodgeable": false,
+          "blockable": false
+        },
+        {
+          "id": "smash",
+          "move_cost": 130,
+          "cooldown": 8,
+          "min_mul": 0.8,
+          "throw_strength": 40,
+          "condition": { "u_has_effect": "effect_vampire_monster_strength" }
+        },
+        {
+          "id": "bio_op_takedown",
+          "cooldown": 10,
+          "condition": { "u_has_effect": "effect_vampire_monster_strength" }
+        }
+      ]
+    },
+    "death_drops": "default_moroi_death_drops"
+  },
+  {
+    "id": "mon_vampire_moroi_animalistic",
+    "looks_like": "mon_vampire_moroi",
+    "type": "MONSTER",
+    "copy-from": "mon_vampire_generic",
+    "name": { "str_sp": "moroi" },
+    "description": "This creature looks more aware than most of the ferals you have seen and in fact you might even suspect them of being normal if it weren't for the dried blood caked around their mouth and down the front of their clothes.  There is a red light in their eyes, and they hunch over almost as though they want to drop to all fours.",
     "speed": 80,
-    "material": [ "flesh" ],
-    "symbol": "M",
-    "color": "brown",
-    "aggression": 100,
-    "morale": 100,
-    "melee_skill": 3,
+    "melee_skill": 4,
     "melee_dice": 2,
     "melee_dice_sides": 4,
+    "vision_night": 25,
     "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
-    "dodge": 3,
-    "regenerates_in_dark": true,
-    "weakpoints": [
-      { "name": "the head", "is_head": true, "armor_mult": { "physical": 0.5 }, "coverage": 3 },
-      { "name": "the eye", "is_head": true, "armor_mult": { "physical": 0 }, "coverage": 1 }
-    ],
-    "families": [ "prof_wp_demihuman" ],
-    "bleed_rate": 80,
-    "vision_day": 45,
-    "vision_night": 15,
-    "harvest": "vampire",
-    "path_settings": { "max_dist": 5 },
-    "grab_strength": 20,
-    "special_attacks": [
-      {
-        "id": "bite_humanoid",
-        "cooldown": 10,
-        "damage_max_instance": [ { "damage_type": "stab", "amount": 10, "armor_multiplier": 0.2 } ]
-      },
-      { "id": "grab", "cooldown": 7 }
-    ],
-    "death_drops": "default_moroi_death_drops",
-    "flags": [ "SEES", "HEARS", "SMELLS", "HAS_MIND", "GRABS", "WARM", "BASHES", "REVIVES", "PUSH_MON" ],
-    "armor": { "bash": 15, "cut": 5, "bullet": 14, "electric": 6 }
+    "extend": {
+      "special_attacks": [
+        {
+          "id": "bite_humanoid",
+          "cooldown": 10,
+          "damage_max_instance": [ { "damage_type": "stab", "amount": 10, "armor_multiplier": 0.2 } ],
+          "eoc": [ "EOC_VAMPIRE_DRINK_BLOOD" ]
+        },
+        {
+          "type": "monster_attack",
+          "attack_type": "melee",
+          "id": "moroi_vampire_sanguine_resilience_buff",
+          "cooldown": 35,
+          "move_cost": 10,
+          "range": 10,
+          "damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
+          "self_effects_always": [ { "id": "effect_vampire_monster_resilience", "duration": [ 25, 45 ] } ],
+          "condition": { "not": { "u_has_effect": "effect_vampire_monster_resilience" } },
+          "hit_dmg_u": "",
+          "hit_dmg_npc": "",
+          "miss_msg_u": "",
+          "miss_msg_npc": "",
+          "no_dmg_msg_u": "%1$s' s skin takes on a waxen sheen.",
+          "no_dmg_msg_npc": "%1$s' s skin takes on a waxen sheen.",
+          "dodgeable": false,
+          "uncanny_dodgeable": false,
+          "blockable": false
+        },
+        {
+          "id": "scratch",
+          "move_cost": 90,
+          "damage_max_instance": [ { "damage_type": "cut", "amount": 11 } ],
+          "cooldown": 3,
+          "min_mul": 1,
+          "max_mul": 2
+        },
+        {
+          "type": "spell",
+          "spell_data": { "id": "mon_vampire_fear_gaze", "min_level": 1 },
+          "cooldown": 20,
+          "condition": {
+            "and": [
+              { "or": [ "npc_is_character", { "npc_has_species": "FERAL" } ] },
+              { "not": { "npc_has_effect": "effect_vampire_fear_gazed" } }
+            ]
+          },
+          "monster_message": "%1$s bares their fangs and hisses at %3$s!"
+        }
+      ]
+    },
+    "death_drops": "default_moroi_death_drops"
+  },
+  {
+    "id": "mon_vampire_moroi_stealthy",
+    "looks_like": "mon_vampire_moroi",
+    "type": "MONSTER",
+    "copy-from": "mon_vampire_generic",
+    "name": { "str_sp": "moroi" },
+    "description": "This creature looks more aware than most of the ferals you have seen and in fact you might even suspect them of being normal if it weren't for the dried blood caked around their mouth and down the front of their clothes.  You have to stare straight at them for your eyes to register that they're there.",
+    "speed": 80,
+    "melee_skill": 4,
+    "melee_dice": 2,
+    "melee_dice_sides": 4,
+    "vision_night": 25,
+    "melee_damage": [ { "damage_type": "cut", "amount": 5 } ],
+    "extend": {
+      "special_attacks": [
+        {
+          "id": "bite_humanoid",
+          "cooldown": 10,
+          "damage_max_instance": [ { "damage_type": "stab", "amount": 10, "armor_multiplier": 0.2 } ],
+          "eoc": [ "EOC_VAMPIRE_DRINK_BLOOD" ]
+        },
+        {
+          "type": "monster_attack",
+          "attack_type": "melee",
+          "id": "moroi_vampire_sanguine_agility_buff",
+          "cooldown": 45,
+          "move_cost": 10,
+          "range": 10,
+          "damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
+          "self_effects_always": [ { "id": "effect_vampire_monster_agility", "duration": [ 25, 45 ] } ],
+          "condition": { "not": { "u_has_effect": "effect_vampire_monster_agility" } },
+          "hit_dmg_u": "%1$s begins moving with inhuman agility.",
+          "hit_dmg_npc": "%1$s begins moving with inhuman agility.",
+          "miss_msg_u": "",
+          "miss_msg_npc": "",
+          "no_dmg_msg_u": "%1$s begins moving with inhuman agility.",
+          "no_dmg_msg_npc": "%1$s begins moving with inhuman agility.",
+          "dodgeable": false,
+          "uncanny_dodgeable": false,
+          "blockable": false
+        }
+      ],
+      "flags": [ "NIGHT_INVISIBILITY", "SILENTMOVES" ]
+    },
+    "death_drops": "default_moroi_death_drops"
   },
   {
     "id": "mon_vampire_strigoi",

data/mods/Xedra_Evolved/monsters/monster_spells.json

@@ -664,5 +664,32 @@
     "effect_str": "EOC_XE_STRANGE_EVENT_BROWNIE_CONVERSATION",
     "shape": "blast",
     "min_range": 10
+  },
+  {
+    "type": "SPELL",
+    "id": "mon_vampire_fear_gaze",
+    "name": { "str": "Vampire Fear Gaze", "//~": "NO_I18N" },
+    "description": { "str": "When a vampire uses its fear gaze on you.  Bluh!.", "//~": "NO_I18N" },
+    "flags": [ "NO_HANDS", "NO_LEGS", "MUST_HAVE_CLASS_TO_LEARN", "RANDOM_DURATION" ],
+    "valid_targets": [ "hostile" ],
+    "max_level": 1,
+    "effect": "effect_on_condition",
+    "effect_str": "EOC_XE_VAMPIRE_MONSTER_FEAR_GAZE",
+    "shape": "blast",
+    "min_range": 6
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_XE_VAMPIRE_MONSTER_FEAR_GAZE",
+    "effect": [
+      { "u_add_effect": "effect_vampire_fear_gazed", "duration": 300 },
+      {
+        "if": { "not": { "u_has_flag": "MAGIAL_MIND_PROTECTION" } },
+        "then": [
+          { "u_add_effect": "stunned", "duration": [ 2, 5 ] },
+          { "u_message": "You freeze like a frightened rabbit!", "type": "bad" }
+        ]
+      }
+    ]
   }
 ]