Molle Improvments / Fixes (by Off_Topic)

- Mini Grenade Size 14->13
- Mini Grenade Pocket 14x2->13x2
- New Pocket (Small Knife) for Nylon Knife Sheath Can't hold KCB or Rambo. 
o KCB & Rambo size 24->28
o Regular Knife Pocket Volume 13->15
- Carabiner
o New Item Class Armour/Face/LBE/Misc.
o Can now hold items 16 (Handcuffs) & 18 (Compact Binoculars)
There are still a few items that will go there that shouldn't (Syringes for example) but with the new item class restriction it's a lot less stuff.
- New ITEM: Carabiner
oCan be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- New Silhouette: Sniper Rifle
- New Pocket type: Sniper Rifle (Can now only hold one item sized 8 & 9, large sniper rifles and one item sized 5,6, or 7)
- Replaced this in Sniper Drag Bag
- General Drop Pouch can now hold more than small pouch (no restriction) and can hold bigger items. Volume increased from 2 to 8.
- New ITEM: Carabiner
o Can be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- Ammo Pockets now more flexible, they still only take Ammo. Other pockets tweaked.
- Mercstarting Gear: Wolf K2 Removed Leg Rig/Ice K3 Removed Combat Pack.

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

gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <MERCGEARLIST>
 	<MERCGEAR>
 		<mIndex>0</mIndex>
@@ -2932,7 +2932,7 @@
 			<mBig0Quantity>2</mBig0Quantity>
 			<lVest>1090</lVest>
 			<lRightThigh>1643</lRightThigh>
-			<lCPack>1098</lCPack>
+			<lCPack>0</lCPack>
 		</GEARKIT>
 		<GEARKIT>
 			<mPriceMod>50</mPriceMod>
@@ -5844,7 +5844,7 @@
 			<mBig3Quantity>1</mBig3Quantity>
 			<lVest>1090</lVest>
 			<lVestStatus>98</lVestStatus>
-			<lRightThigh>1648</lRightThigh>
+			<lRightThigh>0</lRightThigh>
 			<lCPack>1098</lCPack>
 			<lCPackStatus>98</lCPackStatus>
 		</GEARKIT>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <ITEMLIST>
 	<ITEM>
 		<uiIndex>0</uiIndex>
@@ -4151,7 +4151,7 @@
 		<ubGraphicNum>50</ubGraphicNum>
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
-		<ItemSize>14</ItemSize>
+		<ItemSize>13</ItemSize>
 		<usPrice>150</usPrice>
 		<ubCoolness>3</ubCoolness>
 		<bRepairEase>-4</bRepairEase>
@@ -16610,7 +16610,7 @@
 		<ubGraphicNum>520</ubGraphicNum>
 		<ubWeight>4</ubWeight>
 		<ubPerPocket>2</ubPerPocket>
-		<ItemSize>24</ItemSize>
+		<ItemSize>28</ItemSize>
 		<usPrice>130</usPrice>
 		<ubCoolness>2</ubCoolness>
 		<Damageable>1</Damageable>
@@ -16820,7 +16820,7 @@
 		<ubGraphicNum>187</ubGraphicNum>
 		<ubWeight>11</ubWeight>
 		<ubPerPocket>1</ubPerPocket>
-		<ItemSize>24</ItemSize>
+		<ItemSize>28</ItemSize>
 		<usPrice>150</usPrice>
 		<ubCoolness>4</ubCoolness>
 		<bReliability>2</bReliability>
@@ -50331,9 +50331,9 @@
 		<uiIndex>1677</uiIndex>
 		<szItemName>Russian Pistol Holster</szItemName>
 		<szLongItemName>Russian MOLLE pistol holster</szLongItemName>
-		<szItemDesc>This holster may be using for Glock, PMM, APS, GSh-18, PB pistols with a silencer.</szItemDesc>
+		<szItemDesc>This holster may be used for Glock, PMM, APS, GSh-18, PB pistols with a silencer.</szItemDesc>
 		<szBRName>Russian MOLLE pistol holster</szBRName>
