From bd59946bb1f892337c02ba75c5ce62903bc6ac66 Mon Sep 17 00:00:00 2001
From: Starwalker <Starwalker@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 19 Mar 2007 09:39:42 +0000
Subject: [PATCH] reverted changes in weapons.xml that were done behind my
 back! :-(

deleted possibility to attach Energy/Regeneration Boosters to First Aid Kit, because that kit is stackable
corrected folding stock entries for SG540/SG542 to match the pics

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@738 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Attachments.xml | 20 +++++---------------
 gamedir/Data-1.13/TableData/Items.xml       |  4 ++--
 gamedir/Data-1.13/TableData/Weapons.xml     | 10 +++++-----
 3 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml
index d72a5d7c8..eb73368dd 100644
--- a/gamedir/Data-1.13/TableData/Attachments.xml
+++ b/gamedir/Data-1.13/TableData/Attachments.xml
@@ -2564,11 +2564,6 @@
 		<itemIndex>869</itemIndex>
 		<APCost>2</APCost>
 	</ATTACHMENT>
-	<ATTACHMENT>
-		<attachmentIndex>222</attachmentIndex>
-		<itemIndex>201</itemIndex>
-		<APCost>5</APCost>
-	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>222</attachmentIndex>
 		<itemIndex>128</itemIndex>
@@ -2749,11 +2744,6 @@
 		<itemIndex>869</itemIndex>
 		<APCost>2</APCost>
 	</ATTACHMENT>
-	<ATTACHMENT>
-		<attachmentIndex>235</attachmentIndex>
-		<itemIndex>201</itemIndex>
-		<APCost>5</APCost>
-	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>235</attachmentIndex>
 		<itemIndex>128</itemIndex>
@@ -12699,11 +12689,6 @@
 		<itemIndex>347</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
-	<ATTACHMENT>
-		<attachmentIndex>1008</attachmentIndex>
-		<itemIndex>350</itemIndex>
-		<APCost>5</APCost>
-	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1008</attachmentIndex>
 		<itemIndex>615</itemIndex>
@@ -12764,6 +12749,11 @@
 		<itemIndex>706</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1008</attachmentIndex>
+		<itemIndex>712</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1008</attachmentIndex>
 		<itemIndex>720</itemIndex>
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index a4f1e4229..a5b44f44e 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -15799,8 +15799,8 @@
 		<BR_NewInventory>3</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
 		<BR_ROF>800</BR_ROF>
-		<ToHitBonus>-1</ToHitBonus>
-		<PercentReadyTimeAPReduction>30</PercentReadyTimeAPReduction>
+		<ToHitBonus>0</ToHitBonus>
+		<PercentReadyTimeAPReduction>0</PercentReadyTimeAPReduction>
 	</ITEM>
 	<ITEM>
 		<uiIndex>713</uiIndex>
diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml
index 301f47354..3fae95246 100644
--- a/gamedir/Data-1.13/TableData/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Weapons.xml
@@ -538,7 +538,7 @@
 		<ubBulletSpeed>22</ubBulletSpeed>
 		<ubImpact>32</ubImpact>
 		<ubDeadliness>22</ubDeadliness>
-		<bAccuracy>3</bAccuracy>
+		<bAccuracy>1</bAccuracy>
 		<ubMagSize>10</ubMagSize>
 		<usRange>370</usRange>
 		<usReloadDelay>200</usReloadDelay>
@@ -2107,7 +2107,7 @@
 		<ubBulletSpeed>21</ubBulletSpeed>
 		<ubImpact>27</ubImpact>
 		<ubDeadliness>22</ubDeadliness>
-		<bAccuracy>2</bAccuracy>
+		<bAccuracy>1</bAccuracy>
 		<ubMagSize>20</ubMagSize>
 		<usRange>130</usRange>
 		<usReloadDelay>200</usReloadDelay>
@@ -4829,7 +4829,7 @@
 		<ubBulletSpeed>21</ubBulletSpeed>
 		<ubImpact>26</ubImpact>
 		<ubDeadliness>17</ubDeadliness>
-		<bAccuracy>2</bAccuracy>
+		<bAccuracy>1</bAccuracy>
 		<ubMagSize>14</ubMagSize>
 		<usRange>120</usRange>
 		<usReloadDelay>200</usReloadDelay>
@@ -7397,7 +7397,7 @@
 		<ubBulletSpeed>22</ubBulletSpeed>
 		<ubImpact>35</ubImpact>
 		<ubDeadliness>45</ubDeadliness>
-		<bAccuracy>6</bAccuracy>
+		<bAccuracy>5</bAccuracy>
 		<ubMagSize>10</ubMagSize>
 		<usRange>750</usRange>
 		<usReloadDelay>200</usReloadDelay>
@@ -7909,7 +7909,7 @@
 		<ubBulletSpeed>20</ubBulletSpeed>
 		<ubImpact>33</ubImpact>
 		<ubDeadliness>21</ubDeadliness>
-		<bAccuracy>3</bAccuracy>
+		<bAccuracy>2</bAccuracy>
 		<ubMagSize>1</ubMagSize>
 		<usRange>170</usRange>
 		<usReloadDelay>200</usReloadDelay>