New feature: food system requires mercs to eat and drink in order to survive

- added food items
- added food items to various mechants, BR and as enemy item choice
- added cantina facility
- canteens can now be refilled in sectors by pressing 'Ctrl' + '.'. Map/SectorNames.xml determines wether this is possible, and wether the water will be poisonous
- added new icons related to the food system

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

gamedir/Data-1.13/APBPConstants.ini

@@ -397,7 +397,12 @@ DEFAULT_AIMSKILL = 80
 ;***********************************************************************
 ;* The APs needed build a fortification structure                      *
 ;***********************************************************************
-AP_FORTIFICATION = 80
+AP_FORTIFICATION = 180
+
+;***********************************************************************
+;* The APs needed to eat                                               *
+;***********************************************************************
+AP_EAT = 80
 
 [BPConstants]
 BP_RATIO_RED_PTS_TO_NORMAL = 100

gamedir/Data-1.13/Ja2_Options.INI

@@ -276,10 +276,10 @@ EXPERTS_GET_DIFFERENT_CHOICES = TRUE
 ;------------------------------------------------------------------------------------------------------------------------------
 
 ;When set to TRUE: sends the initial M.E.R.C e-mail at the beginning of the game and thus opens the website up on day #1.
-MERC_WEBSITE_IMMEDIATELY_AVAILABLE = FALSE
+MERC_WEBSITE_IMMEDIATELY_AVAILABLE = TRUE
 
 ;When set to TRUE will allow you to hire any of the M.E.R.C mercs as soon as the website opens.
-MERC_WEBSITE_ALL_MERCS_AVAILABLE = FALSE
+MERC_WEBSITE_ALL_MERCS_AVAILABLE = TRUE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; The Following settings define whether A.I.M/M.E.R.C mercenaries can die while away on other missions (if they have not been hired).
@@ -290,7 +290,7 @@ MERC_WEBSITE_ALL_MERCS_AVAILABLE = FALSE
 ; 0 = default behaviour, mercs are on assignment at start, mercs go on assignment during campaign
 ; 1 = all mercs available at the start of the game, during the campaign they will go on assignment
 ; 2 = all mercs at your disposal. nobody goes on any other assignment than yours
-MERCS_CAN_BE_ON_ASSIGNMENT = 0
+MERCS_CAN_BE_ON_ASSIGNMENT = 1
 
 ;Can AIM/MERC mercs die while away on other assignments?
 MERCS_CAN_DIE_ON_ASSIGNMENT = TRUE
@@ -1890,13 +1890,53 @@ ZOMBIE_RISE_WITH_ARMOUR = TRUE
 ; Basic medical skill needed to cure poison (in addition to doctoring skill). Range: 1-100
 POISON_BASE_MEDICAL_SKILL_TO_CURE     = 50
 
+; A multiplicator that determines how many heal points are needed to cure one point of poison
+POISON_MEDICAL_POINTS_TO_CURE_MULTIPLICATOR = 0.5
+
 ; Percentage of damage dealt by zombies that will be poisoned. Range: 0 - 100
 ZOMBIE_POISON_DAMAGE_PERCENTAGE       = 50
 
 ; This multiplier determines the damage we take every hour for being poisoned (simulating our health deteriorating from the infection).
 ; Roughly speaking, the damage we take equals (total poison/max life) * (100 - poison resistance) * this multiplier
 ; valid values from 1.0 to 10.0, 4.0 is recommended
-POISON_INFECTION_DAMAGE_MULTIPLIER    = 4.0
+POISON_INFECTION_DAMAGE_MULTIPLIER    = 2.0
+
+;******************************************************************************************************************************
+;******************************************************************************************************************************
+
+[Tactical Food Settings]
+
+;******************************************************************************************************************************
+; In this section you can specify the food system
+;******************************************************************************************************************************
+
+; Your team needs water food, otherwise they'll starve...
+; If you mouse-over a merc's health bar, you will see two new values: Drink and Food. These represent the amount of drink and food 
+; your merc currently has. Note that 0 is the standard value (it represents the optimal value of sorts)
+; Every hour, your merc digests food, lowering his food and drink values. If these are too low, there are serious drawbacks:
+; - his max morale will get lowered (when your starving, you wont get happy because you jsut found a good gun...)
+; - his energy regeneration due to sleeping is lowered, meaning he needs more sleep
+; - breath regenerates slower
+; - his performance on assignments (training milita, doctoring, repairing...) is worse
+; - if seriously out of water or food, there is a chance that he'll lose strength an health points. You can die from this!
+;   You can regain lost stat points via surgery with the new trait system. However, this requires the pateient to be well-fed again (both values above 0)
+
+; how much food and water is digested every hour? This is the base value, that later gets modified. Range: 0-250
+FOOD_DIGESTION_HOURLY_BASE_FOOD  =  20
+FOOD_DIGESTION_HOURLY_BASE_DRINK = 130
+
+; The digestion value is modfied with the number corresponding to your current activity
+FOOD_DIGESTION_SLEEP            = 0.6
+FOOD_DIGESTION_TRAVEL_VEHICLE   = 0.8
+FOOD_DIGESTION_TRAVEL           = 1.5
+FOOD_DIGESTION_ASSIGNMENT       = 0.9
+FOOD_DIGESTION_ONDUTY           = 1.0
+FOOD_DIGESTION_COMBAT           = 2.0
+
+; allow decay of food in every sector?
+FOOD_DECAY_IN_SECTORS            = TRUE   
+; a global modificator to the speed at which food decays. 1.0 is normal, values between 0.1 and 10.0
+FOOD_DECAY_MODIFICATOR           = 1.0
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
@@ -1908,7 +1948,7 @@ POISON_INFECTION_DAMAGE_MULTIPLIER    = 4.0
 ;******************************************************************************************************************************
 
 ; If set to false, we cannot fill sandbags or set up/remove fortifications while enemies are in the sector
