From 31189694286d63d02ef87d942cafd42e47bbcb92 Mon Sep 17 00:00:00 2001 From: ln-zookeeper Date: Tue, 22 Dec 2015 17:07:21 +0200 Subject: [PATCH] Wired in new mace sounds --- data/campaigns/Dead_Water/units/Child_King.cfg | 4 ++-- data/campaigns/Dead_Water/units/Soldier_King.cfg | 4 ++-- data/campaigns/Dead_Water/units/Warrior_King.cfg | 4 ++-- data/campaigns/Dead_Water/units/Young_King.cfg | 4 ++-- data/campaigns/Liberty/units/Villagers.cfg | 2 +- .../units/Dwarvish_Masked_Fighter.cfg | 2 +- .../The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg | 2 +- .../units/Dwarvish_Masked_Steelclad.cfg | 2 +- .../The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg | 2 +- data/campaigns/The_South_Guard/units/Horseman_Commander.cfg | 2 +- data/campaigns/The_South_Guard/units/Infantry_Commander.cfg | 2 +- data/campaigns/The_South_Guard/units/Mounted_General.cfg | 2 +- .../Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg | 2 +- .../Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg | 2 +- .../Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg | 2 +- data/campaigns/tutorial/units/Quintain.cfg | 2 +- data/core/units/drakes/Enforcer.cfg | 2 +- data/core/units/drakes/Thrasher.cfg | 2 +- data/core/units/dwarves/Arcanister.cfg | 2 +- data/core/units/dwarves/Fighter.cfg | 2 +- data/core/units/dwarves/Lord.cfg | 2 +- data/core/units/dwarves/Runemaster.cfg | 2 +- data/core/units/dwarves/Runesmith.cfg | 2 +- data/core/units/dwarves/Steelclad.cfg | 2 +- data/core/units/humans/Loyalist_Heavy_Infantryman.cfg | 2 +- data/core/units/humans/Loyalist_Iron_Mauler.cfg | 2 +- data/core/units/humans/Outlaw.cfg | 2 +- data/core/units/humans/Outlaw_Fugitive.cfg | 2 +- data/core/units/humans/Outlaw_Highwayman.cfg | 2 +- data/core/units/humans/Royal_Warrior.cfg | 2 +- data/core/units/khalifate/Faris.cfg | 2 +- data/core/units/khalifate/Ghazi.cfg | 2 +- data/core/units/khalifate/Hadaf.cfg | 2 +- data/core/units/khalifate/Hakim.cfg | 2 +- data/core/units/khalifate/Jawal.cfg | 2 +- data/core/units/khalifate/Khaiyal.cfg | 2 +- data/core/units/khalifate/Khalid.cfg | 2 +- data/core/units/khalifate/Mufariq.cfg | 2 +- data/core/units/khalifate/Qanas.cfg | 2 +- data/core/units/khalifate/Rami.cfg | 2 +- data/core/units/khalifate/Saree.cfg | 2 +- data/core/units/khalifate/Shuja.cfg | 2 +- data/core/units/khalifate/Tabib.cfg | 2 +- data/core/units/trolls/Great.cfg | 2 +- data/core/units/trolls/Hero.cfg | 6 +++--- data/core/units/trolls/Warrior.cfg | 2 +- 46 files changed, 52 insertions(+), 52 deletions(-) diff --git a/data/campaigns/Dead_Water/units/Child_King.cfg b/data/campaigns/Dead_Water/units/Child_King.cfg index 1605108aa4c..8f826f744e8 100644 --- a/data/campaigns/Dead_Water/units/Child_King.cfg +++ b/data/campaigns/Dead_Water/units/Child_King.cfg @@ -47,7 +47,7 @@ # [frame] # image="units/merfolk/child_king-attack-[1~5].png:[200,100*3,200]" # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-2.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image="units/merfolk/child_king.png:150" # [/frame] @@ -62,7 +62,7 @@ # [frame] # image="units/merfolk/child_king-attack-[1,2,3n].png:[200,100,200]" # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-2.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image="units/merfolk/child_king.png:150" # [/frame] diff --git a/data/campaigns/Dead_Water/units/Soldier_King.cfg b/data/campaigns/Dead_Water/units/Soldier_King.cfg index 0a2243e3322..9d8ad101d48 100644 --- a/data/campaigns/Dead_Water/units/Soldier_King.cfg +++ b/data/campaigns/Dead_Water/units/Soldier_King.cfg @@ -60,7 +60,7 @@ # [frame] # image=units/merfolk/soldier_king-attack-[1~8].png:[100*2,50*3,150,50*2] # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-1.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image=units/merfolk/soldier_king.png:150 # [/frame] @@ -76,7 +76,7 @@ # [frame] # image=units/merfolk/soldier_king-attack-[1~3,4n,8].png:[100*3,150,100] # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-1.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image=units/merfolk/soldier_king.png:150 # [/frame] diff --git a/data/campaigns/Dead_Water/units/Warrior_King.cfg b/data/campaigns/Dead_Water/units/Warrior_King.cfg index d7c11dfed07..1caf6bc2c07 100644 --- a/data/campaigns/Dead_Water/units/Warrior_King.cfg +++ b/data/campaigns/Dead_Water/units/Warrior_King.cfg @@ -61,7 +61,7 @@ # [frame] # image=units/merfolk/warrior_king-attack-[1~8].png:[100*2,50*3,150,50*2] # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-1.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image=units/merfolk/warrior_king.png:150 # [/frame] @@ -77,7 +77,7 @@ # [frame] # image=units/merfolk/warrior_king-attack-[1~3,4n,8].png:[100*3,150,100] # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-1.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image=units/merfolk/warrior_king.png:150 # [/frame] diff --git a/data/campaigns/Dead_Water/units/Young_King.cfg b/data/campaigns/Dead_Water/units/Young_King.cfg index d20be3e4d78..50f14dba624 100644 --- a/data/campaigns/Dead_Water/units/Young_King.cfg +++ b/data/campaigns/Dead_Water/units/Young_King.cfg @@ -56,7 +56,7 @@ # [frame] # image=units/merfolk/young_king-attack-[1~9].png:[100*2,50*3,150,100*3] # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-1.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image=units/merfolk/young_king.png:150 # [/frame] @@ -72,7 +72,7 @@ # [frame] # image=units/merfolk/young_king-attack-[1~3,4n,9].png:[100*3,150,100] # [/frame] - # {SOUND:HIT_AND_MISS mace.wav miss-1.ogg -100} + # {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} # [frame] # image=units/merfolk/young_king.png:150 # [/frame] diff --git a/data/campaigns/Liberty/units/Villagers.cfg b/data/campaigns/Liberty/units/Villagers.cfg index 2554c90493f..0de40572b85 100644 --- a/data/campaigns/Liberty/units/Villagers.cfg +++ b/data/campaigns/Liberty/units/Villagers.cfg @@ -66,7 +66,7 @@ [/filter_attack] offset=0.0~0.2,0.2~0.6,0.6~0.4,0.4~0.0 start_time=-500 - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} 500} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg 500} [frame] duration=100 image="units/human-peasants/female+senior-village-elder.png" diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg index 0d9274a1323..57988c286d5 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Fighter.cfg @@ -58,7 +58,7 @@ [frame] image="units/masked_fighter-hammer[1~3].png:[50,200,75]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image="units/masked_fighter-hammer.png:25" [/frame] diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg index 9bac5358c81..c8a86834d18 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Lord.cfg @@ -73,7 +73,7 @@ [frame] image="units/masked_lord.png:150" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image="units/masked_lord-attack-hammer.png:150" [/frame] diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg index de2276f5811..b7f6e5c2850 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Masked_Steelclad.cfg @@ -51,7 +51,7 @@ [frame] image="units/masked_steelclad.png:150" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image="units/masked_steelclad-attack-hammer.png:150" [/frame] diff --git a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg index a89a04d2873..d292dd22307 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Rune_Lord.cfg @@ -52,7 +52,7 @@ image=units/karrag-attack[1~4].png:[100*3,200] halo=halo/karrag-attack[1~4]_halo.png:[100*3,200] [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image=units/karrag.png:100 halo=halo/karrag_halo.png:100 diff --git a/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg b/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg index cb4a57aea62..133e2906def 100644 --- a/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg +++ b/data/campaigns/The_South_Guard/units/Horseman_Commander.cfg @@ -86,7 +86,7 @@ [frame] image=deoran/horseman-commander-moving.png:100 [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image=deoran/horseman-commander-attack.png:200 [/frame] diff --git a/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg b/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg index cd09605a901..07b8d6eafdc 100644 --- a/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg +++ b/data/campaigns/The_South_Guard/units/Infantry_Commander.cfg @@ -66,6 +66,6 @@ [frame] image="units/infantry-commander.png:[100*8]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/campaigns/The_South_Guard/units/Mounted_General.cfg b/data/campaigns/The_South_Guard/units/Mounted_General.cfg index d69cf5c4f22..c1d570637de 100644 --- a/data/campaigns/The_South_Guard/units/Mounted_General.cfg +++ b/data/campaigns/The_South_Guard/units/Mounted_General.cfg @@ -75,7 +75,7 @@ [frame] image=deoran/mounted-general-moving.png:[100,200,75] #placeholder graphic [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image=deoran/mounted-general.png:25 [/frame] diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg index 9c43d5b275f..a513558b0e5 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Guardian.cfg @@ -43,6 +43,6 @@ duration=100 image="units/nagas/guardian.png" [/frame] - {SOUND:HIT_AND_MISS mace.ogg {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg index 63ae57aed31..576154d7c12 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Sentinel.cfg @@ -44,6 +44,6 @@ duration=100 image="units/nagas/sentinel.png" [/frame] - {SOUND:HIT_AND_MISS mace.ogg {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg index 00b83e88773..ab6aec2c24e 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/nagas/Naga_Warden.cfg @@ -43,6 +43,6 @@ duration=100 image="units/nagas/warden.png" [/frame] - {SOUND:HIT_AND_MISS mace.ogg {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/campaigns/tutorial/units/Quintain.cfg b/data/campaigns/tutorial/units/Quintain.cfg index ca04f6a66c1..8a07094680d 100644 --- a/data/campaigns/tutorial/units/Quintain.cfg +++ b/data/campaigns/tutorial/units/Quintain.cfg @@ -41,7 +41,7 @@ [frame] image=units/quintain.png:300 [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image=units/quintain.png:75 [/frame] diff --git a/data/core/units/drakes/Enforcer.cfg b/data/core/units/drakes/Enforcer.cfg index e939b320b6b..b9e35eaef73 100644 --- a/data/core/units/drakes/Enforcer.cfg +++ b/data/core/units/drakes/Enforcer.cfg @@ -110,7 +110,7 @@ [frame] image="units/drakes/enforcer-impact-[1~5].png:100" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [frame] image="units/drakes/enforcer-blade.png:100" [/frame] diff --git a/data/core/units/drakes/Thrasher.cfg b/data/core/units/drakes/Thrasher.cfg index 75c8bbd8865..b68e95a511d 100644 --- a/data/core/units/drakes/Thrasher.cfg +++ b/data/core/units/drakes/Thrasher.cfg @@ -109,7 +109,7 @@ [frame] image="units/drakes/thrasher-impact-[1~5].png:100" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [frame] image="units/drakes/thrasher-blade.png:100" [/frame] diff --git a/data/core/units/dwarves/Arcanister.cfg b/data/core/units/dwarves/Arcanister.cfg index 6d7769e1c5a..041a12a1c9c 100644 --- a/data/core/units/dwarves/Arcanister.cfg +++ b/data/core/units/dwarves/Arcanister.cfg @@ -52,7 +52,7 @@ [frame] image=units/dwarves/arcanister.png:250 [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image=units/dwarves/arcanister.png:400 [/frame] diff --git a/data/core/units/dwarves/Fighter.cfg b/data/core/units/dwarves/Fighter.cfg index 70b92cc2154..5620b5b5fc1 100644 --- a/data/core/units/dwarves/Fighter.cfg +++ b/data/core/units/dwarves/Fighter.cfg @@ -88,7 +88,7 @@ image="units/dwarves/fighter-ne-hammer[1~7].png:100,units/dwarves/fighter-ne-hammer.png:100" [/frame] [/else] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -210} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -210} [/attack_anim] [attack_anim] diff --git a/data/core/units/dwarves/Lord.cfg b/data/core/units/dwarves/Lord.cfg index bcfb211c405..0ff82ba072e 100644 --- a/data/core/units/dwarves/Lord.cfg +++ b/data/core/units/dwarves/Lord.cfg @@ -113,7 +113,7 @@ image="units/dwarves/lord-ne-hammer[1~7].png:100,units/dwarves/lord-ne-hammer.png:100" [/frame] [/else] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -410} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -410} [/attack_anim] [attack_anim] diff --git a/data/core/units/dwarves/Runemaster.cfg b/data/core/units/dwarves/Runemaster.cfg index 23505c48114..90a9b7a7dcf 100644 --- a/data/core/units/dwarves/Runemaster.cfg +++ b/data/core/units/dwarves/Runemaster.cfg @@ -46,7 +46,7 @@ [frame] image=units/dwarves/runemaster.png:250 [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image=units/dwarves/runemaster.png:400 [/frame] diff --git a/data/core/units/dwarves/Runesmith.cfg b/data/core/units/dwarves/Runesmith.cfg index 247cc6092ba..d8148bd9e7a 100644 --- a/data/core/units/dwarves/Runesmith.cfg +++ b/data/core/units/dwarves/Runesmith.cfg @@ -56,6 +56,6 @@ [frame] image="units/dwarves/runesmith-attack-se-[1~10].png:70" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -120} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -120} [/attack_anim] [/unit_type] diff --git a/data/core/units/dwarves/Steelclad.cfg b/data/core/units/dwarves/Steelclad.cfg index 616951992a9..0a7a8040b67 100644 --- a/data/core/units/dwarves/Steelclad.cfg +++ b/data/core/units/dwarves/Steelclad.cfg @@ -92,7 +92,7 @@ image="units/dwarves/steelclad-ne-hammer[1~7].png:100,units/dwarves/steelclad-ne-hammer.png:100" [/frame] [/else] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -210} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -210} [/attack_anim] [attack_anim] diff --git a/data/core/units/humans/Loyalist_Heavy_Infantryman.cfg b/data/core/units/humans/Loyalist_Heavy_Infantryman.cfg index 4eb5e5679bf..95c5e975f79 100644 --- a/data/core/units/humans/Loyalist_Heavy_Infantryman.cfg +++ b/data/core/units/humans/Loyalist_Heavy_Infantryman.cfg @@ -43,7 +43,7 @@ [frame] image="units/human-loyalists/heavyinfantry-attack-[1~2].png:[130,200]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image="units/human-loyalists/heavyinfantry.png:100" [/frame] diff --git a/data/core/units/humans/Loyalist_Iron_Mauler.cfg b/data/core/units/humans/Loyalist_Iron_Mauler.cfg index dfa66d7af53..4eb2d5b85b2 100644 --- a/data/core/units/humans/Loyalist_Iron_Mauler.cfg +++ b/data/core/units/humans/Loyalist_Iron_Mauler.cfg @@ -39,7 +39,7 @@ Though staggering in melee combat, there are many drawbacks to being outfitted i [frame] image="units/human-loyalists/siegetrooper-attack-[1~2].png:[160,200]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image="units/human-loyalists/siegetrooper.png:100" [/frame] diff --git a/data/core/units/humans/Outlaw.cfg b/data/core/units/humans/Outlaw.cfg index 92a95dc2b4b..344530896a5 100644 --- a/data/core/units/humans/Outlaw.cfg +++ b/data/core/units/humans/Outlaw.cfg @@ -69,7 +69,7 @@ [frame] image="units/human-outlaws/outlaw-melee-[1~3].png:[100,150,100]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [female] name= _ "female^Outlaw" diff --git a/data/core/units/humans/Outlaw_Fugitive.cfg b/data/core/units/humans/Outlaw_Fugitive.cfg index 6f54d82d6f7..fa317d1b021 100644 --- a/data/core/units/humans/Outlaw_Fugitive.cfg +++ b/data/core/units/humans/Outlaw_Fugitive.cfg @@ -76,7 +76,7 @@ [frame] image="units/human-outlaws/fugitive-melee-[1~3].png:[100,150,100]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [female] name= _ "female^Fugitive" diff --git a/data/core/units/humans/Outlaw_Highwayman.cfg b/data/core/units/humans/Outlaw_Highwayman.cfg index b1171c34556..32702588df5 100644 --- a/data/core/units/humans/Outlaw_Highwayman.cfg +++ b/data/core/units/humans/Outlaw_Highwayman.cfg @@ -35,7 +35,7 @@ [/filter_attack] offset=0.0~0.2,0.2~0.6,0.6~0.4,0.4~0.0 start_time=-500 - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image="units/human-outlaws/highwayman-melee-[1~8].png:100" [/frame] diff --git a/data/core/units/humans/Royal_Warrior.cfg b/data/core/units/humans/Royal_Warrior.cfg index 7b4c52659b3..fa7bc99118d 100644 --- a/data/core/units/humans/Royal_Warrior.cfg +++ b/data/core/units/humans/Royal_Warrior.cfg @@ -49,7 +49,7 @@ [frame] image="units/human-loyalists/royal-warrior-attack[1~2].png:[75,175]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [frame] image="units/human-loyalists/royal-warrior.png:75" [/frame] diff --git a/data/core/units/khalifate/Faris.cfg b/data/core/units/khalifate/Faris.cfg index d0a222b4136..a6542552dfd 100644 --- a/data/core/units/khalifate/Faris.cfg +++ b/data/core/units/khalifate/Faris.cfg @@ -68,6 +68,6 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [/unit_type] diff --git a/data/core/units/khalifate/Ghazi.cfg b/data/core/units/khalifate/Ghazi.cfg index 6b31c79cce7..e0b4f292dfa 100644 --- a/data/core/units/khalifate/Ghazi.cfg +++ b/data/core/units/khalifate/Ghazi.cfg @@ -66,6 +66,6 @@ image="units/khalifate/ghazi.png:300" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/core/units/khalifate/Hadaf.cfg b/data/core/units/khalifate/Hadaf.cfg index dbcf7be9bb6..a3479efa98c 100644 --- a/data/core/units/khalifate/Hadaf.cfg +++ b/data/core/units/khalifate/Hadaf.cfg @@ -52,7 +52,7 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [attack_anim] [filter_attack] diff --git a/data/core/units/khalifate/Hakim.cfg b/data/core/units/khalifate/Hakim.cfg index d404713d3b1..15e3001db1f 100644 --- a/data/core/units/khalifate/Hakim.cfg +++ b/data/core/units/khalifate/Hakim.cfg @@ -40,6 +40,6 @@ image="units/khalifate/hakim.png:300" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/core/units/khalifate/Jawal.cfg b/data/core/units/khalifate/Jawal.cfg index 8e3538fdb6d..75cd3403e2a 100644 --- a/data/core/units/khalifate/Jawal.cfg +++ b/data/core/units/khalifate/Jawal.cfg @@ -53,7 +53,7 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [attack_anim] [filter_attack] diff --git a/data/core/units/khalifate/Khaiyal.cfg b/data/core/units/khalifate/Khaiyal.cfg index 8f0ca201c6c..990a6db10da 100644 --- a/data/core/units/khalifate/Khaiyal.cfg +++ b/data/core/units/khalifate/Khaiyal.cfg @@ -77,6 +77,6 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [/unit_type] diff --git a/data/core/units/khalifate/Khalid.cfg b/data/core/units/khalifate/Khalid.cfg index 0c93bab7c22..ca9acd2ba90 100644 --- a/data/core/units/khalifate/Khalid.cfg +++ b/data/core/units/khalifate/Khalid.cfg @@ -73,6 +73,6 @@ image="units/khalifate/khalid.png:300" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/core/units/khalifate/Mufariq.cfg b/data/core/units/khalifate/Mufariq.cfg index fb0ef316666..130fba2dc8d 100644 --- a/data/core/units/khalifate/Mufariq.cfg +++ b/data/core/units/khalifate/Mufariq.cfg @@ -70,6 +70,6 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [/unit_type] diff --git a/data/core/units/khalifate/Qanas.cfg b/data/core/units/khalifate/Qanas.cfg index 52f3bf7d10d..35d5d9cec52 100644 --- a/data/core/units/khalifate/Qanas.cfg +++ b/data/core/units/khalifate/Qanas.cfg @@ -51,7 +51,7 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [attack_anim] [filter_attack] diff --git a/data/core/units/khalifate/Rami.cfg b/data/core/units/khalifate/Rami.cfg index 869c50b8fef..573f42c3753 100644 --- a/data/core/units/khalifate/Rami.cfg +++ b/data/core/units/khalifate/Rami.cfg @@ -52,7 +52,7 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [attack_anim] [filter_attack] diff --git a/data/core/units/khalifate/Saree.cfg b/data/core/units/khalifate/Saree.cfg index bd97aa32c58..88000ad5373 100644 --- a/data/core/units/khalifate/Saree.cfg +++ b/data/core/units/khalifate/Saree.cfg @@ -52,7 +52,7 @@ sound=horse-canter.wav [/horse_sound_frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [/attack_anim] [attack_anim] [filter_attack] diff --git a/data/core/units/khalifate/Shuja.cfg b/data/core/units/khalifate/Shuja.cfg index 523134e65a7..c0c8af992ad 100644 --- a/data/core/units/khalifate/Shuja.cfg +++ b/data/core/units/khalifate/Shuja.cfg @@ -67,6 +67,6 @@ image="units/khalifate/shuja.png:300" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/core/units/khalifate/Tabib.cfg b/data/core/units/khalifate/Tabib.cfg index 7e37e6d6985..38d52f0c30e 100644 --- a/data/core/units/khalifate/Tabib.cfg +++ b/data/core/units/khalifate/Tabib.cfg @@ -43,6 +43,6 @@ image="units/khalifate/tabib.png:300" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [/unit_type] diff --git a/data/core/units/trolls/Great.cfg b/data/core/units/trolls/Great.cfg index 28be94c0d11..649bb57157b 100644 --- a/data/core/units/trolls/Great.cfg +++ b/data/core/units/trolls/Great.cfg @@ -42,7 +42,7 @@ [frame] image="units/trolls/warrior-attack-[1~4,3,1].png:[75,50,25,175,75,25]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -125} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -125} [frame] image="units/trolls/warrior.png:50" [/frame] diff --git a/data/core/units/trolls/Hero.cfg b/data/core/units/trolls/Hero.cfg index a1553c5bcc1..72d2c7fdb49 100644 --- a/data/core/units/trolls/Hero.cfg +++ b/data/core/units/trolls/Hero.cfg @@ -42,7 +42,7 @@ [frame] image=units/trolls/troll-hero-attack-se-[1~6].png:100 [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [attack_anim] [filter_attack] @@ -56,7 +56,7 @@ [frame] image=units/trolls/troll-hero-attack-se-[1~6].png:100 [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [/attack_anim] [attack_anim] [filter_attack] @@ -70,7 +70,7 @@ [frame] image=units/trolls/troll-hero-attack-se-1.png:100,units/trolls/troll-hero-attack-ne-[2~6].png:[100*2,75*3] [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -100} [frame] image=units/trolls/troll-hero-attack-se-1.png:75 [/frame] diff --git a/data/core/units/trolls/Warrior.cfg b/data/core/units/trolls/Warrior.cfg index 8a91b5d577a..0bb6880ceb6 100644 --- a/data/core/units/trolls/Warrior.cfg +++ b/data/core/units/trolls/Warrior.cfg @@ -42,7 +42,7 @@ [frame] image="units/trolls/warrior-attack-[1~4,3,1].png:[75,50,75,175,75,25]" [/frame] - {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -75} + {SOUND:HIT_AND_MISS mace.ogg mace-miss.ogg -75} [frame] image="units/trolls/warrior.png:50" [/frame]