From 9fb4179f5bc8e85f6547f3ac5b7e8634ec58e238 Mon Sep 17 00:00:00 2001
From: BeatAroundTheBuscher
 <81776525+BeatAroundTheBuscher@users.noreply.github.com>
Date: Sun, 17 Aug 2025 17:46:43 +0200
Subject: [PATCH] NPCs wear more hats, non helmet hats can attach NVGs, etc.
 (#173)

* Hand out some hats

* Added Attachments (NVGs, etc.) to non helmet head gear
---
 .../Inventory/ItemChoices_Enemy_Admin.xml     |   4 +-
 .../Inventory/ItemChoices_Enemy_Elite.xml     |   6 +-
 .../Inventory/ItemChoices_Enemy_Regular.xml   |   4 +-
 .../Inventory/ItemChoices_Militia_Green.xml   |   4 +-
 .../Inventory/ItemChoices_Militia_Regular.xml |   4 +-
 .../Data-1.13/TableData/Items/Attachments.xml | 275 ++++++++++++++++++
 6 files changed, 286 insertions(+), 11 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
index e69b627c4..ede93436c 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
@@ -3,14 +3,14 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>0</uiIndex>
 		<name>Helmets</name>
-		<ubChoices>6</ubChoices>
+		<ubChoices>7</ubChoices>
 		<bItemNo1>176</bItemNo1>          <!-- Steel Helmet -->
 		<bItemNo2>177</bItemNo2>          <!-- Kevlar Helmet -->
 		<bItemNo3>180</bItemNo3>          <!-- Spectra Helmet -->
 		<bItemNo4>810</bItemNo4>          <!-- Twaron Helmet -->
 		<bItemNo5>801</bItemNo5>          <!-- Dyneema Helmet -->
 		<bItemNo6>302</bItemNo6>          <!-- Camo Steel Helmet -->
-		<bItemNo7>0</bItemNo7>
+		<bItemNo7>1774</bItemNo7>		  <!-- Army Cap -->
 		<bItemNo8>0</bItemNo8>
 		<bItemNo9>0</bItemNo9>
 		<bItemNo10>0</bItemNo10>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
index 2112b3e2c..dece8aae3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
@@ -3,15 +3,15 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>0</uiIndex>
 		<name>Helmets</name>
-		<ubChoices>6</ubChoices>
+		<ubChoices>8</ubChoices>
 		<bItemNo1>176</bItemNo1>          <!-- Steel Helmet -->
 		<bItemNo2>177</bItemNo2>          <!-- Kevlar Helmet -->
 		<bItemNo3>180</bItemNo3>          <!-- Spectra Helmet -->
 		<bItemNo4>810</bItemNo4>          <!-- Twaron Helmet -->
 		<bItemNo5>801</bItemNo5>          <!-- Dyneema Helmet -->
 		<bItemNo6>302</bItemNo6>          <!-- Camo Steel Helmet -->
-		<bItemNo7>0</bItemNo7>
-		<bItemNo8>0</bItemNo8>
+		<bItemNo7>285</bItemNo7>		  <!-- Boonie Hat -->
+		<bItemNo8>281</bItemNo8>		  <!-- Black Cap -->
 		<bItemNo9>0</bItemNo9>
 		<bItemNo10>0</bItemNo10>
 		<bItemNo11>0</bItemNo11>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
index 11474129d..41a7984b9 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
@@ -3,14 +3,14 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>0</uiIndex>
 		<name>Helmets</name>
-		<ubChoices>6</ubChoices>
+		<ubChoices>7</ubChoices>
 		<bItemNo1>176</bItemNo1>          <!-- Steel Helmet -->
 		<bItemNo2>177</bItemNo2>          <!-- Kevlar Helmet -->
 		<bItemNo3>180</bItemNo3>          <!-- Spectra Helmet -->
 		<bItemNo4>810</bItemNo4>          <!-- Twaron Helmet -->
 		<bItemNo5>801</bItemNo5>          <!-- Dyneema Helmet -->
 		<bItemNo6>302</bItemNo6>          <!-- Camo Steel Helmet -->
-		<bItemNo7>0</bItemNo7>
+		<bItemNo7>1774</bItemNo7>		  <!-- Army Cap -->
 		<bItemNo8>0</bItemNo8>
 		<bItemNo9>0</bItemNo9>
 		<bItemNo10>0</bItemNo10>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Green.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Green.xml
index e69b627c4..58ce133a3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Green.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Green.xml
@@ -3,14 +3,14 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>0</uiIndex>
 		<name>Helmets</name>
-		<ubChoices>6</ubChoices>
+		<ubChoices>7</ubChoices>
 		<bItemNo1>176</bItemNo1>          <!-- Steel Helmet -->
 		<bItemNo2>177</bItemNo2>          <!-- Kevlar Helmet -->
 		<bItemNo3>180</bItemNo3>          <!-- Spectra Helmet -->
 		<bItemNo4>810</bItemNo4>          <!-- Twaron Helmet -->
 		<bItemNo5>801</bItemNo5>          <!-- Dyneema Helmet -->
 		<bItemNo6>302</bItemNo6>          <!-- Camo Steel Helmet -->
-		<bItemNo7>0</bItemNo7>
+		<bItemNo7>1771</bItemNo7>		  <!-- Green Beret -->
 		<bItemNo8>0</bItemNo8>
 		<bItemNo9>0</bItemNo9>
 		<bItemNo10>0</bItemNo10>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Regular.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Regular.xml
index 57dc5e342..d18c1cbef 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Regular.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Regular.xml
@@ -3,14 +3,14 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>0</uiIndex>
 		<name>Helmets</name>
-		<ubChoices>6</ubChoices>
+		<ubChoices>7</ubChoices>
 		<bItemNo1>176</bItemNo1>          <!-- Steel Helmet -->
 		<bItemNo2>177</bItemNo2>          <!-- Kevlar Helmet -->
 		<bItemNo3>180</bItemNo3>          <!-- Spectra Helmet -->
 		<bItemNo4>810</bItemNo4>          <!-- Twaron Helmet -->
 		<bItemNo5>801</bItemNo5>          <!-- Dyneema Helmet -->
 		<bItemNo6>302</bItemNo6>          <!-- Camo Steel Helmet -->
-		<bItemNo7>0</bItemNo7>
+		<bItemNo7>1772</bItemNo7>		  <!-- Blue Beret -->
 		<bItemNo8>0</bItemNo8>
 		<bItemNo9>0</bItemNo9>
 		<bItemNo10>0</bItemNo10>
diff --git a/gamedir/Data-1.13/TableData/Items/Attachments.xml b/gamedir/Data-1.13/TableData/Items/Attachments.xml
index 18dd09d1e..178c6b552 100644
--- a/gamedir/Data-1.13/TableData/Items/Attachments.xml
+++ b/gamedir/Data-1.13/TableData/Items/Attachments.xml
@@ -4036,6 +4036,61 @@
 		<itemIndex>293</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Black Cap -->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>281</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Boonie Hat -->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>285</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, US-->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>287</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Red Beret-->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>288</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Russian Hat -->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>289</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Fur Hat-->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>290</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, Soviet-->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>292</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+ 	<ATTACHMENT>  <!-- Green Beret-->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>1771</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Blue Beret -->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>1772</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Cowboy Hat -->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>1773</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Army Cap -->
+		<attachmentIndex>211</attachmentIndex>
+		<itemIndex>1774</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>212</attachmentIndex>
 		<itemIndex>176</itemIndex>
@@ -4426,6 +4481,61 @@
 		<itemIndex>293</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Black Cap -->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>281</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Boonie Hat -->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>285</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, US-->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>287</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Red Beret-->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>288</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Russian Hat -->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>289</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Fur Hat-->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>290</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, Soviet-->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>292</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+ 	<ATTACHMENT>  <!-- Green Beret-->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>1771</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Blue Beret -->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>1772</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Cowboy Hat -->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>1773</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Army Cap -->
+		<attachmentIndex>212</attachmentIndex>
+		<itemIndex>1774</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>213</attachmentIndex>
 		<itemIndex>282</itemIndex>
@@ -7706,6 +7816,61 @@
 		<itemIndex>293</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Black Cap -->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>281</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Boonie Hat -->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>285</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, US-->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>287</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Red Beret-->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>288</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Russian Hat -->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>289</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Fur Hat-->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>290</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, Soviet-->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>292</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+ 	<ATTACHMENT>  <!-- Green Beret-->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>1771</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Blue Beret -->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>1772</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Cowboy Hat -->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>1773</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Army Cap -->
+		<attachmentIndex>246</attachmentIndex>
+		<itemIndex>1774</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>284</attachmentIndex>
 		<itemIndex>161</itemIndex>
@@ -23172,6 +23337,61 @@
 		<itemIndex>293</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Black Cap -->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>281</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Boonie Hat -->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>285</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, US-->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>287</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Red Beret-->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>288</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Russian Hat -->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>289</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Fur Hat-->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>290</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, Soviet-->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>292</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+ 	<ATTACHMENT>  <!-- Green Beret-->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>1771</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Blue Beret -->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>1772</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Cowboy Hat -->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>1773</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Army Cap -->
+		<attachmentIndex>1024</attachmentIndex>
+		<itemIndex>1774</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1025</attachmentIndex>
 		<itemIndex>176</itemIndex>
@@ -23267,6 +23487,61 @@
 		<itemIndex>293</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Black Cap -->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>281</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Boonie Hat -->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>285</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, US-->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>287</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Red Beret-->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>288</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Russian Hat -->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>289</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Fur Hat-->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>290</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Officer's Hat, Soviet-->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>292</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+ 	<ATTACHMENT>  <!-- Green Beret-->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>1771</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Blue Beret -->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>1772</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Cowboy Hat -->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>1773</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
+	<ATTACHMENT>  <!-- Army Cap -->
+		<attachmentIndex>1025</attachmentIndex>
+		<itemIndex>1774</itemIndex>
+		<APCost>16</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1026</attachmentIndex>
 		<itemIndex>11</itemIndex>