added missing xml entries

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

gamedir/Data-1.13/TableData/Items/AmmoTypes.xml

@@ -35,6 +35,7 @@
 		<temperatureModificator>0.0</temperatureModificator>
 		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>1</uiIndex>
@@ -69,7 +70,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.17</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>2</uiIndex>
@@ -104,7 +107,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.13</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.2</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>3</uiIndex>
@@ -139,7 +144,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.3</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.2</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>4</uiIndex>
@@ -174,7 +181,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern>BuckshotSpread</spreadPattern>
 		<temperatureModificator>0.0</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>5</uiIndex>
@@ -209,7 +218,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern>FlechetteSpread</spreadPattern>
 		<temperatureModificator>0.03</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>-0.25</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>6</uiIndex>
@@ -244,7 +255,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.08</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>7</uiIndex>
@@ -279,7 +292,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.0</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>8</uiIndex>
@@ -314,7 +329,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.0</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>9</uiIndex>
@@ -349,7 +366,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.15</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.0</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>10</uiIndex>
@@ -384,7 +403,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.3</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.4</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>11</uiIndex>
@@ -419,7 +440,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.1</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>-0.5</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>12</uiIndex>
@@ -454,7 +477,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.5</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.8</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>13</uiIndex>
@@ -489,7 +514,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.35</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.3</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>14</uiIndex>
@@ -524,7 +551,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.2</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.08</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>15</uiIndex>
@@ -559,7 +588,9 @@
 		<tracerEffect>1</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.25</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.4</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>16</uiIndex>
@@ -594,7 +625,9 @@
 		<tracerEffect>1</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.35</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.5</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>17</uiIndex>
@@ -629,7 +662,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.08</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.15</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>18</uiIndex>
@@ -664,7 +699,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.18</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.35</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>19</uiIndex>
@@ -699,7 +736,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.1</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>-0.15</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>20</uiIndex>
@@ -734,7 +773,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.15</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>-0.05</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>21</uiIndex>
@@ -769,7 +810,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.04</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>22</uiIndex>
@@ -804,7 +847,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.07</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>23</uiIndex>
@@ -839,7 +884,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.05</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>-0.1</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>24</uiIndex>
@@ -874,7 +921,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.13</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.03</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>25</uiIndex>
@@ -909,7 +958,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.06</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.35</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>26</uiIndex>
@@ -944,7 +995,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.23</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.27</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>27</uiIndex>
@@ -979,7 +1032,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern>DuplexSpread</spreadPattern>
 		<temperatureModificator>0.15</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.3</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>28</uiIndex>
@@ -1014,7 +1069,9 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.03</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.2</dirtModificator>
+		<ammoflag>0</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
 		<uiIndex>29</uiIndex>
@@ -1049,6 +1106,8 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>-0.1</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
+		<dirtModificator>0</dirtModificator>
 		<ammoflag>1</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
@@ -1084,6 +1143,8 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
+		<dirtModificator>0</dirtModificator>
 		<ammoflag>2</ammoflag>
 	</AMMOTYPE>
 	<AMMOTYPE>
@@ -1119,6 +1180,7 @@
 		<tracerEffect>0</tracerEffect>
 		<spreadPattern />
 		<temperatureModificator>0.3</temperatureModificator>
+		<PoisonPercentage>0</PoisonPercentage>
 		<dirtModificator>0.2</dirtModificator>
 		<ammoflag>4</ammoflag>
 	</AMMOTYPE>

gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <LOADBEARINGEQUIPMENTLIST>
 	<LOADBEARINGEQUIPMENT>
 		<lbeIndex>0</lbeIndex>
@@ -1920,7 +1920,7 @@
 		<lbePocketIndex11>0</lbePocketIndex11>
 		<lbePocketIndex12>0</lbePocketIndex12>
 	</LOADBEARINGEQUIPMENT>
-		<LOADBEARINGEQUIPMENT>
+	<LOADBEARINGEQUIPMENT>
 		<lbeIndex>96</lbeIndex>
 		<lbeClass>1</lbeClass>
 		<lbeCombo>0</lbeCombo>
