AttachmentClass.xml changed to NasAttachmentClass.xml. (New AttachmentClass.xml added to Lookup folder instead)

New version of XML Editor with above change, plus TripWire, TripWireActivation and new AttachmentClass tags added.
Cleanup of xml files in Data folder after running them through the editor.
Removed references to non-existant item id 1525.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1399 4f8fa57e-7814-0410-bad4-adc449f26b7c

gamedir/Data-1.13/TableData/AttachmentClass.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<JA2Data>
-	<AttachmentClass>
-		<id>0</id>
-		<name>None</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>1</id>
-		<name>Default</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>2</id>
-		<name>Barrel</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>4</id>
-		<name>Laser</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>8</id>
-		<name>Sight</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>16</id>
-		<name>Scope</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>32</id>
-		<name>Stock</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>64</id>
-		<name>Ammo</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>128</id>
-		<name>Internal</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>256</id>
-		<name>External</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>512</id>
-		<name>Underbarrel</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>1024</id>
-		<name>Grenade</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>2048</id>
-		<name>Rocket</name>
-	</AttachmentClass>
-</JA2Data>

gamedir/Data-1.13/TableData/Attachments.xml

@@ -4911,11 +4911,6 @@
 		<itemIndex>1523</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
-	<ATTACHMENT>
-		<attachmentIndex>223</attachmentIndex>
-		<itemIndex>1525</itemIndex>
-		<APCost>20</APCost>
-	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>224</attachmentIndex>
 		<itemIndex>137</itemIndex>
@@ -4935,15 +4930,10 @@
 		<attachmentIndex>224</attachmentIndex>
 		<itemIndex>142</itemIndex>
 		<APCost>20</APCost>
-	</ATTACHMENT>
-	 	<ATTACHMENT>
-		<attachmentIndex>224</attachmentIndex>
-		<itemIndex>1523</itemIndex>
-		<APCost>20</APCost>
 	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>224</attachmentIndex>
-		<itemIndex>1525</itemIndex>
+		<itemIndex>1523</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
 	<ATTACHMENT>
@@ -20976,7 +20966,7 @@
 		<attachmentIndex>1011</attachmentIndex>
 		<itemIndex>333</itemIndex>
 		<APCost>20</APCost>
-	</ATTACHMENT>	
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1011</attachmentIndex>
 		<itemIndex>342</itemIndex>

gamedir/Data-1.13/TableData/Explosives.xml

@@ -1530,4 +1530,40 @@
 		<ubFragDamage>0</ubFragDamage>
 		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
+	<EXPLOSIVE>
+		<uiIndex>85</uiIndex>
+		<ubType>0</ubType>
+		<ubDamage>30</ubDamage>
+		<ubStunDamage>30</ubStunDamage>
+		<ubRadius>2</ubRadius>
+		<ubVolume>30</ubVolume>
+		<ubVolatility>2</ubVolatility>
+		<ubAnimationID>1</ubAnimationID>
+		<ubDuration>0</ubDuration>
+		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>1</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
+	</EXPLOSIVE>
+	<EXPLOSIVE>
+		<uiIndex>86</uiIndex>
+		<ubType>7</ubType>
+		<ubDamage>0</ubDamage>
+		<ubStunDamage>0</ubStunDamage>
+		<ubRadius>0</ubRadius>
+		<ubVolume>0</ubVolume>
+		<ubVolatility>0</ubVolatility>
+		<ubAnimationID>0</ubAnimationID>
+		<ubDuration>2</ubDuration>
+		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>1</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
+	</EXPLOSIVE>
 </EXPLOSIVELIST>

gamedir/Data-1.13/TableData/MercStartingGear.xml

@@ -138,8 +138,8 @@
 			<lCPackStatus>98</lCPackStatus>
 		</GEARKIT>
 		<GEARKIT>
-		  <mGearKitName>Sapper</mGearKitName>
 			<mPriceMod>50</mPriceMod>
+			<mGearKitName>Sapper</mGearKitName>
 			<mAbsolutePrice>-1</mAbsolutePrice>
 			<mHelmet>176</mHelmet>
 			<mHelmetStatus>97</mHelmetStatus>

gamedir/Data-1.13/TableData/NasAttachmentClass.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<JA2Data>
+	<NasAttachmentClass>
+		<id>0</id>
+		<name>None</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>1</id>
+		<name>Default</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>2</id>
+		<name>Barrel</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>4</id>
+		<name>Laser</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>8</id>
+		<name>Sight</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>16</id>
+		<name>Scope</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>32</id>
+		<name>Stock</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>64</id>
+		<name>Ammo</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>128</id>
+		<name>Internal</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>256</id>
+		<name>External</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>512</id>
+		<name>Underbarrel</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>1024</id>
+		<name>Grenade</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>2048</id>
+		<name>Rocket</name>
+	</NasAttachmentClass>
+</JA2Data>

