Scorched zombie audit (#75071)

* vanilla audits * re-add the fiend * double space to please the transifex gods * words aren't real * slight string switch * remove the kinderling death spell * Apply suggestions from code review Co-authored-by: Antti Riikonen <[email protected]> * lasher * move the lasher's lash to a separate special attack * scorched dogs * give lasher the grabber harvestgroup * zombify the dogs + scorched dog biggun renaming --------- Co-authored-by: Antti Riikonen <[email protected]>
CleverRaven · Jul 22, 2024 · 9e5b1a1 · 9e5b1a1
1 parent 7f6f1c9
commit 9e5b1a1
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 71 deletions.
diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json
@@ -341,13 +341,29 @@
     "range": 3,
     "damage_max_instance": [ { "damage_type": "stab", "amount": 10 } ],
     "condition": { "not": { "u_has_effect": "maimed_arm" } },
-    "hit_dmg_u": "%1$s thrusts its arms at you, and its claws pierce your %2$s!",
+    "hit_dmg_u": "%1$s thrusts its arms at you, and its claws rake your %2$s!",
     "hit_dmg_npc": "%1$s thrusts its arms at <npcname>!",
     "no_dmg_msg_u": "%1$s's arms hit your %2$s, but they glance off your armor.",
     "no_dmg_msg_npc": "%1$s's arms hit <npcname>, but they glance off their armor.",
     "miss_msg_u": "%s thrusts its arms at you, but you evade the stretched arm!",
     "miss_msg_npc": "%s's thrusts its arms at <npcname>, but they dodge!"
   },
+  {
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "lash_bash_attack",
+    "cooldown": 20,
+    "move_cost": 200,
+    "range": 3,
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 10 } ],
+    "condition": { "not": { "u_has_effect": "maimed_arm" } },
+    "hit_dmg_u": "%1$s lashes its arms at you, hitting your %2$s!",
+    "hit_dmg_npc": "%1$s lashes its arms at <npcname>!",
+    "no_dmg_msg_u": "%1$s's arms hit your %2$s, but they glance off your armor.",
+    "no_dmg_msg_npc": "%1$s's arms hit <npcname>, but they glance off their armor.",
+    "miss_msg_u": "%s lashes its arms at you, but you evade them!",
+    "miss_msg_npc": "%s's lashes its arms at <npcname>, but they dodge!"
+  },
   {
     "type": "monster_attack",
     "attack_type": "melee",

diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json
@@ -755,23 +755,5 @@
     "min_range": 5,
     "max_range": 5,
     "extra_effects": [ { "id": "death_acid", "hit_self": true } ]
-  },
-  {
-    "id": "death_zombie_kinderling",
-    "type": "SPELL",
-    "name": { "str": "Zombie Kinderling Death" },
-    "description": "Zombie kinderling dies.",
-    "valid_targets": [ "hostile" ],
-    "flags": [ "SILENT", "NO_PROJECTILE", "NO_EXPLOSION_SFX" ],
-    "shape": "blast",
-    "effect": "guilt",
-    "effect_str": "ZOMBIE",
-    "min_damage": 100,
-    "max_damage": 100,
-    "min_duration": 180000,
-    "max_duration": 180000,
-    "min_range": 5,
-    "max_range": 5,
-    "extra_effects": [ { "id": "death_smokeburst", "hit_self": true } ]
   }
 ]
diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -88,7 +88,7 @@
     "monsters": [
       { "monster": "mon_zombie_scorched", "weight": 985 },
       { "monster": "mon_zombie_child_scorched", "weight": 10 },
-      { "monster": "mon_zombie_fiend", "weight": 5, "cost_multiplier": 5 }
+      { "monster": "mon_zombie_scorched_brute", "weight": 5, "cost_multiplier": 5 }
     ]
   },
   {

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -1054,6 +1054,7 @@
     "stomach_size": 250,
     "vision_night": 5,
     "zombify_into": "mon_zombie_dog",
+    "burn_into": "mon_dog_scorched",
     "death_drops": "mon_dog_death_drops",
     "weakpoint_sets": [ "wps_animal_quadruped" ],
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_canine" ],
@@ -1111,6 +1112,7 @@
     "harvest": "dog_small_with_skull",
     "upgrades": { "age_grow": 42, "into": "mon_dog" },
     "zombify_into": "",
+    "burn_into": "",
     "anger_triggers": [  ],
     "fear_triggers": [ "FRIEND_ATTACKED", "FRIEND_DIED", "HURT" ],
     "extend": { "flags": [ "NO_BREED", "SMALL_HIDER" ] },
@@ -1196,6 +1198,7 @@
     "stomach_size": 115,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "zombify_into": "",
+    "burn_into": "",
     "fear_triggers": [ "HURT" ],
     "reproduction": { "baby_monster": "mon_dog_beagle_pup", "baby_count": 4, "baby_timer": 270 },
     "//": "1-4 puppies & 270 days per-litter for size tiny canines",
@@ -1299,6 +1302,7 @@
     "harvest": "dog_tiny_with_skull",
     "fear_triggers": [ "HURT" ],
     "zombify_into": "",
+    "burn_into": "",
     "extend": { "flags": [ "HARDTOSHOOT", "SMALL_HIDER" ] },
     "reproduction": { "baby_monster": "mon_dog_chihuahua_pup", "baby_count": 3, "baby_timer": 240 },
     "//": "1-3 puppies & 240 days per-litter for size tiny canines"
@@ -1341,6 +1345,7 @@
     "fear_triggers": [ "HURT" ],
     "harvest": "dog_small_with_skull_leather",
     "zombify_into": "",
+    "burn_into": "",
     "extend": { "flags": [ "STUMBLES", "SMALL_HIDER", "HARDTOSHOOT" ] },
     "reproduction": { "baby_monster": "mon_dog_dachshund_pup", "baby_count": 4, "baby_timer": 270 },
     "//": "1-4 puppies & 270 days per-litter for size small canines"
@@ -2626,6 +2631,7 @@
     "path_settings": { "max_dist": 10 },
     "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE", "PLAYER_NEAR_BABY" ],
     "zombify_into": "mon_zolf",
+    "burn_into": "mon_dog_scorched",
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "CORNERED_FIGHTER" ],
     "armor": { "bash": 1 }
   },

diff --git a/data/json/monsters/mutant_mammal.json b/data/json/monsters/mutant_mammal.json
@@ -157,6 +157,7 @@
       },
       [ "EAT_FOOD", 60 ]
     ],
+    "burn_into": "mon_dog_scorched",
     "stomach_size": 500,
     "harvest": "mutant_mammal_fur",
     "dissect": "dissect_lupine_sample_single",
@@ -203,6 +204,7 @@
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_canine" ],
     "zombify_into": "mon_meat_cocoon_tiny",
     "special_attacks": [ [ "EAT_FOOD", 60 ], [ "EAT_CARRION", 60 ] ],
+    "burn_into": "mon_dog_scorched",
     "flags": [
       "SEES",
       "HEARS",
@@ -259,6 +261,7 @@
       },
       [ "EAT_FOOD", 60 ]
     ],
+    "burn_into": "mon_dog_scorched_hulk",
     "anger_triggers": [ "STALK", "FRIEND_ATTACKED", "FRIEND_DIED", "PLAYER_WEAK", "PLAYER_CLOSE" ],
     "zombify_into": "mon_meat_cocoon_large",
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "KEENNOSE", "EATS" ],
@@ -373,6 +376,7 @@
     "biosignature": { "biosig_item": "feces_dog", "biosig_timer": 6 },
     "anger_triggers": [ "HURT", "FRIEND_ATTACKED", "FRIEND_DIED" ],
     "special_attacks": [ [ "EAT_FOOD", 100 ], [ "PARROT_AT_DANGER", 0 ], [ "EAT_CARRION", 100 ] ],
+    "burn_into": "mon_dog_scorched",
     "stomach_size": 400,
     "petfood": {
       "food": [ "DOGFOOD" ],
@@ -440,6 +444,7 @@
       [ "PARROT_AT_DANGER", 0 ],
       { "type": "leap", "cooldown": 35, "move_cost": 100, "max_range": 3, "min_consider_range": 2 }
     ],
+    "burn_into": "mon_dog_scorched",
     "stomach_size": 400,
     "petfood": {
       "food": [ "DOGFOOD" ],
@@ -539,6 +544,7 @@
       [ "LUNGE", 6 ],
       { "id": "grab" }
     ],
+    "burn_into": "mon_dog_scorched",
     "stomach_size": 500,
     "petfood": {
       "food": [ "DOGFOOD" ],
@@ -635,6 +641,7 @@
       [ "EAT_FOOD", 100 ],
       { "id": "grab" }
     ],
