diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend1.png new file mode 100644 index 000000000000..53f123055f55 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend2.png new file mode 100644 index 000000000000..ecb2875a0dd5 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/champion-defend2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout.png index 4151782f727b..a36fda5ffc9c 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout.png and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/scout.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-shyde.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-shyde.png deleted file mode 100644 index 471ca0c26418..000000000000 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-shyde.png and /dev/null differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-singer.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-singer.png deleted file mode 100644 index 8d98ad67007e..000000000000 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun-singer.png and /dev/null differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-backglow.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-backglow.png index cd825ab1d584..e999008b04a9 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-backglow.png and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-backglow.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-def-flare.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-def-flare.png new file mode 100644 index 000000000000..107248bd4d0f Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-def-flare.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend1.png new file mode 100644 index 000000000000..1ad93191aef9 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend2.png new file mode 100644 index 000000000000..64e4a9e7d66f Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-defend2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend1.png new file mode 100644 index 000000000000..467fe970a48f Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend2.png new file mode 100644 index 000000000000..a06905a47d07 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly-defend2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly1.png new file mode 100644 index 000000000000..7c4f4d11f98c Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly2.png new file mode 100644 index 000000000000..7a5be39e7b55 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly3.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly3.png new file mode 100644 index 000000000000..06c6e0805b2b Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly3.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly4.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly4.png new file mode 100644 index 000000000000..6eba03ab54db Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly4.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly5.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly5.png new file mode 100644 index 000000000000..3004d885eb78 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly5.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly6.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly6.png new file mode 100644 index 000000000000..c825ebde051c Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-fly6.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-stand.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-stand.png index 97810e19de3e..cbf3dff10e08 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-stand.png and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde-stand.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde.png index 6d99646861b4..29fdcf3d1900 100644 Binary files a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde.png and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_shyde/sun-shyde.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend1.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend1.png new file mode 100644 index 000000000000..5adf62539e36 Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend1.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend2.png b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend2.png new file mode 100644 index 000000000000..830506b212dc Binary files /dev/null and b/data/campaigns/Under_the_Burning_Suns/images/units/quenoth/sun_singer/sun-singer-defend2.png differ diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg index 346b9fdfb3b8..8c940bf055aa 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Champion.cfg @@ -41,7 +41,7 @@ number=4 icon=attacks/glaive.png [/attack] - {DEFENSE_ANIM "units/quenoth/champion.png" "units/quenoth/champion.png" {SOUND_LIST:ELF_HIT}} + {DEFENSE_ANIM "units/quenoth/champion-defend2.png" "units/quenoth/champion-defend1.png" {SOUND_LIST:ELF_HIT}} [attack_anim] [filter_attack] name=glaive diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg index 48dcf612bb44..9f823a22ab6d 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Shyde.cfg @@ -46,18 +46,39 @@ {WEAPON_SPECIAL_MAGICAL} [/specials] [/attack] - {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} + # filtering whether she is floating or standing + {DEFENSE_ANIM_FILTERED "units/quenoth/sun_shyde/sun-shyde-fly-defend2.png" "units/quenoth/sun_shyde/sun-shyde-fly-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} ( + terrain_type={QUENOTH_UNWALKABLE_TERRAINS} + )} + {DEFENSE_ANIM_FILTERED "units/quenoth/sun_shyde/sun-shyde-defend2.png" "units/quenoth/sun_shyde/sun-shyde-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} ( + terrain_type=!,{QUENOTH_UNWALKABLE_TERRAINS} + )} + + [movement_anim] + # flame frames are absent because they do some weird lagging thing + start_time=0 + [frame] + image="units/quenoth/sun_shyde/sun-shyde-fly1.png:150" + [/frame] + [/movement_anim] [standing_anim] start_time=0 flame_start_time=0 backglow_start_time=0 - [frame] - image="units/quenoth/sun_shyde/sun-shyde-stand.png" - [/frame] + [if] + terrain_type={QUENOTH_UNWALKABLE_TERRAINS} + [frame] + image="units/quenoth/sun_shyde/sun-shyde-fly[1~6].png:150" + [/frame] + [/if] + [else] + [frame] + image="units/quenoth/sun_shyde/sun-shyde-stand.png" + [/frame] + [/else] [flame_frame] image="{QUENOTH_FLAME_POS 44 0}" - halo="{QUENOTH_FLAME_POS 6 7}" + halo="{QUENOTH_FLAME_POS 4 4}" layer=42 auto_vflip=no auto_hflip=yes @@ -72,14 +93,14 @@ [healing_anim] start_time=-250 [frame] - image="units/quenoth/sun_shyde/sun-shyde.png:50" + image="units/quenoth/sun_shyde/sun-shyde-fly1.png:50" [/frame] [frame] - image="units/quenoth/sun_shyde/sun-shyde.png:350" + image="units/quenoth/sun_shyde/sun-shyde-fly[2~5].png:[80*4]" halo=halo/elven/shaman-heal-halo-[1~7].png [/frame] [frame] - image="units/quenoth/sun_shyde/sun-shyde.png:50" + image="units/quenoth/sun_shyde/sun-shyde-fly6.png:50" [/frame] [/healing_anim] [attack_anim] @@ -87,9 +108,23 @@ name=touch [/filter_attack] start_time=-250 - [frame] - image="units/quenoth/sun_shyde/sun-shyde.png:400" - [/frame] + offset="0~0.6:200,0.6~0:200" + [if] + terrain_type={QUENOTH_UNWALKABLE_TERRAINS} + [frame] + image="units/quenoth/sun_shyde/sun-shyde-fly1.png:400" + [/frame] + [/if] + [else] + [frame] + image="units/quenoth/sun_shyde/sun-shyde.png:400" + [/frame] + [/else] + missile_start_time=0 + [if] + hits=yes + {FIRE_BURST_SMALL} + [/if] {SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -250} [/attack_anim] [attack_anim] @@ -97,13 +132,24 @@ name=faerie fire [/filter_attack] start_time=-350 + elfhalo_start_time=-350 {MISSILE_FRAME_FAERIE_FIRE} - [frame] - image="units/quenoth/sun_shyde/sun-shyde.png" + [if] + terrain_type={QUENOTH_UNWALKABLE_TERRAINS} + [frame] + image="units/quenoth/sun_shyde/sun-shyde-fly1.png" + [/frame] + [/if] + [else] + [frame] + image="units/quenoth/sun_shyde/sun-shyde.png" + [/frame] + [/else] + [elfhalo_frame] duration=500 halo=halo/elven/faerie-fire-halo[1~7].png halo_x,halo_y=14,0 - [/frame] + [/elfhalo_frame] {SOUND:HIT_AND_MISS magic-faeriefire.ogg magic-faeriefire-miss.ogg -350} [/attack_anim] [/unit_type] diff --git a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg index c751653dd20e..4d57dfa60fa5 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg @@ -43,8 +43,7 @@ {WEAPON_SPECIAL_MAGICAL} [/specials] [/attack] - {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} + {DEFENSE_ANIM "units/quenoth/sun_singer/sun-singer-defend2.png" "units/quenoth/sun_singer/sun-singer-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} } [standing_anim] start_time=0 flame_start_time=0 diff --git a/data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg b/data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg index 69e6dc006f38..6f2f82399db9 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg @@ -21,29 +21,7 @@ misc/blank-hex.png~BLIT(units/quenoth/fire/flame-color.png,{X},{Y2})~MASK(units/ {QUENOTH_FLAME_INTERNAL {X} {Y} 4}#enddef +# not all unwalkable, but still supposed to provide some visual cue that movement is different. may need revision. #define QUENOTH_UNWALKABLE_TERRAINS -!,Wwf*^*,Kme*^*,*^B*,!,W*^*,S*^*,Chs*^*,Chw*^*,Cm*^*,Km*^*,Q*^*,Mv*^*,*^Qov,*^Vm#enddef +!,Wwf*^*,Kme*^*,*^B*,!,A*^*,Uu*^*,Uh*^*,*^Uf*,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