@@ -1945,6 +1945,8 @@
 		<lbeClass>3</lbeClass>
 		<lbeCombo>0</lbeCombo>
 		<lbeFilledSize>30</lbeFilledSize>
+		<lbeAvailableVolume>0</lbeAvailableVolume>
+		<lbePocketsAvailable>0</lbePocketsAvailable>
 		<lbePocketIndex1>16</lbePocketIndex1>
 		<lbePocketIndex2>16</lbePocketIndex2>
 		<lbePocketIndex3>0</lbePocketIndex3>
@@ -1958,7 +1960,7 @@
 		<lbePocketIndex11>0</lbePocketIndex11>
 		<lbePocketIndex12>0</lbePocketIndex12>
 	</LOADBEARINGEQUIPMENT>
-		<LOADBEARINGEQUIPMENT>
+	<LOADBEARINGEQUIPMENT>
 		<lbeIndex>98</lbeIndex>
 		<lbeClass>4</lbeClass>
 		<lbeCombo>1</lbeCombo>
@@ -2038,7 +2040,7 @@
 		<lbePocketIndex11>0</lbePocketIndex11>
 		<lbePocketIndex12>0</lbePocketIndex12>
 	</LOADBEARINGEQUIPMENT>
-			<LOADBEARINGEQUIPMENT>
+	<LOADBEARINGEQUIPMENT>
 		<lbeIndex>102</lbeIndex>
 		<lbeClass>4</lbeClass>
 		<lbeCombo>1</lbeCombo>
@@ -2078,7 +2080,7 @@
 		<lbePocketIndex11>0</lbePocketIndex11>
 		<lbePocketIndex12>0</lbePocketIndex12>
 	</LOADBEARINGEQUIPMENT>
-		<LOADBEARINGEQUIPMENT>
+	<LOADBEARINGEQUIPMENT>
 		<lbeIndex>104</lbeIndex>
 		<lbeClass>1</lbeClass>
 		<lbeCombo>0</lbeCombo>
@@ -2118,7 +2120,7 @@
 		<lbePocketIndex11>0</lbePocketIndex11>
 		<lbePocketIndex12>0</lbePocketIndex12>
 	</LOADBEARINGEQUIPMENT>
-			<LOADBEARINGEQUIPMENT>
+	<LOADBEARINGEQUIPMENT>
 		<lbeIndex>106</lbeIndex>
 		<lbeClass>4</lbeClass>
 		<lbeCombo>1</lbeCombo>

gamedir/Data-1.13/TableData/Items/Merges.xml

@@ -136,7 +136,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-<MERGE>
+	<MERGE>
 		<firstItemIndex>37</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -304,7 +304,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>54</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -2184,7 +2184,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>299</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -2217,14 +2217,14 @@
 		<APCost>20</APCost>
 	</MERGE>
 	<MERGE>
-        <firstItemIndex>299</firstItemIndex>
-        <secondItemIndex>1640</secondItemIndex>
-        <firstResultingItemIndex>1524</firstResultingItemIndex>
-        <secondResultingItemIndex>1524</secondResultingItemIndex>
-        <mergeType>13</mergeType>
-        <APCost>20</APCost>
-    </MERGE>
-    <MERGE>
+		<firstItemIndex>299</firstItemIndex>
+		<secondItemIndex>1640</secondItemIndex>
+		<firstResultingItemIndex>1524</firstResultingItemIndex>
+		<secondResultingItemIndex>1524</secondResultingItemIndex>
+		<mergeType>13</mergeType>
+		<APCost>20</APCost>
+	</MERGE>
+	<MERGE>
 		<firstItemIndex>300</firstItemIndex>
 		<secondItemIndex>194</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -2360,7 +2360,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>300</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -2528,7 +2528,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>301</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -2736,7 +2736,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>593</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -2904,7 +2904,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>594</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -3072,7 +3072,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>595</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -3248,7 +3248,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>598</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -3416,7 +3416,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>599</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -3584,7 +3584,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>600</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -5072,7 +5072,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>1055</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -5344,7 +5344,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>1353</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -5520,7 +5520,7 @@
 		<mergeType>6</mergeType>
 		<APCost>20</APCost>
 	</MERGE>
