From f711f0be49be4d9c5af185ab32f536aed06421dc Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Tue, 19 Sep 2023 06:35:40 -0700
Subject: [PATCH] Encounter: adjust push amounts

---
 README.md                               |  9 ++---
 scripts/zm/zgrief/zgrief_reimagined.gsc | 44 +++++++++++++++++--------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 5e5c5820..4ea21554 100644
--- a/README.md
+++ b/README.md
@@ -781,9 +781,10 @@
 * Unupgraded weapons stun enemy players for 0.375 seconds
 * Upgraded weapons stun enemy players for 0.5 seconds
 * Melee weapons stun enemy players for 0.75 seconds
-* Meleeing enemy players with an upgraded melee weapon pushes 25% more
-* Meleeing enemy players that are crouched pushes 25% less
-* Meleeing enemy players that are prone pushes 50% less
+* Meleeing enemy players with an upgraded melee weapon pushes 33% more
+* Meleeing enemy players that are in the air pushes 100% more
+* Meleeing enemy players that are crouched pushes 33% less
+* Meleeing enemy players that are prone pushes 66% 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
@@ -795,7 +796,7 @@
 * Downing enemy players awards 500 points
 * Bleeding out enemy players awards 1000 points to all teammates
 * Landing on top of an enemy player that is prone downs them
-* Increased max radius for landing on top of an enemy player by 16.67%
+* Increased max radius for landing on top of an enemy player by 16.66%
 * Decreased max height for landing on top of an enemy player by 50%
 * M1911 upgraded: decreased stock ammo from 50 to 24
 * Powerups: decreased chance to drop from 3% to 2%
diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 43b205e7..ae11fd0d 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -1830,32 +1830,40 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 			{
 				if (idamage >= 500)
 				{
-					if (self getStance() == "stand")
+					if (!self isOnGround())
 					{
-						amount = 280; // 30 units
+						amount = 185; // 64 air units
+					}
+					else if (self getStance() == "stand")
+					{
+						amount = 297.5; // 32 units
 					}
 					if (self getStance() == "crouch")
 					{
-						amount = 225; // 22.5 units
+						amount = 215; // 21.33 units
 					}
 					else if (self getStance() == "prone")
 					{
-						amount = 166.25; // 15 units
+						amount = 132.5; // 10.66 units
 					}
 				}
 				else
 				{
-					if (self getStance() == "stand")
+					if (!self isOnGround())
+					{
+						amount = 142.5; // 48 air units
+					}
+					else if (self getStance() == "stand")
 					{
 						amount = 235; // 24 units
 					}
 					if (self getStance() == "crouch")
 					{
-						amount = 187.5; // 18 units
+						amount = 172.5; // 16 units
 					}
 					else if (self getStance() == "prone")
 					{
-						amount = 142.5; // 12 units
+						amount = 112.5; // 8 units
 					}
 				}
 			}
@@ -1863,32 +1871,40 @@ game_module_player_damage_callback( einflictor, eattacker, idamage, idflags, sme
 			{
 				if (idamage >= 500)
 				{
-					if (self getStance() == "stand")
+					if (!self isOnGround())
 					{
-						amount = 510; // 60 units
+						amount = 350; // 128 air units
+					}
+					else if (self getStance() == "stand")
+					{
+						amount = 540; // 64 units
 					}
 					if (self getStance() == "crouch")
 					{
-						amount = 395; // 45 units
+						amount = 377.5; // 42.66 units
 					}
 					else if (self getStance() == "prone")
 					{
-						amount = 280; // 30 units
+						amount = 215; // 21.33 units
 					}
 				}
 				else
 				{
-					if (self getStance() == "stand")
+					if (!self isOnGround())
+					{
+						amount = 265; // 96 air units
+					}
+					else if (self getStance() == "stand")
 					{
 						amount = 420; // 48 units
 					}
 					if (self getStance() == "crouch")
 					{
-						amount = 327.5; // 36 units
+						amount = 297.5; // 32 units
 					}
 					else if (self getStance() == "prone")
 					{
-						amount = 235; // 24 units
+						amount = 172.5; // 16 units
 					}
 				}
 			}