-FORTIFICATION_ALLOW_IN_HOSTILE_SECTOR = FALSE
+FORTIFICATION_ALLOW_IN_HOSTILE_SECTOR = TRUE
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
@@ -2935,4 +2975,4 @@ FAST_FORWARD_PERIOD = 500
 ; SCROLL, CONTROL + MENU + SHIFT + S,  MULTIPLY, NUMPAD9, DECIMAL, LCONTROL + RSHIFT + LALT + NUMPAD1
 ;------------------------------------------------------------------------------------------------------------------------------
 
-FAST_FORWARD_KEY = SUBTRACT
+FAST_FORWARD_KEY = SUBTRACT

gamedir/Data-1.13/TableData/EnemyItemChoices.xml

@@ -373,10 +373,10 @@
 		<bItemNo37>1379</bItemNo37>
 		<bItemNo38>1380</bItemNo38>
 		<bItemNo39>1381</bItemNo39>
-		<bItemNo40>0</bItemNo40>
-		<bItemNo41>0</bItemNo41>
-		<bItemNo42>0</bItemNo42>
-		<bItemNo43>0</bItemNo43>
+		<bItemNo40>1545</bItemNo40>
+		<bItemNo41>1546</bItemNo41>
+		<bItemNo42>1567</bItemNo42>
+		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>0</bItemNo44>
 		<bItemNo45>0</bItemNo45>
 		<bItemNo46>0</bItemNo46>

gamedir/Data-1.13/TableData/Food.xml

@@ -0,0 +1,335 @@
+<FOODSLIST>
+	<FOOD>
+		<uiIndex>0</uiIndex>
+		<szName>None</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>0</ubPortionSize>
+		<bMoraleMod>0</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>1</uiIndex>
+		<szName>Canteen</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>1000</bDrinkPoints>
+		<ubPortionSize>20</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>2</uiIndex>
+		<szName>Alcohol</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>3000</bDrinkPoints>
+		<ubPortionSize>10</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>3</uiIndex>
+		<szName>Beer</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>1200</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>3</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>4</uiIndex>
+		<szName>Wine</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>2400</bDrinkPoints>
+		<ubPortionSize>20</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>5</uiIndex>
+		<szName>Calory bars</szName>
+		<bFoodPoints>30</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>20</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>6</uiIndex>
+		<szName>MRE</szName>
+		<bFoodPoints>310</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>7</uiIndex>
+		<szName>EPA</szName>
+		<bFoodPoints>450</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>50</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>8</uiIndex>
+		<szName>Calorie Mate</szName>
+		<bFoodPoints>20</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>10</ubPortionSize>
+		<bMoraleMod>0</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>9</uiIndex>
+		<szName>Peak EPA</szName>
+		<bFoodPoints>20</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>15</ubPortionSize>
+		<bMoraleMod>0</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>10</uiIndex>
+		<szName>Hotdog</szName>
+		<bFoodPoints>90</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>1.8</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>11</uiIndex>
+		<szName>Hamburger</szName>
+		<bFoodPoints>95</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>1.6</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>12</uiIndex>
+		<szName>Fries</szName>
+		<bFoodPoints>40</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>1.5</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>13</uiIndex>
+		<szName>Pizza</szName>
+		<bFoodPoints>150</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>13</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>1.8</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>14</uiIndex>
+		<szName>Spam</szName>
+		<bFoodPoints>165</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>50</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>15</uiIndex>
+		<szName>Spam 2</szName>
+		<bFoodPoints>170</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>50</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>16</uiIndex>
+		<szName>C. vegetables</szName>
+		<bFoodPoints>140</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>50</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+<FOOD>
+		<uiIndex>17</uiIndex>
+		<szName>C. scorpions</szName>
+		<bFoodPoints>90</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>18</uiIndex>
+		<szName>Cat food</szName>
+		<bFoodPoints>80</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>-2</bMoraleMod>
+		<usDecayRate>80</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>19</uiIndex>
+		<szName>Baked beans</szName>
+		<bFoodPoints>150</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>50</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>20</uiIndex>
+		<szName>Steak</szName>
+		<bFoodPoints>220</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>2.1</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>21</uiIndex>
+		<szName>Bean stew</szName>
+		<bFoodPoints>210</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>2.0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>22</uiIndex>
+		<szName>French toast</szName>
+		<bFoodPoints>90</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>1.6</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>23</uiIndex>
+		<szName>Crepes</szName>
+		<bFoodPoints>90</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>1.9</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>24</uiIndex>
+		<szName>Pasta</szName>
+		<bFoodPoints>215</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>2.2</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>25</uiIndex>
+		<szName>Omelet</szName>
+		<bFoodPoints>200</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>2.1</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>26</uiIndex>
+		<szName>Cow meat</szName>
+		<bFoodPoints>700</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>10</ubPortionSize>
+		<bMoraleMod>-2</bMoraleMod>
+		<usDecayRate>3</usDecayRate>
+	</FOOD>
+  <FOOD>
+		<uiIndex>27</uiIndex>
+		<szName>Bloodcat meat</szName>
+		<bFoodPoints>500</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>10</ubPortionSize>
+		<bMoraleMod>-2</bMoraleMod>
+		<usDecayRate>3.2</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>28</uiIndex>
+		<szName>Bread</szName>
+		<bFoodPoints>240</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>20</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>1</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>29</uiIndex>
+		<szName>Applepie</szName>
+		<bFoodPoints>120</bFoodPoints>
+		<bDrinkPoints>0</bDrinkPoints>
+		<ubPortionSize>50</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>1.7</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>30</uiIndex>
+		<szName>Water drum</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>100000</bDrinkPoints>
+		<ubPortionSize>1</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>31</uiIndex>
+		<szName>PET bottle</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>1000</bDrinkPoints>
+		<ubPortionSize>20</ubPortionSize>
+		<bMoraleMod>0</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>32</uiIndex>
+		<szName>Vegetable juice</szName>
+		<bFoodPoints>40</bFoodPoints>
+		<bDrinkPoints>1000</bDrinkPoints>
+		<ubPortionSize>20</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>1.2</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>33</uiIndex>
+		<szName>Milk</szName>
+		<bFoodPoints>5</bFoodPoints>
+		<bDrinkPoints>1000</bDrinkPoints>
+		<ubPortionSize>20</ubPortionSize>
+		<bMoraleMod>1</bMoraleMod>
+		<usDecayRate>1.8</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>34</uiIndex>
+		<szName>Energy drink</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>400</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>0</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>35</uiIndex>
+		<szName>Energy drink 2</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>400</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>0</bMoraleMod>
+		<usDecayRate>0</usDecayRate>
+	</FOOD>
+	<FOOD>
+		<uiIndex>36</uiIndex>
+		<szName>Coffee</szName>
+		<bFoodPoints>0</bFoodPoints>
+		<bDrinkPoints>300</bDrinkPoints>
+		<ubPortionSize>100</ubPortionSize>
+		<bMoraleMod>2</bMoraleMod>
+		<usDecayRate>0.2</usDecayRate>
+	</FOOD>
+</FOODSLIST>

