summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--items/equip-2hand/item548_Halberd.xml6
-rw-r--r--items/equip-2hand/item623_Scythe.xml6
-rw-r--r--items/equip-2hand/item758_WoodenStaff.xml6
-rw-r--r--license.md12
-rw-r--r--sfx/weapons/other/halberd/halberd-hit1.oggbin0 -> 10655 bytes
-rw-r--r--sfx/weapons/other/halberd/halberd-hit2.oggbin0 -> 11171 bytes
-rw-r--r--sfx/weapons/other/halberd/halberd-hit3.oggbin0 -> 10300 bytes
-rw-r--r--sfx/weapons/other/scythe/scythe-hit1.oggbin0 -> 11829 bytes
-rw-r--r--sfx/weapons/other/scythe/scythe-hit2.oggbin0 -> 10096 bytes
-rw-r--r--sfx/weapons/other/scythe/scythe-hit3.oggbin0 -> 12294 bytes
-rw-r--r--sfx/weapons/other/staff/staff-hit1.oggbin0 -> 11738 bytes
-rw-r--r--sfx/weapons/other/staff/staff-hit2.oggbin0 -> 10861 bytes
-rw-r--r--sfx/weapons/other/staff/staff-hit3.oggbin0 -> 10123 bytes
-rw-r--r--sfx/weapons/other/staff/staff-miss1.oggbin0 -> 10788 bytes
-rw-r--r--sfx/weapons/other/staff/staff-miss2.oggbin0 -> 9189 bytes
-rw-r--r--sfx/weapons/other/staff/staff-miss3.oggbin0 -> 10582 bytes
16 files changed, 30 insertions, 0 deletions
diff --git a/items/equip-2hand/item548_Halberd.xml b/items/equip-2hand/item548_Halberd.xml
index 8e851446..cf01373a 100644
--- a/items/equip-2hand/item548_Halberd.xml
+++ b/items/equip-2hand/item548_Halberd.xml
@@ -9,5 +9,11 @@
<item id="548" image="equipment/weapon/polearm-halberd.png" name="Halberd" description="A weapon usually carried by guards." attack="1" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1400">
<sprite gender="unisex">equipment/weapons/polearm-chop.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
<sprite gender="female">equipment/weapons/polearm-chop-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+ <sound event="hit">weapons/other/halberd/halberd-hit1.ogg</sound>
+ <sound event="hit">weapons/other/halberd/halberd-hit2.ogg</sound>
+ <sound event="hit">weapons/other/halberd/halberd-hit3.ogg</sound>
+ <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+ <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+ <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
</item>
</items>
diff --git a/items/equip-2hand/item623_Scythe.xml b/items/equip-2hand/item623_Scythe.xml
index 2062d8c9..dca6fb5e 100644
--- a/items/equip-2hand/item623_Scythe.xml
+++ b/items/equip-2hand/item623_Scythe.xml
@@ -9,5 +9,11 @@
<item id="623" image="equipment/weapon/polearm-scythe.png" name="Scythe" description="Usually used for farming but also usable as a weapon. Slow but deadly." attack="75" type="equip-2hand" attack-action="attack_2hand" attack-range="2" weight="1200" sellProtected="true">
<sprite gender="unisex">equipment/weapons/polearm-stab.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
<sprite gender="female">equipment/weapons/polearm-stab-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+ <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+ <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+ <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
+ <sound event="hit">weapons/other/scythe/scythe-hit1.ogg</sound>
+ <sound event="hit">weapons/other/scythe/scythe-hit2.ogg</sound>
+ <sound event="hit">weapons/other/scythe/scythe-hit3.ogg</sound>
</item>
</items>
diff --git a/items/equip-2hand/item758_WoodenStaff.xml b/items/equip-2hand/item758_WoodenStaff.xml
index 0b9a5942..8d4a277c 100644
--- a/items/equip-2hand/item758_WoodenStaff.xml
+++ b/items/equip-2hand/item758_WoodenStaff.xml
@@ -9,5 +9,11 @@
<item id="758" image="equipment/weapon/staff-woodstaff.png" name="Wooden Staff" description="A basic wooden staff." effect="Lvl 2 Wand" req-int="60+" attack="50" mattack="10" type="equip-2hand" attack-action="attack_sword_stab" attack-range="2" weight="1000">
<sprite gender="unisex">equipment/weapons/polearm-blunt.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
<sprite gender="female">equipment/weapons/polearm-blunt-female.xml|#332c19,443a20,453b1e,61532d,87733d,a58d4d</sprite>
+ <sound event="strike">weapons/other/staff/staff-miss1.ogg</sound>
+ <sound event="strike">weapons/other/staff/staff-miss2.ogg</sound>
+ <sound event="strike">weapons/other/staff/staff-miss3.ogg</sound>
+ <sound event="hit">weapons/other/staff/staff-hit1.ogg</sound>
+ <sound event="hit">weapons/other/staff/staff-hit2.ogg</sound>
+ <sound event="hit">weapons/other/staff/staff-hit3.ogg</sound>
</item>
</items>
diff --git a/license.md b/license.md
index 4632b9a5..87f04d48 100644
--- a/license.md
+++ b/license.md
@@ -1202,6 +1202,9 @@ File | Artists | Licenses
`sfx/weapons/knives/rock-knife-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/knives/rock-knife-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/knives/sharpknife-miss1.ogg` | Krazyjakee | GPLv2
+`sfx/weapons/other/halberd/halberd-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/halberd/halberd-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/halberd/halberd-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/swords/broadsword-hit1.ogg` | Krazyjakee | GPLv2
`sfx/weapons/swords/firesword-miss1.ogg` | Krazyjakee | GPLv2
`sfx/weapons/swords/longsword-hit1.ogg` | Krazyjakee | GPLv2
@@ -1212,6 +1215,15 @@ File | Artists | Licenses
`sfx/weapons/swords/sandcutter-hit7.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/swords/sandcutter-hit8.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/swords/sandcutter-hit9.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/scythe/scythe-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/scythe/scythe-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/scythe/scythe-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/staff/staff-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/staff/staff-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/staff/staff-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/staff/staff-miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/staff/staff-miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
+`sfx/weapons/other/staff/staff-miss3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0
`sfx/weapons/swords/short-sword-hit1.ogg` | Cosmostrator | GPLv2
`sfx/weapons/swords/short-sword-miss1.ogg` | Cosmostrator | GPLv2
diff --git a/sfx/weapons/other/halberd/halberd-hit1.ogg b/sfx/weapons/other/halberd/halberd-hit1.ogg
new file mode 100644
index 00000000..b5c2c247
--- /dev/null
+++ b/sfx/weapons/other/halberd/halberd-hit1.ogg
Binary files differ
diff --git a/sfx/weapons/other/halberd/halberd-hit2.ogg b/sfx/weapons/other/halberd/halberd-hit2.ogg
new file mode 100644
index 00000000..b4bc8c9f
--- /dev/null
+++ b/sfx/weapons/other/halberd/halberd-hit2.ogg
Binary files differ
diff --git a/sfx/weapons/other/halberd/halberd-hit3.ogg b/sfx/weapons/other/halberd/halberd-hit3.ogg
new file mode 100644
index 00000000..eaef35df
--- /dev/null
+++ b/sfx/weapons/other/halberd/halberd-hit3.ogg
Binary files differ
diff --git a/sfx/weapons/other/scythe/scythe-hit1.ogg b/sfx/weapons/other/scythe/scythe-hit1.ogg
new file mode 100644
index 00000000..cb36de94
--- /dev/null
+++ b/sfx/weapons/other/scythe/scythe-hit1.ogg
Binary files differ
diff --git a/sfx/weapons/other/scythe/scythe-hit2.ogg b/sfx/weapons/other/scythe/scythe-hit2.ogg
new file mode 100644
index 00000000..50cbda85
--- /dev/null
+++ b/sfx/weapons/other/scythe/scythe-hit2.ogg
Binary files differ
diff --git a/sfx/weapons/other/scythe/scythe-hit3.ogg b/sfx/weapons/other/scythe/scythe-hit3.ogg
new file mode 100644
index 00000000..6df81d04
--- /dev/null
+++ b/sfx/weapons/other/scythe/scythe-hit3.ogg
Binary files differ
diff --git a/sfx/weapons/other/staff/staff-hit1.ogg b/sfx/weapons/other/staff/staff-hit1.ogg
new file mode 100644
index 00000000..76da7d17
--- /dev/null
+++ b/sfx/weapons/other/staff/staff-hit1.ogg
Binary files differ
diff --git a/sfx/weapons/other/staff/staff-hit2.ogg b/sfx/weapons/other/staff/staff-hit2.ogg
new file mode 100644
index 00000000..c1c32c2d
--- /dev/null
+++ b/sfx/weapons/other/staff/staff-hit2.ogg
Binary files differ
diff --git a/sfx/weapons/other/staff/staff-hit3.ogg b/sfx/weapons/other/staff/staff-hit3.ogg
new file mode 100644
index 00000000..8d68997e
--- /dev/null
+++ b/sfx/weapons/other/staff/staff-hit3.ogg
Binary files differ
diff --git a/sfx/weapons/other/staff/staff-miss1.ogg b/sfx/weapons/other/staff/staff-miss1.ogg
new file mode 100644
index 00000000..a3fabf6e
--- /dev/null
+++ b/sfx/weapons/other/staff/staff-miss1.ogg
Binary files differ
diff --git a/sfx/weapons/other/staff/staff-miss2.ogg b/sfx/weapons/other/staff/staff-miss2.ogg
new file mode 100644
index 00000000..8f97cb20
--- /dev/null
+++ b/sfx/weapons/other/staff/staff-miss2.ogg
Binary files differ
diff --git a/sfx/weapons/other/staff/staff-miss3.ogg b/sfx/weapons/other/staff/staff-miss3.ogg
new file mode 100644
index 00000000..4d6a3286
--- /dev/null
+++ b/sfx/weapons/other/staff/staff-miss3.ogg
Binary files differ