Revert failed attempt to fix slow/poison sounds

The fix failed because attacker/defender hits events are fired after the attack animation has finished, not in the middle of it when the hit occurs.
2015-04-17 08:47:07 +03:00 · 2015-04-17 08:47:07 +03:00 · c4ad38a251
commit c4ad38a251
parent a902f41c71
39 changed files with 42 additions and 99 deletions
--- a/data/campaigns/Dead_Water/units/Kraken.cfg
+++ b/data/campaigns/Dead_Water/units/Kraken.cfg
@ -65,6 +65,7 @@
        [frame]
            image="units/monsters/kraken.png:100"
        [/frame]
+        {SOUND:POISON}
    [/attack_anim]

    # tentacles hit south----------------------------------------------
--- a/data/campaigns/Delfadors_Memoirs/units/Wose_Shaman.cfg
+++ b/data/campaigns/Delfadors_Memoirs/units/Wose_Shaman.cfg
@ -75,6 +75,7 @@
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}

        [frame]
            image="units/wose-shaman.png"
--- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
+++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Annalist.cfg
@ -79,6 +79,7 @@
            image=units/annalist-ranged[1~2].png:[150,300]
        [/frame]
        {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -200}
+        {SOUND:SLOW}
        [frame]
            image="units/annalist.png:50"
        [/frame]
--- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
+++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Loremaster.cfg
@ -83,6 +83,7 @@
            image=units/loremaster-ranged[1~2].png:[150,300]
        [/frame]
        {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -200}
+        {SOUND:SLOW}
        [frame]
            image="units/loremaster.png:50"
        [/frame]
--- a/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
+++ b/data/campaigns/The_Hammer_of_Thursagan/units/Dwarvish_Witness.cfg
@ -84,6 +84,7 @@
            image=units/witness-ranged[1~2].png:[150,300]
        [/frame]
        {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -200}
+        {SOUND:SLOW}
        [frame]
            image="units/witness.png:50"
        [/frame]
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Druid.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Druid.cfg
@ -103,6 +103,7 @@
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Hunter.cfg
@ -55,6 +55,7 @@
            image="units/elves-desert/hunter-ranged-[1~4].png:[125*4]"
        [/frame]
        {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -375}
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Prowler.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Prowler.cfg
@ -57,6 +57,7 @@
            image="units/elves-desert/prowler.png:[125*4]"
        [/frame]
        {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -375}
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sentinel.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Sentinel.cfg
@ -56,6 +56,7 @@
            image="units/elves-desert/sentinel.png:300"
        [/frame]
        {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -300}
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shaman.cfg
@ -79,6 +79,7 @@
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
        [frame]
            image="units/elves-desert/shaman.png:50"
        [/frame]
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Desert_Shyde.cfg
@ -108,6 +108,7 @@
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Kaleh.cfg
@ -100,6 +100,7 @@
                    image=units/elves-desert/kaleh.png:300
                [/frame]
                {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -300}
+                {SOUND:SLOW}
            [/attack_anim]
        [/effect]
    ) {VARIANT_NAME}}
--- a/data/campaigns/Under_the_Burning_Suns/units/elves/Nym.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/elves/Nym.cfg
@ -51,6 +51,7 @@
            image=units/elves-desert/nym-ranged-[1~3].png:[100*3]
        [/frame]
        {SOUND:HIT_AND_MISS hatchet.wav hatchet-miss.wav -300}
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/units/orcs/Dark_Assassin1.cfg
@ -72,6 +72,7 @@
        [/frame]

        {SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -100}
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/macros/sound-utils.cfg
+++ b/data/core/macros/sound-utils.cfg
@ -921,102 +921,3 @@ zombie-hit-[1~6].ogg #enddef
        [/attack_sound_frame]
    [/if]
 #enddef
