diff --git a/README.md b/README.md index 7829c02d..84ed18e1 100644 --- a/README.md +++ b/README.md @@ -449,12 +449,10 @@ * Only sprinting zombies * Unlimited powerups * Unlimited barrier rebuild points -* Decreased stun time of unupgraded weapons from 0.75 seconds to 0.375 seconds -* Decreased stun time of upgraded weapons from 0.75 seconds to 0.5 seconds -* Meleeing enemy players pushes 16.67% more for every 500 damage that melee weapon deals -* Meleeing enemy players that are reviving pushes 50% of the amount when standing (stacks with stance) -* Meleeing enemy players that are crouched pushes 50% of the amount when standing -* Meleeing enemy players that are prone pushes 25% of the amount when standing +* Decreased stun time of weapons from 0.75 seconds to 0.375 seconds +* Meleeing enemy players that are not reviving changes their stance to standing +* Meleeing enemy players that are reviving and crouched pushes 50% of the amount when standing +* Meleeing enemy players that are reviving and prone pushes 25% of the amount when standing * Meleeing enemy players that are already stunned from weapons will push and restun them * Ballistic knife projectile pushes enemy players * Claymores are no longer triggered by enemy players diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 13c7c02e..62679792 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -1676,18 +1676,9 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme is_melee = true; dir = vdir; amount = 420; // 48 units - amount += (amount / 6.875) * int(idamage / 500); // 16.67% increase every 500 damage if(self maps/mp/zombies/_zm_laststand::is_reviving_any()) { - amount /= 1.775; // 50% - } - - if(self isOnGround()) - { - // don't move vertically if on ground - dir = (dir[0], dir[1], 0); - if(self getStance() == "crouch") { amount /= 1.775; // 50% @@ -1697,6 +1688,13 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme amount /= 2.95; // 25% } } + else if(self isOnGround()) + { + // don't move vertically if on ground + dir = (dir[0], dir[1], 0); + + self setStance("stand"); + } //self thread origin_test(); @@ -1780,10 +1778,6 @@ do_game_mode_shellshock(is_melee, is_upgraded) { time = 0.75; } - else if(is_upgraded) - { - time = 0.5; - } self._being_shellshocked = 1; self._being_pushed = is_melee;