-		<szBRDesc>This holster may be using for Glock, PMM, APS, GSh-18, PB pistols with a silencer.</szBRDesc>
+		<szBRDesc>This holster may be used for Glock, PMM, APS, GSh-18, PB pistols with a silencer.</szBRDesc>
 		<usItemClass>131072</usItemClass>
 		<AttachmentClass>16777216</AttachmentClass>
 		<nasAttachmentClass>8192</nasAttachmentClass>
@@ -50644,7 +50644,7 @@
 		<Attachment>1</Attachment>
 		<BR_NewInventory>2</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<CamoBonus>5</CamoBonus>
+		<DesertCamoBonus>6</DesertCamoBonus>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -50677,7 +50677,7 @@
 		<Attachment>1</Attachment>
 		<BR_NewInventory>2</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<CamoBonus>5</CamoBonus>
+		<DesertCamoBonus>6</DesertCamoBonus>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -50710,7 +50710,7 @@
 		<Attachment>1</Attachment>
 		<BR_NewInventory>3</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<CamoBonus>4</CamoBonus>
+		<DesertCamoBonus>6</DesertCamoBonus>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -50743,7 +50743,7 @@
 		<Attachment>1</Attachment>
 		<BR_NewInventory>2</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<CamoBonus>6</CamoBonus>
+		<DesertCamoBonus>6</DesertCamoBonus>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
@@ -50784,7 +50784,7 @@
 		<szLongItemName>Sniper Drag Bag</szLongItemName>
 		<szItemDesc>Carry your sniper rifle with style and protected from bad weather.</szItemDesc>
 		<szBRName>Sniper Drag Bag</szBRName>
-		<szBRDesc>Those heavy sniper rifles can be a real pain to carry over long distances. This sniper bag will ease long  range transportation and it has some additional pockets for your valuable equipment.</szBRDesc>
+		<szBRDesc>This bag can hold a two long guns and two pistols plus quite a bit of gear. This sniper bag will ease long  range transportation and it has some additional pockets for your valuable equipment.</szBRDesc>
 		<usItemClass>131072</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
 		<ubClassIndex>91</ubClassIndex>
@@ -50892,4 +50892,40 @@
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
 	</ITEM>
+<ITEM>
+		<uiIndex>1695</uiIndex>
+		<szItemName>Carabiner</szItemName>
+		<szLongItemName>Carabiner</szLongItemName>
+		<szItemDesc>Functional shape is easy to hold; deep basket accepts loads of slings and runners.</szItemDesc>
+		<szBRName>Carabiner</szBRName>
+		<szBRDesc>Functional shape is easy to hold; deep basket accepts loads of slings and runners</szBRDesc>
+		<usItemClass>131072</usItemClass>
+		<AttachmentClass>16777216</AttachmentClass>
+		<nasAttachmentClass>4096</nasAttachmentClass>
+		<nasLayoutClass>4</nasLayoutClass>
+		<AttachmentPoint>1</AttachmentPoint>
+		<AttachToPointAPCost>5</AttachToPointAPCost>
+		<ubClassIndex>95</ubClassIndex>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>215</ubGraphicNum>
+		<ubWeight>1</ubWeight>
+		<ItemSize>10</ItemSize>
+		<usPrice>20</usPrice>
+		<ubCoolness>3</ubCoolness>
+		<bRepairEase>2</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+              <Metal>1</Metal>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
+		<Attachment>1</Attachment>
+		<BR_NewInventory>2</BR_NewInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
+		<CamoBonus>0</CamoBonus>
+             <StealthBonus>-5</StealthBonus>
+		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
 </ITEMLIST>

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>
@@ -1207,7 +1207,7 @@
 		<lbeFilledSize>26</lbeFilledSize>
 		<lbeAvailableVolume>0</lbeAvailableVolume>
 		<lbePocketsAvailable>0</lbePocketsAvailable>
-		<lbePocketIndex1>2</lbePocketIndex1>
+		<lbePocketIndex1>52</lbePocketIndex1>
 		<lbePocketIndex2>0</lbePocketIndex2>
 		<lbePocketIndex3>0</lbePocketIndex3>
 		<lbePocketIndex4>0</lbePocketIndex4>
@@ -1824,19 +1824,19 @@
 		<lbeIndex>91</lbeIndex>
 		<lbeClass>4</lbeClass>
 		<lbeCombo>2</lbeCombo>