-
-[lua]
-    code=<<
-
-    wesnoth.wml_actions.event{
-        name="attacker hits",
-        id="attacker hits and slows", -- # wmllint: ignore
-        first_time_only=false,
-
-        { "filter_attack", {
-            special="slow"
-        }},
-
-        { "filter_second", {
-             { "not", {
-                { "filter_wml", {
-                    { "status", {
-                        slowed=true
-                    }}
-                }}
-            }}
-        }},
-
-        { "sound", {
-            name="slowed.wav"
-        }}
-    }
-    wesnoth.wml_actions.event{
-        name="defender hits",
-        id="defender hits and slows", -- # wmllint: ignore
-        first_time_only=false,
-
-        { "filter_second_attack", {
-            special="slow"
-        }},
-
-        { "filter", {
-             { "not", {
-                { "filter_wml", {
-                    { "status", {
-                        slowed=true
-                    }}
-                }}
-            }}
-        }},
-
-        { "sound", {
-            name="slowed.wav"
-        }}
-    }
-    
-    wesnoth.wml_actions.event{
-        name="attacker hits",
-        id="attacker hits and poisons", -- # wmllint: ignore
-        first_time_only=false,
-
-        { "filter_attack", {
-            special="poison"
-        }},
-
-        { "filter_second", {
-             { "not", {
-                { "filter_wml", {
-                    { "status", {
-                        poisoned=true
-                    }}
-                }}
-            }}
-        }},
-
-        { "sound", {
-            name="poison.ogg"
-        }}
-    }
-    wesnoth.wml_actions.event{
-        name="defender hits",
-        id="defender hits and poisons", -- # wmllint: ignore
-        first_time_only=false,
-
-        { "filter_second_attack", {
-            special="poison"
-        }},
-
-        { "filter", {
-             { "not", {
-                { "filter_wml", {
-                    { "status", {
-                        poisoned=true
-                    }}
-                }}
-            }}
-        }},
-
-        { "sound", {
-            name="poison.ogg"
-        }}
-    }
->>
-[/lua]
--- a/data/core/units/elves/Druid.cfg
+++ b/data/core/units/elves/Druid.cfg
@ -115,6 +115,7 @@ The chief ability of Druids lies in healing, and it is for this skill that they
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/elves/Enchantress.cfg
+++ b/data/core/units/elves/Enchantress.cfg
@ -103,6 +103,7 @@
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/elves/Shaman.cfg
+++ b/data/core/units/elves/Shaman.cfg
@ -90,6 +90,7 @@ The healing abilities of the elves are also remarkable, and of capital use in ba
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
        [frame]
            image="units/elves-wood/shaman.png:50"
        [/frame]
--- a/data/core/units/elves/Shyde.cfg
+++ b/data/core/units/elves/Shyde.cfg
@ -119,6 +119,7 @@
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/elves/Sorceress.cfg
+++ b/data/core/units/elves/Sorceress.cfg
@ -106,6 +106,7 @@ Those able to do so are roughly titled as ‘sorceresses’ by other races; and
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/elves/Sylph.cfg
+++ b/data/core/units/elves/Sylph.cfg
@ -108,6 +108,7 @@
        [attack_sound_frame]
            sound=entangle.wav
        [/attack_sound_frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/goblins/Direwolf_Rider.cfg
+++ b/data/core/units/goblins/Direwolf_Rider.cfg
@ -80,6 +80,7 @@ The claws of a wolf are not generally regarded as being the more dangerous parts
            image="units/goblins/direwolver-moving.png:100"
        [/frame]
        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -100}
+        {SOUND:POISON}
        [frame]
            image="units/goblins/direwolver-attack.png:150"
        [/frame]