gamedir/Data-1.13/TableData/Item_Transformations.xml

@@ -187,4 +187,38 @@
 		<szMenuRowText>Empty sandbag</szMenuRowText>
 		<szTooltipText>Empty sand from sandbag.</szTooltipText>
 	</TRANSFORM>
+	<TRANSFORM>
+		<usItem>1015</usItem>
+		<usResult1>1543</usResult1>
+		<usResult2>0</usResult2>
+		<usResult3>0</usResult3>
+		<usResult4>0</usResult4>
+		<usResult5>0</usResult5>
+		<usResult6>0</usResult6>
+		<usResult7>0</usResult7>
+		<usResult8>0</usResult8>
+		<usResult9>0</usResult9>
+		<usResult10>0</usResult10>
+		<usAPCost>0</usAPCost>
+		<iBPCost>0</iBPCost>
+		<szMenuRowText>Build mode</szMenuRowText>
+		<szTooltipText>Ready for building.</szTooltipText>
+	</TRANSFORM>
+	<TRANSFORM>
+		<usItem>1543</usItem>
+		<usResult1>1015</usResult1>
+		<usResult2>0</usResult2>
+		<usResult3>0</usResult3>
+		<usResult4>0</usResult4>
+		<usResult5>0</usResult5>
+		<usResult6>0</usResult6>
+		<usResult7>0</usResult7>
+		<usResult8>0</usResult8>
+		<usResult9>0</usResult9>
+		<usResult10>0</usResult10>
+		<usAPCost>0</usAPCost>
+		<iBPCost>0</iBPCost>
+		<szMenuRowText>Combat mode</szMenuRowText>
+		<szTooltipText>Ready for combat.</szTooltipText>
+	</TRANSFORM>
 </TRANSFORMATIONS_LIST>

gamedir/Data-1.13/TableData/Items.xml

@@ -167,6 +167,7 @@
 		<overheatDamageThresholdModificator>0.0</overheatDamageThresholdModificator>
 		<PoisonPercentage>0</PoisonPercentage>
 		<ItemFlag>0</ItemFlag>
+		<FoodType>0</FoodType>
 		<STAND_MODIFIERS>
 			<FlatBase>0</FlatBase>
 			<PercentBase>0</PercentBase>
