Merge branch 'bows-wooden_short_forest' into 'master'

Bows wooden short forest

See merge request evol/clientdata!161

8 files changed, 15 insertions, 2 deletions

diff --git a/LICENSE b/LICENSE
index 839234b2..7e1b34a3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1238,6 +1238,9 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ### Bare Hands
     sfx/weapons/barehands/hit1.ogg (Kenny690)                               (CC BY-SA 3.0)        (-)
     sfx/weapons/barehands/miss1.ogg (Kenny690)                              (CC BY-SA 3.0)        (-)
+### Forest Bow
+    sfx/weapons/bow-forest/hit1.ogg (Ledmitz)                               (CC BY-SA 3.0)        (smcameron)
+    sfx/weapons/bow-forest/miss1.ogg (Ledmitz)                              (CC BY-SA 3.0)        (smcameron)
 ### Knife
     sfx/weapons/knife/hit1.ogg (Cosmostrator)                               (CC BY-SA 3.0)        (Socapex)
     sfx/weapons/knife/miss1.ogg (Cosmostrator)                              (CC BY-SA 3.0)        (Socapex)
@@ -1247,6 +1250,12 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
 ### Scythe
     sfx/weapons/scythe/hit1.ogg (LEGACY)                                    (CC BY-SA 3.0)        (Micksha)
     sfx/weapons/scythe/miss1.ogg (Cosmostrator)                             (CC BY-SA 3.0)        (Socapex)
+### Short Bow
+    sfx/weapons/bow-short/hit1.ogg (Ledmitz)                               (CC BY-SA 3.0)        (smcameron)
+    sfx/weapons/bow-short/miss1.ogg (Ledmitz)                              (CC BY-SA 3.0)        (smcameron)
+### Wooden Bow
+    sfx/weapons/bow-wooden/hit1.ogg (Ledmitz)                               (CC BY-SA 3.0)        (smcameron)
+    sfx/weapons/bow-wooden/miss1.ogg (Ledmitz)                              (CC BY-SA 3.0)        (smcameron)
 ## Env
     sfx/env/fart.ogg (LEGACY)                                               (GUMI)                (-)
 
diff --git a/items.xml b/items.xml
index 3190874d..bea4130d 100644
--- a/items.xml
+++ b/items.xml
@@ -2835,8 +2835,6 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         attack-action="attack"
         weight="250">
         <sprite>equipment/weapons/piouslayer.xml</sprite>
-        <sound event="hit">weapons/piouslayer/hit1.ogg</sound>
-        <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
     </item>
     <item id="3510"
         image="equipment/weapons/pickaxe.png"
@@ -3346,6 +3344,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         attack-action="attack_bow"
         weight="120">
         <sprite>equipment/weapons/woodenbow.xml</sprite>
+	<sound event="hit">weapons/bow-wooden/hit1.ogg</sound>
+	<sound event="miss">weapons/bow-wooden/miss1.ogg</sound>
     </item>
     <item id="6001"
         image="equipment/weapons/shortbow.png"
@@ -3363,6 +3363,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         attack-action="attack_bow"
         weight="260">
         <sprite>equipment/weapons/woodenbow.xml</sprite>
+	<sound event="hit">weapons/bow-short/hit1.ogg</sound>
+	<sound event="miss">weapons/bow-short/miss1.ogg</sound>
     </item>
     <item id="6002"
         image="equipment/weapons/forestbow.png"
@@ -3380,6 +3382,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
         attack-action="attack_bow"
         weight="480">
         <sprite>equipment/weapons/woodenbow.xml</sprite>
+	<sound event="hit">weapons/bow-forest/hit1.ogg</sound>
+	<sound event="miss">weapons/bow-forest/miss1.ogg</sound>
     </item>
 
     <!-- Arrows -->
diff --git a/sfx/weapons/bow-forest/hit1.ogg b/sfx/weapons/bow-forest/hit1.ogg
new file mode 100644
index 00000000..3a8157b1
--- /dev/null
+++ b/sfx/weapons/bow-forest/hit1.ogg
diff --git a/sfx/weapons/bow-forest/miss1.ogg b/sfx/weapons/bow-forest/miss1.ogg
new file mode 100644
index 00000000..a916d8c5
--- /dev/null
+++ b/sfx/weapons/bow-forest/miss1.ogg
diff --git a/sfx/weapons/bow-short/hit1.ogg b/sfx/weapons/bow-short/hit1.ogg
new file mode 100644
index 00000000..ed440e2a
--- /dev/null
+++ b/sfx/weapons/bow-short/hit1.ogg
diff --git a/sfx/weapons/bow-short/miss1.ogg b/sfx/weapons/bow-short/miss1.ogg
new file mode 100644
index 00000000..477d7da2
--- /dev/null
+++ b/sfx/weapons/bow-short/miss1.ogg
diff --git a/sfx/weapons/bow-wooden/hit1.ogg b/sfx/weapons/bow-wooden/hit1.ogg
new file mode 100644
index 00000000..fa8bed3c
--- /dev/null
+++ b/sfx/weapons/bow-wooden/hit1.ogg
diff --git a/sfx/weapons/bow-wooden/miss1.ogg b/sfx/weapons/bow-wooden/miss1.ogg
new file mode 100644
index 00000000..477d7da2
--- /dev/null
+++ b/sfx/weapons/bow-wooden/miss1.ogg