--- a/data/core/units/goblins/Pillager.cfg
+++ b/data/core/units/goblins/Pillager.cfg
@ -91,6 +91,7 @@
        [frame]
            image="units/goblins/pillager.png:175"
        [/frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/humans/Outlaw_Assassin.cfg
+++ b/data/core/units/humans/Outlaw_Assassin.cfg
@ -74,6 +74,7 @@
            image="units/human-outlaws/assassin-throwknife[1~2].png:[250,150]"
        [/frame]
        {SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -150}
+        {SOUND:POISON}
        [frame]
            image="units/human-outlaws/assassin.png:100"
        [/frame]
--- a/data/core/units/khalifate/Ghazi.cfg
+++ b/data/core/units/khalifate/Ghazi.cfg
@ -67,5 +67,6 @@
        [/frame]

        {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100}
+        {SOUND:SLOW}
    [/attack_anim]
 [/unit_type]
--- a/data/core/units/khalifate/Khalid.cfg
+++ b/data/core/units/khalifate/Khalid.cfg
@ -74,5 +74,6 @@
        [/frame]

        {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100}
+        {SOUND:SLOW}
    [/attack_anim]
 [/unit_type]
--- a/data/core/units/khalifate/Shuja.cfg
+++ b/data/core/units/khalifate/Shuja.cfg
@ -67,5 +67,6 @@
        [/frame]

        {SOUND:HIT_AND_MISS mace.wav {SOUND_LIST:MISS} -100}
+        {SOUND:SLOW}
    [/attack_anim]
 [/unit_type]
--- a/data/core/units/merfolk/Entangler.cfg
+++ b/data/core/units/merfolk/Entangler.cfg
@ -56,6 +56,7 @@ Mermen often find themselves in a standoff with land-based enemies; the merfolk
            image="units/merfolk/entangler.png:75"
        [/frame]
        {SOUND:HIT_AND_MISS net.wav {SOUND_LIST:MISS} -75}
+        {SOUND:SLOW}
        [frame]
            image="units/merfolk/entangler.png:175"
        [/frame]
--- a/data/core/units/merfolk/Netcaster.cfg
+++ b/data/core/units/merfolk/Netcaster.cfg
@ -80,6 +80,7 @@ The effectiveness of this method led to the development of smaller, weighted net
        [frame]
            image="units/merfolk/netcaster.png:175"
        [/frame]
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/monsters/Cuttle_Fish.cfg
+++ b/data/core/units/monsters/Cuttle_Fish.cfg
@ -60,6 +60,7 @@
            image="units/monsters/cuttlefish-ranged-[1~6].png:100"
        [/frame]
        {SOUND:HIT_AND_MISS squishy-strike.wav squishy-miss.wav -100}
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/monsters/Giant_Scorpion.cfg
+++ b/data/core/units/monsters/Giant_Scorpion.cfg
@ -72,6 +72,7 @@
            image="units/monsters/scorpion/scorpion.png:200"
        [/frame]
        {SOUND:HIT_AND_MISS spear.ogg {SOUND_LIST:MISS} -100}
+        {SOUND:POISON}
        [frame]
            image="units/monsters/scorpion/scorpion.png:100"
        [/frame]
--- a/data/core/units/monsters/Giant_Spider.cfg
+++ b/data/core/units/monsters/Giant_Spider.cfg
@ -58,6 +58,7 @@
            image="units/monsters/spider-ranged-[1~7,3~1].png:75"
        [/frame]
        {SOUND:HIT_AND_MISS net.wav {SOUND_LIST:MISS} -100}
+        {SOUND:SLOW}
    [/attack_anim]
    [attack_anim]
        start_time=-400
@ -68,5 +69,6 @@
            image="units/monsters/spider-melee-[1~13].png:50"
        [/frame]
        {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -50}
+        {SOUND:POISON}
    [/attack_anim]
 [/unit_type]
--- a/data/core/units/monsters/Water_Serpent.cfg
+++ b/data/core/units/monsters/Water_Serpent.cfg
@ -60,6 +60,7 @@
            image=units/monsters/water-serpent-attack-se-[1~6].png:[150*3,200,100,150]
        [/frame]
        {SOUND:HIT_AND_MISS bite-small.ogg {SOUND_LIST:MISS} -50}
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
@ -77,6 +78,7 @@
        [frame]
            image=units/monsters/water-serpent-attack-s-[5~6].png:[100,150]
        [/frame]
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
@ -90,6 +92,7 @@
            image=units/monsters/water-serpent-attack-ne-[1~6].png:[150*3,200,100,150]
        [/frame]
        {SOUND:HIT_AND_MISS bite-small.ogg {SOUND_LIST:MISS} -50}
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
@ -106,5 +109,6 @@
        [frame]
            image=units/monsters/water-serpent-attack-n-[5~6].png:[100,150]
        [/frame]
+        {SOUND:POISON}
    [/attack_anim]
 [/unit_type]
--- a/data/core/units/orcs/Assassin.cfg
+++ b/data/core/units/orcs/Assassin.cfg
@ -85,6 +85,7 @@
            image="units/orcs/assassin-ranged[1,2].png:100"
        [/frame]
        {SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -150}
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/orcs/Nightblade.cfg
+++ b/data/core/units/orcs/Nightblade.cfg
@ -106,6 +106,7 @@
        [/frame]

        {SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -100}
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/orcs/Slayer.cfg
+++ b/data/core/units/orcs/Slayer.cfg
@ -71,6 +71,7 @@
            image="units/orcs/slayer-ranged[1~2].png:[50,100]"
        [/frame]
        {SOUND:HIT_AND_MISS throwing-knife.ogg throwing-knife-miss.ogg -150}
+        {SOUND:POISON}
    [/attack_anim]
    [attack_anim]
        [filter_attack]
--- a/data/core/units/undead/Corpse_Ghast.cfg
+++ b/data/core/units/undead/Corpse_Ghast.cfg
@ -56,5 +56,6 @@
            image="units/undead/ghast-attack-[1~6].png:[100,150,100*4]"
        [/frame]
        {SOUND:HIT_AND_MISS bite.ogg {SOUND_LIST:MISS} -350}
+        {SOUND:POISON}
    [/attack_anim]
 [/unit_type]
--- a/data/core/units/undead/Corpse_Ghoul.cfg
+++ b/data/core/units/undead/Corpse_Ghoul.cfg
@ -57,6 +57,7 @@ It is because of such things that necromancy is condemned with an almost primal
            image="units/undead/ghoul-attack-[1~4].png:[75*2,100,75]"
        [/frame]
        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -125}
+        {SOUND:POISON}
        [frame]
            image="units/undead/ghoul.png:75"
        [/frame]
--- a/data/core/units/undead/Corpse_Necrophage.cfg
+++ b/data/core/units/undead/Corpse_Necrophage.cfg
@ -55,6 +55,7 @@
            image="units/undead/necrophage.png:50"
        [/frame]
        {SOUND:HIT_AND_MISS claws.ogg {SOUND_LIST:MISS} -125}
+        {SOUND:POISON}
        [frame]
            image="units/undead/necrophage-attack-[1~4].png:[75*2,100,75]"
        [/frame]