Finished Zombie Proficiency & Weakpoint Review

data/json/monster_weakpoints/generic_weakpoints.json

@@ -1,7 +1,7 @@
 [
   {
     "type": "weakpoint_set",
-    "id": "wps_natural_armor",
+    "id": "wps_armored_hide",
     "weakpoints": [
       {
         "id": "gap",
@@ -59,6 +59,37 @@
       }
     ]
   },
+  {
+    "type": "weakpoint_set",
+    "id": "wps_metal_shell_armor",
+    "//": "Similar to wps_bone_armor for rust plated and rust shelled zombies.",
+    "weakpoints": [
+      {
+        "id": "gap",
+        "name": "a small fissure between the metal plates",
+        "coverage": 5,
+        "difficulty": { "melee": 4, "ranged": 5 },
+        "coverage_mult": { "broad": 0.5 },
+        "armor_mult": { "all": 0.35 }
+      },
+      {
+        "id": "joint",
+        "name": "an exposed joint unprotected by the metal plates",
+        "coverage": 10,
+        "difficulty": { "melee": 3, "ranged": 7 },
+        "coverage_mult": { "ranged": 0.25 },
+        "armor_mult": { "all": 0.15 }
+      },
+      {
+        "id": "hard_point",
+        "name": "a strong, rigid chunk of metal",
+        "armor_mult": { "all": 1.4 },
+        "crit_mult": { "all": 0.75 },
+        "coverage_mult": { "melee": 0.75 },
+        "coverage": 3
+      }
+    ]
+  },
   {
     "type": "weakpoint_set",
     "id": "wps_eyes_big",

data/json/monstergroups/zombie_upgrades.json

@@ -218,5 +218,15 @@
       { "monster": "mon_skeleton_master", "weight": 60, "cost_multiplier": 2 },
       { "monster": "mon_skeleton_necro", "weight": 60, "cost_multiplier": 2 }
     ]
+  },
+  {
+    "name": "GROUP_ZOMBIE_MINER_UPGRADE",
+    "type": "monstergroup",
+    "monsters": [
+      { "monster": "mon_zombie_miner" },
+      { "monster": "mon_zombie_shady", "weight": 150 },
+      { "monster": "mon_zombie_rust", "weight": 110 },
+      { "monster": "mon_zombie_tough", "weight": 60 }
+    ]
   }
 ]

data/json/monsters/fish.json

@@ -1004,7 +1004,7 @@
     "harvest": "mutant_shellfish",
     "dissect": "dissect_crustacean_small",
     "weakpoint_sets": [ "wps_arthropod" ],
-    "families": [ "prof_intro_biology", "prof_wp_nat_armored" ],
+    "families": [ "prof_intro_biology", "prof_wp_nat_armored", "prof_wp_basic_bug" ],
     "special_attacks": [ [ "SHRIEK_ALERT", 6 ], [ "SHRIEK_STUN", 1 ] ],
     "anger_triggers": [ "PLAYER_CLOSE", "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ],
     "fear_triggers": [ "FIRE" ],

data/json/monsters/fungus_zombie.json

@@ -266,7 +266,7 @@
     "id": "mon_fungal_wretch",
     "type": "MONSTER",
     "name": { "str": "fungal wretch", "str_pl": "fungal wretches" },
-    "description": "This severely deformed child lies on its back, its ribs exposed to the sky.  With its limbs contorted in ways only possible through a lack of bones, the child’s ribcage stretches far beyond the boundaries of human biology, appearing akin to a bony hive coated in quivering fungal matter.  Spoors occasionally waft from its hollowed interior, and, periodically, you can catch sight of weakened movement staring within the abomination’s guts.",
+    "description": "This severely deformed child lies on its back, its ribs exposed to the sky.  With its limbs contorted in ways only possible through a lack of bones, the child’s ribcage stretches far beyond the boundaries of human biology, appearing akin to a bony hive coated in quivering fungal matter.  Spores occasionally waft from its hollowed interior, and, periodically, you can catch sight of weak movement within the abomination’s guts.",
     "default_faction": "fungus",
     "bodytype": "blob",
     "species": [ "FUNGUS" ],
@@ -294,7 +294,7 @@
         "type": "spell",
         "spell_data": { "id": "wretch_fungal_raptor_spawn", "hit_self": true },
         "cooldown": 50,
-        "monster_message": "Through a plume of fungal spores, a small beast struggles to take wing from the wretch’s abdomen!"
+        "monster_message": "Through a plume of fungal spores, a small beast struggles to take flight from the wretch’s abdomen!"
       }
     ],
     "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_children_clothes", 100 ], [ "child_items", 65 ] ] },

data/json/monsters/zed-animal.json

@@ -680,6 +680,7 @@
     "armor_bash": 8,
     "armor_cut": 2,
     "armor_bullet": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_biochemistry" ],
     "vision_night": 7,
     "harvest": "zombie_acid",
     "path_settings": { "max_dist": 5 },

data/json/monsters/zed-classic.json

