Merge pull request #59113 from SolventMercury/master

Add Weakpoint Proficiencies to More Zombies
CleverRaven · Jul 11, 2022 · 449d78b · 449d78b
2 parents c1a0608 + 74a2f14
commit 449d78b
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 3 deletions.
diff --git a/data/json/monsters/zanimal_upgrade.json b/data/json/monsters/zanimal_upgrade.json
@@ -26,6 +26,8 @@
     "armor_stab": 30,
     "armor_acid": 3,
     "armor_elec": 1,
+    "weakpoint_sets": [ "wps_bone_armor" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_skeleton" ],
     "bleed_rate": 50,
     "vision_night": 3,
     "harvest": "mr_bones",
@@ -178,6 +180,8 @@
     "armor_stab": 30,
     "armor_acid": 3,
     "armor_elec": 3,
+    "weakpoint_sets": [ "wps_bone_armor" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_skeleton" ],
     "bleed_rate": 50,
     "vision_night": 3,
     "harvest": "mr_bones",
@@ -231,6 +235,8 @@
     "armor_stab": 30,
     "armor_acid": 3,
     "armor_elec": 3,
+    "weakpoint_sets": [ "wps_bone_armor" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_skeleton" ],
     "bleed_rate": 0,
     "vision_day": 10,
     "harvest": "mr_bones",

diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json
@@ -25,6 +25,7 @@
     "armor_cut": 2,
     "armor_bullet": 2,
     "luminance": 0,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "harvest": "zombie_leather",
     "flags": [
       "SEES",
@@ -64,6 +65,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "dodge": 1,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_night": 4,
     "harvest": "zombie",
     "special_attacks": [ { "type": "bite", "attack_upper": false, "cooldown": 5 } ],
@@ -97,6 +99,7 @@
     "armor_cut": 6,
     "armor_bullet": 5,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_syn_armored" ],
     "vision_day": 50,
     "vision_night": 4,
     "harvest": "zombie",
@@ -128,6 +131,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "dodge": 1,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "bleed_rate": 50,
     "vision_day": 30,
     "vision_night": 4,
@@ -160,6 +164,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
     "dodge": 2,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_night": 5,
     "harvest": "zombie_fur",
     "special_attacks": [ [ "HOWL", 10 ], { "type": "bite", "attack_upper": false, "cooldown": 2, "accuracy": 4, "infection_chance": 8 } ],
@@ -194,6 +199,7 @@
     "armor_cut": 2,
     "armor_bullet": 2,
     "armor_elec": 2,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 30,
     "vision_night": 5,
     "harvest": "zombie_fur",
@@ -225,6 +231,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
     "dodge": 1,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 50,
     "harvest": "zombie_leather",
     "path_settings": { "max_dist": 10 },
@@ -258,6 +265,7 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
     "dodge": 2,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 30,
     "vision_night": 5,
     "harvest": "zombie_leather",
@@ -290,6 +298,7 @@
     "armor_cut": 4,
     "armor_bullet": 3,
     "armor_elec": 2,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 30,
     "vision_night": 5,
     "harvest": "zombie_leather",
@@ -322,6 +331,7 @@
     "dodge": 2,
     "armor_bash": 1,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 30,
     "vision_night": 10,
     "harvest": "zombie_fur",
@@ -369,6 +379,7 @@
     "armor_bash": 5,
     "armor_cut": 1,
     "armor_elec": 2,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 30,
     "vision_night": 3,
     "harvest": "zombie_leather",
@@ -385,6 +396,7 @@
     "weight": "190 kg",
     "hp": 200,
     "armor_elec": 2,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "speed": 110,
     "symbol": "T",
     "melee_dice": 3,
@@ -415,6 +427,7 @@
     "armor_bash": 3,
     "armor_cut": 3,
     "armor_elec": 3,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 30,
     "vision_night": 3,
     "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ],
@@ -447,6 +460,7 @@
     "armor_cut": 4,
     "armor_bullet": 3,
     "armor_elec": 4,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 30,
     "vision_night": 3,
     "anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
@@ -494,6 +508,7 @@
     "armor_bash": 1,
     "armor_cut": 3,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_night": 15,
     "harvest": "zombie_leather",
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ]
@@ -524,6 +539,7 @@
     "armor_stab": 3,
     "armor_bullet": 2,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology" ],
     "vision_day": 5,
     "vision_night": 5,
     "harvest": "arachnid_tainted",
@@ -570,6 +586,7 @@
     "armor_bash": 5,
     "armor_cut": 4,
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_night": 10,
     "harvest": "zombie_leather",
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ]

diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json
@@ -24,8 +24,8 @@
     "armor_cut": 8,
     "armor_bullet": 6,
     "armor_elec": 1,
-    "weakpoint_sets": [ "wps_humanoid_body" ],
-    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_nat_armored" ],
     "harvest": "zombie",
     "special_attacks": [ { "type": "bite", "cooldown": 5 } ],
     "death_drops": {

diff --git a/data/json/monsters/zed_acid.json b/data/json/monsters/zed_acid.json
@@ -245,6 +245,7 @@
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 }, { "damage_type": "acid", "amount": 4 } ],
     "armor_elec": 1,
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "dodge": 1,
     "harvest": "zombie",
     "special_attacks": [ { "type": "bite", "attack_upper": false, "cooldown": 5 }, [ "ACID_BARF", 10 ] ],

diff --git a/data/json/monsters/zed_burned.json b/data/json/monsters/zed_burned.json
@@ -78,6 +78,8 @@
     "armor_acid": 5,
     "armor_fire": 15,
     "armor_elec": 3,
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_bone_armor" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_burn_care" ],
     "bleed_rate": 0,
     "vision_day": 10,
     "vision_night": 3,
@@ -114,6 +116,8 @@
     "armor_acid": 3,
     "armor_fire": 15,
     "armor_elec": 3,
+    "weakpoint_sets": [ "wps_humanoid_body" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_burn_care" ],
     "bleed_rate": 0,
     "vision_day": 10,
     "vision_night": 3,

diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json
@@ -285,6 +285,8 @@
     "melee_dice_sides": 2,
     "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" ],
     "dodge": 1,
     "vision_day": 20,
     "vision_night": 3,

diff --git a/data/json/monsters/zed_lab.json b/data/json/monsters/zed_lab.json
@@ -24,6 +24,8 @@
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "dodge": 1,
     "armor_elec": 1,
+    "weakpoint_sets": [ "wps_humanoid_body" ],
+    "families": [ "prof_intro_biology", "prof_wp_zombie" ],
     "vision_day": 50,
     "vision_night": 3,
     "harvest": "zombie",

diff --git a/data/json/proficiencies/weakpoints.json b/data/json/proficiencies/weakpoints.json
@@ -141,7 +141,7 @@
     "type": "proficiency",
     "id": "prof_wp_skeleton",
     "category": "prof_weakpoint",
-    "name": { "str": "Natural Exoskeletons" },
+    "name": { "str": "Ossified Exoskeletons" },
     "description": "You're familiar with creatures presenting unsettling bones on their outer structure.",
     "can_learn": true,
     "time_to_learn": "6 h",