gamedir/Data/TableData/AmmoTypes.xml

@@ -32,6 +32,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>1</uiIndex>
@@ -65,6 +66,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>2</uiIndex>
@@ -98,6 +100,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>3</uiIndex>
@@ -131,6 +134,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>4</uiIndex>
@@ -164,6 +168,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>5</uiIndex>
@@ -197,6 +202,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>6</uiIndex>
@@ -230,6 +236,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>7</uiIndex>
@@ -263,6 +270,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>8</uiIndex>
@@ -296,6 +304,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>9</uiIndex>
@@ -329,6 +338,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>10</uiIndex>
@@ -362,6 +372,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>11</uiIndex>
@@ -395,6 +406,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>12</uiIndex>
@@ -428,6 +440,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>13</uiIndex>
@@ -461,6 +474,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>14</uiIndex>
@@ -494,6 +508,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>15</uiIndex>
@@ -527,6 +542,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>1</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>16</uiIndex>
@@ -560,6 +576,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>1</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>17</uiIndex>
@@ -593,6 +610,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>18</uiIndex>
@@ -626,6 +644,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>19</uiIndex>
@@ -659,6 +678,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>20</uiIndex>
@@ -692,6 +712,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>21</uiIndex>
@@ -725,6 +746,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>22</uiIndex>
@@ -758,6 +780,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>23</uiIndex>
@@ -791,6 +814,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>24</uiIndex>
@@ -824,6 +848,7 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>25</uiIndex>
@@ -857,6 +882,7 @@
 		<lockBustingPower>100</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>26</uiIndex>
@@ -890,5 +916,6 @@
 		<lockBustingPower>0</lockBustingPower>
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
+		<temperatureModificator>1</temperatureModificator>
 	</AMMOTYPE>
 </AMMOTYPELIST>

gamedir/Data/TableData/AttachmentClass.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<JA2Data>
-	<AttachmentClass>
-		<id>0</id>
-		<name>None</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>1</id>
-		<name>Default</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>2</id>
-		<name>Barrel</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>4</id>
-		<name>Laser</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>8</id>
-		<name>Sight</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>16</id>
-		<name>Scope</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>32</id>
-		<name>Stock</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>64</id>
-		<name>Ammo</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>128</id>
-		<name>Internal</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>256</id>
-		<name>External</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>512</id>
-		<name>Underbarrel</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>1024</id>
-		<name>Grenade</name>
-	</AttachmentClass>
-	<AttachmentClass>
-		<id>2048</id>
-		<name>Rocket</name>
-	</AttachmentClass>
-</JA2Data>

gamedir/Data/TableData/Attachments.xml

@@ -4,6 +4,7 @@
 		<attachmentIndex>50</attachmentIndex>
 		<itemIndex>12</itemIndex>
 		<APCost>5</APCost>
+		<NASOnly>0</NASOnly>
 	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>50</attachmentIndex>

gamedir/Data/TableData/Explosives.xml

@@ -11,6 +11,12 @@
 		<ubAnimationID>4</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>1</uiIndex>
@@ -23,6 +29,12 @@
 		<ubAnimationID>6</ubAnimationID>
 		<ubDuration>5</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>2</uiIndex>
@@ -35,6 +47,12 @@
 		<ubAnimationID>8</ubAnimationID>
 		<ubDuration>5</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>3</uiIndex>
@@ -47,6 +65,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>4</uiIndex>
@@ -59,6 +83,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>5</uiIndex>
@@ -71,6 +101,12 @@
 		<ubAnimationID>2</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>6</uiIndex>
@@ -83,6 +119,12 @@
 		<ubAnimationID>2</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>7</uiIndex>
@@ -95,6 +137,12 @@
 		<ubAnimationID>2</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>8</uiIndex>
@@ -107,6 +155,12 @@
 		<ubAnimationID>2</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>9</uiIndex>
@@ -119,6 +173,12 @@
 		<ubAnimationID>2</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>10</uiIndex>
@@ -131,6 +191,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>11</uiIndex>
@@ -143,6 +209,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>12</uiIndex>
@@ -155,6 +227,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>35</ubDuration>
 		<ubStartRadius>6</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>13</uiIndex>
@@ -167,6 +245,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>14</uiIndex>
@@ -179,6 +263,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>15</uiIndex>
@@ -191,6 +281,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>35</ubDuration>
 		<ubStartRadius>6</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>16</uiIndex>
@@ -203,6 +299,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>17</uiIndex>
@@ -215,6 +317,12 @@
 		<ubAnimationID>6</ubAnimationID>
 		<ubDuration>5</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>18</uiIndex>
@@ -227,6 +335,12 @@
 		<ubAnimationID>4</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>19</uiIndex>
@@ -239,6 +353,12 @@
 		<ubAnimationID>7</ubAnimationID>
 		<ubDuration>5</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>20</uiIndex>
@@ -251,6 +371,12 @@
 		<ubAnimationID>7</ubAnimationID>
 		<ubDuration>5</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>21</uiIndex>
@@ -263,6 +389,12 @@
 		<ubAnimationID>2</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>22</uiIndex>
@@ -275,6 +407,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>23</uiIndex>
@@ -287,6 +425,12 @@
 		<ubAnimationID>1</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>24</uiIndex>
@@ -299,6 +443,12 @@
 		<ubAnimationID>2</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>25</uiIndex>
@@ -311,6 +461,12 @@
 		<ubAnimationID>3</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>26</uiIndex>
@@ -323,6 +479,12 @@
 		<ubAnimationID>6</ubAnimationID>
 		<ubDuration>5</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>27</uiIndex>
@@ -335,6 +497,12 @@
 		<ubAnimationID>0</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>28</uiIndex>
@@ -347,6 +515,12 @@
 		<ubAnimationID>0</ubAnimationID>
 		<ubDuration>0</ubDuration>
 		<ubStartRadius>1</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 	<EXPLOSIVE>
 		<uiIndex>29</uiIndex>
@@ -359,5 +533,11 @@
 		<ubAnimationID>0</ubAnimationID>
 		<ubDuration>2</ubDuration>
 		<ubStartRadius>0</ubStartRadius>
+		<ubMagSize>0</ubMagSize>
+		<fExplodeOnImpact>0</fExplodeOnImpact>
+		<usNumFragments>0</usNumFragments>
+		<ubFragType>0</ubFragType>
+		<ubFragDamage>0</ubFragDamage>
+		<ubFragRange>0</ubFragRange>
 	</EXPLOSIVE>
 </EXPLOSIVELIST>

gamedir/Data/TableData/IMPItemChoices.xml

@@ -1624,7 +1624,7 @@
 		<bItemNo49>0</bItemNo49>
 		<bItemNo50>0</bItemNo50>
 	</IMPITEMCHOICES>
-		<IMPITEMCHOICES>
+	<IMPITEMCHOICES>
 		<uiIndex>29</uiIndex>
 		<name />
 		<ubChoices>0</ubChoices>
@@ -1680,7 +1680,7 @@
 		<bItemNo49>0</bItemNo49>
 		<bItemNo50>0</bItemNo50>
 	</IMPITEMCHOICES>
-		<IMPITEMCHOICES>
+	<IMPITEMCHOICES>
 		<uiIndex>30</uiIndex>
 		<name />
 		<ubChoices>0</ubChoices>

gamedir/Data/TableData/Magazines.xml

