Merge pull request #51782 from ISuckM8/feral-survivor

Feral sapien enemy
CleverRaven · Dec 15, 2021 · 373cf4e · 373cf4e
2 parents eed7469 + 035a789
commit 373cf4e
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 0 deletions.
diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json
@@ -17,6 +17,20 @@
     "id": "feral_humans_death_drops_crowbar",
     "entries": [ { "item": "crowbar", "prob": 100, "damage": [ 1, 3 ] }, { "group": "default_zombie_clothes", "prob": 100 } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "feral_sapien_death_drops_spear",
+    "entries": [
+      { "group": "survivor_stabbing", "prob": 100, "damage": [ 0, 3 ] },
+      { "group": "mon_zombie_survivor_death_drops", "prob": 100 },
+      { "item": "spearsling", "prob": 100, "damage": [ 0, 3 ] },
+      { "item": "survivor_belt_notools", "prob": 30, "damage": [ 0, 3 ] },
+      { "item": "duster_leather", "prob": 25, "damage": [ 0, 3 ] },
+      { "item": "kevlar", "prob": 25, "damage": [ 0, 3 ] },
+      { "item": "tac_helmet", "prob": 10, "damage": [ 0, 3 ] }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "collection",

diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -12,6 +12,7 @@
       { "monster": "mon_feral_human_pipe", "weight": 40 },
       { "monster": "mon_feral_human_crowbar", "weight": 40 },
       { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 2 },
+      { "monster": "mon_feral_sapien_spear", "weight": 14, "cost_multiplier": 2 },
       { "monster": "mon_zombie_crawler", "weight": 25 },
       { "monster": "mon_zombie_brainless", "weight": 25 },
       { "monster": "mon_zombie_dog", "weight": 25, "pack_size": [ 1, 2 ] }
@@ -62,6 +63,7 @@
       { "monster": "mon_feral_human_pipe", "weight": 20 },
       { "monster": "mon_feral_human_crowbar", "weight": 20 },
       { "monster": "mon_feral_human_axe", "weight": 10, "cost_multiplier": 2 },
+      { "monster": "mon_feral_sapien_spear", "weight": 5, "cost_multiplier": 2 },
       { "monster": "mon_zombie_crawler", "weight": 25 },
       { "monster": "mon_zombie_brainless", "weight": 25 }
     ]
@@ -111,6 +113,7 @@
       { "monster": "mon_feral_human_pipe", "weight": 4, "pack_size": [ 2, 3 ] },
       { "monster": "mon_feral_human_crowbar", "weight": 4, "pack_size": [ 2, 3 ] },
       { "monster": "mon_feral_human_axe", "weight": 2, "cost_multiplier": 2, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_feral_sapien_spear", "weight": 1, "cost_multiplier": 2 },
       { "monster": "mon_zombie_brainless", "weight": 65 }
     ]
   },
@@ -135,6 +138,7 @@
       { "monster": "mon_feral_human_pipe", "weight": 40, "cost_multiplier": 0 },
       { "monster": "mon_feral_human_crowbar", "weight": 40, "cost_multiplier": 0 },
       { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 0 },
+      { "monster": "mon_feral_sapien_spear", "weight": 9, "cost_multiplier": 2 },
       { "monster": "mon_zombie_brainless", "weight": 30, "cost_multiplier": 0 }
     ]
   },
@@ -433,6 +437,7 @@
       { "monster": "mon_feral_human_pipe", "weight": 4, "pack_size": [ 5, 9 ] },
       { "monster": "mon_feral_human_crowbar", "weight": 4, "pack_size": [ 4, 7 ] },
       { "monster": "mon_feral_human_axe", "weight": 2, "cost_multiplier": 2, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_feral_sapien_spear", "weight": 1, "cost_multiplier": 2 },
       { "monster": "mon_zombie", "weight": 75, "cost_multiplier": 2 },
       { "monster": "mon_zombie_medical", "weight": 200, "cost_multiplier": 2 },
       { "monster": "mon_zombie_fat", "weight": 75, "cost_multiplier": 2 },
@@ -526,6 +531,8 @@
       { "monster": "mon_feral_human_pipe", "weight": 840 },
       { "monster": "mon_feral_human_pipe", "weight": 100, "pack_size": [ 3, 8 ] },
       { "monster": "mon_feral_human_crowbar", "weight": 40, "pack_size": [ 2, 6 ] },
+      { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
+      { "monster": "mon_feral_sapien_spear", "weight": 14, "cost_multiplier": 2 },
       { "monster": "mon_feral_human_axe", "weight": 20, "cost_multiplier": 2, "pack_size": [ 1, 4 ] }
     ]
   },

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
@@ -58,6 +58,66 @@
       "DROPS_AMMO"
     ]
   },