@@ -6452,10 +6453,10 @@
 		<nasLayoutClass>1</nasLayoutClass>
 		<ubGraphicType>2</ubGraphicType>
 		<ubGraphicNum>5</ubGraphicNum>
-		<ubWeight>10</ubWeight>
+		<ubWeight>13</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<ItemSize>22</ItemSize>
-		<usPrice>10</usPrice>
+		<usPrice>30</usPrice>
 		<ubCoolness>1</ubCoolness>
 		<Damageable>1</Damageable>
 		<Attachment>1</Attachment>
@@ -6463,6 +6464,7 @@
 		<Hardware>1</Hardware>
 		<Canteen>1</Canteen>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<FoodType>1</FoodType>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -30967,9 +30969,11 @@
 		<szLongItemName>Shovel</szLongItemName>
 		<szItemDesc>Perfect for digging your own grave, or hitting people over the head (and then dig their grave).</szItemDesc>
 		<szBRName>Shovel</szBRName>
-		<szBRDesc>Not for sale through BR.</szBRDesc>
-		<usItemClass>268435456</usItemClass>
-		<nasLayoutClass>1</nasLayoutClass>		
+		<szBRDesc>If it was good in Verdun, it'll still be good enough for you.</szBRDesc>
+		<usItemClass>128</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubClassIndex>1015</ubClassIndex>
+		<ubCursor>2</ubCursor>
 		<ubGraphicType>1</ubGraphicType>
 		<ubGraphicNum>197</ubGraphicNum>
 		<ubWeight>20</ubWeight>
@@ -30983,9 +30987,12 @@
 		<Metal>1</Metal>
 		<Sinks>1</Sinks>
 		<ShowStatus>1</ShowStatus>
-		<Hardware>1</Hardware>		
+		<TwoHanded>1</TwoHanded>
+		<BigGunList>1</BigGunList>
+		<Hardware>1</Hardware>
+		<BR_NewInventory>3</BR_NewInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
 		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
-		<ItemFlag>4</ItemFlag>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -45821,4 +45828,754 @@
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
 	</ITEM>