-		<lbeFilledSize>29</lbeFilledSize>
+		<lbeFilledSize>32</lbeFilledSize>
 		<lbeAvailableVolume>0</lbeAvailableVolume>
 		<lbePocketsAvailable>0</lbePocketsAvailable>
-		<lbePocketIndex1>17</lbePocketIndex1>
+		<lbePocketIndex1>44</lbePocketIndex1>
 		<lbePocketIndex2>34</lbePocketIndex2>
-		<lbePocketIndex3>0</lbePocketIndex3>
+		<lbePocketIndex3>11</lbePocketIndex3>
 		<lbePocketIndex4>0</lbePocketIndex4>
 		<lbePocketIndex5>27</lbePocketIndex5>
 		<lbePocketIndex6>34</lbePocketIndex6>
-		<lbePocketIndex7>0</lbePocketIndex7>
+		<lbePocketIndex7>11</lbePocketIndex7>
 		<lbePocketIndex8>0</lbePocketIndex8>
-		<lbePocketIndex9>31</lbePocketIndex9>
+		<lbePocketIndex9>53</lbePocketIndex9>
-		<lbePocketIndex10>5</lbePocketIndex10>
+		<lbePocketIndex10>31</lbePocketIndex10>
 		<lbePocketIndex11>0</lbePocketIndex11>
 		<lbePocketIndex12>0</lbePocketIndex12>
 	</LOADBEARINGEQUIPMENT>
@@ -1900,4 +1900,24 @@
 		<lbePocketIndex11>49</lbePocketIndex11>
 		<lbePocketIndex12>0</lbePocketIndex12>
 	</LOADBEARINGEQUIPMENT>
+	<LOADBEARINGEQUIPMENT>
+		<lbeIndex>95</lbeIndex>
+		<lbeClass>1</lbeClass>
+		<lbeCombo>0</lbeCombo>
+		<lbeFilledSize>10</lbeFilledSize>
+		<lbeAvailableVolume>0</lbeAvailableVolume>
+		<lbePocketsAvailable>0</lbePocketsAvailable>
+		<lbePocketIndex1>38</lbePocketIndex1>
+		<lbePocketIndex2>0</lbePocketIndex2>
+		<lbePocketIndex3>0</lbePocketIndex3>
+		<lbePocketIndex4>0</lbePocketIndex4>
+		<lbePocketIndex5>0</lbePocketIndex5>
+		<lbePocketIndex6>0</lbePocketIndex6>
+		<lbePocketIndex7>0</lbePocketIndex7>
+		<lbePocketIndex8>0</lbePocketIndex8>
+		<lbePocketIndex9>0</lbePocketIndex9>
+		<lbePocketIndex10>0</lbePocketIndex10>
+		<lbePocketIndex11>0</lbePocketIndex11>
+		<lbePocketIndex12>0</lbePocketIndex12>
+	</LOADBEARINGEQUIPMENT>
 </LOADBEARINGEQUIPMENTLIST>

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>
@@ -59,7 +59,7 @@
 		<pIndex>2</pIndex>
 		<pName>Knife</pName>
 		<pSilhouette>11</pSilhouette>
-		<pVolume>13</pVolume>
+		<pVolume>15</pVolume>
 		<ItemCapacityPerSize12>2</ItemCapacityPerSize12>
 		<ItemCapacityPerSize16>1</ItemCapacityPerSize16>
 		<ItemCapacityPerSize20>1</ItemCapacityPerSize20>
@@ -291,7 +291,7 @@
 		<pName>SMG Mag</pName>
 		<pSilhouette>17</pSilhouette>
 		<pType>1</pType>
-		<pVolume>5</pVolume>
+		<pVolume>6</pVolume>
 		<ItemCapacityPerSize10>4</ItemCapacityPerSize10>
 		<ItemCapacityPerSize12>2</ItemCapacityPerSize12>
 		<ItemCapacityPerSize13>2</ItemCapacityPerSize13>
@@ -476,15 +476,21 @@
 		<pName>General Misc</pName>
 		<pSilhouette>29</pSilhouette>
 		<pType>1</pType>
