From d3c001a32326b05e5ce77f62319170a63831519b Mon Sep 17 00:00:00 2001
From: Starwalker <Starwalker@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 6 Nov 2006 08:41:01 +0000
Subject: [PATCH] Added .357 Magnum AET ammo (both magazine and speedloader)
 Tagged 20mm and 25mm grenade ammo as SciFi, because the relevant launchers
 are tagged as SciFi as well.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@561 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Items.xml     | 93 ++++++++++++-----------
 gamedir/Data-1.13/TableData/Magazines.xml | 12 +++
 2 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index 313366626..e00fb901d 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -68932,31 +68932,32 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>565</uiIndex>
-		<szItemName>Nada</szItemName>
-		<szLongItemName>Nothing</szLongItemName>
-		<szItemDesc>Index 565</szItemDesc>
-		<szBRName>Nothing</szBRName>
-		<szBRDesc>Nothing</szBRDesc>
-		<usItemClass>1</usItemClass>
-		<ubClassIndex>0</ubClassIndex>
+		<szItemName>.357 S-Load AET</szItemName>
+		<szLongItemName>.357 Speed Loader AET</szLongItemName>
+		<szItemDesc>This speed loader holds 6 rounds of .357 Magnum AET ammunition.</szItemDesc>
+		<szBRName>.357 S-Load AET</szBRName>
+		<szBRDesc>Penetrate enemy armor without fear of overpenetration with these french made AET rounds..</szBRDesc>
+		<usItemClass>1024</usItemClass>
+		<ubClassIndex>277</ubClassIndex>
 		<ubCursor>0</ubCursor>
-		<ubGraphicType>0</ubGraphicType>
-		<ubGraphicNum>0</ubGraphicNum>
-		<ubWeight>0</ubWeight>
-		<ubPerPocket>0</ubPerPocket>
-		<usPrice>0</usPrice>
-		<ubCoolness>0</ubCoolness>
-		<bReliability>0</bReliability>
+		<bSoundType>0</bSoundType>
+		<ubGraphicType>1</ubGraphicType>
+		<ubGraphicNum>526</ubGraphicNum>
+		<ubWeight>1</ubWeight>
+		<ubPerPocket>8</ubPerPocket>
+		<usPrice>10</usPrice>
+		<ubCoolness>5</ubCoolness>
+		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
 		<Repairable>0</Repairable>
 		<WaterDamages>0</WaterDamages>
-		<Metal>0</Metal>
-		<Sinks>0</Sinks>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>
 		<ShowStatus>0</ShowStatus>
 		<HiddenAddon>0</HiddenAddon>
 		<TwoHanded>0</TwoHanded>
-		<NotBuyable>1</NotBuyable>
+		<NotBuyable>0</NotBuyable>
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>0</BigGunList>
@@ -68966,7 +68967,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>0</BR_NewInventory>
+		<BR_NewInventory>9</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -69053,32 +69054,32 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>566</uiIndex>
-		<szItemName>Nada</szItemName>
-		<szLongItemName>Nothing</szLongItemName>
-		<szItemDesc>Index 566</szItemDesc>
-		<szBRName>Nothing</szBRName>
-		<szBRDesc>Nothing</szBRDesc>
-		<usItemClass>1</usItemClass>
-		<ubClassIndex>0</ubClassIndex>
+		<szItemName>.357 Mag AET</szItemName>
+		<szLongItemName>.357 Magazine AET</szLongItemName>
+		<szItemDesc>This magazine holds 9 rounds of .357 Magnum AET ammunition.</szItemDesc>
+		<szBRName>.357 Mag AET</szBRName>
+		<szBRDesc>Even if the enemy's armor stops all else, it won't stop these!</szBRDesc>
+		<usItemClass>1024</usItemClass>
+		<ubClassIndex>278</ubClassIndex>
 		<ubCursor>0</ubCursor>
 		<bSoundType>0</bSoundType>
-		<ubGraphicType>0</ubGraphicType>
-		<ubGraphicNum>0</ubGraphicNum>
-		<ubWeight>0</ubWeight>
-		<ubPerPocket>0</ubPerPocket>
-		<usPrice>0</usPrice>
-		<ubCoolness>0</ubCoolness>
-		<bReliability>0</bReliability>
+		<ubGraphicType>1</ubGraphicType>
+		<ubGraphicNum>527</ubGraphicNum>
+		<ubWeight>2</ubWeight>
+		<ubPerPocket>8</ubPerPocket>
+		<usPrice>15</usPrice>
+		<ubCoolness>5</ubCoolness>
+		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
 		<Repairable>0</Repairable>
 		<WaterDamages>0</WaterDamages>
-		<Metal>0</Metal>
-		<Sinks>0</Sinks>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>
 		<ShowStatus>0</ShowStatus>
 		<HiddenAddon>0</HiddenAddon>
 		<TwoHanded>0</TwoHanded>
-		<NotBuyable>1</NotBuyable>
+		<NotBuyable>0</NotBuyable>
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>0</BigGunList>
@@ -69088,7 +69089,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>0</BR_NewInventory>
+		<BR_NewInventory>9</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -116174,7 +116175,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -116296,7 +116297,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -116418,7 +116419,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -116540,7 +116541,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -116662,7 +116663,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -116906,7 +116907,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -117028,7 +117029,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -117150,7 +117151,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -117272,7 +117273,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
@@ -117394,7 +117395,7 @@
 		<Attachment>0</Attachment>
 		<HiddenAttachment>0</HiddenAttachment>
 		<BigGunList>1</BigGunList>
-		<SciFi>0</SciFi>
+		<SciFi>1</SciFi>
 		<NotInEditor>0</NotInEditor>
 		<DefaultUndroppable>0</DefaultUndroppable>
 		<Unaerodynamic>0</Unaerodynamic>
diff --git a/gamedir/Data-1.13/TableData/Magazines.xml b/gamedir/Data-1.13/TableData/Magazines.xml
index 107381f1f..05e26d410 100644
--- a/gamedir/Data-1.13/TableData/Magazines.xml
+++ b/gamedir/Data-1.13/TableData/Magazines.xml
@@ -1662,4 +1662,16 @@
 		<ubMagSize>7</ubMagSize>
 		<ubAmmoType>2</ubAmmoType>
 	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>277</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>6</ubMagSize>
+		<ubAmmoType>13</ubAmmoType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>278</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>9</ubMagSize>
+		<ubAmmoType>13</ubAmmoType>
+	</MAGAZINE>
 </MAGAZINELIST>
\ No newline at end of file