-  <MERGE>
+	<MERGE>
 		<firstItemIndex>1361</firstItemIndex>
 		<secondItemIndex>1619</secondItemIndex>
 		<firstResultingItemIndex>1022</firstResultingItemIndex>
@@ -5847,7 +5847,7 @@
 		<secondResultingItemIndex>0</secondResultingItemIndex>
 		<mergeType>4</mergeType>
 		<APCost>20</APCost>
-	</MERGE>	
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1722</firstItemIndex>
 		<secondItemIndex>1726</secondItemIndex>

gamedir/Data-1.13/TableData/Items/Pockets.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <POCKETLIST>
 	<POCKET>
 		<pIndex>0</pIndex>
@@ -110,7 +110,7 @@
 		<pName>General Large</pName>
 		<pSilhouette>7</pSilhouette>
 		<pType>3</pType>
-              <pVolume>30</pVolume>
+		<pVolume>30</pVolume>
 		<ItemCapacityPerSize0>3</ItemCapacityPerSize0>
 		<ItemCapacityPerSize1>3</ItemCapacityPerSize1>
 		<ItemCapacityPerSize2>3</ItemCapacityPerSize2>
@@ -486,7 +486,6 @@
 		<pRestriction>512</pRestriction>
 		<pVolume>10</pVolume>
 		<ItemCapacityPerSize17>1</ItemCapacityPerSize17>
-		<ItemCapacityPerSize17>22</ItemCapacityPerSize17>
 	</POCKET>
 	<POCKET>
 		<pIndex>29</pIndex>
@@ -529,7 +528,7 @@
 		<pVolume>20</pVolume>
 		<ItemCapacityPerSize0>1</ItemCapacityPerSize0>
 		<ItemCapacityPerSize1>1</ItemCapacityPerSize1>
-        <ItemCapacityPerSize2>1</ItemCapacityPerSize2>
+		<ItemCapacityPerSize2>1</ItemCapacityPerSize2>
 	</POCKET>
 	<POCKET>
 		<pIndex>33</pIndex>
@@ -578,9 +577,9 @@
 		<pName>Med Kit</pName>
 		<pSilhouette>34</pSilhouette>
 		<pType>2</pType>
-        <pVolume>20</pVolume>
 		<pRestriction>4096</pRestriction>
-        <ItemCapacityPerSize18>2</ItemCapacityPerSize18>
+		<pVolume>20</pVolume>
+		<ItemCapacityPerSize18>2</ItemCapacityPerSize18>
 		<ItemCapacityPerSize26>1</ItemCapacityPerSize26>
 	</POCKET>
 	<POCKET>
@@ -588,9 +587,9 @@
 		<pName>Carabiner Ring</pName>
 		<pSilhouette>37</pSilhouette>
 		<pType>1</pType>
-        <pRestriction>268601344</pRestriction>
-        <pVolume>1</pVolume>
-        <ItemCapacityPerSize16>1</ItemCapacityPerSize16>
+		<pRestriction>268601344</pRestriction>
+		<pVolume>1</pVolume>
+		<ItemCapacityPerSize16>1</ItemCapacityPerSize16>
 		<ItemCapacityPerSize18>1</ItemCapacityPerSize18>
 		<ItemCapacityPerSize22>1</ItemCapacityPerSize22>
 		<ItemCapacityPerSize26>1</ItemCapacityPerSize26>
@@ -603,7 +602,7 @@
 		<pType>2</pType>
 		<pRestriction>256</pRestriction>
 		<pVolume>12</pVolume>
-        <ItemCapacityPerSize13>3</ItemCapacityPerSize13>
+		<ItemCapacityPerSize13>3</ItemCapacityPerSize13>
 		<ItemCapacityPerSize14>3</ItemCapacityPerSize14>
 	</POCKET>
 	<POCKET>
@@ -642,7 +641,7 @@
 		<pType>1</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>12</pVolume>
-        <ItemCapacityPerSize12>2</ItemCapacityPerSize12>
+		<ItemCapacityPerSize12>2</ItemCapacityPerSize12>
 		<ItemCapacityPerSize16>2</ItemCapacityPerSize16>
 	</POCKET>
 	<POCKET>
