diff --git a/gamedir/Data-1.13/TableData/EnemyGunChoices.xml b/gamedir/Data-1.13/TableData/EnemyGunChoices.xml
index 325d0db82..b92f8211f 100644
--- a/gamedir/Data-1.13/TableData/EnemyGunChoices.xml
+++ b/gamedir/Data-1.13/TableData/EnemyGunChoices.xml
@@ -164,7 +164,7 @@
 	</ENEMYGUNCHOICES>
 	<ENEMYGUNCHOICES>
 		<uiIndex>3</uiIndex>
-		<ubChoices>21</ubChoices>
+		<ubChoices>20</ubChoices>
 		<bItemNo1>670</bItemNo1>
 		<bItemNo2>723</bItemNo2>
 		<bItemNo3>724</bItemNo3>
@@ -181,11 +181,11 @@
 		<bItemNo14>32</bItemNo14>
 		<bItemNo15>13</bItemNo15>
 		<bItemNo16>14</bItemNo16>
-		<bItemNo17>683</bItemNo17>
+		<bItemNo17>348</bItemNo17>
 		<bItemNo18>347</bItemNo18>
 		<bItemNo19>12</bItemNo19>
 		<bItemNo20>693</bItemNo20>
-		<bItemNo21>348</bItemNo21>
+		<bItemNo21>-1</bItemNo21>
 		<bItemNo22>-1</bItemNo22>
 		<bItemNo23>-1</bItemNo23>
 		<bItemNo24>-1</bItemNo24>
@@ -218,7 +218,7 @@
 	</ENEMYGUNCHOICES>
 	<ENEMYGUNCHOICES>
 		<uiIndex>4</uiIndex>
-		<ubChoices>25</ubChoices>
+		<ubChoices>26</ubChoices>
 		<bItemNo1>641</bItemNo1>
 		<bItemNo2>707</bItemNo2>
 		<bItemNo3>701</bItemNo3>
@@ -244,7 +244,7 @@
 		<bItemNo23>29</bItemNo23>
 		<bItemNo24>728</bItemNo24>
 		<bItemNo25>601</bItemNo25>
-		<bItemNo26>-1</bItemNo26>
+		<bItemNo26>683</bItemNo26>
 		<bItemNo27>-1</bItemNo27>
 		<bItemNo28>-1</bItemNo28>
 		<bItemNo29>-1</bItemNo29>
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index f013e21ad..3a22b4745 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -42971,7 +42971,7 @@
 		<ubWeight>1</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>64</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>5</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -42991,7 +42991,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>6</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -43939,7 +43939,7 @@
 		<ubWeight>2</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>120</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>5</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -43959,7 +43959,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>6</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -44907,7 +44907,7 @@
 		<ubWeight>4</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>240</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -44927,7 +44927,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -45875,7 +45875,7 @@
 		<ubWeight>7</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>400</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>5</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -45895,7 +45895,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>6</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -48174,7 +48174,7 @@
 		<ubWeight>2</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>80</usPrice>
-		<ubCoolness>3</ubCoolness>
+		<ubCoolness>5</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -48194,7 +48194,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>8</BR_NewInventory>
+		<BR_NewInventory>6</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -48416,7 +48416,7 @@
 		<ubWeight>2</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>60</usPrice>
-		<ubCoolness>3</ubCoolness>
+		<ubCoolness>4</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -48436,7 +48436,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>8</BR_NewInventory>
+		<BR_NewInventory>7</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -48900,7 +48900,7 @@
 		<ubWeight>4</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>160</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>5</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -48920,7 +48920,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>6</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -49263,7 +49263,7 @@
 		<ubWeight>9</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>343</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>5</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -49283,7 +49283,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>6</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -55071,7 +55071,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>50</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55091,7 +55091,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -55192,7 +55192,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>75</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55212,7 +55212,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -55313,7 +55313,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>175</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55333,7 +55333,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -55555,7 +55555,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>150</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55575,7 +55575,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -55676,7 +55676,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>45</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55696,7 +55696,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -55797,7 +55797,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>68</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55817,7 +55817,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -55918,7 +55918,7 @@
 		<ubWeight>3</ubWeight>
 		<ubPerPocket>6</ubPerPocket>
 		<usPrice>158</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -55938,7 +55938,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>40</PercentNoiseReduction>
@@ -58822,7 +58822,7 @@
 		<ubWeight>2</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>600</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>8</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -58842,7 +58842,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>3</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -58943,7 +58943,7 @@
 		<ubWeight>5</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>1500</usPrice>
-		<ubCoolness>7</ubCoolness>
+		<ubCoolness>8</ubCoolness>
 		<bReliability>0</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -58963,7 +58963,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>4</BR_NewInventory>
+		<BR_NewInventory>3</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -62331,7 +62331,7 @@
 		<ubWeight>2</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<usPrice>112</usPrice>
-		<ubCoolness>4</ubCoolness>
+		<ubCoolness>5</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -62351,7 +62351,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>7</BR_NewInventory>
+		<BR_NewInventory>6</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -64630,7 +64630,7 @@
 		<ubWeight>6</ubWeight>
 		<ubPerPocket>4</ubPerPocket>
 		<usPrice>404</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>-3</bReliability>
 		<bRepairEase>0</bRepairEase>
 		<Damageable>0</Damageable>
@@ -64650,7 +64650,7 @@
 		<Unaerodynamic>0</Unaerodynamic>
 		<Electronic>0</Electronic>
 		<Inseparable>0</Inseparable>
-		<BR_NewInventory>6</BR_NewInventory>
+		<BR_NewInventory>5</BR_NewInventory>
 		<BR_UsedInventory>0</BR_UsedInventory>
 		<BR_ROF>0</BR_ROF>
 		<PercentNoiseReduction>0</PercentNoiseReduction>
@@ -82659,7 +82659,7 @@
 		<ubWeight>43</ubWeight>
 		<ubPerPocket>0</ubPerPocket>
 		<usPrice>4180</usPrice>
-		<ubCoolness>5</ubCoolness>
+		<ubCoolness>6</ubCoolness>
 		<bReliability>1</bReliability>
 		<bRepairEase>-2</bRepairEase>
 		<Damageable>1</Damageable>