Merge Wose Shaman animations from Earth-Cake's PR #4229

changelog.md

@@ -8,6 +8,7 @@
    * When the forum user handler is enabled, the Multiplayer Moderators group is now also used when determining if someone is a moderator. (PR#4136)
  ### Units
    * Fix typo in the Dune Ranger's advancements
+   * Additional animations for the Wose Shaman (PR#4229)
    * Move Wose Shaman from DM and WoV to core (PR#4226)
    * Move Wose Sapling from TRoW to core (PR#4226)
  ### Miscellaneous and bug fixes

data/core/units/wose/Wose_Shaman.cfg

@@ -4,25 +4,16 @@
     name=_ "Wose Shaman"
     race=wose
     image=units/woses/wose-shaman.png
-    [standing_anim]
-        start_time=0
-        [frame]
-            image="units/woses/wose-shaman.png"
-            halo="halo/woses/shaman-stationary-halo[1~8].png:150"
-        [/frame]
-    [/standing_anim]
-    {DEFENSE_ANIM units/woses/wose-shaman.png units/woses/wose-shaman.png {SOUND_LIST:HUMAN_OLD_HIT}}
+    [abilities]
+        {ABILITY_AMBUSH}
+        {ABILITY_REGENERATES}
+    [/abilities]
 #ifdef ENABLE_WOSE_SHAMAN
     [advancefrom]
         unit=Wose
         experience=80
     [/advancefrom]
 #endif
-    die_sound=wose-die.ogg
-    [abilities]
-        {ABILITY_AMBUSH}
-        {ABILITY_REGENERATES}
-    [/abilities]
     hitpoints=50
     movement_type=treefolk
     movement=3
@@ -34,6 +25,16 @@
     cost=40
     usage=mixed fighter
     description=_"These woses are able to command forest plants such as vines and creepers to hinder their enemies."+{SPECIAL_NOTES}+{SPECIAL_NOTES_AMBUSH}+{SPECIAL_NOTES_REGENERATES}+{SPECIAL_NOTES_SLOW}
+    die_sound=wose-die.ogg
+    [standing_anim]
+        start_time=0
+        [frame]
+            image="units/woses/wose-shaman.png"
+            halo="halo/woses/shaman-stationary-halo[1~8].png:150"
+        [/frame]
+    [/standing_anim]
+    {DEFENSE_ANIM "units/woses/wose-shaman-defend.png" "units/woses/wose-shaman-defend.png" wose-hit.ogg }
+
     [attack]
         name=crush
         description=_"crush"
@@ -60,9 +61,9 @@
         [/filter_attack]
         start_time=-500
         {SOUND:HIT_AND_MISS wose-attack.ogg wose-miss.ogg -500}
-        #    [frame]
-        #        image=units/woses/wose-shaman-attack-[1~2].png:[400,225]
-        #    [/frame]
+        [frame]
+            image=units/woses/wose-shaman-attack-[1~4].png:150
+        [/frame]
     [/attack_anim]
     [attack_anim]
         [filter_attack]
@@ -75,6 +76,7 @@
             image=projectiles/entangle.png
             image_diagonal=projectiles/entangle.png
         [/missile_frame]
+
         start_time=-300
         attack_sound_start_time=-100
 
@@ -83,7 +85,7 @@
         [/attack_sound_frame]
 
         [frame]
-            image="units/woses/wose-shaman.png"
+            image=units/woses/wose-shaman-attack-ranged-[1,2,1].png:[400,225,75]
             halo="halo/elven/nature-halo[1~8].png:75"
         [/frame]
     [/attack_anim]