@@ -652,7 +651,7 @@
 		<pType>1</pType>
 		<pRestriction>8192</pRestriction>
 		<pVolume>3</pVolume>
-        <ItemCapacityPerSize13>1</ItemCapacityPerSize13>
+		<ItemCapacityPerSize13>1</ItemCapacityPerSize13>
 	</POCKET>
 	<POCKET>
 		<pIndex>45</pIndex>
@@ -661,8 +660,8 @@
 		<pType>1</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>16</pVolume>
-        <ItemCapacityPerSize12>4</ItemCapacityPerSize12>
-        <ItemCapacityPerSize16>2</ItemCapacityPerSize16>
+		<ItemCapacityPerSize12>4</ItemCapacityPerSize12>
+		<ItemCapacityPerSize16>2</ItemCapacityPerSize16>
 		<ItemCapacityPerSize20>2</ItemCapacityPerSize20>
 	</POCKET>
 	<POCKET>
@@ -672,8 +671,8 @@
 		<pType>1</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>8</pVolume>
-        <ItemCapacityPerSize12>2</ItemCapacityPerSize12>
-        <ItemCapacityPerSize16>1</ItemCapacityPerSize16>
+		<ItemCapacityPerSize12>2</ItemCapacityPerSize12>
+		<ItemCapacityPerSize16>1</ItemCapacityPerSize16>
 		<ItemCapacityPerSize20>1</ItemCapacityPerSize20>
 	</POCKET>
 	<POCKET>
@@ -683,7 +682,7 @@
 		<pType>2</pType>
 		<pRestriction>256</pRestriction>
 		<pVolume>18</pVolume>
-        <ItemCapacityPerSize13>3</ItemCapacityPerSize13>
+		<ItemCapacityPerSize13>3</ItemCapacityPerSize13>
 		<ItemCapacityPerSize14>3</ItemCapacityPerSize14>
 		<ItemCapacityPerSize18>3</ItemCapacityPerSize18>
 	</POCKET>
@@ -703,8 +702,8 @@
 		<pType>2</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>24</pVolume>
-        <ItemCapacityPerSize12>6</ItemCapacityPerSize12>
-        <ItemCapacityPerSize16>3</ItemCapacityPerSize16>
+		<ItemCapacityPerSize12>6</ItemCapacityPerSize12>
+		<ItemCapacityPerSize16>3</ItemCapacityPerSize16>
 		<ItemCapacityPerSize20>3</ItemCapacityPerSize20>
 	</POCKET>
 	<POCKET>
@@ -723,7 +722,7 @@
 		<pType>2</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>18</pVolume>
-             <ItemCapacityPerSize12>6</ItemCapacityPerSize12>
+		<ItemCapacityPerSize12>6</ItemCapacityPerSize12>
 		<ItemCapacityPerSize16>3</ItemCapacityPerSize16>
 	</POCKET>
 	<POCKET>
@@ -748,18 +747,18 @@
 		<ItemCapacityPerSize8>1</ItemCapacityPerSize8>
 		<ItemCapacityPerSize9>1</ItemCapacityPerSize9>
 	</POCKET>
-		<POCKET>
+	<POCKET>
 		<pIndex>54</pIndex>
 		<pName>Flash Bang</pName>
 		<pSilhouette>36</pSilhouette>
 		<pType>1</pType>
 		<pRestriction>256</pRestriction>
 		<pVolume>6</pVolume>
-        <ItemCapacityPerSize13>1</ItemCapacityPerSize13>
+		<ItemCapacityPerSize13>1</ItemCapacityPerSize13>
 		<ItemCapacityPerSize14>1</ItemCapacityPerSize14>
 		<ItemCapacityPerSize18>1</ItemCapacityPerSize18>
 	</POCKET>
-		<POCKET>
+	<POCKET>
 		<pIndex>55</pIndex>
 		<pName>Grenadex2</pName>
 		<pSilhouette>48</pSilhouette>
