From 10f6ba4dba470ac932b3d78ce6d7b0d8c2c8143c Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sat, 4 Mar 2023 19:13:41 -0800
Subject: [PATCH] Encounter: push amount changes Encounter: remove push
 changing stance

---
 README.md                               |  6 +++---
 scripts/zm/zgrief/zgrief_reimagined.gsc | 26 +++++++++++--------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index a6fb0ca3..a87cebac 100644
--- a/README.md
+++ b/README.md
@@ -474,9 +474,9 @@
 * Unlimited powerups
 * Unlimited barrier rebuild points
 * 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 25% of the amount when standing
-* Meleeing enemy players that are reviving and prone pushes 12.5% of the amount when standing
+* Meleeing enemy players that are crouched pushes 25% less
+* Meleeing enemy players that are prone pushes 50% less
+* Meleeing enemy players that are reviving pushes 50% less
 * 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 5c1cb091..b786be82 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -1720,18 +1720,27 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 			is_melee = true;
 			dir = vdir;
 			amount = 420; // 48 units
+			if(self getStance() == "crouch")
+			{
+				amount = 327.5; // 36 units
+			}
+			else if(self getStance() == "prone")
+			{
+				amount = 235; // 24 units
+			}
 
 			if(self maps\mp\zombies\_zm_laststand::is_reviving_any())
 			{
 				is_reviving = true;
 
+				amount = 235; // 24 units
 				if(self getStance() == "crouch")
 				{
-					amount = 142.5; // 12 units
+					amount = 187.5; // 18 units
 				}
 				else if(self getStance() == "prone")
 				{
-					amount = 95; // 6 units
+					amount = 142.5; // 12 units
 				}
 			}
 
@@ -1821,13 +1830,6 @@ do_game_mode_shellshock(is_melee, is_reviving)
 	if(is_melee)
 	{
 		time = 0.75;
-
-		if(!is_reviving)
-		{
-			self setStance("stand");
-			self allowCrouch(0);
-			self allowProne(0);
-		}
 	}
 
 	self._being_shellshocked = 1;
@@ -1838,12 +1840,6 @@ do_game_mode_shellshock(is_melee, is_reviving)
 
 	self._being_shellshocked = 0;
 	self._being_pushed = 0;
-
-	if(is_melee && !is_reviving && is_player_valid(self))
-	{
-		self allowCrouch(1);
-		self allowProne(1);
-	}
 }
 
 stun_score_steal(attacker, score)