@@ -1,369 +1,430 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<MAGAZINELIST>
-	<MAGAZINE>
-		<uiIndex>0</uiIndex>
-		<ubCalibre>1</ubCalibre>
-		<ubMagSize>6</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>1</uiIndex>
-		<ubCalibre>1</ubCalibre>
-		<ubMagSize>6</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>2</uiIndex>
-		<ubCalibre>1</ubCalibre>
-		<ubMagSize>6</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>3</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>15</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>4</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>15</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>5</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>15</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>6</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>7</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>8</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>9</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>50</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>10</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>50</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>11</uiIndex>
-		<ubCalibre>2</ubCalibre>
-		<ubMagSize>50</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>12</uiIndex>
-		<ubCalibre>3</ubCalibre>
-		<ubMagSize>7</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>13</uiIndex>
-		<ubCalibre>3</ubCalibre>
-		<ubMagSize>7</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>14</uiIndex>
-		<ubCalibre>3</ubCalibre>
-		<ubMagSize>7</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>15</uiIndex>
-		<ubCalibre>3</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>16</uiIndex>
-		<ubCalibre>3</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>17</uiIndex>
-		<ubCalibre>3</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>18</uiIndex>
-		<ubCalibre>4</ubCalibre>
-		<ubMagSize>6</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>19</uiIndex>
-		<ubCalibre>4</ubCalibre>
-		<ubMagSize>6</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>20</uiIndex>
-		<ubCalibre>4</ubCalibre>
-		<ubMagSize>6</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>21</uiIndex>
-		<ubCalibre>4</ubCalibre>
-		<ubMagSize>9</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>22</uiIndex>
-		<ubCalibre>4</ubCalibre>
-		<ubMagSize>9</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>23</uiIndex>
-		<ubCalibre>4</ubCalibre>
-		<ubMagSize>9</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>24</uiIndex>
-		<ubCalibre>5</ubCalibre>
-		<ubMagSize>7</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>25</uiIndex>
-		<ubCalibre>5</ubCalibre>
-		<ubMagSize>7</ubMagSize>
-		<ubAmmoType>4</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>26</uiIndex>
-		<ubCalibre>6</ubCalibre>
-		<ubMagSize>10</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>27</uiIndex>
-		<ubCalibre>6</ubCalibre>
-		<ubMagSize>10</ubMagSize>
-		<ubAmmoType>4</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>28</uiIndex>
-		<ubCalibre>7</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>29</uiIndex>
-		<ubCalibre>7</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>30</uiIndex>
-		<ubCalibre>7</ubCalibre>
-		<ubMagSize>45</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>31</uiIndex>
-		<ubCalibre>7</ubCalibre>
-		<ubMagSize>45</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>32</uiIndex>
-		<ubCalibre>8</ubCalibre>
-		<ubMagSize>10</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>33</uiIndex>
-		<ubCalibre>8</ubCalibre>
-		<ubMagSize>10</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>34</uiIndex>
-		<ubCalibre>8</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>35</uiIndex>
-		<ubCalibre>8</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>36</uiIndex>
-		<ubCalibre>8</ubCalibre>
-		<ubMagSize>200</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>37</uiIndex>
-		<ubCalibre>8</ubCalibre>
-		<ubMagSize>200</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>38</uiIndex>
-		<ubCalibre>9</ubCalibre>
-		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>39</uiIndex>
-		<ubCalibre>9</ubCalibre>
-		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>40</uiIndex>
-		<ubCalibre>9</ubCalibre>
-		<ubMagSize>20</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>41</uiIndex>
-		<ubCalibre>9</ubCalibre>
-		<ubMagSize>20</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>42</uiIndex>
-		<ubCalibre>9</ubCalibre>
-		<ubMagSize>100</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>43</uiIndex>
-		<ubCalibre>9</ubCalibre>
-		<ubMagSize>100</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>44</uiIndex>
-		<ubCalibre>10</ubCalibre>
-		<ubMagSize>10</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>45</uiIndex>
-		<ubCalibre>10</ubCalibre>
-		<ubMagSize>10</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>46</uiIndex>
-		<ubCalibre>10</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>47</uiIndex>
-		<ubCalibre>10</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>2</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>48</uiIndex>
-		<ubCalibre>11</ubCalibre>
-		<ubMagSize>45</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>49</uiIndex>
-		<ubCalibre>12</ubCalibre>
-		<ubMagSize>50</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>50</uiIndex>
-		<ubCalibre>12</ubCalibre>
-		<ubMagSize>50</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>51</uiIndex>
-		<ubCalibre>14</ubCalibre>
-		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>52</uiIndex>
-		<ubCalibre>14</ubCalibre>
-		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>9</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>53</uiIndex>
-		<ubCalibre>14</ubCalibre>
-		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>10</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>54</uiIndex>
-		<ubCalibre>15</ubCalibre>
-		<ubMagSize>1</ubMagSize>
-		<ubAmmoType>11</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>55</uiIndex>
-		<ubCalibre>16</ubCalibre>
-		<ubMagSize>5</ubMagSize>
-		<ubAmmoType>12</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>56</uiIndex>
-		<ubCalibre>17</ubCalibre>
-		<ubMagSize>11</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>57</uiIndex>
-		<ubCalibre>18</ubCalibre>
-		<ubMagSize>20</ubMagSize>
-		<ubAmmoType>3</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>58</uiIndex>
-		<ubCalibre>20</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>59</uiIndex>
-		<ubCalibre>20</ubCalibre>
-		<ubMagSize>30</ubMagSize>
-		<ubAmmoType>1</ubAmmoType>
-	</MAGAZINE>
-	<MAGAZINE>
-		<uiIndex>60</uiIndex>
-		<ubCalibre>0</ubCalibre>
-		<ubMagSize>0</ubMagSize>
-		<ubAmmoType>0</ubAmmoType>
-	</MAGAZINE>
+<?xml version="1.0" encoding="utf-8"?>
+<MAGAZINELIST>
+	<MAGAZINE>
+		<uiIndex>0</uiIndex>
+		<ubCalibre>0</ubCalibre>
+		<ubMagSize>0</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>1</uiIndex>
+		<ubCalibre>1</ubCalibre>
+		<ubMagSize>6</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>2</uiIndex>
+		<ubCalibre>1</ubCalibre>
+		<ubMagSize>6</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>3</uiIndex>
+		<ubCalibre>1</ubCalibre>
+		<ubMagSize>6</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>4</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>15</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>5</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>15</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>6</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>15</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>7</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>8</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>9</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>10</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>50</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>11</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>50</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>12</uiIndex>
+		<ubCalibre>2</ubCalibre>
+		<ubMagSize>50</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>13</uiIndex>
+		<ubCalibre>3</ubCalibre>
+		<ubMagSize>7</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>14</uiIndex>
+		<ubCalibre>3</ubCalibre>
+		<ubMagSize>7</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>15</uiIndex>
+		<ubCalibre>3</ubCalibre>
+		<ubMagSize>7</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>16</uiIndex>
+		<ubCalibre>3</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>17</uiIndex>
+		<ubCalibre>3</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>18</uiIndex>
+		<ubCalibre>3</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>19</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>6</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>20</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>6</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>21</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>6</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>22</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>9</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>23</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>9</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>24</uiIndex>
+		<ubCalibre>4</ubCalibre>
+		<ubMagSize>9</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>25</uiIndex>
+		<ubCalibre>5</ubCalibre>
+		<ubMagSize>7</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>26</uiIndex>
+		<ubCalibre>5</ubCalibre>
+		<ubMagSize>7</ubMagSize>
+		<ubAmmoType>4</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>27</uiIndex>
+		<ubCalibre>6</ubCalibre>
+		<ubMagSize>10</ubMagSize>
+		<ubAmmoType>3</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>28</uiIndex>
+		<ubCalibre>6</ubCalibre>
+		<ubMagSize>10</ubMagSize>
+		<ubAmmoType>4</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>29</uiIndex>
+		<ubCalibre>7</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>30</uiIndex>
+		<ubCalibre>7</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>31</uiIndex>
+		<ubCalibre>7</ubCalibre>
+		<ubMagSize>45</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>32</uiIndex>
+		<ubCalibre>7</ubCalibre>
+		<ubMagSize>45</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>33</uiIndex>
+		<ubCalibre>8</ubCalibre>
+		<ubMagSize>10</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>34</uiIndex>
+		<ubCalibre>8</ubCalibre>
+		<ubMagSize>10</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>35</uiIndex>
+		<ubCalibre>8</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>36</uiIndex>
+		<ubCalibre>8</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>37</uiIndex>
+		<ubCalibre>8</ubCalibre>
+		<ubMagSize>200</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>38</uiIndex>
+		<ubCalibre>8</ubCalibre>
+		<ubMagSize>200</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>39</uiIndex>
+		<ubCalibre>9</ubCalibre>
+		<ubMagSize>5</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>40</uiIndex>
+		<ubCalibre>9</ubCalibre>
+		<ubMagSize>5</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>41</uiIndex>
+		<ubCalibre>9</ubCalibre>
+		<ubMagSize>20</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>42</uiIndex>
+		<ubCalibre>9</ubCalibre>
+		<ubMagSize>20</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>43</uiIndex>
+		<ubCalibre>9</ubCalibre>
+		<ubMagSize>100</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>44</uiIndex>
+		<ubCalibre>9</ubCalibre>
+		<ubMagSize>100</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>45</uiIndex>
+		<ubCalibre>10</ubCalibre>
+		<ubMagSize>10</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>46</uiIndex>
+		<ubCalibre>10</ubCalibre>
+		<ubMagSize>10</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>47</uiIndex>
+		<ubCalibre>10</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>48</uiIndex>
+		<ubCalibre>10</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>2</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>49</uiIndex>
+		<ubCalibre>11</ubCalibre>
+		<ubMagSize>45</ubMagSize>
+		<ubAmmoType>3</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>50</uiIndex>
+		<ubCalibre>12</ubCalibre>
+		<ubMagSize>50</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>51</uiIndex>
+		<ubCalibre>12</ubCalibre>
+		<ubMagSize>50</ubMagSize>
+		<ubAmmoType>3</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>52</uiIndex>
+		<ubCalibre>14</ubCalibre>
+		<ubMagSize>5</ubMagSize>
+		<ubAmmoType>3</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>53</uiIndex>
+		<ubCalibre>14</ubCalibre>
+		<ubMagSize>5</ubMagSize>
+		<ubAmmoType>9</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>54</uiIndex>
+		<ubCalibre>14</ubCalibre>
+		<ubMagSize>5</ubMagSize>
+		<ubAmmoType>10</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>55</uiIndex>
+		<ubCalibre>15</ubCalibre>
+		<ubMagSize>1</ubMagSize>
+		<ubAmmoType>11</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>56</uiIndex>
+		<ubCalibre>16</ubCalibre>
+		<ubMagSize>5</ubMagSize>
+		<ubAmmoType>12</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>57</uiIndex>
+		<ubCalibre>17</ubCalibre>
+		<ubMagSize>11</ubMagSize>
+		<ubAmmoType>3</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>58</uiIndex>
+		<ubCalibre>18</ubCalibre>
+		<ubMagSize>20</ubMagSize>
+		<ubAmmoType>3</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>59</uiIndex>
+		<ubCalibre>20</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>0</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
+	<MAGAZINE>
+		<uiIndex>60</uiIndex>
+		<ubCalibre>20</ubCalibre>
+		<ubMagSize>30</ubMagSize>
+		<ubAmmoType>1</ubAmmoType>
+		<ubMagType>0</ubMagType>
+	</MAGAZINE>
 </MAGAZINELIST>