+	<ITEM>
+		<uiIndex>1543</uiIndex>
+		<szItemName>Shovel</szItemName>
+		<szLongItemName>Shovel</szLongItemName>
+		<szItemDesc>Perfect for digging your own grave, hitting people over the head (and then dig their grave) or building makeshift fortifications.</szItemDesc>
+		<szBRName>Shovel</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>		
+		<ubGraphicType>1</ubGraphicType>
+		<ubGraphicNum>197</ubGraphicNum>
+		<ubWeight>20</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>32</ItemSize>
+		<usPrice>10</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<bRepairEase>-2</bRepairEase>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<Metal>1</Metal>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
+		<Hardware>1</Hardware>		
+		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
+		<ItemFlag>4</ItemFlag>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1544</uiIndex>
+		<szItemName>Calory Bars</szItemName>
+		<szLongItemName>Calory Bars</szLongItemName>
+		<szItemDesc>Because normal food is sooo 2011.</szItemDesc>
+		<szBRName>Calory Bars</szBRName>
+		<szBRDesc>Calories, without distracting taste.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>115</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>3</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>16</usPrice>
+		<ubCoolness>3</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>3</BR_NewInventory>
+		<FoodType>5</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1545</uiIndex>
+		<szItemName>MRE</szItemName>
+		<szLongItemName>MRE</szLongItemName>
+		<szItemDesc>An individual food ration in use with the US military.</szItemDesc>
+		<szBRName>MRE</szBRName>
+		<szBRDesc>If its good for the US army, it better be good enough for you.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>118</ubGraphicNum>
+		<ubWeight>7</ubWeight>
+		<ubPerPocket>3</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>12</usPrice>
+		<ubCoolness>5</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>25</BR_NewInventory>
+		<FoodType>6</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1546</uiIndex>
+		<szItemName>EPA</szItemName>
+		<szLongItemName>EPA</szLongItemName>
+		<szItemDesc>German army food. Beware the Raviolis! </szItemDesc>
+		<szBRName>EPA</szBRName>
+		<szBRDesc>This box of german army food will bring you through the day. Note the cookies, which also serve as burning material.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>111</ubGraphicNum>
+		<ubWeight>16</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>28</usPrice>
+		<ubCoolness>5</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>20</BR_NewInventory>
+		<FoodType>7</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1547</uiIndex>
+		<szItemName>Calorie Mate</szItemName>
+		<szLongItemName>Calorie Mate</szLongItemName>
+		<szItemDesc>It better taste better than it looks...</szItemDesc>
+		<szBRName>Calorie Mate</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>101</ubGraphicNum>
+		<ubWeight>8</ubWeight>
+		<ubPerPocket>4</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>15</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>8</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1548</uiIndex>
+		<szItemName>Peak EPA</szItemName>
+		<szLongItemName>Peak EPA</szLongItemName>
+		<szItemDesc>A small bottle of vitamins and steroids.</szItemDesc>
+		<szBRName>Peak EPA</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>122</ubGraphicNum>
+		<ubWeight>4</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>12</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>9</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1549</uiIndex>
+		<szItemName>Hotdog</szItemName>
+		<szLongItemName>Hotdog</szLongItemName>
+		<szItemDesc>Butchery leftovers with old bread. Enjoy.</szItemDesc>
+		<szBRName>Hotdog</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>114</ubGraphicNum>
+		<ubWeight>6</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>4</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>10</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1550</uiIndex>
+		<szItemName>Hamburger</szItemName>
+		<szLongItemName>Hamburger</szLongItemName>
+		<szItemDesc>For some obscure reason, this is also sold outside Hamburg.</szItemDesc>
+		<szBRName>Hamburger</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>113</ubGraphicNum>
+		<ubWeight>5</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>6</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>11</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1551</uiIndex>
+		<szItemName>Fries</szItemName>
+		<szLongItemName>French Fries</szLongItemName>
+		<szItemDesc>Or 'Freedom Fries', as some people like to call them.</szItemDesc>
+		<szBRName>Fries</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>112</ubGraphicNum>
+		<ubWeight>3</ubWeight>
+		<ubPerPocket>3</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>2</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>12</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1552</uiIndex>
+		<szItemName>Pizza</szItemName>
+		<szLongItemName>Pizza</szLongItemName>
+		<szItemDesc>Favourite food of couch potatoes and sewer-based squads of tortoise ninjas everywhere.</szItemDesc>
+		<szBRName>Pizza</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>124</ubGraphicNum>
+		<ubWeight>4</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>5</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>13</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1553</uiIndex>
+		<szItemName>Spam</szItemName>
+		<szLongItemName>Spam</szLongItemName>
+		<szItemDesc>Spam, spam, spam, spam, spam, spam, baked beans, spam, spam, spam and spam.</szItemDesc>
+		<szBRName>Spam</szBRName>
+		<szBRDesc>A viking's favourite food.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>126</ubGraphicNum>
+		<ubWeight>8</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>8</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>15</BR_NewInventory>
+		<FoodType>14</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1554</uiIndex>
+		<szItemName>Spam 2</szItemName>
+		<szLongItemName>Spam in a can</szLongItemName>
+		<szItemDesc>Spam, spam, spam, spam, spam, spam, spam, spam, lovely spam, wonderful spam!</szItemDesc>
+		<szBRName>Spam 2</szBRName>
+		<szBRDesc>Hey, at least it doesn't fill up your mailbox...</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>125</ubGraphicNum>
+		<ubWeight>8</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>8</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>15</BR_NewInventory>
+		<FoodType>15</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1555</uiIndex>
+		<szItemName>C. vegetables</szItemName>
+		<szLongItemName>Canned vegetables</szLongItemName>
+		<szItemDesc>These vegetables will stay edible forever, much to children's dismay.</szItemDesc>
+		<szBRName>C. vegetables</szBRName>
+		<szBRDesc>Nutritious, long-lasting, and animal-friendly.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>106</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>6</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>18</BR_NewInventory>
+		<FoodType>16</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1556</uiIndex>
+		<szItemName>C. scorpions</szItemName>
+		<szLongItemName>Canned scorpions</szLongItemName>
+		<szItemDesc>How about something exotic? Like poisonous insects?</szItemDesc>
+		<szBRName>C. scorpions</szBRName>
+		<szBRDesc>We were assured this is actually eaten in some place we forgot.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>105</ubGraphicNum>
+		<ubWeight>7</ubWeight>
+		<ubPerPocket>4</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>12</usPrice>
+		<ubCoolness>4</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>7</BR_NewInventory>
+		<DrugType>8192</DrugType>
+		<FoodType>17</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1557</uiIndex>
+		<szItemName>Cat food</szItemName>
+		<szLongItemName>Canned cat food</szLongItemName>
+		<szItemDesc>Seriously? You really think about eating this? You should rethink this assignment...</szItemDesc>
+		<szBRName>Cat food</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>103</ubGraphicNum>
+		<ubWeight>3</ubWeight>
+		<ubPerPocket>4</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>2</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>18</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1558</uiIndex>
+		<szItemName>Baked beans</szItemName>
+		<szLongItemName>Canned baked beans</szLongItemName>
+		<szItemDesc>Tip: Best served with spam.</szItemDesc>
+		<szBRName>Baked beans</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>102</ubGraphicNum>
+		<ubWeight>8</ubWeight>
+		<ubPerPocket>4</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>6</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>19</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1559</uiIndex>
+		<szItemName>Steak</szItemName>
+		<szLongItemName>Steak</szLongItemName>
+		<szItemDesc>The best arulcan steak you'll find in .. Arulco.</szItemDesc>
+		<szBRName>Steak</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>128</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>24</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>20</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1560</uiIndex>
+		<szItemName>Bean stew</szItemName>
+		<szLongItemName>Bean stew</szLongItemName>
+		<szItemDesc>A mexican-style bean stew. Really hot!</szItemDesc>
+		<szBRName>Bean stew</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>116</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>22</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>21</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1561</uiIndex>
+		<szItemName>French toast</szItemName>
+		<szLongItemName>French toast</szLongItemName>
+		<szItemDesc>Mhmm, breakfast!</szItemDesc>
+		<szBRName>French toast</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>129</ubGraphicNum>
+		<ubWeight>4</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>7</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>22</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+  <ITEM>
+		<uiIndex>1562</uiIndex>
+		<szItemName>Crepes</szItemName>
+		<szLongItemName>Crepes</szLongItemName>
+		<szItemDesc>A spinach and mushroom crepe.</szItemDesc>
+		<szBRName>Crepes</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>127</ubGraphicNum>
+		<ubWeight>5</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>6</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>23</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1563</uiIndex>
+		<szItemName>Pasta</szItemName>
+		<szLongItemName>Pasta</szLongItemName>
+		<szItemDesc>Italian pasta.</szItemDesc>
+		<szBRName>Pasta</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>121</ubGraphicNum>
+		<ubWeight>12</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>23</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>24</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1564</uiIndex>
+		<szItemName>Omelet</szItemName>
+		<szLongItemName>Omelet</szLongItemName>
+		<szItemDesc>Omelet du fromage. Or not?</szItemDesc>
+		<szBRName>Omelet</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>119</ubGraphicNum>
+		<ubWeight>8</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>21</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>25</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1565</uiIndex>
+		<szItemName>Cow meat</szItemName>
+		<szLongItemName>Cow meat</szLongItemName>
+		<szItemDesc>Sure, you can eat it right now. Cooking is for wussies, eh?</szItemDesc>
+		<szBRName>Cow meat</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>108</ubGraphicNum>
+		<ubWeight>30</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>30</ItemSize>
+		<usPrice>12</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<ItemFlag>64</ItemFlag>
+		<FoodType>26</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1566</uiIndex>
+		<szItemName>Bloodcat meat</szItemName>
+		<szLongItemName>Bloodcat meat</szLongItemName>
+		<szItemDesc>You have to be a tough guy to kill them, but an even tougher guy to eat them!</szItemDesc>
+		<szBRName>Bloodcat meat</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>99</ubGraphicNum>
+		<ubWeight>30</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>60</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<ItemFlag>32</ItemFlag>
+		<FoodType>27</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>	
+	<ITEM>
+		<uiIndex>1567</uiIndex>
+		<szItemName>Bread</szItemName>
+		<szLongItemName>Bread loaf</szLongItemName>
+		<szItemDesc>A loaf of bread, made from grain of local farms.</szItemDesc>
+		<szBRName>Bread</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>100</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>4</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>28</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1568</uiIndex>
+		<szItemName>Applepie</szItemName>
+		<szLongItemName>Applepie</szLongItemName>
+		<szItemDesc>A delicious applepie made from tasty arulcan apples. Don't you do anything naughty with it!</szItemDesc>
+		<szBRName>Applepie</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>98</ubGraphicNum>
+		<ubWeight>13</ubWeight>
+		<ubPerPocket>2</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>8</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>29</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1569</uiIndex>
+		<szItemName>Water drum</szItemName>
+		<szLongItemName>Water drum</szLongItemName>
+		<szItemDesc>A rusty old water barrel.</szItemDesc>
+		<szBRName>Water drum</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>131</ubGraphicNum>
+		<ubWeight>10000</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>65</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<Canteen>1</Canteen>
+		<ItemFlag>16</ItemFlag>
+		<FoodType>30</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1570</uiIndex>
+		<szItemName>PET bottle</szItemName>
+		<szLongItemName>PET bottle</szLongItemName>
+		<szItemDesc>A bottle with 1 liter of still mineral water.</szItemDesc>
+		<szBRName>PET bottle</szBRName>
+		<szBRDesc>1 liter of healthy mineral water, in a one-use bottle.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>123</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>2</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>30</BR_NewInventory>
+		<FoodType>31</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1571</uiIndex>
+		<szItemName>Vegetable juice</szItemName>
+		<szLongItemName>Vegetable juice</szLongItemName>
+		<szItemDesc>A drink that is so nutritious, it also stills your hunger (a bit).</szItemDesc>
+		<szBRName>Vegetable juice</szBRName>
+		<szBRDesc>For those without teeth who want to eat vegetables.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>130</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>3</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<BR_NewInventory>14</BR_NewInventory>
+		<FoodType>32</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1572</uiIndex>
+		<szItemName>Milk</szItemName>
+		<szLongItemName>Milk</szLongItemName>
+		<szItemDesc>Cow milk, 1 liter.</szItemDesc>
+		<szBRName>Milk</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>117</ubGraphicNum>
+		<ubWeight>10</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>3</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<FoodType>33</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1573</uiIndex>
+		<szItemName>Energy drink</szItemName>
+		<szLongItemName>Energy drink</szLongItemName>
+		<szItemDesc>You can almost taste the yummy chemicals that went into this.</szItemDesc>
+		<szBRName>Energy drink</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>110</ubGraphicNum>
+		<ubWeight>5</ubWeight>
+		<ubPerPocket>3</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>6</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<DrugType>1</DrugType>
+		<FoodType>34</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1574</uiIndex>
+		<szItemName>Energy drink 2</szItemName>
+		<szLongItemName>Energy drink 2</szLongItemName>
+		<szItemDesc>Both tastes and refreshes like a kick in the belly.</szItemDesc>
+		<szBRName>Energy drink 2</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>109</ubGraphicNum>
+		<ubWeight>5</ubWeight>
+		<ubPerPocket>4</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>6</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<DrugType>1</DrugType>
+		<FoodType>35</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
+	<ITEM>
+		<uiIndex>1575</uiIndex>
+		<szItemName>Coffee</szItemName>
+		<szLongItemName>Coffee</szLongItemName>
+		<szItemDesc>Apparently some people can get hooked to this stuff.</szItemDesc>
+		<szBRName>Coffee</szBRName>
+		<szBRDesc>Not for sale through BR.</szBRDesc>
+		<usItemClass>268435456</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>107</ubGraphicNum>
+		<ubWeight>4</ubWeight>
+		<ubPerPocket>4</ubPerPocket>
+		<ItemSize>22</ItemSize>
+		<usPrice>4</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<Damageable>1</Damageable>
+		<DrugType>1</DrugType>
+		<FoodType>36</FoodType>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>	
 </ITEMLIST>

