From 2a5e97c22db8b53666197608a9b5aa44c123a064 Mon Sep 17 00:00:00 2001 From: Ledmitz <69915785+Ledmitz@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:59:57 +0000 Subject: Added one handed knife/sword sfx. Includes setzer, ice gladius, misses, rock kife vol tweak and other minor edits. Vol normalized to ~ -13db (#399) Co-authored-by: Jesusaves --- items/equip-1hand/item1201_Knife.xml | 2 ++ items/equip-1hand/item521_Dagger.xml | 2 ++ items/equip-1hand/item522_SharpKnife.xml | 2 ++ items/equip-1hand/item536_ShortSword.xml | 2 ++ items/equip-1hand/item570_BoneKnife.xml | 2 ++ items/equip-1hand/item571_Setzer.xml | 6 ++++++ items/equip-1hand/item579_RockKnife.xml | 7 +++++-- items/equip-1hand/item867_IceGladius.xml | 6 ++++++ license.md | 20 ++++++++++++++++---- sfx/weapons/knives/rock-knife-hit1.ogg | Bin 11557 -> 0 bytes sfx/weapons/knives/rock-knife-hit2.ogg | Bin 10459 -> 0 bytes sfx/weapons/knives/rock/rock-hit1.ogg | Bin 0 -> 12641 bytes sfx/weapons/knives/rock/rock-hit2.ogg | Bin 0 -> 13296 bytes sfx/weapons/knives/setzer/setzer-hit1.ogg | Bin 0 -> 9201 bytes sfx/weapons/knives/setzer/setzer-hit2.ogg | Bin 0 -> 11311 bytes sfx/weapons/knives/setzer/setzer-hit3.ogg | Bin 0 -> 10372 bytes sfx/weapons/miss1.ogg | Bin 0 -> 10036 bytes sfx/weapons/miss2.ogg | Bin 0 -> 9926 bytes sfx/weapons/miss3.ogg | Bin 0 -> 9657 bytes sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg | Bin 0 -> 18172 bytes sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg | Bin 0 -> 18924 bytes sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg | Bin 0 -> 18826 bytes sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg | Bin 0 -> 20614 bytes sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg | Bin 0 -> 19928 bytes sfx/weapons/swords/sandcutter-hit7.ogg | Bin 11089 -> 0 bytes sfx/weapons/swords/sandcutter-hit8.ogg | Bin 10583 -> 0 bytes sfx/weapons/swords/sandcutter-hit9.ogg | Bin 12268 -> 0 bytes sfx/weapons/swords/short-sword-hit1.ogg | Bin 6153 -> 0 bytes sfx/weapons/swords/short-sword-miss1.ogg | Bin 8116 -> 0 bytes sfx/weapons/swords/sword-miss1.ogg | Bin 0 -> 10489 bytes 30 files changed, 43 insertions(+), 6 deletions(-) delete mode 100644 sfx/weapons/knives/rock-knife-hit1.ogg delete mode 100644 sfx/weapons/knives/rock-knife-hit2.ogg create mode 100644 sfx/weapons/knives/rock/rock-hit1.ogg create mode 100644 sfx/weapons/knives/rock/rock-hit2.ogg create mode 100644 sfx/weapons/knives/setzer/setzer-hit1.ogg create mode 100644 sfx/weapons/knives/setzer/setzer-hit2.ogg create mode 100644 sfx/weapons/knives/setzer/setzer-hit3.ogg create mode 100644 sfx/weapons/miss1.ogg create mode 100644 sfx/weapons/miss2.ogg create mode 100644 sfx/weapons/miss3.ogg create mode 100644 sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg create mode 100644 sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg create mode 100644 sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg create mode 100644 sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg create mode 100644 sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg delete mode 100644 sfx/weapons/swords/sandcutter-hit7.ogg delete mode 100644 sfx/weapons/swords/sandcutter-hit8.ogg delete mode 100644 sfx/weapons/swords/sandcutter-hit9.ogg delete mode 100644 sfx/weapons/swords/short-sword-hit1.ogg delete mode 100644 sfx/weapons/swords/short-sword-miss1.ogg create mode 100644 sfx/weapons/swords/sword-miss1.ogg diff --git a/items/equip-1hand/item1201_Knife.xml b/items/equip-1hand/item1201_Knife.xml index 4343126c..a67cffe9 100644 --- a/items/equip-1hand/item1201_Knife.xml +++ b/items/equip-1hand/item1201_Knife.xml @@ -9,5 +9,7 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + weapons/knives/knife-miss1.ogg + weapons/knives/knife-hit1.ogg diff --git a/items/equip-1hand/item521_Dagger.xml b/items/equip-1hand/item521_Dagger.xml index 1b2a8a0e..27eeb202 100644 --- a/items/equip-1hand/item521_Dagger.xml +++ b/items/equip-1hand/item521_Dagger.xml @@ -9,5 +9,7 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + weapons/knives/knife-miss1.ogg + weapons/knives/knife-hit1.ogg diff --git a/items/equip-1hand/item522_SharpKnife.xml b/items/equip-1hand/item522_SharpKnife.xml index fcbfe47e..fe32f5cd 100644 --- a/items/equip-1hand/item522_SharpKnife.xml +++ b/items/equip-1hand/item522_SharpKnife.xml @@ -9,5 +9,7 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + weapons/knives/knife-miss1.ogg + weapons/knives/knife-hit1.ogg diff --git a/items/equip-1hand/item536_ShortSword.xml b/items/equip-1hand/item536_ShortSword.xml index 6e2dac2b..1ab6a40a 100644 --- a/items/equip-1hand/item536_ShortSword.xml +++ b/items/equip-1hand/item536_ShortSword.xml @@ -9,5 +9,7 @@ equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + weapons/knives/knife-miss1.ogg + weapons/knives/knife-hit1.ogg diff --git a/items/equip-1hand/item570_BoneKnife.xml b/items/equip-1hand/item570_BoneKnife.xml index c53933d3..c07579df 100644 --- a/items/equip-1hand/item570_BoneKnife.xml +++ b/items/equip-1hand/item570_BoneKnife.xml @@ -9,5 +9,7 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + weapons/knives/knife-miss1.ogg + weapons/knives/knife-hit1.ogg diff --git a/items/equip-1hand/item571_Setzer.xml b/items/equip-1hand/item571_Setzer.xml index 39ec5f25..fa574961 100644 --- a/items/equip-1hand/item571_Setzer.xml +++ b/items/equip-1hand/item571_Setzer.xml @@ -9,5 +9,11 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + weapons/knives/setzer/setzer-hit1.ogg + weapons/knives/setzer/setzer-hit2.ogg + weapons/knives/setzer/setzer-hit3.ogg + weapons/miss1.ogg + weapons/miss2.ogg + weapons/miss3.ogg diff --git a/items/equip-1hand/item579_RockKnife.xml b/items/equip-1hand/item579_RockKnife.xml index 1ebf11ca..7ef7346f 100644 --- a/items/equip-1hand/item579_RockKnife.xml +++ b/items/equip-1hand/item579_RockKnife.xml @@ -9,7 +9,10 @@ equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff - weapons/knives/rock-knife-hit1.ogg - weapons/knives/rock-knife-hit2.ogg + weapons/miss1.ogg + weapons/miss2.ogg + weapons/miss3.ogg + weapons/knives/rock/rock-hit1.ogg + weapons/knives/rock/rock-hit2.ogg diff --git a/items/equip-1hand/item867_IceGladius.xml b/items/equip-1hand/item867_IceGladius.xml index 7cdd5e20..ee130e5b 100644 --- a/items/equip-1hand/item867_IceGladius.xml +++ b/items/equip-1hand/item867_IceGladius.xml @@ -9,5 +9,11 @@ equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff + weapons/swords/ice_gladius/ice_gladius-hit1.ogg + weapons/swords/ice_gladius/ice_gladius-hit2.ogg + weapons/swords/ice_gladius/ice_gladius-hit3.ogg + weapons/swords/ice_gladius/ice_gladius-hit4.ogg + weapons/swords/ice_gladius/ice_gladius-hit5.ogg + weapons/swords/sword-miss1.ogg diff --git a/license.md b/license.md index 10cec0da..4fca3cd6 100644 --- a/license.md +++ b/license.md @@ -1232,6 +1232,9 @@ File | Artists | Licenses `sfx/system/levelup.ogg` | Cosmostrator | GPLv2 `sfx/system/ship-bell2.ogg` | unknown | (public domain) `sfx/system/warning.ogg` | Jesusalva | (public domain) +`sfx/weapons/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/weapons/miss2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/weapons/miss3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/bows/bow_shoot_1.ogg` | Cosmostrator | GPLv2 `sfx/weapons/bows/banshee/banshee-hit1.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0 `sfx/weapons/bows/banshee/banshee-hit2.ogg` | Ledmitz (rocket-shots.mp3 / Audionautics / CC BY 3.0) | GPLv2, CC BY-SA 3.0 @@ -1247,8 +1250,11 @@ File | Artists | Licenses `sfx/weapons/bows/bow-miss1.ogg` | Ledmitz (arrow_whoosh.ogg / smcameron / CC BY 3.0) | GPLv2, CC BY-SA 3.0 `sfx/weapons/knives/knife-hit1.ogg` | Cosmostrator | GPLv2 `sfx/weapons/knives/knife-miss1.ogg` | Cosmostrator | GPLv2 -`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/rock/rock-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/weapons/knives/rock/rock-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/weapons/knives/setzer/setzer-hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/weapons/knives/setzer/setzer-hit2.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 +`sfx/weapons/knives/setzer/setzer-hit3.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/knives/sharpknife-miss1.ogg` | Krazyjakee | GPLv2 `sfx/weapons/projectiles/snowball/hit1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 `sfx/weapons/projectiles/snowball/miss1.ogg` | Ledmitz | GPLv2, CC BY-SA 3.0 @@ -1257,6 +1263,14 @@ File | Artists | Licenses `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/short-sword-hit1.ogg` | Cosmostrator | GPLv2 +`sfx/weapons/swords/short-sword-miss1.ogg` | Cosmostrator | GPLv2 +`sfx/weapons/swords/sword-miss1.ogg` | Cosmostrator [Ledmitz] | GPLv2 +`sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 +`sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 +`sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 +`sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 +`sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg` | Ledmitz (ting shas wav.mp3 / CMeeson / CC BY-3.0) | GPLv2, CC BY-SA 3.0 `sfx/weapons/swords/longsword-hit1.ogg` | Krazyjakee | GPLv2 `sfx/weapons/swords/longsword-hit2.ogg` | Krazyjakee | GPLv2 `sfx/weapons/swords/longsword-miss1.ogg` | Krazyjakee | GPLv2 @@ -1274,8 +1288,6 @@ File | Artists | Licenses `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 ## Music Please see music sub-folder diff --git a/sfx/weapons/knives/rock-knife-hit1.ogg b/sfx/weapons/knives/rock-knife-hit1.ogg deleted file mode 100644 index ca94d344..00000000 Binary files a/sfx/weapons/knives/rock-knife-hit1.ogg and /dev/null differ diff --git a/sfx/weapons/knives/rock-knife-hit2.ogg b/sfx/weapons/knives/rock-knife-hit2.ogg deleted file mode 100644 index 1201f253..00000000 Binary files a/sfx/weapons/knives/rock-knife-hit2.ogg and /dev/null differ diff --git a/sfx/weapons/knives/rock/rock-hit1.ogg b/sfx/weapons/knives/rock/rock-hit1.ogg new file mode 100644 index 00000000..49068f89 Binary files /dev/null and b/sfx/weapons/knives/rock/rock-hit1.ogg differ diff --git a/sfx/weapons/knives/rock/rock-hit2.ogg b/sfx/weapons/knives/rock/rock-hit2.ogg new file mode 100644 index 00000000..15dbfd71 Binary files /dev/null and b/sfx/weapons/knives/rock/rock-hit2.ogg differ diff --git a/sfx/weapons/knives/setzer/setzer-hit1.ogg b/sfx/weapons/knives/setzer/setzer-hit1.ogg new file mode 100644 index 00000000..26695069 Binary files /dev/null and b/sfx/weapons/knives/setzer/setzer-hit1.ogg differ diff --git a/sfx/weapons/knives/setzer/setzer-hit2.ogg b/sfx/weapons/knives/setzer/setzer-hit2.ogg new file mode 100644 index 00000000..b9409ec5 Binary files /dev/null and b/sfx/weapons/knives/setzer/setzer-hit2.ogg differ diff --git a/sfx/weapons/knives/setzer/setzer-hit3.ogg b/sfx/weapons/knives/setzer/setzer-hit3.ogg new file mode 100644 index 00000000..91ee7ad4 Binary files /dev/null and b/sfx/weapons/knives/setzer/setzer-hit3.ogg differ diff --git a/sfx/weapons/miss1.ogg b/sfx/weapons/miss1.ogg new file mode 100644 index 00000000..722a9868 Binary files /dev/null and b/sfx/weapons/miss1.ogg differ diff --git a/sfx/weapons/miss2.ogg b/sfx/weapons/miss2.ogg new file mode 100644 index 00000000..916a3704 Binary files /dev/null and b/sfx/weapons/miss2.ogg differ diff --git a/sfx/weapons/miss3.ogg b/sfx/weapons/miss3.ogg new file mode 100644 index 00000000..c90026a5 Binary files /dev/null and b/sfx/weapons/miss3.ogg differ diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg new file mode 100644 index 00000000..241669b6 Binary files /dev/null and b/sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg differ diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg new file mode 100644 index 00000000..6a24bbfd Binary files /dev/null and b/sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg differ diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg new file mode 100644 index 00000000..1b338590 Binary files /dev/null and b/sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg differ diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg new file mode 100644 index 00000000..ecdf3e7b Binary files /dev/null and b/sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg differ diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg new file mode 100644 index 00000000..bc8df59d Binary files /dev/null and b/sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg differ diff --git a/sfx/weapons/swords/sandcutter-hit7.ogg b/sfx/weapons/swords/sandcutter-hit7.ogg deleted file mode 100644 index ab89739f..00000000 Binary files a/sfx/weapons/swords/sandcutter-hit7.ogg and /dev/null differ diff --git a/sfx/weapons/swords/sandcutter-hit8.ogg b/sfx/weapons/swords/sandcutter-hit8.ogg deleted file mode 100644 index 6b1a161a..00000000 Binary files a/sfx/weapons/swords/sandcutter-hit8.ogg and /dev/null differ diff --git a/sfx/weapons/swords/sandcutter-hit9.ogg b/sfx/weapons/swords/sandcutter-hit9.ogg deleted file mode 100644 index 4a477289..00000000 Binary files a/sfx/weapons/swords/sandcutter-hit9.ogg and /dev/null differ diff --git a/sfx/weapons/swords/short-sword-hit1.ogg b/sfx/weapons/swords/short-sword-hit1.ogg deleted file mode 100644 index 2fc7a17b..00000000 Binary files a/sfx/weapons/swords/short-sword-hit1.ogg and /dev/null differ diff --git a/sfx/weapons/swords/short-sword-miss1.ogg b/sfx/weapons/swords/short-sword-miss1.ogg deleted file mode 100644 index ba76d967..00000000 Binary files a/sfx/weapons/swords/short-sword-miss1.ogg and /dev/null differ diff --git a/sfx/weapons/swords/sword-miss1.ogg b/sfx/weapons/swords/sword-miss1.ogg new file mode 100644 index 00000000..9e120f43 Binary files /dev/null and b/sfx/weapons/swords/sword-miss1.ogg differ -- cgit v1.2.3-70-g09d2