diff --git a/data/core/units/dwarves/Dragonguard.cfg b/data/core/units/dwarves/Dragonguard.cfg index 9c9da837d36..5ec82ce1783 100644 --- a/data/core/units/dwarves/Dragonguard.cfg +++ b/data/core/units/dwarves/Dragonguard.cfg @@ -68,7 +68,6 @@ name=dragonstaff [/filter_attack] start_time=-1250 - sound_start_time=-250 halo_start_time=-250 [if] @@ -89,10 +88,6 @@ halo="halo/dragonguard/dg-muzzle-flash-s-[1~17].png:[80*3,90,100,120*3,100*9]" auto_vflip=false [/halo_frame] - - [sound_frame] - sound=dragonstick.ogg - [/sound_frame] [/if] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 3 24} @@ -107,10 +102,6 @@ [frame] image="units/dwarves/dragonguard/dragonguard.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_DG_SECOND_MUZZLE_FLARE_HIT_DIAG_NORTH -8 10} @@ -127,10 +118,6 @@ halo="halo/dragonguard/dg-muzzle-flash-ne-[1~17].png:[80*3,90,100,120*3,100*9]" auto_vflip=false [/halo_frame] - - [sound_frame] - sound=dragonstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 19 -2} @@ -142,10 +129,6 @@ [frame] image="units/dwarves/dragonguard/dragonguard-ne.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_DG_SECOND_MUZZLE_FLARE_HIT_NORTH -1 16} @@ -165,10 +148,6 @@ halo="halo/dragonguard/dg-muzzle-flash-n-[1~17].png:[80*3,90,100,120*3,100*9]" auto_vflip=false [/halo_frame] - - [sound_frame] - sound=dragonstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS -7 -6} @@ -183,10 +162,6 @@ [frame] image="units/dwarves/dragonguard/dragonguard-ne.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_DG_SECOND_MUZZLE_FLARE_HIT_DIAG_SOUTH 0 8} @@ -203,10 +178,6 @@ halo="halo/dragonguard/dg-muzzle-flash-se-[1~17].png:[80*3,90,100,120*3,100*9]" auto_vflip=false [/halo_frame] - - [sound_frame] - sound=dragonstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 18 17} @@ -218,11 +189,9 @@ [frame] image="units/dwarves/dragonguard/dragonguard.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] + + {SOUND:HIT_AND_MISS dragonstick.ogg thunderstick-miss.ogg -250} [/attack_anim] [attack_anim] [filter_attack] @@ -235,17 +204,15 @@ [frame] image="units/dwarves/dragonguard/dragonguard-se-blade[1~9,1].png:[50,100*8,50]" [/frame] - - {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/if] [else] direction=n,ne,nw [frame] image="units/dwarves/dragonguard/dragonguard-ne-blade[1~9,1].png:[50,100*8,50]" [/frame] - - {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/else] + + {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/attack_anim] {MOVING_ANIM_DIRECTIONAL_10_FRAME "units/dwarves/dragonguard/dragonguard"} diff --git a/data/core/units/dwarves/Thunderer.cfg b/data/core/units/dwarves/Thunderer.cfg index f3a6513cd5d..8eada516d44 100644 --- a/data/core/units/dwarves/Thunderer.cfg +++ b/data/core/units/dwarves/Thunderer.cfg @@ -81,7 +81,6 @@ name=thunderstick [/filter_attack] start_time=-750 - sound_start_time=-250 [if] {MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH -6 -5} @@ -93,10 +92,6 @@ [frame] image="units/dwarves/thunderer/thunderer.png:280" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/if] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS -4 6} @@ -108,10 +103,6 @@ [frame] image="units/dwarves/thunderer/thunderer.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_NORTH -3 20} @@ -123,10 +114,6 @@ [frame] image="units/dwarves/thunderer/thunderer-ne.png:280" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 5 0} @@ -138,10 +125,6 @@ [frame] image="units/dwarves/thunderer/thunderer-ne.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_HIT_NORTH 4 21} @@ -153,10 +136,6 @@ [frame] image="units/dwarves/thunderer/thunderer-ne.png:280" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 3 -2} @@ -168,10 +147,6 @@ [frame] image="units/dwarves/thunderer/thunderer-ne.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_SOUTH -10 10} @@ -183,10 +158,6 @@ [frame] image="units/dwarves/thunderer/thunderer.png:280" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 4 11} @@ -198,11 +169,9 @@ [frame] image="units/dwarves/thunderer/thunderer.png:20" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] + + {SOUND:HIT_AND_MISS thunderstick.ogg thunderstick-miss.ogg -250} [/attack_anim] [attack_anim] @@ -216,17 +185,15 @@ [frame] image="units/dwarves/thunderer/thunderer-se-blade[1~9,1].png:[50,100*8,50]" [/frame] - - {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/if] [else] direction=n,ne,nw [frame] image="units/dwarves/thunderer/thunderer-ne-blade[1~9,1].png:[50,100*8,50]" [/frame] - - {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/else] + + {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/attack_anim] {MOVING_ANIM_DIRECTIONAL_10_FRAME "units/dwarves/thunderer/thunderer"} diff --git a/data/core/units/dwarves/Thunderguard.cfg b/data/core/units/dwarves/Thunderguard.cfg index 90000c760e1..0b2567b6cd1 100644 --- a/data/core/units/dwarves/Thunderguard.cfg +++ b/data/core/units/dwarves/Thunderguard.cfg @@ -69,7 +69,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to name=thunderstick [/filter_attack] start_time=-750 - sound_start_time=-250 [if] {MISSILE_FRAME_MUZZLE_FLARE_HIT_SOUTH 2 1} @@ -81,10 +80,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard.png:10" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/if] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 4 7} @@ -96,10 +91,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard.png:10" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_NORTH -1 16} @@ -111,10 +102,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard-ne.png:10" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 8 -1} @@ -126,10 +113,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard-ne.png:10" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_HIT_NORTH -10 19} @@ -141,10 +124,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard-ne.png:10" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS -9 -4} @@ -156,10 +135,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard-ne.png:10" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_HIT_DIAG_SOUTH -3 7} @@ -171,10 +146,6 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard.png:10" [/frame] - - [sound_frame] - sound=thunderstick.ogg - [/sound_frame] [/else] [else] {MISSILE_FRAME_MUZZLE_FLARE_MISS 11 8} @@ -186,11 +157,9 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard.png:10" [/frame] - - [sound_frame] - sound=thunderstick-miss.ogg - [/sound_frame] [/else] + + {SOUND:HIT_AND_MISS thunderstick.ogg thunderstick-miss.ogg -250} [/attack_anim] [attack_anim] [filter_attack] @@ -203,17 +172,15 @@ Though a single shot from these ‘thundersticks’ can take several minutes to [frame] image="units/dwarves/thunderguard/thunderguard-se-blade[1~9,1].png:[50,100*8,50]" [/frame] - - {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/if] [else] direction=n,ne,nw [frame] image="units/dwarves/thunderguard/thunderguard-ne-blade[1~9,1].png:[50,100*8,50]" [/frame] - - {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/else] + + {SOUND:HIT_AND_MISS knife.ogg {SOUND_LIST:MISS} -100} [/attack_anim] {MOVING_ANIM_DIRECTIONAL_10_FRAME "units/dwarves/thunderguard/thunderguard"}