From 9c6c5d83268bf4507004d657054f8d0a857095a8 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 21 Apr 2014 06:58:21 +0000
Subject: [PATCH] Merged from revision: 2017 - Fixed wrong item updates from
 commit 2014 (custom souns for non-guns) o Now the hedge trimmer has the
 correct new sound

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

diff --git a/gamedir/Data-1.13/TableData/Items/Weapons.xml b/gamedir/Data-1.13/TableData/Items/Weapons.xml
index 4782baf35..253bf257e 100644
--- a/gamedir/Data-1.13/TableData/Items/Weapons.xml
+++ b/gamedir/Data-1.13/TableData/Items/Weapons.xml
@@ -13201,7 +13201,8 @@
 		<ubImpact>25</ubImpact>
 		<ubDeadliness>6</ubDeadliness>
 		<usReloadDelay>200</usReloadDelay>
-		<ubAttackVolume>2</ubAttackVolume>
+		<ubAttackVolume>20</ubAttackVolume>
+		<sSound>500</sSound>
 		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
 	</WEAPON>
 </WEAPONLIST>
\ No newline at end of file
diff --git a/gamedir/Data/TableData/Items/Weapons.xml b/gamedir/Data/TableData/Items/Weapons.xml
index e990dcbd1..d4fce2c06 100644
--- a/gamedir/Data/TableData/Items/Weapons.xml
+++ b/gamedir/Data/TableData/Items/Weapons.xml
@@ -1582,8 +1582,7 @@
 		<ubImpact>25</ubImpact>
 		<ubDeadliness>6</ubDeadliness>
 		<usReloadDelay>200</usReloadDelay>
-		<ubAttackVolume>20</ubAttackVolume>
-		<sSound>500</sSound>
+		<ubAttackVolume>2</ubAttackVolume>
 		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
 	</WEAPON>
 	<WEAPON>
@@ -2296,8 +2295,7 @@
 		<ubImpact>20</ubImpact>
 		<ubDeadliness>7</ubDeadliness>
 		<usReloadDelay>200</usReloadDelay>
-		<ubAttackVolume>20</ubAttackVolume>
-		<sSound>500</sSound>
+		<ubAttackVolume>2</ubAttackVolume>
 		<MaxDistForMessyDeath>7</MaxDistForMessyDeath>
 	</WEAPON>
 	<WEAPON>