@@ -24,7 +24,7 @@
     "armor_cut": 8,
     "armor_bullet": 6,
     "armor_elec": 1,
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_armored_hide" ],
     "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_nat_armored" ],
     "harvest": "zombie",
     "special_attacks": [ { "type": "bite", "cooldown": 5 } ],
@@ -258,7 +258,7 @@
     "armor_bullet": 3,
     "armor_elec": 5,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_gasmask" ],
-    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_syn_armored" ],
     "weakpoints": [
       {
         "name": "a tear in its hazmat suit",

data/json/monsters/zed-pupating.json

@@ -120,6 +120,8 @@
     "armor_cut": 10,
     "armor_bullet": 10,
     "armor_elec": 6,
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_hulk" ],
     "vision_day": 83,
     "vision_night": 4,
     "harvest": "zombie",
@@ -172,6 +174,8 @@
     "armor_cut": 10,
     "armor_bullet": 10,
     "armor_elec": 6,
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_hulk" ],
     "vision_day": 83,
     "vision_night": 4,
     "harvest": "zombie",

data/json/monsters/zed-winged.json

@@ -154,6 +154,8 @@
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
     "dodge": 3,
+    "weakpoint_sets": [ "wps_arthropod_hymenoptera", "wps_arthropod_flying" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_flying" ],
     "vision_night": 5,
     "harvest": "zombie",
     "special_attacks": [ { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] } ],
@@ -215,6 +217,7 @@
     "description": "This small, winged predator darts through the air on three thinly-haired wings that look like stretched human hands.  A jagged spike with a pulsing electrical glow juts out from the point where the wings meet.",
     "melee_damage": [ { "damage_type": "electric", "amount": 8 } ],
     "luminance": 8,
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_electromagnetics" ],
     "special_attacks": [
       [ "SHOCKSTORM", 25 ],
       { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] }

data/json/monsters/zed_acid.json

@@ -54,7 +54,7 @@
     "id": "mon_zombie_corrosive",
     "type": "MONSTER",
     "name": { "str": "corrosive zombie" },
-    "description": "This zombie has swollen to immense proportions, but still manages to hold itself together with semi-congealed acid all over its bloated body.  It moves clumsily, but spits from a large reserve of acid with uncanny accuracy.",
+    "description": "This zombie has swollen to immense proportions, but still manages to hold itself together with semi-congealed acid all over its bloated, leathery body.  It moves clumsily, but spits from a large reserve of acid with uncanny accuracy.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "ZOMBIE", "HUMAN" ],
@@ -79,8 +79,8 @@
     "armor_elec": 2,
     "bleed_rate": 50,
     "vision_night": 3,
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_natural_armor" ],
-    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_biochemistry" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_armored_hide" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_biochemistry", "prof_wp_nat_armored" ],
     "harvest": "zombie_acid",
     "special_attacks": [
       {
@@ -144,7 +144,7 @@
     "dodge": 1,
     "bleed_rate": 50,
     "vision_night": 3,
-    "weakpoint_sets": [ "wps_humanoid_body" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_big" ],
     "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_biochemistry" ],
     "harvest": "zombie_acid",
     "special_attacks": [ [ "ACID", 20 ] ],

data/json/monsters/zed_amalgamation.json

@@ -30,6 +30,7 @@
     "default_faction": "zombie",
     "volume": "75 L",
     "weight": "75 kg",
+    "families": [ "prof_intro_biology", "prof_wp_amalgamation" ],
     "hp": 100,
     "speed": 100,
     "upgrades": { "age_grow": 1, "into_group": "GROUP_COCOON_SMALL", "multiple_spawns": true, "spawn_range": 5 },
@@ -109,7 +110,7 @@
     "aggression": 100,
     "morale": 100,
     "weakpoint_sets": [ "wps_amalgamation_base" ],
-    "families": [ "prof_wp_amalgamation" ],
+    "families": [ "prof_intro_biology", "prof_wp_amalgamation" ],
     "harvest": "zombie_amalgamation",
     "//": "TODO: When effects/spells can mess with path settings + flags move smartness to the effect of dedicated coordinatiors",
     "path_settings": { "avoid_sharp": true, "avoid_traps": true, "max_dist": 400 },
@@ -208,7 +209,11 @@
       { "id": "acid_charge" }
     ],
     "harvest": "zombie_amalgamation_acid",
-    "extend": { "flags": [ "ACIDPROOF", "ACID_BLOOD" ], "weakpoint_sets": [ "wps_amalgamation_acid" ] }
+    "extend": {
+      "flags": [ "ACIDPROOF", "ACID_BLOOD" ],
+      "families": [ "prof_biochemistry" ],
+      "weakpoint_sets": [ "wps_amalgamation_acid" ]
+    }
   },
   {
     "type": "MONSTER",
@@ -282,7 +287,11 @@
     "special_when_hit": [ "ZAPBACK", 100 ],
     "death_function": { "effect": { "id": "death_shock_blast", "hit_self": true } },
     "harvest": "zombie_amalgamation_electric",
-    "extend": { "flags": [ "ELECTRIC" ], "weakpoint_sets": [ "wps_amalgamation_armor", "wps_amalgamation_electric" ] }
+    "extend": {
+      "flags": [ "ELECTRIC" ],
+      "families": [ "prof_electromagnetics" ],
+      "weakpoint_sets": [ "wps_amalgamation_armor", "wps_amalgamation_electric" ]
+    }
   },
   {
     "type": "MONSTER",
@@ -328,6 +337,9 @@
     "armor_acid": 12,
     "armor_elec": 12,
     "vision_night": 8,
-    "extend": { "weakpoint_sets": [ "wps_amalgamation_armor", "wps_amalgamation_mandible", "wps_amalgamation_tail" ] }
+    "extend": {
+      "weakpoint_sets": [ "wps_amalgamation_armor", "wps_amalgamation_mandible", "wps_amalgamation_tail" ],
+      "families": [ "prof_wp_nat_armored" ]
+    }
   }
 ]

data/json/monsters/zed_burned.json

@@ -3,7 +3,7 @@
     "id": "mon_zombie_child_scorched",
     "type": "MONSTER",
     "name": { "str": "zombie kinderling" },
-    "description": "A tiny charred body, jumping and kicked and flailing around in a mockery of playground exercise.  It does not need a face for you to feel bad about killing it.",
+    "description": "A tiny charred body, jumping and kicking and flailing around in a mockery of playground exercise.  It does not need a face for you to feel bad about killing it.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "ZOMBIE", "HUMAN" ],
@@ -27,7 +27,7 @@
     "armor_acid": 3,
     "armor_fire": 15,
     "armor_elec": 3,
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_child_body", "wps_humanoid_head_big", "wps_natural_armor" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_child_body", "wps_humanoid_head_big", "wps_armored_hide" ],
     "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_child", "prof_burn_care" ],
     "bleed_rate": 0,
     "vision_day": 10,