gamedir/Data/TableData/NPCInventory/AlbertoInventory.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/CarloInventory.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/DevinInventory.xml

@@ -1,158 +1,158 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>40</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>41</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>50</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>51</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>111</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>112</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>113</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>131</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>8</uiIndex>
-		<sItemIndex>132</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>9</uiIndex>
-		<sItemIndex>133</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>10</uiIndex>
-		<sItemIndex>134</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>11</uiIndex>
-		<sItemIndex>135</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>12</uiIndex>
-		<sItemIndex>136</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>13</uiIndex>
-		<sItemIndex>137</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>14</uiIndex>
-		<sItemIndex>138</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>15</uiIndex>
-		<sItemIndex>139</sItemIndex>
-		<ubOptimalNumber>4</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>16</uiIndex>
-		<sItemIndex>140</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>17</uiIndex>
-		<sItemIndex>141</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>18</uiIndex>
-		<sItemIndex>142</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>19</uiIndex>
-		<sItemIndex>145</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>20</uiIndex>
-		<sItemIndex>147</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>21</uiIndex>
-		<sItemIndex>148</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>22</uiIndex>
-		<sItemIndex>149</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>23</uiIndex>
-		<sItemIndex>150</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>24</uiIndex>
-		<sItemIndex>151</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>25</uiIndex>
-		<sItemIndex>215</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>26</uiIndex>
-		<sItemIndex>223</sItemIndex>
-		<ubOptimalNumber>10</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>27</uiIndex>
-		<sItemIndex>224</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>28</uiIndex>
-		<sItemIndex>242</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>29</uiIndex>
-		<sItemIndex>243</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>30</uiIndex>
-		<sItemIndex>304</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>40</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>41</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>50</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>51</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>111</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>112</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>113</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>131</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>132</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>133</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>134</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>135</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>136</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>137</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>138</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>139</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>140</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>141</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>142</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>145</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>147</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>148</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>149</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>150</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>24</uiIndex>
+		<sItemIndex>151</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>25</uiIndex>
+		<sItemIndex>215</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>26</uiIndex>
+		<sItemIndex>223</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>27</uiIndex>
+		<sItemIndex>224</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>28</uiIndex>
+		<sItemIndex>242</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>29</uiIndex>
+		<sItemIndex>243</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>30</uiIndex>
+		<sItemIndex>304</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/ElginInventory.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/FrankInventory.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/FranzInventory.xml