gamedir/Data-1.13/TableData/Map/Facilities.xml

@@ -8,7 +8,7 @@
 											2 = No, never.
 -->
 
-<SECTORFACILITIES>
+<SECTORFACILITIES>  
 	<!-- DRASSEN -->
 	<FACILITY>
 		<SectorGrid>B13</SectorGrid>
@@ -77,6 +77,11 @@
 		<FacilityType>18</FacilityType>
 		<ubHidden>2</ubHidden>
 	</FACILITY>
+	<FACILITY>
+		<SectorGrid>H13</SectorGrid>
+		<FacilityType>20</FacilityType>
+		<ubHidden>1</ubHidden>
+	</FACILITY>
 	<FACILITY>
 		<SectorGrid>H14</SectorGrid>
 		<FacilityType>18</FacilityType>

gamedir/Data-1.13/TableData/Map/FacilityTypes.xml

@@ -307,4 +307,30 @@
 		</ASSIGNMENT> 
 	</FACILITYTYPE>
 	
+	<FACILITYTYPE>
+		<ubIndex>20</ubIndex>
+		<szFacilityName>Army Barracks Cantina</szFacilityName>
+		<szFacilityShortName>Cantina</szFacilityShortName>
+		<ubTotalStaffLimit>10</ubTotalStaffLimit>
+		<ASSIGNMENT>
+			<ubAssignmentType>FACILITY_EAT</ubAssignmentType>
+			<szTooltipText>By taking over the armies barracks, you've also taken over the cantina inside. Your mercs can eat here.</szTooltipText>
+			<ubStaffLimit>10</ubStaffLimit>
+			<sCostPerHour>10</sCostPerHour>
+			<sCantinaFoodModifier>500</sCantinaFoodModifier>
+			<CONDITIONS>
+			</CONDITIONS>
+			<MORALE>
+				<usChance>500</usChance>
+				<bBaseEffect>1</bBaseEffect>
+				<ubRange>0</ubRange>
+			</MORALE>
+			<DRUNK>
+				<ubChance>400</ubChance>
+				<bBaseEffect>1</bBaseEffect>
+				<ubRange>0</ubRange>
+			</DRUNK>
+		</ASSIGNMENT>
+	</FACILITYTYPE>
+	
 </FACILITYTYPES>

