summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-12-06 19:09:27 +0000
committerJesusaves <cpntb1@ymail.com>2020-12-06 19:09:27 +0000
commit154f6254325f964b6c7c02c677ef690012e3a220 (patch)
tree6ff89e711755dd7e766bd26e7000837c7f24c3c8
parent0544bc70850cd42570021c332b1ac8e36d835103 (diff)
parent08612735bd9eef0ee79f563b08cc4aa54860bbba (diff)
downloadclientdata-154f6254325f964b6c7c02c677ef690012e3a220.tar.gz
clientdata-154f6254325f964b6c7c02c677ef690012e3a220.tar.bz2
clientdata-154f6254325f964b6c7c02c677ef690012e3a220.tar.xz
clientdata-154f6254325f964b6c7c02c677ef690012e3a220.zip
Merge branch 'RockKnife_sfx' into 'master'
Added sfx for RockKnife hits. See merge request evol/clientdata!188
-rw-r--r--LICENSE3
-rw-r--r--items.xml2
-rw-r--r--sfx/weapons/knife-rock/hit1.oggbin0 -> 12641 bytes
-rw-r--r--sfx/weapons/knife-rock/hit2.oggbin0 -> 13296 bytes
4 files changed, 5 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 9aa3c0bd..ba7e8a0b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1611,6 +1611,9 @@ legal@themanaworld.org
### Piouslayer
sfx/weapons/piouslayer/hit1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex)
sfx/weapons/piouslayer/miss1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex)
+### RockKnife
+ sfx/weapons/knife-rock/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz)
+ sfx/weapons/knife-rock/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz)
### Scythe
sfx/weapons/scythe/hit1.ogg (LEGACY) (GPLv2) (Micksha)
sfx/weapons/scythe/miss1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex)
diff --git a/items.xml b/items.xml
index ec85a2c5..9efc30c1 100644
--- a/items.xml
+++ b/items.xml
@@ -3687,6 +3687,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
attack-action="attack_chop"
weight="1300">
<sprite>equipment/weapons/chopper.xml</sprite> <!-- FIXME -->
+ <sound event="hit">weapons/knife-rock/hit1.ogg</sound>
+ <sound event="hit">weapons/knife-rock/hit2.ogg</sound>
</item>
<item id="3520"
image="equipment/weapons/bronzegladius.png"
diff --git a/sfx/weapons/knife-rock/hit1.ogg b/sfx/weapons/knife-rock/hit1.ogg
new file mode 100644
index 00000000..49068f89
--- /dev/null
+++ b/sfx/weapons/knife-rock/hit1.ogg
Binary files differ
diff --git a/sfx/weapons/knife-rock/hit2.ogg b/sfx/weapons/knife-rock/hit2.ogg
new file mode 100644
index 00000000..15dbfd71
--- /dev/null
+++ b/sfx/weapons/knife-rock/hit2.ogg
Binary files differ