@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>61</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>164</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>167</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>170</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>173</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>177</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>180</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>183</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>8</uiIndex>
-		<sItemIndex>196</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>9</uiIndex>
-		<sItemIndex>205</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>10</uiIndex>
-		<sItemIndex>210</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>11</uiIndex>
-		<sItemIndex>211</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>12</uiIndex>
-		<sItemIndex>215</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>13</uiIndex>
-		<sItemIndex>241</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>14</uiIndex>
-		<sItemIndex>258</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>15</uiIndex>
-		<sItemIndex>264</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>16</uiIndex>
-		<sItemIndex>265</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>17</uiIndex>
-		<sItemIndex>315</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>18</uiIndex>
-		<sItemIndex>318</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>61</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>164</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>167</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>170</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>173</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>177</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>180</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>183</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>196</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>205</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>210</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>211</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>215</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>241</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>258</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>264</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>265</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>315</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>318</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/GabbyInventory.xml

@@ -1,53 +1,46 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>217</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>218</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>220</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>221</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>230</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>231</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>232</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>260</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>8</uiIndex>
-		<sItemIndex>261</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>9</uiIndex>
-		<sItemIndex>262</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>217</sItemIndex>
+		<ubOptimalNumber>0</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>218</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>220</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>221</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>230</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>231</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>232</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>260</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>261</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>262</sItemIndex>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/HerveInventory.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/HowardInventory.xml

