summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-12-06 18:50:25 +0000
committerJesusaves <cpntb1@ymail.com>2020-12-06 18:50:25 +0000
commitafdfa7850d2bdcc48fba54e8ff7b48f8cb83cf5b (patch)
tree44ec6ab7181bb0242bca0d8d9376979b31f22dbc
parentb6c6d43f0cb906efbd66819250d46d30db73f8ed (diff)
parentc1e2765ba12cb52c238041a946cb7f85b2f9af86 (diff)
downloadclientdata-afdfa7850d2bdcc48fba54e8ff7b48f8cb83cf5b.tar.gz
clientdata-afdfa7850d2bdcc48fba54e8ff7b48f8cb83cf5b.tar.bz2
clientdata-afdfa7850d2bdcc48fba54e8ff7b48f8cb83cf5b.tar.xz
clientdata-afdfa7850d2bdcc48fba54e8ff7b48f8cb83cf5b.zip
Merge branch 'Setzer_sfx' into 'master'
Added sfx for Setzer hits See merge request evol/clientdata!184
-rw-r--r--LICENSE4
-rw-r--r--items.xml4
-rw-r--r--sfx/weapons/knife-setzer/hit1.oggbin0 -> 9201 bytes
-rw-r--r--sfx/weapons/knife-setzer/hit2.oggbin0 -> 11311 bytes
-rw-r--r--sfx/weapons/knife-setzer/hit3.oggbin0 -> 10372 bytes
5 files changed, 8 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index dd4e17cc..99cf431c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1579,6 +1579,10 @@ legal@themanaworld.org
### 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)
+### Setzer
+ sfx/weapons/knife-setzer/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz)
+ sfx/weapons/knife-setzer/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz)
+ sfx/weapons/knife-setzer/hit3.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz)
### 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)
diff --git a/items.xml b/items.xml
index a6571f42..dbcf4c88 100644
--- a/items.xml
+++ b/items.xml
@@ -3535,6 +3535,10 @@ 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/knife-setzer/hit1.ogg</sound>
+ <sound event="hit">weapons/knife-setzer/hit2.ogg</sound>
+ <sound event="hit">weapons/knife-setzer/hit3.ogg</sound>
+ <sound event="miss">weapons/knife/miss1.ogg</sound>
</item>
<item id="3510"
image="equipment/weapons/pickaxe.png"
diff --git a/sfx/weapons/knife-setzer/hit1.ogg b/sfx/weapons/knife-setzer/hit1.ogg
new file mode 100644
index 00000000..26695069
--- /dev/null
+++ b/sfx/weapons/knife-setzer/hit1.ogg
Binary files differ
diff --git a/sfx/weapons/knife-setzer/hit2.ogg b/sfx/weapons/knife-setzer/hit2.ogg
new file mode 100644
index 00000000..b9409ec5
--- /dev/null
+++ b/sfx/weapons/knife-setzer/hit2.ogg
Binary files differ
diff --git a/sfx/weapons/knife-setzer/hit3.ogg b/sfx/weapons/knife-setzer/hit3.ogg
new file mode 100644
index 00000000..91ee7ad4
--- /dev/null
+++ b/sfx/weapons/knife-setzer/hit3.ogg
Binary files differ