summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--items.xml10
-rw-r--r--sfx/weapons/bows/strike1.ogg (renamed from sfx/weapons/bows/bow_shoot_1.ogg)bin8984 -> 9053 bytes
-rwxr-xr-x[-rw-r--r--]sfx/weapons/daggers/dagger-hit1.ogg (renamed from sfx/weapons/swords/short-sword-hit1.ogg)bin6153 -> 6222 bytes
-rwxr-xr-x[-rw-r--r--]sfx/weapons/daggers/dagger-strike1.ogg (renamed from sfx/weapons/swords/short-sword-miss1.ogg)bin8116 -> 8188 bytes
-rw-r--r--sfx/weapons/knives/knife-hit1.oggbin6389 -> 6506 bytes
-rw-r--r--sfx/weapons/knives/knife-miss1.oggbin6438 -> 0 bytes
-rw-r--r--sfx/weapons/knives/knife-strike1.oggbin0 -> 6460 bytes
-rwxr-xr-xsfx/weapons/knives/sharpknife-miss1.oggbin5861 -> 0 bytes
-rw-r--r--sfx/weapons/swords/broadsword-hit1.oggbin4718 -> 0 bytes
-rwxr-xr-xsfx/weapons/swords/firesword-miss1.oggbin8420 -> 0 bytes
-rw-r--r--sfx/weapons/swords/longsword-hit1.oggbin10679 -> 0 bytes
-rw-r--r--sfx/weapons/swords/longsword-hit2.oggbin7064 -> 0 bytes
-rw-r--r--sfx/weapons/swords/longsword-miss1.oggbin14656 -> 0 bytes
-rw-r--r--sfx/weapons/swords/rapier-hit1.oggbin8287 -> 0 bytes
-rwxr-xr-xsfx/weapons/swords/sabre-hit1.oggbin6686 -> 0 bytes
15 files changed, 5 insertions, 5 deletions
diff --git a/items.xml b/items.xml
index 6b9e1d52..40304999 100644
--- a/items.xml
+++ b/items.xml
@@ -158,14 +158,14 @@ Multiple's colors dye is now setted up by itemcolors.xml.
type="other"
weapon_type="12">
<sprite>bow.xml</sprite>
- <sound event="swing">weapons/bows/bow_shoot_1.ogg</sound>
+ <sound event="strike">weapons/bows/strike1.ogg</sound>
</item>
<item id="33"
type="other"
weapon_type="12">
<sprite>dagger.xml</sprite>
- <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
- <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+ <sound event="hit">weapons/daggers/dagger-hit1.ogg</sound>
+ <sound event="strike">weapons/daggers/dagger-strike1.ogg</sound>
</item>
<item id="34"
type="other"
@@ -526,8 +526,8 @@ Multiple's colors dye is now setted up by itemcolors.xml.
attack-action="attack"
weight="50">
<sprite>equipment/weapons/dagger.xml</sprite>
- <sound event="strike">weapons/swords/short-sword-miss1.ogg</sound>
- <sound event="hit">weapons/swords/short-sword-hit1.ogg</sound>
+ <sound event="hit">weapons/knives/knife-hit1.ogg</sound>
+ <sound event="strike">weapons/knives/knife-strike1.ogg</sound>
</item>
</items>
diff --git a/sfx/weapons/bows/bow_shoot_1.ogg b/sfx/weapons/bows/strike1.ogg
index 872669c1..37c539a0 100644
--- a/sfx/weapons/bows/bow_shoot_1.ogg
+++ b/sfx/weapons/bows/strike1.ogg
Binary files differ
diff --git a/sfx/weapons/swords/short-sword-hit1.ogg b/sfx/weapons/daggers/dagger-hit1.ogg
index 2fc7a17b..f5a35f34 100644..100755
--- a/sfx/weapons/swords/short-sword-hit1.ogg
+++ b/sfx/weapons/daggers/dagger-hit1.ogg
Binary files differ
diff --git a/sfx/weapons/swords/short-sword-miss1.ogg b/sfx/weapons/daggers/dagger-strike1.ogg
index ba76d967..375d1a42 100644..100755
--- a/sfx/weapons/swords/short-sword-miss1.ogg
+++ b/sfx/weapons/daggers/dagger-strike1.ogg
Binary files differ
diff --git a/sfx/weapons/knives/knife-hit1.ogg b/sfx/weapons/knives/knife-hit1.ogg
index 5ed879e4..94c83972 100644
--- a/sfx/weapons/knives/knife-hit1.ogg
+++ b/sfx/weapons/knives/knife-hit1.ogg
Binary files differ
diff --git a/sfx/weapons/knives/knife-miss1.ogg b/sfx/weapons/knives/knife-miss1.ogg
deleted file mode 100644
index b43229f2..00000000
--- a/sfx/weapons/knives/knife-miss1.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/knives/knife-strike1.ogg b/sfx/weapons/knives/knife-strike1.ogg
new file mode 100644
index 00000000..2a1d0984
--- /dev/null
+++ b/sfx/weapons/knives/knife-strike1.ogg
Binary files differ
diff --git a/sfx/weapons/knives/sharpknife-miss1.ogg b/sfx/weapons/knives/sharpknife-miss1.ogg
deleted file mode 100755
index 07ea44b4..00000000
--- a/sfx/weapons/knives/sharpknife-miss1.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/swords/broadsword-hit1.ogg b/sfx/weapons/swords/broadsword-hit1.ogg
deleted file mode 100644
index c223e3ed..00000000
--- a/sfx/weapons/swords/broadsword-hit1.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/swords/firesword-miss1.ogg b/sfx/weapons/swords/firesword-miss1.ogg
deleted file mode 100755
index fb339a24..00000000
--- a/sfx/weapons/swords/firesword-miss1.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/swords/longsword-hit1.ogg b/sfx/weapons/swords/longsword-hit1.ogg
deleted file mode 100644
index 43b325a4..00000000
--- a/sfx/weapons/swords/longsword-hit1.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/swords/longsword-hit2.ogg b/sfx/weapons/swords/longsword-hit2.ogg
deleted file mode 100644
index c0df2bc7..00000000
--- a/sfx/weapons/swords/longsword-hit2.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/swords/longsword-miss1.ogg b/sfx/weapons/swords/longsword-miss1.ogg
deleted file mode 100644
index bf1336ed..00000000
--- a/sfx/weapons/swords/longsword-miss1.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/swords/rapier-hit1.ogg b/sfx/weapons/swords/rapier-hit1.ogg
deleted file mode 100644
index d640e37e..00000000
--- a/sfx/weapons/swords/rapier-hit1.ogg
+++ /dev/null
Binary files differ
diff --git a/sfx/weapons/swords/sabre-hit1.ogg b/sfx/weapons/swords/sabre-hit1.ogg
deleted file mode 100755
index a6b35991..00000000
--- a/sfx/weapons/swords/sabre-hit1.ogg
+++ /dev/null
Binary files differ