-		<pRestriction>268435456</pRestriction>
+		<pVolume>10</pVolume>
-		<pVolume>2</pVolume>
+		<ItemCapacityPerSize0>1</ItemCapacityPerSize0>
-		<ItemCapacityPerSize10>4</ItemCapacityPerSize10>
+		<ItemCapacityPerSize10>5</ItemCapacityPerSize10>
-		<ItemCapacityPerSize11>3</ItemCapacityPerSize11>
+		<ItemCapacityPerSize11>4</ItemCapacityPerSize11>
-		<ItemCapacityPerSize12>2</ItemCapacityPerSize12>
+		<ItemCapacityPerSize12>4</ItemCapacityPerSize12>
 		<ItemCapacityPerSize13>2</ItemCapacityPerSize13>
 		<ItemCapacityPerSize14>2</ItemCapacityPerSize14>
 		<ItemCapacityPerSize15>2</ItemCapacityPerSize15>
-		<ItemCapacityPerSize16>1</ItemCapacityPerSize16>
+		<ItemCapacityPerSize16>2</ItemCapacityPerSize16>
+		<ItemCapacityPerSize17>1</ItemCapacityPerSize17>
+		<ItemCapacityPerSize18>1</ItemCapacityPerSize18>
+		<ItemCapacityPerSize19>1</ItemCapacityPerSize19>
+		<ItemCapacityPerSize20>1</ItemCapacityPerSize20>
+		<ItemCapacityPerSize21>1</ItemCapacityPerSize21>
+		<ItemCapacityPerSize22>1</ItemCapacityPerSize22>
 	</POCKET>
 	<POCKET>
 		<pIndex>28</pIndex>
@@ -533,15 +539,10 @@
 		<pSilhouette>32</pSilhouette>
 		<pType>3</pType>
 		<pRestriction>2</pRestriction>
-		<pVolume>20</pVolume>
+		<pVolume>25</pVolume>
-		<ItemCapacityPerSize4>1</ItemCapacityPerSize4>
 		<ItemCapacityPerSize5>1</ItemCapacityPerSize5>
 		<ItemCapacityPerSize6>1</ItemCapacityPerSize6>
 		<ItemCapacityPerSize7>1</ItemCapacityPerSize7>
-		<ItemCapacityPerSize13>3</ItemCapacityPerSize13>
-		<ItemCapacityPerSize17>2</ItemCapacityPerSize17>
-		<ItemCapacityPerSize18>1</ItemCapacityPerSize18>
-		<ItemCapacityPerSize25>2</ItemCapacityPerSize25>
 	</POCKET>
 	<POCKET>
 		<pIndex>32</pIndex>
@@ -613,6 +614,10 @@
 		<pName>Carabiner Ring</pName>
 		<pSilhouette>37</pSilhouette>
 		<pType>1</pType>
+              <pRestriction>268601344</pRestriction>
+              <pVolume>13</pVolume>
+              <ItemCapacityPerSize16>1</ItemCapacityPerSize16>
+		<ItemCapacityPerSize18>1</ItemCapacityPerSize18>
 		<ItemCapacityPerSize22>1</ItemCapacityPerSize22>
 		<ItemCapacityPerSize26>1</ItemCapacityPerSize26>
 		<ItemCapacityPerSize29>1</ItemCapacityPerSize29>
@@ -624,6 +629,7 @@
 		<pType>2</pType>
 		<pRestriction>256</pRestriction>
 		<pVolume>12</pVolume>
+              <ItemCapacityPerSize13>3</ItemCapacityPerSize13>
 		<ItemCapacityPerSize14>3</ItemCapacityPerSize14>
 	</POCKET>
 	<POCKET>
@@ -659,7 +665,8 @@
 		<pSilhouette>41</pSilhouette>
 		<pType>1</pType>
 		<pRestriction>1024</pRestriction>
-		<pVolume>9</pVolume>
+		<pVolume>12</pVolume>
+             <ItemCapacityPerSize12>2</ItemCapacityPerSize12>
 		<ItemCapacityPerSize16>2</ItemCapacityPerSize16>
 	</POCKET>
 	<POCKET>
@@ -677,6 +684,8 @@
 		<pType>1</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>16</pVolume>