@@ -769,7 +768,7 @@
 		<ItemCapacityPerSize13>2</ItemCapacityPerSize13>
 		<ItemCapacityPerSize14>2</ItemCapacityPerSize14>
 	</POCKET>
-		<POCKET>
+	<POCKET>
 		<pIndex>56</pIndex>
 		<pName>Revolver Holster</pName>
 		<pSilhouette>49</pSilhouette>
@@ -779,7 +778,7 @@
 		<ItemCapacityPerSize0>1</ItemCapacityPerSize0>
 		<ItemCapacityPerSize1>1</ItemCapacityPerSize1>
 	</POCKET>
-		<POCKET>
+	<POCKET>
 		<pIndex>57</pIndex>
 		<pName>Rifle Magx2</pName>
 		<pSilhouette>28</pSilhouette>
@@ -789,7 +788,7 @@
 		<ItemCapacityPerSize12>4</ItemCapacityPerSize12>
 		<ItemCapacityPerSize13>2</ItemCapacityPerSize13>
 	</POCKET>
-			<POCKET>
+	<POCKET>
 		<pIndex>58</pIndex>
 		<pName>Bladder</pName>
 		<pSilhouette>51</pSilhouette>
@@ -798,7 +797,7 @@
 		<pVolume>9</pVolume>
 		<ItemCapacityPerSize23>1</ItemCapacityPerSize23>
 	</POCKET>
-		<POCKET>
+	<POCKET>
 		<pIndex>59</pIndex>
 		<pName>Tactical Gun Sling</pName>
 		<pSilhouette>32</pSilhouette>
@@ -811,7 +810,7 @@
 		<ItemCapacityPerSize8>1</ItemCapacityPerSize8>
 		<ItemCapacityPerSize9>1</ItemCapacityPerSize9>
 	</POCKET>
-		<POCKET>
+	<POCKET>
 		<pIndex>60</pIndex>
 		<pName>Drum Ammo</pName>
 		<pSilhouette>52</pSilhouette>
@@ -819,5 +818,5 @@
 		<pRestriction>1024</pRestriction>
 		<pVolume>11</pVolume>
 		<ItemCapacityPerSize22>1</ItemCapacityPerSize22>
-		</POCKET>
+	</POCKET>
 </POCKETLIST>

gamedir/Data-1.13/TableData/Lookup/ItemFlag.xml

@@ -84,6 +84,10 @@
 		<id>262144</id>
 		<name>Jumping Grenade</name>
 	</ItemFlag>
+	<ItemFlag>
+		<id>419430</id>
+		<name>Scuba Mask</name>
+	</ItemFlag>
 	<ItemFlag>
 		<id>524288</id>
 		<name>Handcuffs</name>
@@ -96,10 +100,6 @@
 		<id>2097152</id>
 		<name>Scuba Bottle</name>
 	</ItemFlag>
-	<ItemFlag>
-		<id>419430</id>
-		<name>Scuba Mask</name>
-	</ItemFlag>
 	<ItemFlag>
 		<id>8388608</id>
 		<name>Scuba Fins</name>

gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml

@@ -376,7 +376,7 @@
 	<INVENTORY>
 		<uiIndex>77</uiIndex>
 		<sItemIndex>1361</sItemIndex>
-	</INVENTORY>	
+	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>78</uiIndex>
 		<sItemIndex>1553</sItemIndex>
@@ -431,11 +431,10 @@
 		<uiIndex>88</uiIndex>
 		<sItemIndex>1576</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
-	</INVENTORY>	
+	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>89</uiIndex>
 		<sItemIndex>1606</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>90</uiIndex>
@@ -470,7 +469,6 @@
 	<INVENTORY>
 		<uiIndex>96</uiIndex>
 		<sItemIndex>1614</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>97</uiIndex>
@@ -490,7 +488,6 @@
 	<INVENTORY>
 		<uiIndex>100</uiIndex>
 		<sItemIndex>1618</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>101</uiIndex>
@@ -500,7 +497,6 @@
 	<INVENTORY>
 		<uiIndex>102</uiIndex>
 		<sItemIndex>1620</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
 		<uiIndex>103</uiIndex>