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.

Sign up for GitHub

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

Adding Physiology (Part 7/7) #69499

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Adding Physiology (Part 7/7) #69499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 21 additions & 20 deletions data/json/monsters/zed-animal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 8 } ],
"dodge": 5,
"luminance": 0,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"harvest": "zombie_leather",
"flags": [
"SEES",
Expand Down Expand Up @@ -67,7 +67,7 @@
"//grab": "Pretty low, but they tend not to be alone",
"grab_strength": 10,
"dodge": 1,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_night": 4,
"harvest": "zombie_dog",
"special_attacks": [ { "id": "bite_grab", "attack_upper": false, "cooldown": 5 }, { "id": "scratch_grab_required" } ],
Expand Down Expand Up @@ -99,7 +99,7 @@
"melee_dice_sides": 5,
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"dodge": 1,
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"vision_day": 50,
"vision_night": 4,
"harvest": "zombie_dog",
Expand Down Expand Up @@ -146,7 +146,7 @@
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"dodge": 1,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"bleed_rate": 50,
"vision_day": 30,
"vision_night": 4,
Expand Down Expand Up @@ -195,7 +195,7 @@
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
"dodge": 2,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_night": 5,
"harvest": "zombie_fur",
"grab_strength": 20,
Expand Down Expand Up @@ -248,7 +248,7 @@
"grab_strength": 25,
"special_attacks": [ { "id": "bite_grab", "move_cost": 150, "cooldown": 3, "min_mul": 0.75, "max_mul": 1.5 }, { "id": "scratch" } ],
"dodge": 2,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 5,
"harvest": "zombie_fur",
Expand Down Expand Up @@ -294,7 +294,7 @@
"melee_dice_sides": 5,
"melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
"dodge": 1,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 50,
"harvest": "zombie_leather",
"path_settings": { "max_dist": 10 },
Expand Down Expand Up @@ -329,7 +329,7 @@
"melee_dice_sides": 6,
"melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
"dodge": 2,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 5,
"harvest": "zombie_fur",
Expand Down Expand Up @@ -360,7 +360,7 @@
"melee_dice": 3,
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 5,
"harvest": "zombie_leather",
Expand Down Expand Up @@ -393,7 +393,7 @@
"melee_dice_sides": 5,
"melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
"dodge": 2,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 10,
"harvest": "zombie_fur",
Expand Down Expand Up @@ -439,7 +439,7 @@
"melee_dice": 3,
"melee_dice_sides": 6,
"melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 3,
"harvest": "zombie_leather",
Expand All @@ -457,7 +457,6 @@
"volume": "150 L",
"weight": "190 kg",
"hp": 200,
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"speed": 110,
"attack_cost": 110,
"symbol": "T",
Expand Down Expand Up @@ -488,7 +487,7 @@
"melee_dice": 1,
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "bash", "amount": 4 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 20,
"vision_night": 3,
"anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ],
Expand Down Expand Up @@ -520,7 +519,7 @@
"melee_dice": 2,
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "bash", "amount": 5 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 3,
"anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ],
Expand Down Expand Up @@ -551,7 +550,7 @@
"melee_dice": 2,
"melee_dice_sides": 10,
"melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 3,
"anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK" ],
Expand Down Expand Up @@ -583,7 +582,7 @@
"melee_dice": 4,
"melee_dice_sides": 6,
"melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_day": 30,
"vision_night": 3,
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
Expand Down Expand Up @@ -632,7 +631,7 @@
"morale": 100,
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
"harvest": "zombie_leather",
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"special_attacks": [
{
"type": "gun",
Expand Down Expand Up @@ -675,7 +674,7 @@
"melee_dice": 3,
"melee_dice_sides": 3,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_night": 15,
"harvest": "zombie_leather",
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ],
Expand Down Expand Up @@ -704,7 +703,7 @@
"melee_dice_sides": 3,
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"dodge": 1,
"families": [ "prof_intro_biology" ],
"families": [ "prof_intro_biology", "prof_physiology" ],
"vision_day": 5,
"vision_night": 5,
"harvest": "arachnid_tainted",
Expand Down Expand Up @@ -750,7 +749,7 @@
"melee_dice": 4,
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_night": 10,
"harvest": "zombie_leather",
"flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ],
Expand Down Expand Up @@ -779,6 +778,8 @@
"melee_damage": [ { "damage_type": "bash", "amount": 5 } ],
"dodge": 2,
"vision_night": 7,
"weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie" ],
"harvest": "zombie_animal_acid",
"path_settings": { "max_dist": 5 },
"special_attacks": [ { "type": "leap", "cooldown": 10, "move_cost": 0, "max_range": 10, "min_consider_range": 2 } ],
Expand Down
20 changes: 10 additions & 10 deletions data/json/monsters/zed-classic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_natural_armor" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_nat_armored" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_nat_armored" ],
"harvest": "zombie_humanoid",
"grab_strength": 20,
"special_attacks": [ { "id": "grab" }, { "id": "bite_humanoid", "cooldown": 5 }, { "id": "scratch_humanoid" } ],
Expand Down Expand Up @@ -71,7 +71,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"vision_night": 3,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"harvest": "zombie_humanoid",
"grab_strength": 20,
"special_attacks": [ { "id": "grab" }, { "id": "bite_humanoid", "cooldown": 5 }, { "id": "scratch_humanoid" } ],
Expand Down Expand Up @@ -118,7 +118,7 @@
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"vision_day": 30,
"vision_night": 3,
"harvest": "zombie_humanoid",
Expand Down Expand Up @@ -167,7 +167,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"vision_day": 10,
"weakpoint_sets": [ "wps_humanoid_head_big" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"harvest": "zombie_humanoid",
"grab_strength": 20,
"special_attacks": [
Expand Down Expand Up @@ -205,7 +205,7 @@
"melee_dice_sides": 4,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_night": 3,
"harvest": "zombie_humanoid",
"grab_strength": 20,
Expand Down Expand Up @@ -253,7 +253,7 @@
"melee_dice_sides": 3,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_turnout_gear", "wps_humanoid_full_helmet" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"vision_night": 3,
"harvest": "zombie_humanoid",
"//grab": "Slightly stronger, but can't bite because of the gear.",
Expand Down Expand Up @@ -302,7 +302,7 @@
"melee_dice_sides": 3,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_gasmask" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"weakpoints": [
{
"name": "a tear in its hazmat suit",
Expand Down Expand Up @@ -359,7 +359,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"vision_night": 3,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"harvest": "zombie_humanoid",
"grab_strength": 15,
"special_attacks": [ { "id": "grab" }, { "id": "bite_humanoid" }, { "id": "scratch_humanoid" } ],
Expand Down Expand Up @@ -394,7 +394,7 @@
"melee_dice_sides": 5,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_syn_armored" ],
"vision_day": 30,
"vision_night": 3,
"harvest": "zombie_humanoid",
Expand Down Expand Up @@ -444,7 +444,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
"dodge": 1,
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"vision_night": 3,
"harvest": "zombie_humanoid",
"grab_strength": 30,
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/zed-pupating.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"melee_dice_sides": 7,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_hulk" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_hulk" ],
"vision_day": 83,
"vision_night": 4,
"harvest": "zombie_pupating_hulk",
Expand Down Expand Up @@ -176,7 +176,7 @@
"melee_dice_sides": 7,
"melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_hulk" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_hulk" ],
"vision_day": 83,
"vision_night": 4,
"harvest": "zombie_pupating_hulk",
Expand Down
8 changes: 4 additions & 4 deletions data/json/monsters/zed-winged.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"bleed_rate": 50,
"vision_night": 3,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_flying" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_flying" ],
"weakpoints": [
{
"id": "arm",
Expand Down Expand Up @@ -91,7 +91,7 @@
"bleed_rate": 0,
"vision_night": 7,
"weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_head_small" ],
"families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_flying" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_flying" ],
"weakpoints": [
{
"id": "arm",
Expand Down Expand Up @@ -154,7 +154,7 @@
"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" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_flying" ],
"vision_night": 5,
"harvest": "zombie_animal",
"special_attacks": [ { "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] } ],
Expand Down Expand Up @@ -219,7 +219,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" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_electromagnetics" ],
"special_attacks": [
[ "SHOCKSTORM", 25 ],
{ "id": "impale", "damage_max_instance": [ { "damage_type": "stab", "amount": 15, "armor_multiplier": 0.6 } ] }
Expand Down
10 changes: 5 additions & 5 deletions data/json/monsters/zed_radiation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
"dodge": 2,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"bleed_rate": 0,
"vision_day": 50,
"vision_night": 3,
Expand Down Expand Up @@ -61,7 +61,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
"dodge": 1,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"bleed_rate": 50,
"vision_day": 50,
"vision_night": 3,
Expand Down Expand Up @@ -95,7 +95,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
"dodge": 1,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"bleed_rate": 50,
"vision_day": 50,
"vision_night": 3,
Expand Down Expand Up @@ -130,7 +130,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
"dodge": 1,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"bleed_rate": 50,
"vision_day": 50,
"vision_night": 3,
Expand Down Expand Up @@ -165,7 +165,7 @@
"melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
"dodge": 2,
"weakpoint_sets": [ "wps_humanoid_body" ],
"families": [ "prof_intro_biology", "prof_wp_zombie" ],
"families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
"bleed_rate": 50,
"vision_day": 50,
"vision_night": 3,
Expand Down
Loading