gamedir/Data-1.13/TableData/Merges.xml

@@ -144,14 +144,6 @@
 		<mergeType>1</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
-	<MERGE>
-		<firstItemIndex>214</firstItemIndex>
-		<secondItemIndex>214</secondItemIndex>
-		<firstResultingItemIndex>214</firstResultingItemIndex>
-		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>1</mergeType>
-		<APCost>32</APCost>
-	</MERGE>
 	<MERGE>
 		<firstItemIndex>216</firstItemIndex>
 		<secondItemIndex>161</secondItemIndex>
@@ -3848,4 +3840,37 @@
 		<mergeType>3</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
+	
+	<MERGE>
+		<firstItemIndex>1546</firstItemIndex>
+		<secondItemIndex>1546</secondItemIndex>
+		<firstResultingItemIndex>1546</firstResultingItemIndex>
+		<secondResultingItemIndex>0</secondResultingItemIndex>
+		<mergeType>1</mergeType>
+		<APCost>32</APCost>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>1570</firstItemIndex>
+		<secondItemIndex>1570</secondItemIndex>
+		<firstResultingItemIndex>1570</firstResultingItemIndex>
+		<secondResultingItemIndex>0</secondResultingItemIndex>
+		<mergeType>1</mergeType>
+		<APCost>32</APCost>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>1571</firstItemIndex>
+		<secondItemIndex>1571</secondItemIndex>
+		<firstResultingItemIndex>1571</firstResultingItemIndex>
+		<secondResultingItemIndex>0</secondResultingItemIndex>
+		<mergeType>1</mergeType>
+		<APCost>32</APCost>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>1572</firstItemIndex>
+		<secondItemIndex>1572</secondItemIndex>
+		<firstResultingItemIndex>1572</firstResultingItemIndex>
+		<secondResultingItemIndex>0</secondResultingItemIndex>
+		<mergeType>1</mergeType>
+		<APCost>32</APCost>
+	</MERGE>
 </MERGELIST>

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

