diff --git a/gamedir/Data-1.13/TableData/NPCInventory/SamInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/SamInventory.xml
index ce41c4953..602f681bd 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/SamInventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/SamInventory.xml
@@ -11,126 +11,126 @@
 		<ubOptimalNumber>5</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>3</uiIndex>
+		<uiIndex>2</uiIndex>
 		<sItemIndex>1416</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>7</uiIndex>
+		<uiIndex>3</uiIndex>
 		<sItemIndex>146</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>8</uiIndex>
+		<uiIndex>4</uiIndex>
 		<sItemIndex>201</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>9</uiIndex>
+		<uiIndex>5</uiIndex>
 		<sItemIndex>203</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>10</uiIndex>
+		<uiIndex>6</uiIndex>
 		<sItemIndex>204</sItemIndex>
 		<ubOptimalNumber>4</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>11</uiIndex>
+		<uiIndex>7</uiIndex>
 		<sItemIndex>214</sItemIndex>
 		<ubOptimalNumber>5</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>12</uiIndex>
+		<uiIndex>8</uiIndex>
 		<sItemIndex>215</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>13</uiIndex>
+		<uiIndex>9</uiIndex>
 		<sItemIndex>220</sItemIndex>
 		<ubOptimalNumber>12</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>14</uiIndex>
+		<uiIndex>10</uiIndex>
 		<sItemIndex>243</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>15</uiIndex>
+		<uiIndex>11</uiIndex>
 		<sItemIndex>244</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>16</uiIndex>
+		<uiIndex>12</uiIndex>
 		<sItemIndex>258</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>17</uiIndex>
+		<uiIndex>13</uiIndex>
 		<sItemIndex>299</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>18</uiIndex>
+		<uiIndex>14</uiIndex>
 		<sItemIndex>309</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>19</uiIndex>
+		<uiIndex>15</uiIndex>
 		<sItemIndex>316</sItemIndex>
 		<ubOptimalNumber>5</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>20</uiIndex>
+		<uiIndex>16</uiIndex>
 		<sItemIndex>322</sItemIndex>
 		<ubOptimalNumber>10</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>21</uiIndex>
+		<uiIndex>17</uiIndex>
 		<sItemIndex>1410</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>22</uiIndex>
+		<uiIndex>18</uiIndex>
 		<sItemIndex>1467</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>23</uiIndex>
+		<uiIndex>19</uiIndex>
 		<sItemIndex>1471</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>24</uiIndex>
+		<uiIndex>20</uiIndex>
 		<sItemIndex>523</sItemIndex>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>26</uiIndex>
+		<uiIndex>21</uiIndex>
 		<sItemIndex>1486</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>29</uiIndex>
+		<uiIndex>22</uiIndex>
 		<sItemIndex>1498</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>30</uiIndex>
+		<uiIndex>23</uiIndex>
 		<sItemIndex>600</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>31</uiIndex>
+		<uiIndex>24</uiIndex>
 		<sItemIndex>1003</sItemIndex>
 		<ubOptimalNumber>4</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>32</uiIndex>
+		<uiIndex>25</uiIndex>
 		<sItemIndex>1026</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>33</uiIndex>
+		<uiIndex>26</uiIndex>
 		<sItemIndex>1202</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml
index 74c587879..65aa095af 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml
@@ -1,297 +1,297 @@
 <?xml version="1.0" encoding="utf-8"?>
 <INVENTORYLIST>
 	<INVENTORY>
-		<uiIndex>1</uiIndex>
+		<uiIndex>0</uiIndex>
 		<sItemIndex>7</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>6</uiIndex>
+		<uiIndex>1</uiIndex>
 		<sItemIndex>20</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>8</uiIndex>
+		<uiIndex>2</uiIndex>
 		<sItemIndex>24</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>9</uiIndex>
+		<uiIndex>3</uiIndex>
 		<sItemIndex>30</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>11</uiIndex>
+		<uiIndex>4</uiIndex>
 		<sItemIndex>34</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>14</uiIndex>
+		<uiIndex>5</uiIndex>
 		<sItemIndex>38</sItemIndex>
 		<ubOptimalNumber>6</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>19</uiIndex>
+		<uiIndex>6</uiIndex>
 		<sItemIndex>61</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>22</uiIndex>
+		<uiIndex>7</uiIndex>
 		<sItemIndex>113</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>23</uiIndex>
+		<uiIndex>8</uiIndex>
 		<sItemIndex>131</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>29</uiIndex>
+		<uiIndex>9</uiIndex>
 		<sItemIndex>146</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>32</uiIndex>
+		<uiIndex>10</uiIndex>
 		<sItemIndex>149</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>33</uiIndex>
+		<uiIndex>11</uiIndex>
 		<sItemIndex>150</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>35</uiIndex>
+		<uiIndex>12</uiIndex>
 		<sItemIndex>207</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>36</uiIndex>
