Skip to content

Commit

Permalink
Trigger traps after ranged_pull mattack
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
anothersimulacrum committed Jan 20, 2020
1 parent dcdef1e commit b2b3ce6
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/monattack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down

0 comments on commit b2b3ce6

Please sign in to comment.