Added gun ricochets as misses, renamed gunstaff to gun and corrected all references

* Hopefully, I got all the references this time

* Added gun ricochets as misses, renamed gunstaff to gun and corrected all references

**** ml/clientdata!147
Approved-by: Fedja Beader <fedja@protonmail.ch>
Approved-by: Jesusalva Jesusalva <jesusalva@tmw2.org>

8 files changed, 41 insertions, 20 deletions

diff --git a/LICENSE b/LICENSE
index cc250d6f..23caaab0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3175,8 +3175,11 @@ This list also includes the list of Evol Online and The Mana World contributors.
 	sfx/weapons/piouslayer/hit1.ogg (Cosmostrator)                          (CC BY-SA 3.0)          (Socapex)
 	sfx/weapons/piouslayer/hit2.ogg (TMW-BR Team)                           (GPLv2)          (-)
 	sfx/weapons/piouslayer/miss1.ogg (Cosmostrator)                         (CC BY-SA 3.0)          (Socapex)
-### Gunstaff
-	sfx/weapons/gunstaff/shot.ogg (Bird-Man)                                (CC 0)                  (Freesound.org, Jesusalva)
+### Gun
+	sfx/weapons/gun/hit1.ogg (Bird-Man (shot.ogg))                          (CC 0)                  (Freesound.org, Jesusalva)
+	sfx/weapons/gun/miss1.ogg (Ledmitz)                                     (CC 0)                  (Freesound.org, Bird-Man (shot.ogg), craigsmith (Rifle ricochets))
+	sfx/weapons/gun/miss2.ogg (Ledmitz)                                     (CC 0)                  (Freesound.org, Bird-Man (shot.ogg), craigsmith (Rifle ricochets))
+	sfx/weapons/gun/miss3.ogg (Ledmitz)                                     (CC 0)                  (Freesound.org, Bird-Man (shot.ogg), craigsmith (Rifle ricochets))
 ### Lightsaber
 	sfx/weapons/lightsaber/crit.ogg (?)                                     (GPL v2)                (FreedroidRPG)
 	sfx/weapons/lightsaber/hit1.ogg (skytheguy)                             (CC BY 3.0)             (Freesound.org, Jesusalva)
diff --git a/items.xml b/items.xml
index 4c0aacb8..9cdc2dd6 100644
--- a/items.xml
+++ b/items.xml
@@ -8500,8 +8500,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="2000">
 		<sprite>equipment/weapons/bow.xml</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/gunstaff/shot.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</item>
 	<item id="6020"
 		image="equipment/weapons/gatling.png"
@@ -8521,8 +8523,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="2500">
 		<sprite>equipment/weapons/bow.xml</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/gunstaff/shot.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</item>
 	<item id="6030"
 		image="equipment/weapons/shotgun.png"
@@ -8542,8 +8546,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="1800">
 		<sprite>equipment/weapons/bow.xml</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/gunstaff/shot.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</item>
 	<item id="6040"
 		image="equipment/weapons/revolver.png"
@@ -8563,8 +8569,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="1500">
 		<sprite>equipment/weapons/gun.xml</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/gunstaff/shot.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</item>
 	<item id="6050"
 		image="equipment/weapons/dustynator.png"
@@ -8584,8 +8592,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="1000">
 		<sprite>equipment/weapons/bow.xml</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/gunstaff/shot.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</item>
 
 	<!-- Arrows -->
diff --git a/monsters.xml b/monsters.xml
index 96affb6c..af057236 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1066,8 +1066,10 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 		<!--sprite>equipment/weapons/lidersword.xml</sprite-->
 		<sprite>equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>equipment/feet/boots-male.xml|#212121</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</monster>
 	<monster id="1207" name="Rifle Shooter" walkType="walkswim">
 		<sprite>races/human-male.xml</sprite>
@@ -1076,8 +1078,10 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 		<!--sprite>equipment/weapons/lidersword.xml</sprite-->
 		<sprite>equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>equipment/feet/boots-male.xml|#212121</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</monster>
 	<monster id="1208" name="Revolver Shooter" walkType="walkswim">
 		<sprite>races/human-male.xml</sprite>
@@ -1086,8 +1090,10 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 		<!--sprite>equipment/weapons/lidersword.xml</sprite-->
 		<sprite>equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>equipment/feet/boots-male.xml|#212121</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</monster>
 	<monster id="1209" name="Boss Of The Dusty People">
 		<sprite>races/orc-male.xml</sprite>
@@ -1097,8 +1103,10 @@ event=""        Links the sfx to an action, like die, hit, hurt, miss, move or s
 		<sprite>equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>equipment/feet/boots-male.xml|#212121</sprite>
 		<sprite>equipment/head/bromenalhelmet.xml</sprite>
-		<sound event="hit">weapons/gunstaff/shot.ogg</sound>
-		<sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+		<sound event="hit">weapons/gun/hit1.ogg</sound>
+		<sound event="miss">weapons/gun/miss1.ogg</sound>
+		<sound event="miss">weapons/gun/miss2.ogg</sound>
+		<sound event="miss">weapons/gun/miss3.ogg</sound>
 	</monster>
 	<monster id="1210" name="St Patrick's Clover" targetCursor="medium">
 		<sprite>monsters/cloverpatch.xml</sprite>
diff --git a/sfx/weapons/gun/hit1.ogg b/sfx/weapons/gun/hit1.ogg
new file mode 100644
index 00000000..70f7c6ed
--- /dev/null
+++ b/sfx/weapons/gun/hit1.ogg
diff --git a/sfx/weapons/gun/miss1.ogg b/sfx/weapons/gun/miss1.ogg
new file mode 100644
index 00000000..da792609
--- /dev/null
+++ b/sfx/weapons/gun/miss1.ogg
diff --git a/sfx/weapons/gun/miss2.ogg b/sfx/weapons/gun/miss2.ogg
new file mode 100644
index 00000000..b3d5aaaa
--- /dev/null
+++ b/sfx/weapons/gun/miss2.ogg
diff --git a/sfx/weapons/gun/miss3.ogg b/sfx/weapons/gun/miss3.ogg
new file mode 100644
index 00000000..7dcb6fa8
--- /dev/null
+++ b/sfx/weapons/gun/miss3.ogg
diff --git a/sfx/weapons/gunstaff/shot.ogg b/sfx/weapons/gunstaff/shot.ogg
deleted file mode 100644
index b5354c6d..00000000
--- a/sfx/weapons/gunstaff/shot.ogg
+++ /dev/null