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

Jump to bottom

Add bleed resistance to monsters #49546

Merged
merged 13 commits into from Jul 7, 2021
Merged

Add bleed resistance to monsters #49546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
05eb1e5
Code part
Venera3 Jul 3, 2021
34cb80c
Update src/creature.h
Venera3 Jul 3, 2021
c30be0e
Update src/creature.cpp
Venera3 Jul 4, 2021
d65f4c1
Update src/monster.cpp
Venera3 Jul 4, 2021
772981a
Longswipe slipped through
Venera3 Jul 4, 2021
350946e
Merge branch 'bleedresist' of https://github.com/Venera3/Cataclysm-DD…
Venera3 Jul 4, 2021
28d8834
Clang happy?
Venera3 Jul 4, 2021
5b5ae8a
Ia ia clang fhtagn
Venera3 Jul 5, 2021
2867154
Merge branch 'bleedresist' of https://github.com/Venera3/Cataclysm-DD…
Venera3 Jul 5, 2021
6571e13
Actual monster changes
Venera3 Jul 6, 2021
674a25d
Merge branch 'master' into bleedresist
Venera3 Jul 6, 2021
3d169ff
Creature effect test
Venera3 Jul 6, 2021
9046880
Merge branch 'bleedresist' of https://github.com/Venera3/Cataclysm-DD…
Venera3 Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions data/json/monsters/cyborgs.json
View file
Open in desktop
Expand Up @@ -193,6 +193,7 @@
"melee_cut": 12,
"armor_bash": 12,
"armor_cut": 28,
"bleed_rate": 50,
"vision_night": 3,
"special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "GRAB", 7 ], [ "scratch", 20 ] ],
"death_drops": { "subtype": "collection", "groups": [ [ "robots", 80 ] ] },
Expand Down
4 changes: 4 additions & 0 deletions data/json/monsters/fish.json
View file
Open in desktop
Expand Up @@ -25,6 +25,7 @@
"armor_bash": 20,
"armor_cut": 30,
"armor_bullet": 24,
"bleed_rate": 60,
"vision_day": 30,
"vision_night": 20,
"path_settings": { "max_dist": 50, "avoid_traps": true, "avoid_sharp": true },
Expand Down Expand Up @@ -628,6 +629,7 @@
"dodge": 2,
"armor_cut": 8,
"armor_bullet": 6,
"bleed_rate": 85,
"harvest": "shellfish",
"anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
"fear_triggers": [ "FIRE" ],
Expand All @@ -645,6 +647,7 @@
"volume": "625 L",
"weight": "815 kg",
"melee_dice": 2,
"bleed_rate": 60,
"special_attacks": [
[ "PARROT", 20 ],
{ "id": "scratch", "damage_max_instance": [ { "damage_type": "cut", "amount": 23, "armor_multiplier": 0.8 } ] }
Expand Down Expand Up @@ -677,6 +680,7 @@
"armor_bash": 10,
"armor_cut": 18,
"armor_bullet": 14,
"bleed_rate": 65,
"vision_day": 30,
"vision_night": 15,
"path_settings": { "max_dist": 50, "avoid_traps": true, "avoid_sharp": true },
Expand Down
16 changes: 16 additions & 0 deletions data/json/monsters/fungus.json
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@
"melee_dice_sides": 6,
"melee_cut": 0,
"armor_bash": 2,
"bleed_rate": 0,
"vision_day": 30,
"vision_night": 3,
"harvest": "zombie",
Expand Down Expand Up @@ -52,6 +53,7 @@
"armor_bash": 4,
"armor_cut": 4,
"armor_bullet": 3,
"bleed_rate": 0,
"luminance": 40,
"harvest": "exempt",
"special_attacks": [ [ "FUNGUS_HAZE", 25 ] ],
Expand Down Expand Up @@ -82,6 +84,7 @@
"armor_bash": 10,
"armor_cut": 10,
"armor_bullet": 8,
"bleed_rate": 0,
"harvest": "exempt",
"special_attacks": [ [ "FUNGUS_BRISTLE", 10 ] ],
"death_function": [ "DISINTEGRATE" ],
Expand Down Expand Up @@ -112,6 +115,7 @@
"armor_bash": 10,
"armor_cut": 4,
"armor_bullet": 3,
"bleed_rate": 0,
"harvest": "exempt",
"special_attacks": [ [ "FUNGUS_INJECT", 10 ] ],
"death_function": [ "FUNGUS" ],
Expand Down Expand Up @@ -141,6 +145,7 @@
"armor_bash": 10,
"armor_cut": 10,
"armor_bullet": 8,
"bleed_rate": 0,
"harvest": "exempt",
"special_attacks": [ [ "FUNGUS", 10 ] ],
"death_function": [ "DISINTEGRATE" ],
Expand Down Expand Up @@ -169,6 +174,7 @@
"melee_dice_sides": 4,
"melee_cut": 0,
"armor_bash": 4,
"bleed_rate": 0,
"harvest": "fungaloid",
"special_attacks": [ [ "FUNGUS", 30 ] ],
"death_function": [ "FUNGUS", "NORMAL" ],
Expand All @@ -189,6 +195,7 @@
"armor_bullet": 20,
"armor_stab": 20,
"armor_acid": 3,
"bleed_rate": 0,
"special_attacks": [
[ "FUNGUS", 20 ],
{
Expand Down Expand Up @@ -316,6 +323,7 @@
"armor_bash": 4,
"armor_cut": 4,
"armor_bullet": 3,
"bleed_rate": 0,
"harvest": "fungaloid",
"special_attacks": [ [ "FUNGUS_GROWTH", 10000 ] ],
"death_function": [ "NORMAL" ],
Expand All @@ -340,6 +348,7 @@
"morale": 75,
"melee_cut": 0,
"dodge": 2,
"bleed_rate": 0,
"harvest": "exempt",
"special_attacks": [ [ "PLANT", 100 ] ],
"death_function": [ "DISINTEGRATE" ],
Expand Down Expand Up @@ -369,6 +378,7 @@
"melee_dice_sides": 6,
"melee_cut": 0,
"armor_bash": 3,
"bleed_rate": 0,
"vision_day": 5,
"vision_night": 5,
"harvest": "zombie",
Expand Down Expand Up @@ -401,6 +411,7 @@
"melee_dice": 2,
"melee_dice_sides": 4,
"melee_cut": 0,
"bleed_rate": 0,
"vision_day": 5,
"vision_night": 5,
"harvest": "exempt",
Expand Down Expand Up @@ -435,6 +446,7 @@
"melee_cut": 2,
"dodge": 4,
"armor_fire": 5,
"bleed_rate": 0,
"vision_day": 5,
"vision_night": 3,
"harvest": "zombie",
Expand Down Expand Up @@ -469,6 +481,7 @@
"armor_bash": 20,
"armor_cut": 45,
"armor_bullet": 36,
"bleed_rate": 0,
"vision_day": 5,
"vision_night": 5,
"harvest": "mr_bones",
Expand Down Expand Up @@ -513,6 +526,7 @@
"melee_dice_sides": 6,
"melee_cut": 2,
"dodge": 2,
"bleed_rate": 0,
"vision_day": 30,
"vision_night": 5,
"harvest": "zombie",
Expand Down Expand Up @@ -552,6 +566,7 @@
"armor_bash": 1,
"armor_cut": 1,
"armor_bullet": 1,
"bleed_rate": 0,
"vision_day": 3,
"vision_night": 3,
"harvest": "arachnid",
Expand Down Expand Up @@ -585,6 +600,7 @@
"armor_bash": 2,
"armor_cut": 6,
"armor_bullet": 5,
"bleed_rate": 0,
"vision_day": 5,
"vision_night": 5,
"harvest": "arachnid",
Expand Down
9 changes: 9 additions & 0 deletions data/json/monsters/insect_spider.json
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@
"melee_cut": 4,
"dodge": 4,
"armor_bash": 6,
"bleed_rate": 60,
"harvest": "arachnid_acid",
"death_function": [ "NORMAL" ],
"flags": [ "SMELLS", "HEARS", "GOODHEARING", "BASHES", "BORES", "POISON", "SUNDEATH", "ACIDPROOF", "ACIDTRAIL" ]
Expand Down Expand Up @@ -50,6 +51,7 @@
"armor_bash": 12,
"armor_cut": 8,
"armor_bullet": 6,
"bleed_rate": 60,
"harvest": "meatslug",
"death_function": [ "WORM" ],
"flags": [ "DIGS", "HEARS", "POISON", "GOODHEARING", "BASHES", "DESTROYS" ]
Expand Down Expand Up @@ -478,6 +480,7 @@
"armor_cut": 25,
"armor_bullet": 12,
"armor_stab": 14,
"bleed_rate": 80,
"vision_day": 9,
"vision_night": 6,
"anger_triggers": [ "STALK", "PLAYER_CLOSE" ],
Expand Down Expand Up @@ -570,6 +573,7 @@
"armor_bullet": 45,
"armor_cut": 35,
"armor_stab": 15,
"bleed_rate": 60,
"vision_day": 12,
"vision_night": 7,
"anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT" ],
Expand Down Expand Up @@ -1442,6 +1446,7 @@
"armor_cut": 14,
"armor_stab": 12,
"armor_bullet": 12,
"bleed_rate": 80,
"vision_day": 17,
"vision_night": 7,
"harvest": "arachnid_wasp",
Expand Down Expand Up @@ -1503,6 +1508,7 @@
"armor_cut": 30,
"armor_stab": 18,
"armor_bullet": 22,
"bleed_rate": 60,
"harvest": "arachnid_wasp_queen",
"reproduction": { "baby_egg": "egg_wasp", "baby_count": 4, "baby_timer": 5 },
"extend": { "flags": [ "PUSH_MON" ] },
Expand Down Expand Up @@ -1811,6 +1817,7 @@
"armor_bash": 12,
"armor_cut": 14,
"armor_bullet": 11,
"bleed_rate": 80,
"vision_day": 5,
"vision_night": 5,
"special_attacks": [ [ "ACID", 15 ] ],
Expand Down Expand Up @@ -1901,6 +1908,7 @@
"armor_bash": 10,
"armor_cut": 12,
"armor_bullet": 10,
"bleed_rate": 80,
"vision_day": 5,
"vision_night": 5,
"harvest": "arachnid",
Expand All @@ -1920,6 +1928,7 @@
"volume": "625 L",
"weight": "815 kg",
"melee_dice": 2,
"bleed_rate": 60,
"special_attacks": [ [ "SMASH", 30 ], [ "BIO_OP_TAKEDOWN", 20 ], [ "RANGED_PULL", 20 ], [ "GRAB", 5 ] ],
"extend": { "flags": [ "DESTROYS", "PUSH_MON", "PUSH_VEH", "RANGED_ATTACKER" ] }
},
Expand Down
3 changes: 3 additions & 0 deletions data/json/monsters/jabberwock.json
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@
"armor_bash": 2,
"armor_cut": 2,
"armor_bullet": 2,
"bleed_rate": 80,
"vision_day": 50,
"vision_night": 3,
"special_attacks": [ [ "FLESH_GOLEM", 10 ], [ "ABSORB_MEAT", 10 ] ],
Expand Down Expand Up @@ -53,6 +54,7 @@
"armor_bash": 6,
"armor_cut": 4,
"armor_bullet": 3,
"bleed_rate": 60,
"vision_day": 50,
"vision_night": 3,
"special_attacks": [ [ "FLESH_GOLEM", 8 ], [ "ABSORB_MEAT", 1 ] ],
Expand Down Expand Up @@ -85,6 +87,7 @@
"armor_bash": 12,
"armor_cut": 8,
"armor_bullet": 6,
"bleed_rate": 40,
"vision_day": 50,
"vision_night": 3,
"special_attacks": [ [ "FLESH_GOLEM", 5 ] ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/monsters/marloss.json
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
"melee_dice_sides": 4,
"melee_cut": 0,
"dodge": 1,
"bleed_rate": 50,
"harvest": "human",
"vision_day": 30,
"vision_night": 3,
Expand Down Expand Up @@ -52,6 +53,7 @@
"melee_dice_sides": 4,
"melee_cut": 0,
"dodge": 1,
"bleed_rate": 50,
"harvest": "human",
"vision_day": 30,
"vision_night": 3,
Expand Down
6 changes: 6 additions & 0 deletions data/json/monsters/mi-go.json
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@
"armor_bash": 4,
"armor_cut": 12,
"armor_bullet": 10,
"bleed_rate": 75,
"vision_day": 50,
"vision_night": 20,
"harvest": "zombie_meatslug",
Expand Down Expand Up @@ -74,6 +75,7 @@
"armor_bash": 4,
"armor_cut": 12,
"armor_bullet": 10,
"bleed_rate": 50,
"vision_day": 50,
"vision_night": 20,
"harvest": "zombie_meatslug",
Expand Down Expand Up @@ -125,6 +127,7 @@
"armor_bash": 5,
"armor_cut": 13,
"armor_bullet": 10,
"bleed_rate": 75,
"vision_day": 50,
"vision_night": 20,
"harvest": "zombie_meatslug",
Expand Down Expand Up @@ -175,6 +178,7 @@
"armor_bash": 17,
"armor_cut": 22,
"armor_bullet": 18,
"bleed_rate": 50,
"vision_day": 50,
"vision_night": 20,
"harvest": "zombie_meatslug",
Expand Down Expand Up @@ -229,6 +233,7 @@
"armor_bash": 19,
"armor_cut": 27,
"armor_bullet": 22,
"bleed_rate": 25,
"vision_day": 50,
"vision_night": 25,
"harvest": "zombie_meatslug",
Expand Down Expand Up @@ -282,6 +287,7 @@
"armor_bash": 4,
"armor_cut": 5,
"armor_bullet": 4,
"bleed_rate": 25,
"vision_day": 50,
"vision_night": 25,
"harvest": "zombie_meatslug",
Expand Down
2 changes: 2 additions & 0 deletions data/json/monsters/mutant.json
View file
Open in desktop
Expand Up @@ -55,6 +55,7 @@
"armor_bash": 5,
"armor_cut": 5,
"armor_bullet": 4,
"bleed_rate": 75,
"vision_day": 25,
"vision_night": 5,
"harvest": "human_fur",
Expand Down Expand Up @@ -97,6 +98,7 @@
"armor_bash": 7,
"armor_cut": 7,
"armor_bullet": 6,
"bleed_rate": 50,
"vision_night": 15,
"harvest": "human_large_fur",
"special_attacks": [
Expand Down
2 changes: 2 additions & 0 deletions data/json/monsters/mutant_mammal.json
View file
Open in desktop
Expand Up @@ -24,6 +24,7 @@
"dodge": 3,
"armor_bash": 8,
"armor_cut": 12,
"bleed_rate": 80,
"vision_day": 30,
"vision_night": 10,
"path_settings": { "max_dist": 10 },
Expand Down Expand Up @@ -283,6 +284,7 @@
"dodge": 2,
"armor_bash": 8,
"armor_cut": 10,
"bleed_rate": 60,
"vision_day": 50,
"vision_night": 5,
"harvest": "mutant_mammal_large_fur",
Expand Down