From ac2ad02b1c304d77a60d451f8bedfa7f3e4ea5fd Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sun, 24 Mar 2013 19:33:26 +0000
Subject: [PATCH] added stun gun to enemy item choices

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1626 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml    | 4 ++--
 .../Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml | 4 ++--
 .../Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml | 4 ++--
 .../TableData/Inventory/ItemChoices_Enemy_Regular.xml         | 4 ++--
 .../TableData/Inventory/ItemChoices_Militia_Elite.xml         | 4 ++--
 .../TableData/Inventory/ItemChoices_Militia_Green.xml         | 4 ++--
 .../TableData/Inventory/ItemChoices_Militia_Regular.xml       | 4 ++--
 gamedir/Data-1.13/TableData/Items/Items.xml                   | 1 +
 8 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml b/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml
index fc75a3323..6ff933df3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/EnemyItemChoices.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>44</ubChoices>
+		<ubChoices>45</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -378,7 +378,7 @@
 		<bItemNo42>1567</bItemNo42>
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
-		<bItemNo45>0</bItemNo45>
+		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>0</bItemNo46>
 		<bItemNo47>0</bItemNo47>
 		<bItemNo48>0</bItemNo48>
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 fc75a3323..6ff933df3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Admin.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>44</ubChoices>
+		<ubChoices>45</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -378,7 +378,7 @@
 		<bItemNo42>1567</bItemNo42>
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
-		<bItemNo45>0</bItemNo45>
+		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>0</bItemNo46>
 		<bItemNo47>0</bItemNo47>
 		<bItemNo48>0</bItemNo48>
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 fc75a3323..6ff933df3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Elite.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>44</ubChoices>
+		<ubChoices>45</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -378,7 +378,7 @@
 		<bItemNo42>1567</bItemNo42>
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
-		<bItemNo45>0</bItemNo45>
+		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>0</bItemNo46>
 		<bItemNo47>0</bItemNo47>
 		<bItemNo48>0</bItemNo48>
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 fc75a3323..6ff933df3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Enemy_Regular.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>44</ubChoices>
+		<ubChoices>45</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -378,7 +378,7 @@
 		<bItemNo42>1567</bItemNo42>
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
-		<bItemNo45>0</bItemNo45>
+		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>0</bItemNo46>
 		<bItemNo47>0</bItemNo47>
 		<bItemNo48>0</bItemNo48>
diff --git a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Elite.xml b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Elite.xml
index fc75a3323..6ff933df3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Elite.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Elite.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>44</ubChoices>
+		<ubChoices>45</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -378,7 +378,7 @@
 		<bItemNo42>1567</bItemNo42>
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
-		<bItemNo45>0</bItemNo45>
+		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>0</bItemNo46>
 		<bItemNo47>0</bItemNo47>
 		<bItemNo48>0</bItemNo48>
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 fc75a3323..6ff933df3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Green.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Green.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>44</ubChoices>
+		<ubChoices>45</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -378,7 +378,7 @@
 		<bItemNo42>1567</bItemNo42>
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
-		<bItemNo45>0</bItemNo45>
+		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>0</bItemNo46>
 		<bItemNo47>0</bItemNo47>
 		<bItemNo48>0</bItemNo48>
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 fc75a3323..6ff933df3 100644
--- a/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Regular.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/ItemChoices_Militia_Regular.xml
@@ -333,7 +333,7 @@
 	<ENEMYITEMCHOICES>
 		<uiIndex>6</uiIndex>
 		<name>Misc</name>
-		<ubChoices>44</ubChoices>
+		<ubChoices>45</ubChoices>
 		<bItemNo1>49</bItemNo1>
 		<bItemNo2>214</bItemNo2>
 		<bItemNo3>214</bItemNo3>
@@ -378,7 +378,7 @@
 		<bItemNo42>1567</bItemNo42>
 		<bItemNo43>1570</bItemNo43>
 		<bItemNo44>1576</bItemNo44>
-		<bItemNo45>0</bItemNo45>
+		<bItemNo45>1626</bItemNo45>
 		<bItemNo46>0</bItemNo46>
 		<bItemNo47>0</bItemNo47>
 		<bItemNo48>0</bItemNo48>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 6a4d0d2db..b8a580086 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -48697,6 +48697,7 @@
 		<Electronic>1</Electronic>
 		<NeedsBatteries>1</NeedsBatteries>
 		<ShowStatus>1</ShowStatus>
+		<DefaultAttachment>322</DefaultAttachment>
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_UsedInventory>3</BR_UsedInventory>
 		<BR_ROF>30</BR_ROF>