summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE11
-rw-r--r--items.xml12
-rw-r--r--sfx/weapons/halberd/hit1.oggbin0 -> 10655 bytes
-rw-r--r--sfx/weapons/halberd/hit2.oggbin0 -> 11171 bytes
-rw-r--r--sfx/weapons/halberd/hit3.oggbin0 -> 10300 bytes
-rw-r--r--sfx/weapons/staff/hit1.oggbin0 -> 11738 bytes
-rw-r--r--sfx/weapons/staff/hit2.oggbin0 -> 10861 bytes
-rw-r--r--sfx/weapons/staff/hit3.oggbin0 -> 10123 bytes
-rw-r--r--sfx/weapons/staff/miss1.oggbin0 -> 10788 bytes
-rw-r--r--sfx/weapons/staff/miss2.oggbin0 -> 9189 bytes
-rw-r--r--sfx/weapons/staff/miss3.oggbin0 -> 10582 bytes
11 files changed, 23 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index b4dfa293..fb40301c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1590,6 +1590,10 @@ legal@themanaworld.org
### 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)
+### Halberd
+ sfx/weapons/halberd/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/weapons/halberd/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/weapons/halberd/hit3.ogg (Ledmitz) (CC BY-SA 3.0) (-)
### 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)
@@ -1606,6 +1610,13 @@ legal@themanaworld.org
### 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)
+### Staff
+ sfx/weapons/staff/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/weapons/staff/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/weapons/staff/hit3.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/weapons/staff/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/weapons/staff/miss2.ogg (Ledmitz) (CC BY-SA 3.0) (-)
+ sfx/weapons/staff/miss3.ogg (Ledmitz) (CC BY-SA 3.0) (-)
### 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)
diff --git a/items.xml b/items.xml
index f6e6b0da..1cceb53a 100644
--- a/items.xml
+++ b/items.xml
@@ -3597,6 +3597,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
attack-action="attack_chop_long"
weight="400">
<sprite>equipment/weapons/staff.xml</sprite>
+ <sound event="hit">weapons/staff/hit1.ogg</sound>
+ <sound event="hit">weapons/staff/hit2.ogg</sound>
+ <sound event="hit">weapons/staff/hit3.ogg</sound>
+ <sound event="miss">weapons/staff/miss1.ogg</sound>
+ <sound event="miss">weapons/staff/miss2.ogg</sound>
+ <sound event="miss">weapons/staff/miss3.ogg</sound>
</item>
<item id="3514"
image="equipment/weapons/halberd.png"
@@ -3609,6 +3615,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
attack-action="attack_chop_long"
weight="1200">
<sprite>equipment/weapons/halberd.xml</sprite>
+ <sound event="hit">weapons/halberd/hit1.ogg</sound>
+ <sound event="hit">weapons/halberd/hit2.ogg</sound>
+ <sound event="hit">weapons/halberd/hit3.ogg</sound>
+ <sound event="miss">weapons/staff/miss1.ogg</sound>
+ <sound event="miss">weapons/staff/miss2.ogg</sound>
+ <sound event="miss">weapons/staff/miss3.ogg</sound>
</item>
<item id="3515"
image="equipment/weapons/sharpknife.png"
diff --git a/sfx/weapons/halberd/hit1.ogg b/sfx/weapons/halberd/hit1.ogg
new file mode 100644
index 00000000..b5c2c247
--- /dev/null
+++ b/sfx/weapons/halberd/hit1.ogg
Binary files differ
diff --git a/sfx/weapons/halberd/hit2.ogg b/sfx/weapons/halberd/hit2.ogg
new file mode 100644
index 00000000..b4bc8c9f
--- /dev/null
+++ b/sfx/weapons/halberd/hit2.ogg
Binary files differ
diff --git a/sfx/weapons/halberd/hit3.ogg b/sfx/weapons/halberd/hit3.ogg
new file mode 100644
index 00000000..eaef35df
--- /dev/null
+++ b/sfx/weapons/halberd/hit3.ogg
Binary files differ
diff --git a/sfx/weapons/staff/hit1.ogg b/sfx/weapons/staff/hit1.ogg
new file mode 100644
index 00000000..76da7d17
--- /dev/null
+++ b/sfx/weapons/staff/hit1.ogg
Binary files differ
diff --git a/sfx/weapons/staff/hit2.ogg b/sfx/weapons/staff/hit2.ogg
new file mode 100644
index 00000000..c1c32c2d
--- /dev/null
+++ b/sfx/weapons/staff/hit2.ogg
Binary files differ
diff --git a/sfx/weapons/staff/hit3.ogg b/sfx/weapons/staff/hit3.ogg
new file mode 100644
index 00000000..8d68997e
--- /dev/null
+++ b/sfx/weapons/staff/hit3.ogg
Binary files differ
diff --git a/sfx/weapons/staff/miss1.ogg b/sfx/weapons/staff/miss1.ogg
new file mode 100644
index 00000000..a3fabf6e
--- /dev/null
+++ b/sfx/weapons/staff/miss1.ogg
Binary files differ
diff --git a/sfx/weapons/staff/miss2.ogg b/sfx/weapons/staff/miss2.ogg
new file mode 100644
index 00000000..8f97cb20
--- /dev/null
+++ b/sfx/weapons/staff/miss2.ogg
Binary files differ
diff --git a/sfx/weapons/staff/miss3.ogg b/sfx/weapons/staff/miss3.ogg
new file mode 100644
index 00000000..4d6a3286
--- /dev/null
+++ b/sfx/weapons/staff/miss3.ogg
Binary files differ