@@ -14,5 +14,110 @@
 		<uiIndex>2</uiIndex>
 		<sItemIndex>256</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1549</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1550</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>1551</sItemIndex>
+		<ubOptimalNumber>16</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>1552</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>1559</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>1560</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>1561</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>1562</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>1564</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>	
+  <INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>20</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1571</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>14</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1573</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>1574</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
 </INVENTORYLIST>

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

@@ -15,4 +15,109 @@
 		<sItemIndex>256</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1549</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1550</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>1551</sItemIndex>
+		<ubOptimalNumber>16</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>1552</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>1559</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>1560</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>1561</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>1562</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>1564</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>	
+  <INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>20</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1571</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>14</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1573</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>1574</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

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

@@ -15,4 +15,109 @@
 		<sItemIndex>256</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1549</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1550</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>1551</sItemIndex>
+		<ubOptimalNumber>16</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>1552</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>1559</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>1560</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>1561</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>1562</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>1564</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>	
+  <INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>20</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1571</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>14</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1573</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>1574</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

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

@@ -15,4 +15,109 @@
 		<sItemIndex>256</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1549</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1550</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>1551</sItemIndex>
+		<ubOptimalNumber>16</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>1552</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>1559</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>1560</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>1561</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>1562</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>1564</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>	
+  <INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>20</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1571</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>14</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1573</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>1574</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

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

@@ -15,4 +15,109 @@
 		<sItemIndex>256</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1549</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1550</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>1551</sItemIndex>
+		<ubOptimalNumber>16</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>1552</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>1559</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>1560</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>1561</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>1562</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>1564</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>	
+  <INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>20</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1571</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>14</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1573</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>1574</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

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

@@ -79,5 +79,20 @@
 		<uiIndex>15</uiIndex>
 		<sItemIndex>1539</sItemIndex>
 		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1544</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1547</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1548</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 </INVENTORYLIST>

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

@@ -323,4 +323,9 @@
 		<sItemIndex>1053</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>65</uiIndex>
+		<sItemIndex>1569</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

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

@@ -376,5 +376,55 @@
 	<INVENTORY>
 		<uiIndex>77</uiIndex>
 		<sItemIndex>1361</sItemIndex>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>78</uiIndex>
+		<sItemIndex>1553</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>79</uiIndex>
+		<sItemIndex>1554</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>80</uiIndex>
+		<sItemIndex>1555</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>81</uiIndex>
+		<sItemIndex>1557</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>82</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>83</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>84</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>85</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>86</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>87</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 </INVENTORYLIST>

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

@@ -15,4 +15,109 @@
 		<sItemIndex>256</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1549</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1550</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>1551</sItemIndex>
+		<ubOptimalNumber>16</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>1552</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>1559</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>1560</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>1561</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>1562</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>1564</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>	
+  <INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>20</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1571</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>14</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1573</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>1574</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>

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

@@ -17,4 +17,8 @@
 		<uiIndex>3</uiIndex>
 		<sItemIndex>232</sItemIndex>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1566</sItemIndex>
+	</INVENTORY>
 </INVENTORYLIST>

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

@@ -15,4 +15,109 @@
 		<sItemIndex>256</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1549</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>4</uiIndex>
+		<sItemIndex>1550</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>5</uiIndex>
+		<sItemIndex>1551</sItemIndex>
+		<ubOptimalNumber>16</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>6</uiIndex>
+		<sItemIndex>1552</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>7</uiIndex>
+		<sItemIndex>1558</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>8</uiIndex>
+		<sItemIndex>1559</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>9</uiIndex>
+		<sItemIndex>1560</sItemIndex>
+		<ubOptimalNumber>6</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>10</uiIndex>
+		<sItemIndex>1561</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>11</uiIndex>
+		<sItemIndex>1562</sItemIndex>
+		<ubOptimalNumber>10</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>12</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>13</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>14</uiIndex>
+		<sItemIndex>1563</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>15</uiIndex>
+		<sItemIndex>1564</sItemIndex>
+		<ubOptimalNumber>5</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>16</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>17</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>	
+  <INVENTORY>
+		<uiIndex>18</uiIndex>
+		<sItemIndex>1570</sItemIndex>
+		<ubOptimalNumber>20</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>19</uiIndex>
+		<sItemIndex>1571</sItemIndex>
+		<ubOptimalNumber>7</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>20</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>14</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>21</uiIndex>
+		<sItemIndex>1573</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>22</uiIndex>
+		<sItemIndex>1574</sItemIndex>
+		<ubOptimalNumber>4</ubOptimalNumber>
+	</INVENTORY>
+  <INVENTORY>
+		<uiIndex>23</uiIndex>
+		<sItemIndex>1575</sItemIndex>
+		<ubOptimalNumber>12</ubOptimalNumber>
+	</INVENTORY>
 </INVENTORYLIST>