+    "burn_into": "mon_dog_scorched",
     "stomach_size": 400,
     "petfood": {
       "food": [ "DOGFOOD" ],

diff --git a/data/json/monsters/zanimal_upgrade.json b/data/json/monsters/zanimal_upgrade.json
@@ -87,6 +87,20 @@
     "upgrades": { "half_life": 56, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" },
     "extend": { "special_attacks": [ [ "PARROT_AT_DANGER", 2 ], [ "SHRIEK", 2 ] ], "flags": [ "KEEP_DISTANCE" ] }
   },
+  {
+    "id": "mon_dog_scorched",
+    "type": "MONSTER",
+    "name": { "str": "scorched dog" },
+    "description": "A charred and damaged corpse of a canid, covered in fused patches of burnt hide and flesh.",
+    "copy-from": "mon_zombie_dog",
+    "hp": 27,
+    "speed": 72,
+    "color": "i_brown",
+    "melee_skill": 3,
+    "bleed_rate": 25,
+    "armor": { "bash": 2, "cut": 4, "acid": 3, "heat": 15, "bullet": 2, "electric": 3 },
+    "extend": { "flags": [ "REVIVES_HEALTHY", "NO_NECRO" ] }
+  },
   {
     "id": "mon_dog_zombie_hulk",
     "type": "MONSTER",
@@ -115,9 +129,22 @@
       },
       { "id": "scratch_grab_required" }
     ],
+    "burn_into": "mon_dog_scorched_hulk",
     "extend": { "flags": [ "DESTROYS" ] },
     "armor": { "bash": 8, "cut": 12, "bullet": 10, "electric": 4 }
   },
+  {
+    "id": "mon_dog_scorched_hulk",
+    "type": "MONSTER",
+    "name": { "str": "scorched hulking dog" },
+    "description": "A charred and damaged corpse of what you can only assume was once a horribly mutated dog.  Covering its entire body is a layer of fused and melted hide, giving it an armored appearance.",
+    "copy-from": "mon_dog_zombie_hulk",
+    "proportional": { "hp": 0.75, "speed": 0.6875 },
+    "relative": { "melee_skill": -1 },
+    "color": "i_brown",
+    "armor": { "bash": 9, "cut": 13, "acid": 6, "heat": 15, "bullet": 11, "electric": 3 },
+    "extend": { "flags": [ "REVIVES_HEALTHY", "NO_NECRO" ] }
+  },
   {
     "id": "mon_dog_skeleton_brute",
     "type": "MONSTER",
@@ -193,6 +220,7 @@
     "melee_dice": 3,
     "melee_dice_sides": 7,
     "melee_damage": [ { "damage_type": "cut", "amount": 8 } ],
+    "burn_into": "mon_dog_scorched",
     "dodge": 4,
     "bleed_rate": 50,
     "vision_night": 3,

diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json
@@ -113,6 +113,7 @@
     "harvest": "zombie_dog",
     "special_attacks": [ { "id": "bite_grab", "attack_upper": false, "cooldown": 5 }, { "id": "scratch_grab_required" } ],
     "death_drops": "mon_dog_death_drops",
+    "burn_into": "mon_dog_scorched",
     "upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" },
     "fungalize_into": "mon_zombie_dog_fungus",
     "flags": [

diff --git a/data/json/monsters/zed-winged.json b/data/json/monsters/zed-winged.json
@@ -12,7 +12,6 @@
     "melee_skill": 2,
     "melee_dice_sides": 2,
     "bleed_rate": 50,
-    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_flying" ],
     "weakpoints": [
       {
         "id": "arm",
@@ -31,6 +30,7 @@
       { "id": "scratch_humanoid" },
       { "type": "leap", "cooldown": 10, "max_range": 5 }
     ],
+    "burn_into": "mon_zombie_scorched_lasher",
     "upgrades": { "half_life": 35, "into": "mon_zombie_brute_winged" },
     "extend": { "families": [ "prof_wp_flying" ], "flags": [ "SMELLS" ] },
     "//": "In the future, it would be nice if these guys could be resistant to fall damage."
@@ -72,8 +72,7 @@
       { "id": "scratch_humanoid" },
       { "type": "leap", "cooldown": 2, "max_range": 8 }
     ],
-    "death_drops": "default_zombie_death_drops",
-    "burn_into": "mon_zombie_scorched",
+    "burn_into": "mon_zombie_scorched_lasher",
     "armor": { "bash": 2, "cut": 2, "bullet": 2, "electric": 1 },
     "extend": { "families": [ "prof_wp_flying" ], "flags": [ "SMELLS" ] }
   },