+  {
+    "id": "mon_feral_sapien_spear",
+    "type": "MONSTER",
+    "name": { "str": "cunning feral" },
+    "description": "In this feral human's eyes is more intelligence than in those of most of their kind.  They're carrying a crude spear, and have assembled some basic armor from scavenged clothing and bits of riot armour, leaving several gaps.  Although a bit more together, this creature is still only a few steps away from being a living zombie themself.",
+    "default_faction": "zombie",
+    "bodytype": "human",
+    "species": [ "HUMAN" ],
+    "volume": "62500 ml",
+    "weight": "81500 g",
+    "hp": 80,
+    "speed": 100,
+    "material": [ "flesh" ],
+    "symbol": "@",
+    "color": "magenta",
+    "aggression": 30,
+    "morale": 100,
+    "melee_skill": 3,
+    "melee_dice": 4,
+    "melee_dice_sides": 6,
+    "melee_cut": 2,
+    "dodge": 3,
+    "armor_bash": 9,
+    "armor_cut": 7,
+    "armor_bullet": 12,
+    "special_attacks": [
+      [ "PARROT_AT_DANGER", 0 ],
+      {
+        "id": "stretch_attack",
+        "cooldown": 5,
+        "range": 2,
+        "hit_dmg_u": "The %1$s thrusts a spear at your %2$s, slashing it!",
+        "hit_dmg_npc": "The %1$s thrusts a spear at <npcname>'s %2$s, slashing it!",
+        "no_dmg_msg_u": "The %1$s thrusts a spear at your %2$s, but glances off your armor!",
+        "no_dmg_msg_npc": "The %1$s thrusts a spear at <npcname>'s %2$s, but glances off armor!",
+        "miss_msg_u": "The %s thrusts a spear at you, but you evade it!",
+        "miss_msg_npc": "The %s thrusts a spear at <npcname>, but they evade it!"
+      }
+    ],
+    "armor_acid": 4,
+    "harvest": "human",
+    "vision_day": 50,
+    "vision_night": 3,
+    "path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true },
+    "death_drops": "feral_sapien_death_drops_spear",
+    "zombify_into": "mon_zombie_survivor",
+    "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ],
+    "flags": [
+      "SEES",
+      "HEARS",
+      "SMELLS",
+      "WARM",
+      "BASHES",
+      "GROUP_BASH",
+      "HUMAN",
+      "CAN_OPEN_DOORS",
+      "PATH_AVOID_DANGER_1",
+      "PRIORITIZE_TARGETS"
+    ]
+  },
   {
     "id": "mon_chud",
     "type": "MONSTER",

diff --git a/data/json/speech.json b/data/json/speech.json
@@ -2262,6 +2262,42 @@
     "sound": "\"Wanna play with me?\"",
     "volume": 10
   },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_sapien_spear" ],
+    "sound": "\"You!\"",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_sapien_spear" ],
+    "sound": "\"Food!\"",
+    "volume": 15
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_sapien_spear" ],
+    "sound": "\"Raagh!\"",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_sapien_spear" ],
+    "sound": "\"Hunger…\"",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_sapien_spear" ],
+    "sound": "\"Hate…\"",
+    "volume": 10
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_feral_sapien_spear" ],
+    "sound": "\"Hate… you…\"",
+    "volume": 10
+  },
   {
     "type": "speech",
     "speaker": [ "talking_doll", "mon_mi_go", "mon_mi_go_slaver", "mon_mannequin_decoy" ],