Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chain zombie dogs via copy-from #75102

Merged
merged 3 commits into from
Jul 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 11 additions & 82 deletions data/json/monsters/zanimal_upgrade.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,27 @@
"type": "MONSTER",
"name": { "str": "skeletal dog" },
"description": "This undead canine has shed all of its skin, revealing a carapace of fused bones and ribs. This walking suit of bone seems to be controlled by a net of veins and sinews which pulse with glistening black goo.",
"default_faction": "zombie",
"bodytype": "dog",
"species": [ "ZOMBIE" ],
"volume": "30000 ml",
"weight": "40750 g",
"copy-from": "mon_zombie_dog",
"hp": 12,
"speed": 100,
"material": [ "bone" ],
"symbol": "d",
"color": "white",
"scents_tracked": [ "sc_human", "sc_fetid" ],
"aggression": 100,
"morale": 100,
"melee_skill": 4,
"melee_dice": 1,
"melee_dice_sides": 9,
"melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
"grab_strength": 20,
"dodge": 3,
"weakpoint_sets": [ "wps_animal_quadruped", "wps_bone_armor" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_canine", "prof_wp_skeleton" ],
"bleed_rate": 50,
"vision_night": 3,
"harvest": "doggy_bones",
"special_attacks": [ { "id": "bite_grab", "attack_upper": false, "cooldown": 5 }, { "id": "scratch_grab_required", "max_mul": 1.5 } ],
"death_drops": "mon_dog_death_drops",
"upgrades": { "half_life": 42, "into": "mon_dog_skeleton_brute" },
"flags": [ "SEES", "HEARS", "NO_BREATHE", "REVIVES", "POISON", "FILTHY" ],
"armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 12, "electric": 1 }
"armor": { "cut": 15, "stab": 30, "acid": 3, "bullet": 12, "electric": 1 },
"delete": { "flags": [ "SMELLS" ] },
"extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ] }
},
{
"id": "mon_dog_zombie_brute",
"type": "MONSTER",
"name": { "str": "barghest" },
"copy-from": "mon_dog_zombie_rot",
"harvest": "zombie_dog",
"description": "A huge swollen zombie dog, smeared black with slime. Its teeth have grown longer, and its broad back ripples with muscles and oozing wounds.",
"diff": 2,
"color": "red",
Expand All @@ -51,7 +36,6 @@
"vision_night": 1,
"armor": { "bash": 4, "cut": 6, "bullet": 5, "electric": 1 }
},
"bleed_rate": 50,
"upgrades": { "half_life": 42, "into": "mon_dog_zombie_hulk" },
"grab_strength": 30,
"special_attacks": [
Expand All @@ -65,102 +49,49 @@
"infection_chance": 8
}
],
"extend": { "flags": [ "GROUP_BASH", "PUSH_VEH" ] }
"extend": { "flags": [ "PUSH_MON", "PUSH_VEH" ] }
},
{
"id": "mon_dog_cuspated",
"type": "MONSTER",
"name": { "str": "cuspated dog" },
"//": "Cuspated just means angled, sharp, pointy. Other ways of translating the feel of the name may be something akin to 'scythe dog', or 'beaked beast'.",
"description": "This dog's snout and jaw have seemingly fused together, the skin and flesh ranging from completely gone to barely hanging on. The boney mass as a whole has an incredibly sharp yet jagged point. It stumbles around, barely keeping its hefty 'beak' from hitting the ground.",
"default_faction": "zombie",
"bodytype": "dog",
"species": [ "ZOMBIE" ],
"volume": "30000 ml",
"weight": "40750 g",
"copy-from": "mon_zombie_dog",
"hp": 30,
"speed": 65,
"material": [ "flesh" ],
"symbol": "d",
"color": "white_red",
"scents_tracked": [ "sc_human", "sc_fetid" ],
"aggression": 100,
"morale": 100,
"melee_skill": 3,
"melee_dice": 1,
"melee_dice_sides": 6,
"melee_damage": [ { "damage_type": "stab", "amount": 10, "armor_penetration": 8 } ],
"grab_strength": 0,
"weakpoint_sets": [ "wps_animal_quadruped" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_canine" ],
"vision_day": 15,
"vision_night": 5,
"harvest": "zombie_dog",
"upgrades": false,
"//2": "Can't bite because it doesn't exactly have a mouth anymore. Instead, it's effectively a one-hit, one-trick wonder. It tries to drive its extremely sharp beak into you. If it succeeds, you're thoroughly damaged. If it fails, it's screwed.",
"special_attacks": [ { "id": "wicked_impale", "attack_upper": false } ],
"death_drops": "mon_dog_death_drops",
"fungalize_into": "mon_zombie_dog_fungus",
"flags": [ "SEES", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ],
"//3": "Minor amounts of protection due to the boney jaw.",
"armor": { "cut": 5, "stab": 8, "acid": 1, "bullet": 8, "electric": 1 }
"armor": { "cut": 5, "stab": 8, "acid": 1, "bullet": 8, "electric": 1 },
"delete": { "flags": [ "GRABS", "SMELLS" ] }
},
{
"id": "mon_dog_howling",
"type": "MONSTER",
"name": { "str": "howling dog" },
"description": "The underbelly of this undead canine expands and contracts arrhythmically, almost like it's breathing. Despite that, it is clearly in an advanced state of decomposition. Its snout and throat appear far too large for its species, and the remains of its eyes appear much more analytical than its brethren.",
"default_faction": "zombie",
"bodytype": "dog",
"species": [ "ZOMBIE" ],
"volume": "30000 ml",
"weight": "40750 g",
"copy-from": "mon_zombie_dog",
"hp": 34,
"speed": 85,
"material": [ "flesh" ],
"symbol": "d",
"color": "magenta",
"scents_tracked": [ "sc_human", "sc_fetid" ],
"tracking_distance": 5,
"aggression": 5,
"morale": 100,
"melee_skill": 4,
"melee_dice": 1,
"melee_dice_sides": 6,
"harvest": "zombie_dog",
"weakpoint_sets": [ "wps_animal_quadruped" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_canine" ],
"special_attacks": [
{ "id": "bite_grab", "attack_upper": false, "cooldown": 5 },
{ "id": "scratch_grab_required" },
[ "PARROT_AT_DANGER", 2 ],
[ "SHRIEK", 2 ]
],
"anger_triggers": [ "HURT", "PLAYER_WEAK", "PLAYER_CLOSE" ],
"death_drops": "mon_dog_death_drops",
"upgrades": { "half_life": 56, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" },
"fungalize_into": "mon_zombie_dog_fungus",
"flags": [
"SEES",
"HEARS",
"KEEP_DISTANCE",
"SMELLS",
"GRABS",
"STUMBLES",
"WARM",
"BASHES",
"POISON",
"NO_BREATHE",
"REVIVES",
"FILTHY"
],
"armor": { "electric": 1 }
"extend": { "special_attacks": [ [ "PARROT_AT_DANGER", 2 ], [ "SHRIEK", 2 ] ], "flags": [ "KEEP_DISTANCE" ] }
},
{
"id": "mon_dog_zombie_hulk",
"type": "MONSTER",
"name": { "str": "hulking horror" },
"copy-from": "mon_dog_zombie_brute",
"harvest": "zombie_dog",
"description": "What may once have been a dog is now a grotesquely swollen monstrosity, standing on four limbs as wide as trash cans and showing massive, jagged teeth.",
"diff": 5,
"volume": "440 L",
Expand Down Expand Up @@ -191,15 +122,13 @@
"id": "mon_dog_skeleton_brute",
"type": "MONSTER",
"copy-from": "mon_dog_skeleton",
"harvest": "doggy_bones",
"name": { "str": "boneplate wolf", "str_pl": "boneplate wolves" },
"description": "A four-legged creature covered in fused bony plates, shaped somewhat like a dog or wolf. Joints and cracks across its body ooze with black goo.",
"volume": "46 L",
"weight": "60 kg",
"hp": 70,
"relative": { "melee_dice": 1, "melee_dice_sides": 2, "melee_damage": 6 },
"bleed_rate": 0,
"death_drops": "mon_dog_death_drops",
"special_attacks": [
{ "id": "bite_grab", "attack_upper": false, "cooldown": 5, "max_mul": 1.5 },
{
Expand Down
93 changes: 19 additions & 74 deletions data/json/monsters/zed-animal.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,107 +115,52 @@
"death_drops": "mon_dog_death_drops",
"upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" },
"fungalize_into": "mon_zombie_dog_fungus",
"flags": [ "SEES", "HEARS", "SMELLS", "GRABS", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ],
"flags": [
"SEES",
"HEARS",
"SMELLS",
"GRABS",
"STUMBLES",
"WARM",
"BASHES",
"GROUP_BASH",
"POISON",
"NO_BREATHE",
"REVIVES",
"FILTHY"
],
"armor": { "electric": 1 }
},
{
"id": "mon_dog_zombie_cop",
"type": "MONSTER",
"name": { "str": "Z-9" },
"description": "A zombified version of one of the German Shepherd dogs used in law enforcement. Its deformed body is encased in a protective Kevlar harness.",
"default_faction": "zombie",
"bodytype": "dog",
"species": [ "ZOMBIE" ],
"volume": "30000 ml",
"weight": "40750 g",
"copy-from": "mon_zombie_dog",
"hp": 42,
"speed": 105,
"material": [ "flesh" ],
"symbol": "d",
"color": "blue",
"scents_tracked": [ "sc_human", "sc_fetid" ],
"aggression": 100,
"morale": 100,
"melee_skill": 5,
"melee_dice": 2,
"melee_dice_sides": 5,
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"dodge": 1,
"weakpoint_sets": [ "wps_animal_quadruped" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored", "prof_wp_canine" ],
"vision_day": 50,
"vision_night": 4,
"harvest": "zombie_dog",
"grab_strength": 10,
"special_attacks": [ { "id": "bite_grab", "attack_upper": false, "cooldown": 5 }, { "id": "scratch_grab_required" } ],
"death_drops": { "subtype": "collection", "groups": [ [ "dog_cop", 40 ] ], "//": "40% chance of an item from group dog_cop" },
"upgrades": { "half_life": 30, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" },
"fungalize_into": "mon_zombie_dog_fungus",
"flags": [
"SEES",
"HEARS",
"SMELLS",
"STUMBLES",
"WARM",
"GRABS",
"BASHES",
"POISON",
"NO_BREATHE",
"REVIVES",
"PUSH_MON",
"FILTHY"
],
"armor": { "bash": 6, "cut": 6, "bullet": 5, "electric": 1 }
"armor": { "bash": 6, "cut": 6, "bullet": 5, "electric": 1 },
"extend": { "families": [ "prof_wp_syn_armored" ] }
},
{
"id": "mon_dog_zombie_rot",
"type": "MONSTER",
"name": { "str": "rot-weiler" },
"description": "An acrid smell accompanies this animated canine corpse. Its whole body is covered in chains of pulsing cysts and slime-dribbling ulcers.",
"default_faction": "zombie",
"bodytype": "dog",
"species": [ "ZOMBIE" ],
"volume": "30000 ml",
"weight": "40750 g",
"copy-from": "mon_zombie_dog",
"hp": 24,
"speed": 105,
"material": [ "flesh" ],
"symbol": "d",
"color": "yellow",
"scents_tracked": [ "sc_human", "sc_fetid" ],
"aggression": 100,
"morale": 100,
"melee_skill": 1,
"melee_dice": 1,
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"dodge": 1,
"weakpoint_sets": [ "wps_animal_quadruped" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_canine" ],
"bleed_rate": 50,
"vision_day": 30,
"vision_night": 4,
"harvest": "zombie_dog",
"grab_strength": 10,
"special_attacks": [ { "id": "bite_grab", "attack_upper": false, "cooldown": 2 }, { "id": "scratch_grab_required" } ],
"death_drops": "mon_dog_death_drops",
"upgrades": { "half_life": 42, "into": "mon_dog_zombie_brute" },
"fungalize_into": "mon_zombie_dog_fungus",
"flags": [
"SEES",
"HEARS",
"SMELLS",
"STUMBLES",
"WARM",
"GRABS",
"BASHES",
"POISON",
"NO_BREATHE",
"REVIVES",
"PUSH_MON",
"FILTHY"
],
"armor": { "electric": 1 }
"fungalize_into": "mon_zombie_dog_fungus"
},
{
"id": "mon_zolf",
Expand Down
Loading