@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>37</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>114</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>201</sItemIndex>
-		<ubOptimalNumber>10</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>202</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>222</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>235</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>320</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>37</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>114</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>201</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>202</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>222</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>235</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>320</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/JakeInventory.xml

@@ -1,198 +1,198 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>1</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>2</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>3</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>4</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>5</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>6</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>7</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>8</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>8</uiIndex>
-		<sItemIndex>37</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>9</uiIndex>
-		<sItemIndex>38</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>10</uiIndex>
-		<sItemIndex>49</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>11</uiIndex>
-		<sItemIndex>54</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>12</uiIndex>
-		<sItemIndex>64</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>13</uiIndex>
-		<sItemIndex>77</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>14</uiIndex>
-		<sItemIndex>146</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>15</uiIndex>
-		<sItemIndex>176</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>16</uiIndex>
-		<sItemIndex>183</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>17</uiIndex>
-		<sItemIndex>194</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>18</uiIndex>
-		<sItemIndex>195</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>19</uiIndex>
-		<sItemIndex>201</sItemIndex>
-		<ubOptimalNumber>4</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>20</uiIndex>
-		<sItemIndex>202</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>21</uiIndex>
-		<sItemIndex>203</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>22</uiIndex>
-		<sItemIndex>204</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>23</uiIndex>
-		<sItemIndex>209</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>24</uiIndex>
-		<sItemIndex>214</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>25</uiIndex>
-		<sItemIndex>216</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>26</uiIndex>
-		<sItemIndex>220</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>27</uiIndex>
-		<sItemIndex>243</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>28</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>29</uiIndex>
-		<sItemIndex>247</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>30</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>31</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>32</uiIndex>
-		<sItemIndex>257</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>33</uiIndex>
-		<sItemIndex>264</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>34</uiIndex>
-		<sItemIndex>265</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>35</uiIndex>
-		<sItemIndex>266</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>36</uiIndex>
-		<sItemIndex>267</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>37</uiIndex>
-		<sItemIndex>269</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>38</uiIndex>
-		<sItemIndex>319</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>1</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>2</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>3</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>4</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>5</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>6</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>7</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>8</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>37</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>38</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>49</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>54</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>64</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>77</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>146</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>176</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>183</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>194</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>195</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>201</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>202</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>203</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>204</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>209</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>24</uiIndex>
+		<sItemIndex>214</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>25</uiIndex>
+		<sItemIndex>216</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>26</uiIndex>
+		<sItemIndex>220</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>27</uiIndex>
+		<sItemIndex>243</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>28</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>29</uiIndex>
+		<sItemIndex>247</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>30</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>31</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>32</uiIndex>
+		<sItemIndex>257</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>33</uiIndex>
+		<sItemIndex>264</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>34</uiIndex>
+		<sItemIndex>265</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>35</uiIndex>
+		<sItemIndex>266</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>36</uiIndex>
+		<sItemIndex>267</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>37</uiIndex>
+		<sItemIndex>269</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>38</uiIndex>
+		<sItemIndex>319</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/KeithInventory.xml

@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>37</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>38</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>49</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>54</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>64</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>161</sItemIndex>
-		<ubOptimalNumber>2</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>176</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>188</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>8</uiIndex>
-		<sItemIndex>201</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>9</uiIndex>
-		<sItemIndex>203</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>10</uiIndex>
-		<sItemIndex>212</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>11</uiIndex>
-		<sItemIndex>213</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>12</uiIndex>
-		<sItemIndex>214</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>13</uiIndex>
-		<sItemIndex>220</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>14</uiIndex>
-		<sItemIndex>266</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>15</uiIndex>
-		<sItemIndex>267</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>16</uiIndex>
-		<sItemIndex>303</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>37</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>38</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>49</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>54</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>64</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>161</sItemIndex>
+		<ubOptimalNumber>2</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>176</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>188</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>201</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>203</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>212</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>213</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>214</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>220</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>266</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>267</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>303</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/MannyInventory.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/MickeyInventory.xml

@@ -1,38 +1,32 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>217</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>230</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>231</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>232</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>260</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>261</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>262</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>217</sItemIndex>
+		<ubOptimalNumber>0</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>230</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>231</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>232</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>260</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>261</sItemIndex>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>262</sItemIndex>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/PeterInventory.xml

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>245</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>255</sItemIndex>
-		<ubOptimalNumber>6</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>256</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>245</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>255</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>256</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NPCInventory/SamInventory.xml

