diff --git a/data/json/effects.json b/data/json/effects.json index 0dc23aa715d1b..9451986301e3d 100644 --- a/data/json/effects.json +++ b/data/json/effects.json @@ -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 }, @@ -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", diff --git a/data/json/monster_special_attacks/monster_attacks.json b/data/json/monster_special_attacks/monster_attacks.json index 275cbfb9aa658..6ba56d6dcb95a 100644 --- a/data/json/monster_special_attacks/monster_attacks.json +++ b/data/json/monster_special_attacks/monster_attacks.json @@ -92,6 +92,23 @@ "no_dmg_msg_u": "%1$s grabs your %2$s with another appendage!", "no_dmg_msg_npc": "%1$s grabs '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 '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 , but they dodge!", + "no_dmg_msg_u": "%1$s grabs your %2$s with its other hand!", + "no_dmg_msg_npc": "%1$s grabs 's %2$s with its other hand!" + }, { "type": "monster_attack", "attack_type": "melee", diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 95b7defaeb77f..a1a1f0857d4cd 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -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", @@ -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",