From 9e56c1ad52ab3c2ee82563da0d8633e61e66b4d0 Mon Sep 17 00:00:00 2001
From: A Man <AirwavesMan@users.noreply.github.com>
Date: Wed, 29 Apr 2020 16:18:18 +0200
Subject: [PATCH] Add new boxes with ammo to loot tables

---
 .../Configs/CfgLoot/Groups/AmmoBox.hpp        | 112 ++++++++++++------
 .../CfgLoot/Groups/Buildings/Military.hpp     |  10 +-
 2 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
index 3656e6797..6bb7fa889 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
@@ -20,6 +20,41 @@ AmmoBoxRU3[] =
 	{Loot_MAGAZINE,		1,		100Rnd_762x54_PK}
 };
 
+//GP-25
+AmmoBoxRU4[] =
+{
+	{Loot_MAGAZINE,		3,		1Rnd_HE_GP25},
+	{Loot_MAGAZINE,		1,		FlareWhite_GP25},
+	{Loot_MAGAZINE,		1,		FlareGreen_GP25},
+	{Loot_MAGAZINE,		1,		1Rnd_Smoke_GP25}
+};
+
+//Explosives
+AmmoBoxRU5[] =
+{
+	{Loot_MAGAZINE,		2,		HandGrenade_East},
+	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellGreen}
+};
+
+//7.62x39Rmm RK95, Groza
+AmmoBoxRU6[] =
+{
+	{Loot_MAGAZINE,		5,		30Rnd_762x39_RK95},
+	{Loot_MAGAZINE,		1,		30Rnd_762x39_RK95SD},
+	{Loot_MAGAZINE,		5,		30Rnd_762x39_Groza1},
+	{Loot_MAGAZINE,		1,		30Rnd_762x39_Groza1SD}	
+};
+
+//9x39mm Groza, VSS VaL
+AmmoBoxRU7[] =
+{
+	{Loot_MAGAZINE,		6,		20Rnd_9x39_Groza9},
+	{Loot_MAGAZINE,		2,		20Rnd_9x39_Groza9SD},
+	{Loot_MAGAZINE,		1,		20Rnd_9x39_SP5_VSS}
+};
+
 //5.56x45mm
 AmmoBoxUS1[] =
 {
@@ -36,6 +71,31 @@ AmmoBoxUS2[] =
 	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
 };
 
+//M203
+AmmoBoxUS3[] =
+{
+	{Loot_MAGAZINE,		3,		1Rnd_HE_M203},
+	{Loot_MAGAZINE,		1,		FlareWhite_M203},
+	{Loot_MAGAZINE,		1,		FlareGreen_M203},
+	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203}
+};
+
+//Explosives
+AmmoBoxUS4[] =
+{
+	{Loot_MAGAZINE,		2,		HandGrenade_West},
+	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellGreen}
+};
+
+//6.80x43mm
+AmmoBoxUS5[] =
+{
+	{Loot_MAGAZINE,		5,		ACR_30Rnd_680x43},
+	{Loot_MAGAZINE,		1,		ACR_30Rnd_680x43_SD}
+};
+
 //5.56x45mm
 AmmoBoxEU1[] =
 {
@@ -61,6 +121,23 @@ AmmoBoxEU3[] =
 	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
 };
 
+// Aug and 7.62x51
+AmmoBoxEU4[] =
+{
+	{Loot_MAGAZINE,		10,		30Rnd_556x45_Aug},
+	{Loot_MAGAZINE,		6,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE,		1,		20Rnd_762x51_G3}
+};
+
+// P90, UMP
+AmmoBoxEU5[] =
+{
+	{Loot_MAGAZINE,		10,		50Rnd_57x28_P90},
+	{Loot_MAGAZINE,		6,		50Rnd_57x28_P90SD},
+	{Loot_MAGAZINE,		10,		25Rnd_45ACP_UMP},
+	{Loot_MAGAZINE,		6,		25Rnd_45ACP_UMPSD}
+};
+
 // Assault Rifles
 AmmoBoxCZ1[] =
 {
@@ -84,38 +161,3 @@ AmmoBoxCZ3[] =
 	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR}
 };
 
-//GP-25
-AmmoBoxRU4[] =
-{
-	{Loot_MAGAZINE,		3,		1Rnd_HE_GP25},
-	{Loot_MAGAZINE,		1,		FlareWhite_GP25},
-	{Loot_MAGAZINE,		1,		FlareGreen_GP25},
-	{Loot_MAGAZINE,		1,		1Rnd_Smoke_GP25}
-};
-
-//M203
-AmmoBoxUS3[] =
-{
-	{Loot_MAGAZINE,		3,		1Rnd_HE_M203},
-	{Loot_MAGAZINE,		1,		FlareWhite_M203},
-	{Loot_MAGAZINE,		1,		FlareGreen_M203},
-	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203}
-};
-
-//Explosives
-AmmoBoxRU5[] =
-{
-	{Loot_MAGAZINE,		2,		HandGrenade_East},
-	{Loot_MAGAZINE,		1,		SmokeShell},
-	{Loot_MAGAZINE,		1,		SmokeShellRed},
-	{Loot_MAGAZINE,		1,		SmokeShellGreen}
-};
-
-//Explosives
-AmmoBoxUS4[] =
-{
-	{Loot_MAGAZINE,		2,		HandGrenade_West},
-	{Loot_MAGAZINE,		1,		SmokeShell},
-	{Loot_MAGAZINE,		1,		SmokeShellRed},
-	{Loot_MAGAZINE,		1,		SmokeShellGreen}
-};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
index 36016f718..892d177df 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Buildings/Military.hpp
@@ -26,6 +26,8 @@ MilitaryRU[] =
 	{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxRU1, 10, 20},	//5.45x39
 	{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},	//7.62x39
 	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 3, 7},	//7.62x54R
+	{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxRU6, 5, 9},	//7.62x39
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU7, 5, 9},	//9x39mm	
 	{Loot_CONTAINER,	1,		DZ_ExplosiveBoxRU, AmmoBoxRU4, 5, 15},	//GP-25
 	{Loot_CONTAINER,	1,		DZ_ExplosiveBoxRU, AmmoBoxRU5, 3, 7},	//Grenades
 
@@ -71,7 +73,8 @@ MilitaryUS[] =
 	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxUS2, 7, 14},	//7.62x51
 	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxUS3, 7, 14},	//M203
 	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxUS4, 7, 14},	//Explosives
-
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxUS5, 7, 14},	//6.80x43
+	
 	//Other
 	{Loot_MAGAZINE,		3,		FoodMRE},
 	{Loot_PILE,			15,		AmmoUS, 1, 4},
@@ -111,7 +114,10 @@ MilitaryEU[] =
 	
 	//Containers
 	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxEU1, 7, 14},	//5.56x45
-	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxEU2, 7, 14},	//7.62x51mm
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxEU2, 7, 14},	//7.62x51, 8.6x70
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxEU3, 7, 14},	//7.62x51, 5.56x45
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxEU4, 7, 14},	//7.62x51
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxEU5, 7, 14},	//5.7x28, .45ACP
 
 	//Other
 	{Loot_MAGAZINE,		3,		FoodMRE},