From 6acedece52ac8a6fa138ce209afb9b74dceb6ee3 Mon Sep 17 00:00:00 2001
From: Starwalker <Starwalker@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Tue, 8 May 2007 09:39:50 +0000
Subject: [PATCH] added a missing merge with the SCAR-WP SV Barrel added
 further merges to exchange the barrel in a SCAR Conversion Kit added ability
 to mount Kobra on Bizon SMG corrected a typo in one of the SCAR-WP Conversion
 Kit descriptions changed sound of Steyr ACR, because the sound of falling
 brass does not go well with synthetic cartridge cases ;-)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@789 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Attachments.xml |  5 ++
 gamedir/Data-1.13/TableData/Items.xml       |  5 +-
 gamedir/Data-1.13/TableData/Merges.xml      | 72 +++++++++++++++++++++
 gamedir/Data-1.13/TableData/Weapons.xml     |  4 +-
 4 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml
index 26fbb6b25..af2112237 100644
--- a/gamedir/Data-1.13/TableData/Attachments.xml
+++ b/gamedir/Data-1.13/TableData/Attachments.xml
@@ -8410,6 +8410,11 @@
 		<itemIndex>706</itemIndex>
 		<APCost>5</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>998</attachmentIndex>
+		<itemIndex>626</itemIndex>
+		<APCost>5</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>999</attachmentIndex>
 		<itemIndex>14</itemIndex>
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index 0d8e359d2..8d89e44d1 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -23382,7 +23382,7 @@
 		<szLongItemName>SCAR-WP Conversion Kit</szLongItemName>
 		<szItemDesc>This kit contains the necessary parts to convert your SCAR-H to the 7.62x39mm caliber.</szItemDesc>
 		<szBRName>SCAR-WP Conversion Kit</szBRName>
-		<szBRDesc>If you need to convert your SCAR-H to the Russian 7.92x39mm caliber, here are the necessary parts: A new CQC-barrel, bolt, and triggergroup with magazine well.</szBRDesc>
+		<szBRDesc>If you need to convert your SCAR-H to the Russian 7.62x39mm caliber, here are the necessary parts: A new CQC-barrel, bolt, and triggergroup with magazine well.</szBRDesc>
 		<usItemClass>268435456</usItemClass>
 		<ubGraphicType>1</ubGraphicType>
 		<ubGraphicNum>588</ubGraphicNum>
@@ -23652,7 +23652,6 @@
 		<ShowStatus>1</ShowStatus>
 		<BR_NewInventory>4</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<BR_ROF>0</BR_ROF>
 	</ITEM>
 	<ITEM>
 		<uiIndex>1054</uiIndex>
@@ -23681,7 +23680,6 @@
 		<BigGunList>1</BigGunList>
 		<BR_NewInventory>2</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<BR_ROF>0</BR_ROF>
 	</ITEM>
 	<ITEM>
 		<uiIndex>1055</uiIndex>
@@ -23709,6 +23707,5 @@
 		<BigGunList>1</BigGunList>
 		<BR_NewInventory>2</BR_NewInventory>
 		<BR_UsedInventory>1</BR_UsedInventory>
-		<BR_ROF>0</BR_ROF>
 	</ITEM>
 </ITEMLIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml
index 1cdbc6eec..e55b767ca 100644
--- a/gamedir/Data-1.13/TableData/Merges.xml
+++ b/gamedir/Data-1.13/TableData/Merges.xml
@@ -1544,6 +1544,14 @@
 		<mergeType>4</mergeType>
 		<APCost>10</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1031</firstItemIndex>
+		<secondItemIndex>1038</secondItemIndex>
+		<firstResultingItemIndex>1037</firstResultingItemIndex>
+		<secondResultingItemIndex>1032</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1032</firstItemIndex>
 		<secondItemIndex>652</secondItemIndex>
@@ -1552,6 +1560,14 @@
 		<mergeType>4</mergeType>
 		<APCost>10</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1032</firstItemIndex>
+		<secondItemIndex>1037</secondItemIndex>
+		<firstResultingItemIndex>1038</firstResultingItemIndex>
+		<secondResultingItemIndex>1031</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1033</firstItemIndex>
 		<secondItemIndex>787</secondItemIndex>
@@ -1560,6 +1576,14 @@
 		<mergeType>4</mergeType>
 		<APCost>10</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1033</firstItemIndex>
+		<secondItemIndex>1044</secondItemIndex>
+		<firstResultingItemIndex>1043</firstResultingItemIndex>
+		<secondResultingItemIndex>1034</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1034</firstItemIndex>
 		<secondItemIndex>651</secondItemIndex>
@@ -1568,6 +1592,14 @@
 		<mergeType>4</mergeType>
 		<APCost>10</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1034</firstItemIndex>
+		<secondItemIndex>1043</secondItemIndex>
+		<firstResultingItemIndex>1044</firstResultingItemIndex>
+		<secondResultingItemIndex>1033</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1035</firstItemIndex>
 		<secondItemIndex>652</secondItemIndex>
@@ -1640,6 +1672,14 @@
 		<mergeType>4</mergeType>
 		<APCost>10</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1039</firstItemIndex>
+		<secondItemIndex>1036</secondItemIndex>
+		<firstResultingItemIndex>1035</firstResultingItemIndex>
+		<secondResultingItemIndex>1040</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1040</firstItemIndex>
 		<secondItemIndex>792</secondItemIndex>
@@ -1648,6 +1688,14 @@
 		<mergeType>4</mergeType>
 		<APCost>10</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1040</firstItemIndex>
+		<secondItemIndex>1035</secondItemIndex>
+		<firstResultingItemIndex>1036</firstResultingItemIndex>
+		<secondResultingItemIndex>1039</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1041</firstItemIndex>
 		<secondItemIndex>651</secondItemIndex>
@@ -1720,6 +1768,30 @@
 		<mergeType>4</mergeType>
 		<APCost>10</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1045</firstItemIndex>
+		<secondItemIndex>1042</secondItemIndex>
+		<firstResultingItemIndex>1041</firstResultingItemIndex>
+		<secondResultingItemIndex>1046</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>1046</firstItemIndex>
+		<secondItemIndex>790</secondItemIndex>
+		<firstResultingItemIndex>791</firstResultingItemIndex>
+		<secondResultingItemIndex>1045</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>10</APCost>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>1046</firstItemIndex>
+		<secondItemIndex>1041</secondItemIndex>
+		<firstResultingItemIndex>1042</firstResultingItemIndex>
+		<secondResultingItemIndex>1045</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>2</APCost>
+	</MERGE>
 	<MERGE>
 		<firstItemIndex>1055</firstItemIndex>
 		<secondItemIndex>194</secondItemIndex>
diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml
index 782de6329..f3f0625a4 100644
--- a/gamedir/Data-1.13/TableData/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Weapons.xml
@@ -8497,8 +8497,8 @@
 		<BurstAniDelay>40</BurstAniDelay>
 		<ubAttackVolume>77</ubAttackVolume>
 		<ubHitVolume>7</ubHitVolume>
-		<sSound>439</sSound>
-		<sBurstSound>82</sBurstSound>
+		<sSound>145</sSound>
+		<sBurstSound>8</sBurstSound>
 		<sSilencedBurstSound>111</sSilencedBurstSound>
 		<sReloadSound>102</sReloadSound>
 		<sLocknLoadSound>108</sLocknLoadSound>