summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE9
-rw-r--r--items.xml16
-rw-r--r--sfx/weapons/axe/hit.oggbin0 -> 9142 bytes
-rw-r--r--sfx/weapons/axe/miss.oggbin0 -> 8749 bytes
-rw-r--r--sfx/weapons/gunstaff/shot.oggbin0 -> 12186 bytes
5 files changed, 20 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index cba0ad18..7da07114 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2245,17 +2245,22 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
sfx/system/warp.ogg (Kenny690) (CC BY-SA 3.0) (-)
## Weapons
+### Axe
+ sfx/weapons/axe/hit.ogg (CamoMano) (CC 0) (Freesound.org, Jesusalva)
+ sfx/weapons/axe/miss.ogg (Josethehedgehog) (CC 0) (Freesound.org, Jesusalva)
### Bare Hands
sfx/weapons/barehands/hit1.ogg (Kenny690) (CC BY-SA 3.0) (-)
sfx/weapons/barehands/miss1.ogg (Kenny690) (CC BY-SA 3.0) (-)
+### Bow
+ sfx/weapons/bow/shoot.ogg (Porkmuncher) (CC 0) (Freesound.org, Jesusalva)
### 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)
### 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)
-### Bow
- sfx/weapons/bow/shoot.ogg (Porkmuncher) (CC 0) (-)
+### Gunstaff
+ sfx/weapons/gunstaff/shot.ogg (Bird-Man) (CC 0) (Freesound.org, Jesusalva)
(-): No other contributor.
(?): Unknown author.
diff --git a/items.xml b/items.xml
index 298e4b76..52406e29 100644
--- a/items.xml
+++ b/items.xml
@@ -6061,7 +6061,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="1200">
<sprite>equipment/weapons/kanabo.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
- <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+ <sound event="miss">weapons/axe/miss.ogg</sound>
</item>
<item id="3523"
image="equipment/weapons/miere.png"
@@ -6112,7 +6112,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="1500">
<sprite>equipment/weapons/heavyaxe.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
- <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+ <sound event="miss">weapons/axe/miss.ogg</sound>
</item>
<item id="3526"
image="equipment/weapons/indianspear.png"
@@ -6224,7 +6224,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
weight="3000">
<sprite>equipment/weapons/heavyaxe.xml</sprite>
<sound event="hit">weapons/piouslayer/hit1.ogg</sound>
- <sound event="miss">weapons/piouslayer/miss1.ogg</sound>
+ <sound event="miss">weapons/axe/miss.ogg</sound>
</item>
<item id="3602"
image="equipment/weapons/championshipbow.png"
@@ -6814,6 +6814,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack_bow"
weight="11000">
<sprite>equipment/weapons/woodenbow.xml</sprite>
+ <sound event="hit">weapons/gunstaff/shot.ogg</sound>
+ <sound event="miss">weapons/gunstaff/shot.ogg</sound>
</item>
<item id="6020"
image="equipment/weapons/placeholder_gatling.png"
@@ -6832,6 +6834,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack_bow"
weight="16000">
<sprite>equipment/weapons/woodenbow.xml</sprite>
+ <sound event="hit">weapons/gunstaff/shot.ogg</sound>
+ <sound event="miss">weapons/gunstaff/shot.ogg</sound>
</item>
<item id="6030"
image="equipment/weapons/placeholder_shotgun.png"
@@ -6850,6 +6854,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack_bow"
weight="11000">
<sprite>equipment/weapons/woodenbow.xml</sprite>
+ <sound event="hit">weapons/gunstaff/shot.ogg</sound>
+ <sound event="miss">weapons/gunstaff/shot.ogg</sound>
</item>
<item id="6040"
image="equipment/weapons/placeholder_revolver.png"
@@ -6868,6 +6874,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack_bow"
weight="8000">
<sprite>equipment/weapons/woodenbow.xml</sprite>
+ <sound event="hit">weapons/gunstaff/shot.ogg</sound>
+ <sound event="miss">weapons/gunstaff/shot.ogg</sound>
</item>
<item id="6050"
image="equipment/weapons/placeholder_rifle.png"
@@ -6886,6 +6894,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
attack-action="attack_bow"
weight="970">
<sprite>equipment/weapons/woodenbow.xml</sprite>
+ <sound event="hit">weapons/gunstaff/shot.ogg</sound>
+ <sound event="miss">weapons/gunstaff/shot.ogg</sound>
</item>
<!-- Arrows -->
diff --git a/sfx/weapons/axe/hit.ogg b/sfx/weapons/axe/hit.ogg
new file mode 100644
index 00000000..9ebcecf8
--- /dev/null
+++ b/sfx/weapons/axe/hit.ogg
Binary files differ
diff --git a/sfx/weapons/axe/miss.ogg b/sfx/weapons/axe/miss.ogg
new file mode 100644
index 00000000..0e51178a
--- /dev/null
+++ b/sfx/weapons/axe/miss.ogg
Binary files differ
diff --git a/sfx/weapons/gunstaff/shot.ogg b/sfx/weapons/gunstaff/shot.ogg
new file mode 100644
index 00000000..b5354c6d
--- /dev/null
+++ b/sfx/weapons/gunstaff/shot.ogg
Binary files differ