From 8d656133aa5ca7b4cd9a6527b7de780131065d30 Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Mon, 8 Aug 2022 22:14:22 -0700
Subject: [PATCH] Encounter: player push changes

---
 README.md                               |  7 +++---
 scripts/zm/zgrief/zgrief_reimagined.gsc | 31 +++++++++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index f5977658..0944e5cf 100644
--- a/README.md
+++ b/README.md
@@ -444,9 +444,10 @@
 * Unlimited barrier rebuild points
 * Decreased stun time of unupgraded weapons from 0.75 seconds to 0.5 seconds
 * Decreased stun time of upgraded weapons from 0.75 seconds to 0.625 seconds
-* Meleeing enemy players pushes 16.67% farther for every 500 damage that melee weapon deals
-* Meleeing enemy players that are crouched pushes 33.33% of the amount when standing
-* Meleeing enemy players that are prone pushes 16.67% of the amount when standing
+* Meleeing enemy players pushes 16.67% more for every 500 damage that melee weapon deals
+* Meleeing enemy players that are reviving pushes 50% less
+* Meleeing enemy players that are crouched pushes 50% less
+* Meleeing enemy players that are prone pushes 75% less
 * Meleeing enemy players that are already stunned will push 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 c9d3d5c6..c1f43e90 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -1658,6 +1658,11 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 			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
@@ -1665,14 +1670,16 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 
 				if(self getStance() == "crouch")
 				{
-					amount /= 2.4; // 33.33%
+					amount /= 1.775; // 50%
 				}
 				else if(self getStance() == "prone")
 				{
-					amount /= 3.75; // 16.67%
+					amount /= 2.95; // 25%
 				}
 			}
 
+			//self thread origin_test();
+
 			dir = vectorNormalize(dir);
 			self setVelocity(amount * dir);
 
@@ -2799,23 +2806,37 @@ spawn_bots()
 		level.bots[i].pers["isBot"] = 1;
 	}
 
+	//player thread stance_test();
+}
+
+origin_test()
+{
+	org = self.origin;
+
+	wait .5;
+
+	iprintln(distance(org, self.origin));
+}
+
+stance_test()
+{
 	while(1)
 	{
-		if (player useButtonPressed())
+		if (self useButtonPressed())
 		{
 			for (i = 0; i < level.bots.size; i++)
 			{
 				level.bots[i] setStance("prone");
 			}
 		}
-		else if (player adsButtonPressed())
+		else if (self adsButtonPressed())
 		{
 			for (i = 0; i < level.bots.size; i++)
 			{
 				level.bots[i] setStance("crouch");
 			}
 		}
-		else if (player attackButtonPressed())
+		else if (self attackButtonPressed())
 		{
 			for (i = 0; i < level.bots.size; i++)
 			{