@@ -53,7 +53,7 @@
     "id": "mon_zombie_fiend",
     "type": "MONSTER",
     "name": { "str": "fiend" },
-    "description": "A charred zombie covered with bony plates, spikes and protrusions.  Moves stiffly, but swiftly.",
+    "description": "A charred zombie covered with bony plates, spikes, and protrusions.  Moves stiffly, but swiftly.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "ZOMBIE", "HUMAN" ],
@@ -78,7 +78,7 @@
     "armor_fire": 15,
     "armor_elec": 3,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_bone_armor" ],
-    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_burn_care" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_skeleton", "prof_burn_care" ],
     "bleed_rate": 0,
     "vision_day": 10,
     "vision_night": 3,
@@ -115,7 +115,7 @@
     "armor_acid": 3,
     "armor_fire": 15,
     "armor_elec": 3,
-    "weakpoint_sets": [ "wps_humanoid_body" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_armored_hide" ],
     "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_burn_care" ],
     "bleed_rate": 0,
     "vision_day": 10,

data/json/monsters/zed_children.json

@@ -99,7 +99,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
     "armor_elec": 1,
     "dodge": 1,
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_child_body", "wps_humanoid_head_big" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_child_body", "wps_humanoid_head_big", "wps_eyes_big" ],
     "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_child" ],
     "bleed_rate": 50,
     "vision_day": 10,
@@ -285,6 +285,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
     "armor_elec": 1,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_child_body", "wps_humanoid_head_big" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_child" ],
     "vision_day": 20,
     "vision_night": 3,
     "bleed_rate": 0,

data/json/monsters/zed_command.json

@@ -3,7 +3,7 @@
     "id": "mon_skeleton_master",
     "type": "MONSTER",
     "name": { "str": "skeletal master" },
-    "description": "A strange zombie covered in bone plates from face to toe.  Despite the added weight on its body its movements are coordinated, almost as if capable of analyzing your movements.",
+    "description": "A strange zombie covered in bone plates from face to toe.  Despite the added weight on its body, its movements are coordinated, almost as if capable of analyzing your movements.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "ZOMBIE", "HUMAN" ],
@@ -60,7 +60,7 @@
     "id": "mon_skeleton_necro",
     "type": "MONSTER",
     "name": { "str": "zombie lich", "str_pl": "zombie liches" },
-    "description": "A twisted visage of the human body decked in bone from head to toe.  Its vague shape reminiscent of some tabletop monster, it walks and watches your actions with a cold and calculating demeanor.",
+    "description": "A twisted visage of the human body decked in bone from head to toe.  Its vague shape is reminiscent of some tabletop monster, and it walks and watches your actions with a cold and calculating demeanor.",
     "default_faction": "zombie",
     "bodytype": "human",
     "species": [ "ZOMBIE", "HUMAN" ],

data/json/monsters/zed_electric.json

@@ -24,7 +24,7 @@
     "armor_bash": 3,
     "armor_cut": 8,
     "armor_bullet": 6,
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_natural_armor", "wps_humanoid_head_small" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_armored_hide", "wps_humanoid_head_small" ],
     "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_electromagnetics" ],
     "bleed_rate": 0,
     "vision_night": 3,