@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<INVENTORYLIST>
-	<INVENTORY>
-		<uiIndex>0</uiIndex>
-		<sItemIndex>64</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>1</uiIndex>
-		<sItemIndex>71</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>2</uiIndex>
-		<sItemIndex>72</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>3</uiIndex>
-		<sItemIndex>77</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>4</uiIndex>
-		<sItemIndex>80</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>5</uiIndex>
-		<sItemIndex>81</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>6</uiIndex>
-		<sItemIndex>86</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>7</uiIndex>
-		<sItemIndex>87</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>8</uiIndex>
-		<sItemIndex>107</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>9</uiIndex>
-		<sItemIndex>108</sItemIndex>
-		<ubOptimalNumber>9</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>10</uiIndex>
-		<sItemIndex>146</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>11</uiIndex>
-		<sItemIndex>201</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>12</uiIndex>
-		<sItemIndex>203</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>13</uiIndex>
-		<sItemIndex>204</sItemIndex>
-		<ubOptimalNumber>4</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>14</uiIndex>
-		<sItemIndex>214</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>15</uiIndex>
-		<sItemIndex>215</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>16</uiIndex>
-		<sItemIndex>220</sItemIndex>
-		<ubOptimalNumber>12</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>17</uiIndex>
-		<sItemIndex>243</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>18</uiIndex>
-		<sItemIndex>244</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>19</uiIndex>
-		<sItemIndex>258</sItemIndex>
-		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>20</uiIndex>
-		<sItemIndex>309</sItemIndex>
-		<ubOptimalNumber>3</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>21</uiIndex>
-		<sItemIndex>316</sItemIndex>
-		<ubOptimalNumber>5</ubOptimalNumber>
-	</INVENTORY>
-	<INVENTORY>
-		<uiIndex>22</uiIndex>
-		<sItemIndex>322</sItemIndex>
-		<ubOptimalNumber>10</ubOptimalNumber>
-	</INVENTORY>
+<?xml version="1.0" encoding="utf-8"?>
+<INVENTORYLIST>
+	<INVENTORY>
+		<uiIndex>0</uiIndex>
+		<sItemIndex>64</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>71</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>72</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>77</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>80</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>81</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>86</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>87</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>107</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>108</sItemIndex>
+		<ubOptimalNumber>9</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>146</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>201</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>203</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>204</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>214</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>215</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>220</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>243</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>244</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>258</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>309</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>316</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>322</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

gamedir/Data/TableData/NasAttachmentClass.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<JA2Data>
+	<NasAttachmentClass>
+		<id>0</id>
+		<name>None</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>1</id>
+		<name>Default</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>2</id>
+		<name>Barrel</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>4</id>
+		<name>Laser</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>8</id>
+		<name>Sight</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>16</id>
+		<name>Scope</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>32</id>
+		<name>Stock</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>64</id>
+		<name>Ammo</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>128</id>
+		<name>Internal</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>256</id>
+		<name>External</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>512</id>
+		<name>Underbarrel</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>1024</id>
+		<name>Grenade</name>
+	</NasAttachmentClass>
+	<NasAttachmentClass>
+		<id>2048</id>
+		<name>Rocket</name>
+	</NasAttachmentClass>
+</JA2Data>

gamedir/Data/TableData/Weapons.xml

@@ -33,6 +33,7 @@
 		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
 		<AutoPenalty>0</AutoPenalty>
 		<NoSemiAuto>0</NoSemiAuto>
+		<EasyUnjam>0</EasyUnjam>
 		<APsToReloadManually>0</APsToReloadManually>
 		<ManualReloadSound>0</ManualReloadSound>
 		<nAccuracy>0</nAccuracy>
@@ -40,6 +41,10 @@
 		<bRecoilY>0</bRecoilY>
 		<ubAimLevels>0</ubAimLevels>
 		<ubRecoilDelay>0</ubRecoilDelay>
+		<Handling>0</Handling>
+		<usOverheatingJamThreshold>4000</usOverheatingJamThreshold>
+		<usOverheatingDamageThreshold>5000</usOverheatingDamageThreshold>
+		<usOverheatingSingleShotTemperature>80</usOverheatingSingleShotTemperature>
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>1</uiIndex>
@@ -1613,7 +1618,7 @@
 	</WEAPON>
 	<WEAPON>
 		<uiIndex>56</uiIndex>
-		<szWeaponName>Automag III</szWeaponName>
+		<szWeaponName>Automag III Custom</szWeaponName>
 		<ubWeaponClass>1</ubWeaponClass>
 		<ubWeaponType>1</ubWeaponType>
 		<ubCalibre>9</ubCalibre>