Fixed escaping not giving you itemsTM and now when you escape ammo carries over

Author: MrMith

StackingItems/StackEventHandler.cs

@@ -225,24 +225,22 @@ public void OnSetRole(PlayerSetRoleEvent ev)
 				if (StackMain.checkSteamIDItemNum[ev.Player.SteamId].HasEscaped)
 				{
 					StackMain.checkSteamIDItemNum[ev.Player.SteamId].HasEscaped = false;
-					Dictionary<int, int> EscapedItemList = new Dictionary<int, int>();
-					foreach (KeyValuePair<int, int> keyValuePair in StackMain.checkSteamIDItemNum[ev.Player.SteamId].checkItemForNumOfItems)
-					{
-						EscapedItemList[keyValuePair.Key] = keyValuePair.Value;
-					}
 
 					StackMain.checkSteamIDItemNum[ev.Player.SteamId].ResetToZero();
-
+					ev.Player.SetAmmo(AmmoType.DROPPED_9, StackMain.checkSteamIDItemNum[ev.Player.SteamId].ammo9 + ev.Player.GetAmmo(AmmoType.DROPPED_9));
+					ev.Player.SetAmmo(AmmoType.DROPPED_7, StackMain.checkSteamIDItemNum[ev.Player.SteamId].ammo7 + ev.Player.GetAmmo(AmmoType.DROPPED_7));
+					ev.Player.SetAmmo(AmmoType.DROPPED_5, StackMain.checkSteamIDItemNum[ev.Player.SteamId].ammo5 + ev.Player.GetAmmo(AmmoType.DROPPED_5));
 					foreach (Smod2.API.ItemType item in (Smod2.API.ItemType[])Enum.GetValues(typeof(Smod2.API.ItemType)))
 					{
-						if (EscapedItemList.TryGetValue((int)item, out int value))
+						if (StackMain.checkSteamIDItemNum[ev.Player.SteamId].EscapedItemList.TryGetValue((int)item, out int value))
 						{
 							for (int i = 0; i < value; i++)
 							{
 								ev.Items.Add(item);
 							}
 						}
 					}
+					StackMain.checkSteamIDItemNum[ev.Player.SteamId].EscapedItemList.Clear();
 				}
 				else
 				{
@@ -295,13 +293,35 @@ public void OnUpdate(UpdateEvent ev) // OnHandCuffed is broke >:(
 
 		#region OnCheckEscape
 		/// <summary>
-		/// Checks if they have escaped to transfer item stacks over.
+		/// Checks if they have escaped to transfer item stacks and ammo over.
 		/// </summary>
 		public void OnCheckEscape(PlayerCheckEscapeEvent ev)
 		{
 			if (StackMain.checkSteamIDItemNum.ContainsKey(ev.Player.SteamId) && StackMain.keepItemsOnExtract)
 			{
 				StackMain.checkSteamIDItemNum[ev.Player.SteamId].HasEscaped = true;
+				foreach(KeyValuePair<int,int> kv in StackMain.checkSteamIDItemNum[ev.Player.SteamId].checkItemTypeForNumOfItems)
+				{
+					StackMain.checkSteamIDItemNum[ev.Player.SteamId].EscapedItemList[kv.Key] = kv.Value;
+				}
+
+				foreach(Item item in ev.Player.GetInventory())
+				{
+					if (StackMain.checkSteamIDItemNum[ev.Player.SteamId].GetItemAmount((int)item.ItemType) != 0) continue;
+					if (StackMain.checkSteamIDItemNum[ev.Player.SteamId].EscapedItemList.ContainsKey((int)item.ItemType))
+					{
+						StackMain.checkSteamIDItemNum[ev.Player.SteamId].EscapedItemList[(int)item.ItemType]++;
+					}
+					else
+					{
+						StackMain.checkSteamIDItemNum[ev.Player.SteamId].EscapedItemList[(int)item.ItemType] = 1;
+					}
+					
+				}
+
+				StackMain.checkSteamIDItemNum[ev.Player.SteamId].ammo9 = ev.Player.GetAmmo(AmmoType.DROPPED_9);
+				StackMain.checkSteamIDItemNum[ev.Player.SteamId].ammo7 = ev.Player.GetAmmo(AmmoType.DROPPED_7);
+				StackMain.checkSteamIDItemNum[ev.Player.SteamId].ammo5 = ev.Player.GetAmmo(AmmoType.DROPPED_5);
 			}
 			else
 			{

StackingItems/StackMain.cs

@@ -11,7 +11,7 @@ namespace StackingItems
 		name = "StackingItems",
 		description = "Items stack to save inventory space.",
 		id = "mith.StackingItems",
-		version = "1.0.4",
+		version = "1.0.5",
 		SmodMajor = 3,
 		SmodMinor = 2,
 		SmodRevision = 2
@@ -64,7 +64,12 @@ public static void SetStackSize()
 
 		public class StackCheckSteamIDsforItemInts
 		{
-			public Dictionary<int, int> checkItemForNumOfItems = new Dictionary<int, int>();
+			public Dictionary<int, int> checkItemTypeForNumOfItems = new Dictionary<int, int>();
+			public Dictionary<int, int> EscapedItemList = new Dictionary<int, int>();
+
+			public int ammo9 = 0,
+				ammo7 = 0,
+				ammo5 = 0;
 
 			public bool fixUseMedKit = false;
 			public bool fixthrowGrenade = false;
@@ -73,30 +78,30 @@ public class StackCheckSteamIDsforItemInts
 
 			public void ResetToZero()
 			{
-				checkItemForNumOfItems.Clear();
+				checkItemTypeForNumOfItems.Clear();
 			}
 
 			public int GetItemAmount(int ItemType)
 			{
-				if (checkItemForNumOfItems.TryGetValue(ItemType, out int value))
+				if (checkItemTypeForNumOfItems.TryGetValue(ItemType, out int value))
 				{
 					return value;
 				}
 				else
 				{
-					return -1;
+					return 0;
 				}
 			}
 
 			public void AddItemAmount(int ItemType, int Amount)
 			{
-				if (checkItemForNumOfItems.TryGetValue(ItemType, out int value))
+				if (checkItemTypeForNumOfItems.TryGetValue(ItemType, out int value))
 				{
-					checkItemForNumOfItems[ItemType] += Amount;
+					checkItemTypeForNumOfItems[ItemType] += Amount;
 				}
 				else
 				{
-					checkItemForNumOfItems[ItemType] = Amount;
+					checkItemTypeForNumOfItems[ItemType] = Amount;
 				}
 			}
 		}