From b2b3ce6cb79cc75c89fce0ccd634f498d3491bd8 Mon Sep 17 00:00:00 2001 From: anothersimulacrum Date: Sun, 19 Jan 2020 18:41:07 -0800 Subject: [PATCH] Trigger traps after ranged_pull mattack When playing with 3d FOV, grappler zombies could drag the player off of a rooftop position and onto open air, where they just levitated. Prevent players from levitating by triggering traps on the tile they end up on. --- src/monattack.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/monattack.cpp b/src/monattack.cpp index 646739419f4b4..26e2457970d69 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -2607,6 +2607,9 @@ bool mattack::ranged_pull( monster *z ) g->draw(); } } + // The monster might drag a target that's not on it's z level + // So if they leave them on open air, make them fall + g->m.creature_on_trap( *target ); if( seen ) { if( z->type->bodytype == "human" || z->type->bodytype == "angel" ) { add_msg( _( "The %1$s's arms fly out and pull and grab %2$s!" ), z->name(),