[UtBS] Quenoth Mystic and Sun Singer line animations (#2579)

* Initial pass at sun singer animations

* adding sun-shyde and generalizing fire animations

* sun-singer healing anim, and change of default image

* mystic healing animation, and move mystic images to sub-directory

* harmonized sprite file naming scheme for sun-shyde with sun-singer

data/campaigns/Under_the_Burning_Suns/units/quenoth/Mystic.cfg

@@ -5,7 +5,7 @@
     name= _ "female^Quenoth Mystic"
     race=elf
     gender=female
-    image=units/quenoth/mystic.png
+    image=units/quenoth/mystic/mystic.png
     hitpoints=26
     movement_type=quenoth_foot
     movement=5
@@ -44,18 +44,18 @@
             {WEAPON_SPECIAL_DAZE}
         [/specials]
     [/attack]
-    {DEFENSE_ANIM "units/quenoth/mystic-defend-2.png" "units/quenoth/mystic-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} }
+    {DEFENSE_ANIM "units/quenoth/mystic/mystic-defend-2.png" "units/quenoth/mystic/mystic-defend-1.png" {SOUND_LIST:ELF_FEMALE_HIT} }
     [healing_anim]
-        start_time=-250
+        start_time=-450
         [frame]
-            image="units/quenoth/mystic.png:50"
+            image="units/quenoth/mystic/mystic.png:50"
         [/frame]
         [frame]
-            image="units/quenoth/mystic.png:350"
+            image="units/quenoth/mystic/mystic-heal-[1~8].png:70"
             halo=halo/elven/shaman-heal-halo-[1~7].png
         [/frame]
         [frame]
-            image="units/quenoth/mystic.png:50"
+            image="units/quenoth/mystic/mystic.png:50"
         [/frame]
     [/healing_anim]
     [attack_anim]
@@ -64,7 +64,7 @@
         [/filter_attack]
         start_time=-250
         [frame]
-            image="units/quenoth/mystic.png:400"
+            image="units/quenoth/mystic/mystic.png:400"
         [/frame]
         {SOUND:HIT_AND_MISS staff.ogg staff-miss.ogg -125}
     [/attack_anim]
@@ -81,7 +81,7 @@
         [/missile_frame]
         start_time=-320
         [frame]
-            image="units/quenoth/mystic.png:450"
+            image="units/quenoth/mystic/mystic.png:450"
             sound=petrified.ogg
         [/frame]
     [/attack_anim]

data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg

@@ -5,7 +5,7 @@
     name= _ "female^Quenoth Sun Sylph"
     race=elf
     gender=female
-    image=units/quenoth/sun-shyde.png
+    image=units/quenoth/sun_shyde/sun-shyde.png
     halo=halo/illuminates-aura.png
     hitpoints=59
     movement_type=quenoth_float
@@ -46,18 +46,40 @@
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
     [/attack]
-    {DEFENSE_ANIM "units/quenoth/sun-shyde.png" "units/quenoth/sun-shyde.png" {SOUND_LIST:ELF_FEMALE_HIT} }
+    {DEFENSE_ANIM "units/quenoth/sun_shyde/sun-shyde.png" "units/quenoth/sun_shyde/sun-shyde.png" {SOUND_LIST:ELF_FEMALE_HIT} }
+    {QE_SUN_FLYING_ANIM sun_shyde/sun-shyde}
+    [standing_anim]
+        start_time=0
+        flame_start_time=0
+        backglow_start_time=0
+        [frame]
+            image="units/quenoth/sun_shyde/sun-shyde-stand.png"
+        [/frame]
+        [flame_frame]
+            image="{QUENOTH_FLAME_POS 44 0}"
+            halo="{QUENOTH_FLAME_POS 6 7}"
+            layer=42
+            auto_vflip=no
+            auto_hflip=yes
+        [/flame_frame]
+        [backglow_frame]
+            image="units/quenoth/sun_shyde/sun-shyde-backglow.png"
+            layer=41
+            auto_vflip=no
+            auto_hflip=yes
+        [/backglow_frame] 
+    [/standing_anim]
     [healing_anim]
         start_time=-250
         [frame]
-            image="units/quenoth/sun-shyde.png:50"
+            image="units/quenoth/sun_shyde/sun-shyde.png:50"
         [/frame]
         [frame]
-            image="units/quenoth/sun-shyde.png:350"
+            image="units/quenoth/sun_shyde/sun-shyde.png:350"
             halo=halo/elven/shaman-heal-halo-[1~7].png
         [/frame]
         [frame]
-            image="units/quenoth/sun-shyde.png:50"
+            image="units/quenoth/sun_shyde/sun-shyde.png:50"
         [/frame]
     [/healing_anim]
     [attack_anim]
@@ -66,7 +88,7 @@
         [/filter_attack]
         start_time=-250
         [frame]
-            image="units/quenoth/sun-shyde.png:400"
+            image="units/quenoth/sun_shyde/sun-shyde.png:400"
         [/frame]
         {SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -250}
     [/attack_anim]
@@ -77,7 +99,7 @@
         start_time=-350
         {MISSILE_FRAME_FAERIE_FIRE}
         [frame]
-            image="units/quenoth/sun-shyde.png"
+            image="units/quenoth/sun_shyde/sun-shyde.png"
             duration=500
             halo=halo/elven/faerie-fire-halo[1~7].png
             halo_x,halo_y=14,0

data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg

@@ -5,7 +5,7 @@
     name= _ "female^Quenoth Sun Singer"
     race=elf
     gender=female
-    image=units/quenoth/sun-singer.png
+    image=units/quenoth/sun_singer/sun-singer.png
     hitpoints=50
     movement_type=quenoth_float
     movement=5
@@ -43,18 +43,39 @@
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
     [/attack]
-    {DEFENSE_ANIM "units/quenoth/sun-singer.png" "units/quenoth/sun-singer.png" {SOUND_LIST:ELF_FEMALE_HIT} }
+    {DEFENSE_ANIM "units/quenoth/sun_singer/sun-singer.png" "units/quenoth/sun_singer/sun-singer.png" {SOUND_LIST:ELF_FEMALE_HIT} }
+    {QE_SUN_FLYING_ANIM sun_singer/sun-singer}
+    [standing_anim]
+        start_time=0
+        flame_start_time=0
+        backglow_start_time=0
+        [frame]
+            image="units/quenoth/sun_singer/sun-singer-stand.png"
+        [/frame]
+        [flame_frame]
+            image="{QUENOTH_FLAME_POS 38 0}"
+            layer=42
+            auto_vflip=no
+            auto_hflip=yes
+        [/flame_frame]
+        [backglow_frame]
+            image="units/quenoth/sun_singer/sun-singer-backglow.png"
+            layer=41
+            auto_vflip=no
+            auto_hflip=yes
+        [/backglow_frame] 
+    [/standing_anim]
     [healing_anim]
-        start_time=-250
+        start_time=-270
         [frame]
-            image="units/quenoth/sun-singer.png:50"
+            image="units/quenoth/sun_singer/sun-singer-heal-[1,2].png:70"
         [/frame]
         [frame]
-            image="units/quenoth/sun-singer.png:350"
-            halo=halo/elven/shaman-heal-halo-[1~7].png
+            image="units/quenoth/sun_singer/sun-singer-heal-[3~8].png:90"
+            halo=halo/elven/shaman-heal-halo-[1~7].png~O(0.8)~CS(30,-15,-35)~SCALE(108,108)
         [/frame]
         [frame]
-            image="units/quenoth/sun-singer.png:50"
+            image="units/quenoth/sun_singer/sun-singer.png:50"
         [/frame]
     [/healing_anim]
     [attack_anim]
@@ -63,7 +84,7 @@
         [/filter_attack]
         start_time=-250
         [frame]
-            image="units/quenoth/sun-singer.png:400"
+            image="units/quenoth/sun_singer/sun-singer.png:400"
         [/frame]
         {SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -250}
     [/attack_anim]
@@ -74,7 +95,7 @@
         start_time=-350
         {MISSILE_FRAME_FAERIE_FIRE}
         [frame]
-            image="units/quenoth/sun-singer.png"
+            image="units/quenoth/sun_singer/sun-singer.png"
             duration=500
             halo=halo/elven/faerie-fire-halo[1~7].png
             halo_x,halo_y=14,0

data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg

@@ -0,0 +1,49 @@
+#textdomain wesnoth-utbs
+# Macros for setting animations.
+
+# Quenoth elf animation macros
+
+#define QUENOTH_FLAME_INTERNAL X Y Y2
+misc/blank-hex.png~BLIT(units/quenoth/fire/flame-color.png,{X},{Y2})~MASK(units/quenoth/fire/flame-mask.png,{X},{Y}):75#enddef
+
+#define QUENOTH_FLAME_POS X Y
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 15},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 14},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 13},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 12},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 11},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 10},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 9},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 8},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 7},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 6},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 5},
+		  {QUENOTH_FLAME_INTERNAL {X} {Y} 4}#enddef
+
+
+#define QUENOTH_UNWALKABLE_TERRAINS
+!,Wwf*^*,Kme*^*,*^B*,!,W*^*,S*^*,Chs*^*,Chw*^*,Cm*^*,Km*^*,Q*^*,Mv*^*,*^Qov,*^Vm#enddef
+
+# adapted (and simplified) from drake animations, may need more adjustments
+
+#define QE_SUN_FLYING_ANIM SUN_NAME
+    [standing_anim] 
+        start_time=0
+        terrain_type={QUENOTH_UNWALKABLE_TERRAINS}
+        # wmlscope: start ignoring
+        [frame]
+            image="units/quenoth/{SUN_NAME}.png:100"
+#            image="units/quenoth/{SUN_NAME}-fly-[1~3,2].png:100"
+        [/frame]
+        # wmlscope: stop ignoring
+    [/standing_anim]
+    [movement_anim]
+        start_time=0
+        # wmlscope: start ignoring
+        [frame]
+            image="units/quenoth/{SUN_NAME}.png:100"
+#            image="units/drakes/{SUN_NAME}-fly-[1~3,2].png:100"
+        [/frame]
+        # wmlscope: stop ignoring
+    [/movement_anim]
+#enddef