From 4d08d3e722f5bf2a94043d39caa8149574c6798d Mon Sep 17 00:00:00 2001
From: Jbleezy <thejbirdjustin@yahoo.com>
Date: Sun, 30 Jan 2022 07:37:32 -0800
Subject: [PATCH] Containment: award players grenades and mines on respawn Fix
 mines and equipment not being given on respawn

---
 scripts/zm/zgrief/zgrief_reimagined.gsc | 88 +++++++++++++++++--------
 1 file changed, 61 insertions(+), 27 deletions(-)

diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc
index 7828ed33..a5783910 100644
--- a/scripts/zm/zgrief/zgrief_reimagined.gsc
+++ b/scripts/zm/zgrief/zgrief_reimagined.gsc
@@ -1754,6 +1754,16 @@ grief_laststand_weapons_return()
 
 		if ( isDefined( self.grief_savedweapon_grenades_clip ) )
 		{
+			if(level.scr_zm_ui_gametype_obj == "zcontainment")
+			{
+				self.grief_savedweapon_grenades_clip += 2;
+
+				if(self.grief_savedweapon_grenades_clip > weaponClipSize(self.grief_savedweapon_grenades))
+				{
+					self.grief_savedweapon_grenades_clip = weaponClipSize(self.grief_savedweapon_grenades);
+				}
+			}
+
 			self setweaponammoclip( self.grief_savedweapon_grenades, self.grief_savedweapon_grenades_clip );
 		}
 	}
@@ -1769,33 +1779,9 @@ grief_laststand_weapons_return()
 		}
 	}
 
-	if ( isDefined( self.grief_savedweapon_mine ) )
-	{
-		self giveweapon( self.grief_savedweapon_mine );
-		self set_player_placeable_mine( self.grief_savedweapon_mine );
-		self setactionslot( 4, "weapon", self.grief_savedweapon_mine );
-		self setweaponammoclip( self.grief_savedweapon_mine, self.grief_savedweapon_mine_clip );
-	}
-
-	if ( isDefined( self.current_equipment ) )
-	{
-		self maps/mp/zombies/_zm_equipment::equipment_take( self.current_equipment );
-	}
-
-	if ( isDefined( self.grief_savedweapon_equipment ) )
-	{
-		self.do_not_display_equipment_pickup_hint = 1;
-		self maps/mp/zombies/_zm_equipment::equipment_give( self.grief_savedweapon_equipment );
-		self.do_not_display_equipment_pickup_hint = undefined;
-	}
-
-	if ( isDefined( self.grief_hasriotshield ) && self.grief_hasriotshield )
-	{
-		if ( isDefined( self.player_shield_reset_health ) )
-		{
-			self [[ self.player_shield_reset_health ]]();
-		}
-	}
+	// mines and equipment get taken away if given too early
+	self thread wait_and_return_mine();
+	self thread wait_and_return_equipment();
 
 	if(level.scr_zm_ui_gametype_obj == "zcontainment")
 	{
@@ -1830,6 +1816,54 @@ grief_laststand_weapons_return()
 	return 0;
 }
 
+wait_and_return_mine()
+{
+	wait 0.05;
+
+	if ( isDefined( self.grief_savedweapon_mine ) )
+	{
+		if(level.scr_zm_ui_gametype_obj == "zcontainment")
+		{
+			self.grief_savedweapon_mine_clip += 2;
+
+			if(self.grief_savedweapon_mine_clip > weaponClipSize(self.grief_savedweapon_mine))
+			{
+				self.grief_savedweapon_mine_clip = weaponClipSize(self.grief_savedweapon_mine);
+			}
+		}
+
+		self giveweapon( self.grief_savedweapon_mine );
+		self set_player_placeable_mine( self.grief_savedweapon_mine );
+		self setactionslot( 4, "weapon", self.grief_savedweapon_mine );
+		self setweaponammoclip( self.grief_savedweapon_mine, self.grief_savedweapon_mine_clip );
+	}
+}
+
+wait_and_return_equipment()
+{
+	wait 0.05;
+
+	if ( isDefined( self.current_equipment ) )
+	{
+		self maps/mp/zombies/_zm_equipment::equipment_take( self.current_equipment );
+	}
+
+	if ( isDefined( self.grief_savedweapon_equipment ) )
+	{
+		self.do_not_display_equipment_pickup_hint = 1;
+		self maps/mp/zombies/_zm_equipment::equipment_give( self.grief_savedweapon_equipment );
+		self.do_not_display_equipment_pickup_hint = undefined;
+	}
+
+	if ( isDefined( self.grief_hasriotshield ) && self.grief_hasriotshield )
+	{
+		if ( isDefined( self.player_shield_reset_health ) )
+		{
+			self [[ self.player_shield_reset_health ]]();
+		}
+	}
+}
+
 sudden_death()
 {
 	level endon("end_game");