Added gun misses and corrected references to it, etc

8 files changed, 45 insertions, 22 deletions

diff --git a/LICENSE b/LICENSE
index 3feffb2..6e21906 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3106,8 +3106,11 @@ https://wiki.moubootaurlegends.org/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 f2614d2..441bbad 100644
--- a/items.xml
+++ b/items.xml
@@ -8243,8 +8243,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="9000">
 		<sprite>ml/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="ml/equipment/weapons/gatling.png"
@@ -8264,8 +8266,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="12000">
 		<sprite>ml/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="ml/equipment/weapons/shotgun.png"
@@ -8285,8 +8289,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="10000">
 		<sprite>ml/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="ml/equipment/weapons/revolver.png"
@@ -8306,8 +8312,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="7000">
 		<sprite>ml/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="ml/equipment/weapons/dustynator.png"
@@ -8327,8 +8335,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		critical-hit-effect-id="35"
 		weight="6000">
 		<sprite>ml/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 -->
@@ -15892,8 +15902,10 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		sellProtected="true"
 		weight="3000">
 		<sprite>tmw/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="11178"
         image="tmw/equipment/chest/contributor.png|W:#87876c,bbc39c,edf4e1,ffffff;R:#bc2c26"
diff --git a/monsters.xml b/monsters.xml
index 71c7a1c..d9d8cc9 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>ml/equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>ml/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>ml/equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>ml/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>ml/equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>ml/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>ml/equipment/legs/bromenalpants-male.xml</sprite>
 		<sprite>ml/equipment/feet/boots-male.xml|#212121</sprite>
 		<sprite>ml/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 0000000..70f7c6e
--- /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 0000000..da79260
--- /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 0000000..b3d5aaa
--- /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 0000000..7dcb6fa
--- /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 b5354c6..0000000
--- a/sfx/weapons/gunstaff/shot.ogg
+++ /dev/null