+		<uiIndex>13</uiIndex>
 		<sItemIndex>208</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>37</uiIndex>
+		<uiIndex>14</uiIndex>
 		<sItemIndex>209</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>39</uiIndex>
+		<uiIndex>15</uiIndex>
 		<sItemIndex>244</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>40</uiIndex>
+		<uiIndex>16</uiIndex>
 		<sItemIndex>297</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>41</uiIndex>
+		<uiIndex>17</uiIndex>
 		<sItemIndex>298</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>42</uiIndex>
+		<uiIndex>18</uiIndex>
 		<sItemIndex>299</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>45</uiIndex>
+		<uiIndex>19</uiIndex>
 		<sItemIndex>331</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>91</uiIndex>
+		<uiIndex>20</uiIndex>
 		<sItemIndex>664</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>92</uiIndex>
+		<uiIndex>21</uiIndex>
 		<sItemIndex>665</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>93</uiIndex>
+		<uiIndex>22</uiIndex>
 		<sItemIndex>666</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>110</uiIndex>
+		<uiIndex>23</uiIndex>
 		<sItemIndex>692</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>111</uiIndex>
+		<uiIndex>24</uiIndex>
 		<sItemIndex>696</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>112</uiIndex>
+		<uiIndex>25</uiIndex>
 		<sItemIndex>698</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>113</uiIndex>
+		<uiIndex>26</uiIndex>
 		<sItemIndex>707</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>114</uiIndex>
+		<uiIndex>27</uiIndex>
 		<sItemIndex>709</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>115</uiIndex>
+		<uiIndex>28</uiIndex>
 		<sItemIndex>710</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>116</uiIndex>
+		<uiIndex>29</uiIndex>
 		<sItemIndex>713</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>117</uiIndex>
+		<uiIndex>30</uiIndex>
 		<sItemIndex>714</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>118</uiIndex>
+		<uiIndex>31</uiIndex>
 		<sItemIndex>715</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>119</uiIndex>
+		<uiIndex>32</uiIndex>
 		<sItemIndex>717</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>120</uiIndex>
+		<uiIndex>33</uiIndex>
 		<sItemIndex>718</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>121</uiIndex>
+		<uiIndex>34</uiIndex>
 		<sItemIndex>719</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>122</uiIndex>
+		<uiIndex>35</uiIndex>
 		<sItemIndex>722</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>123</uiIndex>
+		<uiIndex>36</uiIndex>
 		<sItemIndex>726</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>124</uiIndex>
+		<uiIndex>37</uiIndex>
 		<sItemIndex>727</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>125</uiIndex>
+		<uiIndex>38</uiIndex>
 		<sItemIndex>728</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>126</uiIndex>
+		<uiIndex>39</uiIndex>
 		<sItemIndex>729</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>129</uiIndex>
+		<uiIndex>40</uiIndex>
 		<sItemIndex>732</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>130</uiIndex>
+		<uiIndex>41</uiIndex>
 		<sItemIndex>736</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>131</uiIndex>
+		<uiIndex>42</uiIndex>
 		<sItemIndex>741</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>132</uiIndex>
+		<uiIndex>43</uiIndex>
 		<sItemIndex>746</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>136</uiIndex>
+		<uiIndex>44</uiIndex>
 		<sItemIndex>751</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>137</uiIndex>
+		<uiIndex>45</uiIndex>
 		<sItemIndex>752</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>138</uiIndex>
+		<uiIndex>46</uiIndex>
 		<sItemIndex>755</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>140</uiIndex>
+		<uiIndex>47</uiIndex>
 		<sItemIndex>757</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>141</uiIndex>
+		<uiIndex>48</uiIndex>
 		<sItemIndex>758</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>142</uiIndex>
+		<uiIndex>49</uiIndex>
 		<sItemIndex>759</sItemIndex>
 		<ubOptimalNumber>3</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>143</uiIndex>
+		<uiIndex>50</uiIndex>
 		<sItemIndex>760</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>147</uiIndex>
+		<uiIndex>51</uiIndex>
 		<sItemIndex>764</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>148</uiIndex>
+		<uiIndex>52</uiIndex>
 		<sItemIndex>765</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>149</uiIndex>
+		<uiIndex>53</uiIndex>
 		<sItemIndex>766</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>150</uiIndex>
+		<uiIndex>54</uiIndex>
 		<sItemIndex>767</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>151</uiIndex>
+		<uiIndex>55</uiIndex>
 		<sItemIndex>768</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>152</uiIndex>
+		<uiIndex>56</uiIndex>
 		<sItemIndex>769</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>201</uiIndex>
+		<uiIndex>57</uiIndex>
 		<sItemIndex>959</sItemIndex>
 		<ubOptimalNumber>2</ubOptimalNumber>
 	</INVENTORY>
 	<INVENTORY>
-		<uiIndex>348</uiIndex>
+		<uiIndex>58</uiIndex>
 		<sItemIndex>1492</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>