From 7de497be47ee3f70c42ebedb98f4a069cfa6a725 Mon Sep 17 00:00:00 2001 From: SolventMercury Date: Thu, 27 Apr 2023 13:47:40 -0700 Subject: [PATCH 1/5] Weakpoints & Proficiencies for Zombie-Adjacent Monsters --- data/json/monsters/feral_humans.json | 9 +++++---- data/json/monsters/fungus_zombie.json | 18 +++++++++++++++++- data/json/monsters/jabberwock.json | 3 +++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index f7a5d794037ef..0a35c879ecac4 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -125,7 +125,7 @@ "id": "mon_chud", "type": "MONSTER", "name": { "str": "feral troglobite" }, - "description": "This person is still alive but completely crazed, changed by something they are exposed to down here. Their face is dominated by unnaturally large, faintly glowing eyes and needle-sharp teeth poking through their lips. They remind you of something out of a campy monster movie - and of the good times when underground cannibals were less of a real concern.", + "description": "This person is still alive but completely crazed, changed by something they were exposed to down here. Their face is dominated by unnaturally large, faintly glowing eyes and needle-sharp teeth poking through their lips. They remind you of something out of a campy monster movie - and of the good times when underground cannibals were less of a real concern.", "copy-from": "mon_feral_human_pipe", "looks_like": "mon_zombie_runner", "symbol": "@", @@ -618,7 +618,7 @@ "id": "mon_feral_militia", "type": "MONSTER", "name": { "str": "mad militia" }, - "description": "Wearing a tactical camo uniform with a Kevlar vest, this person seems to have been a militia member, now turned feral. Their hands grip unto a semi-automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their forehead illuminates their presence and surroundings.", + "description": "Wearing a tactical camo uniform with a Kevlar vest, this person seems to have been a militia member, now turned feral. Their hands grip unto a semi-automatic rifle as their bloodshot eyes scan for threats; a flashlight strapped to their helmet illuminates their presence and surroundings.", "default_faction": "zombie", "bodytype": "human", "species": [ "HUMAN" ], @@ -737,6 +737,7 @@ "melee_dice_sides": 3, "dodge": 1, "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ], "vision_day": 50, "vision_night": 3, "harvest": "human", @@ -908,7 +909,7 @@ "melee_dice_sides": 4, "dodge": 2, "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ], - "families": [ "prof_intro_biology", "prof_physiology" ], + "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ], "special_attacks": [ [ "PARROT_AT_DANGER", 0 ], { @@ -1049,7 +1050,7 @@ "id": "mon_feral_human_archaeologist", "type": "MONSTER", "name": "feral archaeologist", - "description": "Judging by looks, this poor individual was probably an archeologist in their former life. Maniac and bloodshot, it now seems intent to make you a part of its collection of artifacts, as it comes at you with a shovel in hand.", + "description": "Judging by looks, this poor individual was probably an archeologist in their former life. Rabid and bloodshot, they now seem intent to make you a part of their collection as they come at you with a shovel in hand.", "copy-from": "mon_feral_human_pipe", "looks_like": "mon_feral_human_tool", "death_drops": "feral_archaelogist_death_drops" diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index ceff4f2964329..c459cf873401c 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -21,6 +21,8 @@ "melee_dice": 1, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_intro_biology", "prof_wp_zombie" ], "bleed_rate": 0, "vision_day": 5, "vision_night": 5, @@ -54,6 +56,8 @@ "melee_dice": 2, "melee_dice_sides": 4, "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_intro_biology", "prof_wp_zombie" ], "bleed_rate": 0, "vision_day": 5, "vision_night": 5, @@ -88,6 +92,8 @@ "melee_dice": 1, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_intro_biology", "prof_wp_zombie" ], "dodge": 4, "bleed_rate": 0, "vision_day": 5, @@ -133,7 +139,7 @@ "proportional": { "hp": 1.5, "speed": 1.5 }, "relative": { "melee_dice": 1, "melee_dice_sides": 5, "melee_damage": 2, "armor": { "bash": 4, "cut": 6, "bullet": 5 } }, "special_attacks": [ [ "SMASH", 30 ], [ "FUNGUS", 200 ] ], - "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH", "HARDTOSHOOT" ] }, + "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH", "HARDTOSHOOT" ], "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }, "harvest": "mr_bones", "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } } }, @@ -160,6 +166,8 @@ "melee_dice": 3, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 15 } ], + "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ], + "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_hulk" ], "bleed_rate": 0, "vision_day": 5, "vision_night": 5, @@ -205,6 +213,8 @@ "melee_dice": 1, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_child_body", "wps_humanoid_head_big" ], + "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_child" ], "dodge": 2, "bleed_rate": 0, "vision_day": 30, @@ -242,6 +252,8 @@ "melee_dice": 2, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "weakpoint_sets": [ "wps_humanoid_body" ], + "families": [ "prof_intro_biology", "prof_wp_zombie" ], "bleed_rate": 0, "vision_day": 30, "vision_night": 3, @@ -274,6 +286,8 @@ "melee_dice": 2, "melee_dice_sides": 2, "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "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": 2, "vision_night": 2, "emit_fields": [ { "emit_id": "emit_fungal_leak", "delay": "1 s" } ], @@ -313,6 +327,8 @@ "melee_dice": 2, "melee_dice_sides": 3, "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], + "weakpoint_sets": [ "wps_arthropod_hymenoptera", "wps_arthropod_flying" ], + "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_flying" ], "dodge": 3, "vision_night": 5, "harvest": "zombie", diff --git a/data/json/monsters/jabberwock.json b/data/json/monsters/jabberwock.json index 42754fa4af2c6..27abdefbe58ec 100644 --- a/data/json/monsters/jabberwock.json +++ b/data/json/monsters/jabberwock.json @@ -19,6 +19,7 @@ "melee_dice": 2, "melee_dice_sides": 4, "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], + "families": [ "prof_intro_biology", "prof_wp_demihuman" ], "bleed_rate": 80, "vision_day": 50, "vision_night": 3, @@ -50,6 +51,7 @@ "melee_dice": 4, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "families": [ "prof_intro_biology", "prof_wp_demihuman" ], "bleed_rate": 60, "vision_day": 50, "vision_night": 3, @@ -81,6 +83,7 @@ "melee_dice": 4, "melee_dice_sides": 8, "melee_damage": [ { "damage_type": "cut", "amount": 3 } ], + "families": [ "prof_intro_biology", "prof_wp_demihuman" ], "dodge": 3, "bleed_rate": 40, "vision_day": 50, From f0cf2dcce1c1e3ef729421a09f25cd05894dab1f Mon Sep 17 00:00:00 2001 From: SolventMercury <87032239+SolventMercury@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:12:51 -0700 Subject: [PATCH 2/5] Update data/json/monsters/fungus_zombie.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/monsters/fungus_zombie.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index c459cf873401c..0da862825174a 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -139,7 +139,11 @@ "proportional": { "hp": 1.5, "speed": 1.5 }, "relative": { "melee_dice": 1, "melee_dice_sides": 5, "melee_damage": 2, "armor": { "bash": 4, "cut": 6, "bullet": 5 } }, "special_attacks": [ [ "SMASH", 30 ], [ "FUNGUS", 200 ] ], - "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH", "HARDTOSHOOT" ], "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }, + "extend": { + "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH", "HARDTOSHOOT" ], + "weakpoint_sets": [ "wps_bone_armor" ], + "families": [ "prof_wp_skeleton" ] + }, "harvest": "mr_bones", "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } } }, From dcf0bb4e444ef5f80d03b0c24d888bee673c145a Mon Sep 17 00:00:00 2001 From: SolventMercury <87032239+SolventMercury@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:13:01 -0700 Subject: [PATCH 3/5] Update data/json/monsters/fungus_zombie.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/monsters/fungus_zombie.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index 0da862825174a..22a5e392190bd 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -217,7 +217,7 @@ "melee_dice": 1, "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "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" ], "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_child" ], "dodge": 2, "bleed_rate": 0, From 239724c291cf476d7e6809835304c0b143a0c6b7 Mon Sep 17 00:00:00 2001 From: SolventMercury <87032239+SolventMercury@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:13:10 -0700 Subject: [PATCH 4/5] Update data/json/monsters/fungus_zombie.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/monsters/fungus_zombie.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index 22a5e392190bd..91dff625b9bbf 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -290,7 +290,7 @@ "melee_dice": 2, "melee_dice_sides": 2, "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], - "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" ], "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_child" ], "vision_day": 2, "vision_night": 2, From 65ee1265bd07a6f87f645d1b2adc7fff77d4d0e3 Mon Sep 17 00:00:00 2001 From: SolventMercury Date: Thu, 27 Apr 2023 15:47:04 -0700 Subject: [PATCH 5/5] Fixed Incorrect Proficiency - Fixed the incorrect use of the Synthetic Armors proficiency on an enemy with no armor. --- data/json/monsters/feral_humans.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json index 0a35c879ecac4..724d5efd8e8ad 100644 --- a/data/json/monsters/feral_humans.json +++ b/data/json/monsters/feral_humans.json @@ -737,7 +737,7 @@ "melee_dice_sides": 3, "dodge": 1, "weakpoint_sets": [ "wps_humanoid_body" ], - "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ], + "families": [ "prof_intro_biology", "prof_physiology" ], "vision_day": 50, "vision_night": 3, "harvest": "human",