Skip to content

Commit

Permalink
Redesign of zombie Wrestler (CleverRaven#71163)
Browse files Browse the repository at this point in the history
* Rework of zombie wrestler

Redesigned to be a late game grabber evolution as it makes sense for what it does now. Removed bio_op_takedown. Gave it the ability to grab twice similar to the shelled mutant but with lower cool downs though staggered cool downs. Removed its scratch. Increased its grab strength. Changed its description to hint towards it being a grappler evolution. Increased difficulty from 2 to 3, considering a 4.
Increased its weight and balanced its volume to better reflect its increased mass compared to body builders. Reduced health by 60. Changed drag cost to 1.5 from 0.2. Added a new grab_3 special attack as grab two specified an appendage leaving it up to imagination. So created a grab_3 to better represent whats happening.
It normally throws you giving you time to pull a gun and with a m4 you can kill it before it approaches you again. Definitely still a enemy players will want to shoot, but can lead to death if paired with other dangerous creatures.

* Added Grab_3 attack

Added a Grab_3 attack to represent the double grab that the reworked wrestler now does.

* Added Grabbing_3 effect and removal on stagger.

Commit message explains the change

* Update data/json/monsters/zed_misc.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/monster_special_attacks/monster_attacks.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/effects.json

* Update data/json/effects.json

* Update data/json/monsters/zed_misc.json

Grammar and typos fix

Co-authored-by: Kamayana <[email protected]>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Maleclypse <[email protected]>
Co-authored-by: Kamayana <[email protected]>
  • Loading branch information
4 people authored Jan 31, 2024
1 parent b2d77bb commit 17c277b
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 11 deletions.
13 changes: 12 additions & 1 deletion data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@
"apply_message": "You're staggered off-balance.",
"max_duration": "5 s",
"base_mods": { "speed_mod": [ -20 ] },
"removes_effects": [ "grabbing", "grabbing_2" ],
"removes_effects": [ "grabbing", "grabbing_2", "grabbing_3" ],
"rating": "bad",
"show_in_info": true
},
Expand Down Expand Up @@ -3513,6 +3513,17 @@
"base_mods": { "dodge_mod": [ -8 ] },
"flags": [ "GRAB_FILTER" ]
},
{
"type": "effect_type",
"id": "grabbing_3",
"name": [ "Grabbing" ],
"desc": [ "Grabbing another creature and holding them in place with a second appendage." ],
"max_intensity": 1,
"show_in_info": true,
"//": "-dodge (can't really miss something holding you)",
"base_mods": { "dodge_mod": [ -8 ] },
"flags": [ "GRAB_FILTER" ]
},
{
"type": "effect_type",
"id": "lack_sleep",
Expand Down
17 changes: 17 additions & 0 deletions data/json/monster_special_attacks/monster_attacks.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,23 @@
"no_dmg_msg_u": "%1$s grabs your %2$s with another appendage!",
"no_dmg_msg_npc": "%1$s grabs <npcname>'s %2$s with another appendage!"
},
{
"type": "monster_attack",
"attack_type": "melee",
"id": "grab_3",
"damage_max_instance": [ { "damage_type": "bash", "amount": 0 } ],
"grab": true,
"grab_data": { "grab_effect": "grabbed" },
"condition": { "and": [ { "u_has_flag": "GRAB_FILTER" }, { "npc_has_flag": "GRAB" }, { "not": { "u_has_effect": "grabbing_3" } } ] },
"//": "We can't count grab filters, so grabbing 3 works as a soft cooldown",
"self_effects_onhit": [ { "id": "grabbing_3", "duration": 150, "permanent": false } ],
"hit_dmg_u": "%1$s grabs your %2$s with its other hand!",
"hit_dmg_npc": "%1$s grabs <npcname>'s %2$s with its other hand!",
"miss_msg_u": "%s tries to grab you, but you dodge!",
"miss_msg_npc": "%s tries to grab <npcname>, but they dodge!",
"no_dmg_msg_u": "%1$s grabs your %2$s with its other hand!",
"no_dmg_msg_npc": "%1$s grabs <npcname>'s %2$s with its other hand!"
},
{
"type": "monster_attack",
"attack_type": "melee",
Expand Down
20 changes: 10 additions & 10 deletions data/json/monsters/zed_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -428,14 +428,14 @@
"id": "mon_zombie_brute_grappler",
"type": "MONSTER",
"name": { "str": "zombie wrestler" },
"description": "A slab of festering muscle the size of a well-toned bodybuilder. Seems eager to strangle the life from you.",
"description": "A slab of festering muscle the size of a well-toned bodybuilder. With popping and cracking sounds its arm muscles constantly lengthen and contract as it reaches out with deformed muscular hands the size of dinner plates.",
"default_faction": "zombie",
"bodytype": "human",
"species": [ "ZOMBIE", "HUMAN" ],
"diff": 2,
"volume": "62500 ml",
"weight": "81500 g",
"hp": 280,
"diff": 3,
"volume": "93560 ml",
"weight": "94500 g",
"hp": 220,
"speed": 95,
"material": [ "flesh" ],
"symbol": "Z",
Expand All @@ -453,15 +453,15 @@
"bleed_rate": 50,
"vision_night": 3,
"harvest": "zombie_grabber",
"grab_strength": 40,
"grab_strength": 37,
"special_attacks": [
{ "id": "smash", "throw_strength": 72, "cooldown": 30 },
{ "id": "bio_op_takedown", "cooldown": 20 },
{ "id": "grab", "cooldown": 11 },
{ "id": "grab_3", "cooldown": 12 },
{ "id": "ranged_pull", "cooldown": 20 },
{ "id": "bite_humanoid" },
{ "id": "scratch_humanoid" },
{ "id": "grab_drag", "grab_data": { "drag_distance": 5, "drag_deviation": 1, "drag_movecost_mod": 0.2 } },
{ "id": "drag_followup", "grab_data": { "drag_distance": 5, "drag_deviation": 1, "drag_movecost_mod": 0.2 } }
{ "id": "grab_drag", "grab_data": { "drag_distance": 1, "drag_deviation": 1, "drag_movecost_mod": 1.5 } },
{ "id": "drag_followup", "grab_data": { "drag_distance": 1, "drag_deviation": 1, "drag_movecost_mod": 1.5 } }
],
"death_drops": "default_zombie_death_drops",
"burn_into": "mon_zombie_fiend",
Expand Down

0 comments on commit 17c277b

Please sign in to comment.