diff options
30 files changed, 43 insertions, 6 deletions
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 @@ <item id="1201" image="equipment/weapon/dagger-knive.png" name="Knife" description="A small knife; the perfect weapon for a beginner." attack="5" type="equip-1hand" weight="120" attack-action="attack" attack-range="2"> <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="strike">weapons/knives/knife-miss1.ogg</sound> + <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> </items> 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 @@ <item id="521" image="equipment/weapon/dagger-dagger.png" name="Dagger" description="A simple dagger." type="equip-1hand" attack-action="attack" attack="15" attack-range="2" weight="200"> <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="strike">weapons/knives/knife-miss1.ogg</sound> + <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> </items> 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 @@ <item id="522" image="equipment/weapon/dagger-sharpknife.png" name="Sharp Knife" description="A really sharp knife. Don't hurt yourself!" attack="10" type="equip-1hand" attack-action="attack" attack-range="2" weight="150"> <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="strike">weapons/knives/knife-miss1.ogg</sound> + <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> </items> 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 @@ <item id="536" image="equipment/weapon/dagger-shortsword.png" name="Short Sword" description="A small but sharp sword." type="equip-1hand" attack="100" attack-action="attack" attack-range="2" weight="2000"> <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="strike">weapons/knives/knife-miss1.ogg</sound> + <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> </items> 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 @@ <item id="570" image="equipment/weapon/dagger-boneknife.png" name="Bone Knife" description="A knife masterly carved out of a bone." attack="115" type="equip-1hand" attack-action="attack" attack-range="2" weight="450"> <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="strike">weapons/knives/knife-miss1.ogg</sound> + <sound event="hit">weapons/knives/knife-hit1.ogg</sound> </item> </items> 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 @@ <item id="571" image="equipment/weapon/dagger-setzer.png" name="Setzer" description="A sharp knife, named after a famous gambler." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" weight="900" sellProtected="true"> <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="hit">weapons/knives/setzer/setzer-hit1.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit2.ogg</sound> + <sound event="hit">weapons/knives/setzer/setzer-hit3.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> + <sound event="strike">weapons/miss2.ogg</sound> + <sound event="strike">weapons/miss3.ogg</sound> </item> </items> 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 @@ <item id="579" image="equipment/weapon/dagger-rockknive.png" name="Rock Knife" description="A knife made of stone." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" vit="3" weight="500" sellProtected="true"> <sprite gender="unisex">equipment/weapons/dagger.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/dagger-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> - <sound event="hit">weapons/knives/rock-knife-hit1.ogg</sound> - <sound event="hit">weapons/knives/rock-knife-hit2.ogg</sound> + <sound event="strike">weapons/miss1.ogg</sound> + <sound event="strike">weapons/miss2.ogg</sound> + <sound event="strike">weapons/miss3.ogg</sound> + <sound event="hit">weapons/knives/rock/rock-hit1.ogg</sound> + <sound event="hit">weapons/knives/rock/rock-hit2.ogg</sound> </item> </items> 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 @@ <item id="867" image="equipment/weapon/sword-ice.png" name="Ice Gladius" description="A sword with a shimmering blue blade." attack="110" type="equip-1hand" attack-action="attack" attack-range="2" luk="1" weight="1000"> <sprite gender="unisex">equipment/weapons/sword-short.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> <sprite gender="female">equipment/weapons/sword-short-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff</sprite> + <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit1.ogg</sound> + <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit2.ogg</sound> + <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit3.ogg</sound> + <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit4.ogg</sound> + <sound event="hit">weapons/swords/ice_gladius/ice_gladius-hit5.ogg</sound> + <sound event="strike">weapons/swords/sword-miss1.ogg</sound> </item> </items> @@ -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 Binary files differdeleted file mode 100644 index ca94d344..00000000 --- a/sfx/weapons/knives/rock-knife-hit1.ogg +++ /dev/null diff --git a/sfx/weapons/knives/rock-knife-hit2.ogg b/sfx/weapons/knives/rock-knife-hit2.ogg Binary files differdeleted file mode 100644 index 1201f253..00000000 --- a/sfx/weapons/knives/rock-knife-hit2.ogg +++ /dev/null diff --git a/sfx/weapons/knives/rock/rock-hit1.ogg b/sfx/weapons/knives/rock/rock-hit1.ogg Binary files differnew file mode 100644 index 00000000..49068f89 --- /dev/null +++ b/sfx/weapons/knives/rock/rock-hit1.ogg diff --git a/sfx/weapons/knives/rock/rock-hit2.ogg b/sfx/weapons/knives/rock/rock-hit2.ogg Binary files differnew file mode 100644 index 00000000..15dbfd71 --- /dev/null +++ b/sfx/weapons/knives/rock/rock-hit2.ogg diff --git a/sfx/weapons/knives/setzer/setzer-hit1.ogg b/sfx/weapons/knives/setzer/setzer-hit1.ogg Binary files differnew file mode 100644 index 00000000..26695069 --- /dev/null +++ b/sfx/weapons/knives/setzer/setzer-hit1.ogg diff --git a/sfx/weapons/knives/setzer/setzer-hit2.ogg b/sfx/weapons/knives/setzer/setzer-hit2.ogg Binary files differnew file mode 100644 index 00000000..b9409ec5 --- /dev/null +++ b/sfx/weapons/knives/setzer/setzer-hit2.ogg diff --git a/sfx/weapons/knives/setzer/setzer-hit3.ogg b/sfx/weapons/knives/setzer/setzer-hit3.ogg Binary files differnew file mode 100644 index 00000000..91ee7ad4 --- /dev/null +++ b/sfx/weapons/knives/setzer/setzer-hit3.ogg diff --git a/sfx/weapons/miss1.ogg b/sfx/weapons/miss1.ogg Binary files differnew file mode 100644 index 00000000..722a9868 --- /dev/null +++ b/sfx/weapons/miss1.ogg diff --git a/sfx/weapons/miss2.ogg b/sfx/weapons/miss2.ogg Binary files differnew file mode 100644 index 00000000..916a3704 --- /dev/null +++ b/sfx/weapons/miss2.ogg diff --git a/sfx/weapons/miss3.ogg b/sfx/weapons/miss3.ogg Binary files differnew file mode 100644 index 00000000..c90026a5 --- /dev/null +++ b/sfx/weapons/miss3.ogg diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg Binary files differnew file mode 100644 index 00000000..241669b6 --- /dev/null +++ b/sfx/weapons/swords/ice_gladius/ice_gladius-hit1.ogg diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg Binary files differnew file mode 100644 index 00000000..6a24bbfd --- /dev/null +++ b/sfx/weapons/swords/ice_gladius/ice_gladius-hit2.ogg diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg Binary files differnew file mode 100644 index 00000000..1b338590 --- /dev/null +++ b/sfx/weapons/swords/ice_gladius/ice_gladius-hit3.ogg diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg Binary files differnew file mode 100644 index 00000000..ecdf3e7b --- /dev/null +++ b/sfx/weapons/swords/ice_gladius/ice_gladius-hit4.ogg diff --git a/sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg b/sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg Binary files differnew file mode 100644 index 00000000..bc8df59d --- /dev/null +++ b/sfx/weapons/swords/ice_gladius/ice_gladius-hit5.ogg diff --git a/sfx/weapons/swords/sandcutter-hit7.ogg b/sfx/weapons/swords/sandcutter-hit7.ogg Binary files differdeleted file mode 100644 index ab89739f..00000000 --- a/sfx/weapons/swords/sandcutter-hit7.ogg +++ /dev/null diff --git a/sfx/weapons/swords/sandcutter-hit8.ogg b/sfx/weapons/swords/sandcutter-hit8.ogg Binary files differdeleted file mode 100644 index 6b1a161a..00000000 --- a/sfx/weapons/swords/sandcutter-hit8.ogg +++ /dev/null diff --git a/sfx/weapons/swords/sandcutter-hit9.ogg b/sfx/weapons/swords/sandcutter-hit9.ogg Binary files differdeleted file mode 100644 index 4a477289..00000000 --- a/sfx/weapons/swords/sandcutter-hit9.ogg +++ /dev/null diff --git a/sfx/weapons/swords/short-sword-hit1.ogg b/sfx/weapons/swords/short-sword-hit1.ogg Binary files differdeleted file mode 100644 index 2fc7a17b..00000000 --- a/sfx/weapons/swords/short-sword-hit1.ogg +++ /dev/null diff --git a/sfx/weapons/swords/short-sword-miss1.ogg b/sfx/weapons/swords/short-sword-miss1.ogg Binary files differdeleted file mode 100644 index ba76d967..00000000 --- a/sfx/weapons/swords/short-sword-miss1.ogg +++ /dev/null diff --git a/sfx/weapons/swords/sword-miss1.ogg b/sfx/weapons/swords/sword-miss1.ogg Binary files differnew file mode 100644 index 00000000..9e120f43 --- /dev/null +++ b/sfx/weapons/swords/sword-miss1.ogg |