From 31ac8cb8d6ad152c236f7779c12ae0ac78112ba3 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 31 Jul 2017 19:15:48 +0000
Subject: [PATCH] - Added riot shields for Grizzly, Raider and It - slightly
 adjusted shield strength

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2382 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 .../TableData/Inventory/MercStartingGear.xml  | 34 +++++++++----------
 gamedir/Data-1.13/TableData/Items/Items.xml   |  4 +--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
index 80829e626..c4adfcdae 100644
--- a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
@@ -571,25 +571,24 @@
 			<lBPackStatus>0</lBPackStatus>
 		</GEARKIT>
 		<GEARKIT>
-			<mGearKitName>HTH</mGearKitName>
+			<mGearKitName>Breach</mGearKitName>
 			<mAbsolutePrice>-1</mAbsolutePrice>
 			<mHelmet>176</mHelmet>
 			<mHelmetStatus>99</mHelmetStatus>
 			<mVest>161</mVest>
-			<mVestStatus>100</mVestStatus>
-			<mWeapon>7</mWeapon>
-			<mWeaponStatus>92</mWeaponStatus>
-			<mBig0>87</mBig0>
-			<mBig0Status>100</mBig0Status>
-			<mBig0Quantity>3</mBig0Quantity>
+			<mVestStatus>100</mVestStatus>			
+			<mWeapon>1743</mWeapon>
+			<mWeaponStatus>100</mWeaponStatus>			
+			<mBig0>7</mBig0>
+			<mBig0Status>92</mBig0Status>
 			<mBig2>49</mBig2>
 			<mBig2Status>98</mBig2Status>
 			<mBig2Quantity>1</mBig2Quantity>
+			<mBig3>87</mBig3>
+			<mBig3Quantity>3</mBig3Quantity>			
 			<mSmall0>214</mSmall0>
 			<lVest>1090</lVest>
-			<lVestStatus>100</lVestStatus>
 			<lRightThigh>1641</lRightThigh>
-			<lRightThighStatus>100</lRightThighStatus>
 		</GEARKIT>
 		<GEARKIT>
 			<mGearKitName>Heavy WPNS</mGearKitName>
@@ -3740,25 +3739,23 @@
 			<lRightThigh>1091</lRightThigh>
 		</GEARKIT>
 		<GEARKIT>
-			<mGearKitName>Gun Choice</mGearKitName>
+			<mGearKitName>Riot Gear</mGearKitName>
 			<mAbsolutePrice>-1</mAbsolutePrice>
 			<mHelmet>176</mHelmet>
 			<mHelmetStatus>98</mHelmetStatus>
 			<mVest>161</mVest>
 			<mVestStatus>98</mVestStatus>
-			<mLegStatus>91</mLegStatus>
-			<mWeapon>747</mWeapon>
-			<mWeaponStatus>92</mWeaponStatus>
-			<mBig0>530</mBig0>
-			<mBig0Quantity>3</mBig0Quantity>
+			<mLegStatus>91</mLegStatus>			
+			<mWeapon>1</mWeapon>			
+			<mBig0>1743</mBig0>
 			<mBig1>214</mBig1>
 			<mBig1Quantity>1</mBig1Quantity>
-			<mBig2>37</mBig2>
+			<mBig2>298</mBig2>
 			<mBig2Status>89</mBig2Status>
 			<mBig2Quantity>1</mBig2Quantity>
+			<mBig3>71</mBig3>
+			<mBig3Quantity>3</mBig3Quantity>			
 			<mSmall0>1625</mSmall0>
-			<mSmall0Status>100</mSmall0Status>
-			<mSmall0Quantity>1</mSmall0Quantity>
 			<lVest>1090</lVest>
 			<lVestStatus>98</lVestStatus>
 		</GEARKIT>
@@ -19810,6 +19807,7 @@
 			<mBig0>64</mBig0>
 			<mBig0Status>93</mBig0Status>
 			<mBig0Quantity>1</mBig0Quantity>
+			<mBig1>1743</mBig1>
 			<mSmall0>86</mSmall0>
 			<mSmall0Status>100</mSmall0Status>
 			<mSmall0Quantity>2</mSmall0Quantity>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 8e66b4e75..60df907f5 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -52279,7 +52279,7 @@
 		<TwoHanded>1</TwoHanded>
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<usRiotShieldStrength>28</usRiotShieldStrength>
+		<usRiotShieldStrength>25</usRiotShieldStrength>
 		<usRiotShieldGraphic>2</usRiotShieldGraphic>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -52308,7 +52308,7 @@
 		<TwoHanded>1</TwoHanded>
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<usRiotShieldStrength>50</usRiotShieldStrength>
+		<usRiotShieldStrength>52</usRiotShieldStrength>
 		<usRiotShieldGraphic>0</usRiotShieldGraphic>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />