diff --git a/README.md b/README.md index 4565257d..5bbd30b3 100644 --- a/README.md +++ b/README.md @@ -241,7 +241,8 @@ * Players start each round with at least 10000 points * 2 lethal grenades and mines awarded each round * Unlimited barrier rebuild points -* Players can be stunned from melee by enemy players while already stunned +* Meleeing enemy players that are already stunned will stun them again +* Meleeing enemy players that are prone will make them crouch * Stunning enemy players steals 10 points from them * Downing enemy players awards 5% of their current points * Bleeding out enemy players awards 10% of your current points to all teammates diff --git a/scripts/zm/main/_zm_reimagined_zgrief.gsc b/scripts/zm/main/_zm_reimagined_zgrief.gsc index cda32e46..05eaee6e 100644 --- a/scripts/zm/main/_zm_reimagined_zgrief.gsc +++ b/scripts/zm/main/_zm_reimagined_zgrief.gsc @@ -995,14 +995,19 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme } } - shellshock_override = false; + is_melee = false; if ( isDefined( eattacker ) && isplayer( eattacker ) && eattacker != self && eattacker.team != self.team && smeansofdeath == "MOD_MELEE" ) { - shellshock_override = true; + is_melee = true; self applyknockback( idamage, vdir ); + + if(self getstance() == "prone") + { + self setStance("crouch"); + } } - if ( is_true( self._being_shellshocked ) && !shellshock_override ) + if ( is_true( self._being_shellshocked ) && !is_melee ) { return; }