+             <ItemCapacityPerSize12>4</ItemCapacityPerSize12>
+             <ItemCapacityPerSize16>2</ItemCapacityPerSize16>
 		<ItemCapacityPerSize20>2</ItemCapacityPerSize20>
 	</POCKET>
 	<POCKET>
@@ -686,6 +695,8 @@
 		<pType>1</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>8</pVolume>
+             <ItemCapacityPerSize12>2</ItemCapacityPerSize12>
+             <ItemCapacityPerSize16>1</ItemCapacityPerSize16>
 		<ItemCapacityPerSize20>1</ItemCapacityPerSize20>
 	</POCKET>
 	<POCKET>
@@ -694,8 +705,9 @@
 		<pSilhouette>36</pSilhouette>
 		<pType>2</pType>
 		<pRestriction>256</pRestriction>
-		<pVolume>12</pVolume>
+		<pVolume>18</pVolume>
-		<ItemCapacityPerSize14>1</ItemCapacityPerSize14>
+             <ItemCapacityPerSize14>3</ItemCapacityPerSize14>
+		<ItemCapacityPerSize14>3</ItemCapacityPerSize14>
 		<ItemCapacityPerSize18>3</ItemCapacityPerSize18>
 	</POCKET>
 	<POCKET>
@@ -714,6 +726,8 @@
 		<pType>2</pType>
 		<pRestriction>1024</pRestriction>
 		<pVolume>24</pVolume>
+             <ItemCapacityPerSize12>6</ItemCapacityPerSize12>
+             <ItemCapacityPerSize16>3</ItemCapacityPerSize16>
 		<ItemCapacityPerSize20>3</ItemCapacityPerSize20>
 	</POCKET>
 	<POCKET>
@@ -723,7 +737,7 @@
 		<pType>1</pType>
 		<pRestriction>256</pRestriction>
 		<pVolume>8</pVolume>
-		<ItemCapacityPerSize14>2</ItemCapacityPerSize14>
+		<ItemCapacityPerSize13>2</ItemCapacityPerSize13>
 	</POCKET>
 	<POCKET>
 		<pIndex>51</pIndex>
@@ -731,7 +745,28 @@
 		<pSilhouette>45</pSilhouette>
 		<pType>2</pType>
 		<pRestriction>1024</pRestriction>
-		<pVolume>12</pVolume>
+		<pVolume>18</pVolume>
+             <ItemCapacityPerSize12>6</ItemCapacityPerSize12>
 		<ItemCapacityPerSize16>3</ItemCapacityPerSize16>
 	</POCKET>
+	<POCKET>
+		<pIndex>52</pIndex>
+		<pName>Small Knife</pName>
+		<pSilhouette>11</pSilhouette>
+		<pVolume>13</pVolume>
+		<ItemCapacityPerSize12>2</ItemCapacityPerSize12>
+		<ItemCapacityPerSize16>1</ItemCapacityPerSize16>
+		<ItemCapacityPerSize20>1</ItemCapacityPerSize20>
+		<ItemCapacityPerSize24>1</ItemCapacityPerSize24>
+	</POCKET>
+	<POCKET>
+		<pIndex>53</pIndex>
+		<pName>Sniper Rifle Gun Sling</pName>
+		<pSilhouette>47</pSilhouette>
+		<pType>3</pType>
+		<pRestriction>2</pRestriction>
+		<pVolume>25</pVolume>
+		<ItemCapacityPerSize9>1</ItemCapacityPerSize9>
+		<ItemCapacityPerSize8>1</ItemCapacityPerSize8>
+	</POCKET>
 </POCKETLIST>

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

@@ -84,6 +84,10 @@
 		<id>268435712</id>
 		<name>Grenade / Misc</name>
 	</ItemClass>
+	<ItemClass>
+		<id>268601344</id>
+		<name>Armour/Face Item/LBE/Misc</name>
+	</ItemClass>
 	<ItemClass>
 		<id>536870912</id>
 		<name>Money</name>

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

@@ -188,4 +188,8 @@
 		<id>46</id>
 		<name>Small Shotgun</name>
 	</Silhouette>
+	<Silhouette>
+		<id>47</id>
+		<name>Sniper Rifle</name>
+	</Silhouette>
 </JA2Data>