upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 21:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

UtBS: wmlindent pass

Browse Source 
[ci skip]

(cherry-picked from commit efa798c72ee4d08322ec888df9c63638e7e33f46)
This commit is contained in:
Charles Dang 2018-04-20 11:39:09 +11:00
parent fd873814b4
commit 041a49ebbc
3 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Singer.cfg
View File

@ -63,7 +63,7 @@
layer=41 layer=41
auto_vflip=no auto_vflip=no
auto_hflip=yes auto_hflip=yes
[/backglow_frame] [/backglow_frame]
[/standing_anim] [/standing_anim]
[healing_anim] [healing_anim]
start_time=-270 start_time=-270

88
data/campaigns/Under_the_Burning_Suns/units/quenoth/Sun_Sylph.cfg
View File

@ -49,34 +49,34 @@
[/attack] [/attack]
# filtering whether she is floating or standing # filtering whether she is floating or standing
{DEFENSE_ANIM_FILTERED "units/quenoth/sun_sylph/sun-sylph-fly-defend2.png" "units/quenoth/sun_sylph/sun-sylph-fly-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} ( {DEFENSE_ANIM_FILTERED "units/quenoth/sun_sylph/sun-sylph-fly-defend2.png" "units/quenoth/sun_sylph/sun-sylph-fly-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
terrain_type={QUENOTH_UNWALKABLE_TERRAINS} terrain_type={QUENOTH_UNWALKABLE_TERRAINS}
)} )}
{DEFENSE_ANIM_FILTERED "units/quenoth/sun_sylph/sun-sylph-defend2.png" "units/quenoth/sun_sylph/sun-sylph-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} ( {DEFENSE_ANIM_FILTERED "units/quenoth/sun_sylph/sun-sylph-defend2.png" "units/quenoth/sun_sylph/sun-sylph-defend1.png" {SOUND_LIST:ELF_FEMALE_HIT} (
terrain_type=!,{QUENOTH_UNWALKABLE_TERRAINS} terrain_type=!,{QUENOTH_UNWALKABLE_TERRAINS}
)} )}
[movement_anim] [movement_anim]
# flame frames are absent because they do some weird lagging thing # flame frames are absent because they do some weird lagging thing
start_time=0 start_time=0
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph-fly1.png:150" image="units/quenoth/sun_sylph/sun-sylph-fly1.png:150"
[/frame] [/frame]
[/movement_anim] [/movement_anim]
[standing_anim] [standing_anim]
start_time=0 start_time=0
flame_start_time=0 flame_start_time=0
backglow_start_time=0 backglow_start_time=0
[if] [if]
terrain_type={QUENOTH_UNWALKABLE_TERRAINS} terrain_type={QUENOTH_UNWALKABLE_TERRAINS}
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph-fly[1~6].png:150" image="units/quenoth/sun_sylph/sun-sylph-fly[1~6].png:150"
[/frame] [/frame]
[/if] [/if]
[else] [else]
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph-stand.png" image="units/quenoth/sun_sylph/sun-sylph-stand.png"
[/frame] [/frame]
[/else] [/else]
[flame_frame] [flame_frame]
image="{QUENOTH_FLAME_POS 44 0}" image="{QUENOTH_FLAME_POS 44 0}"
halo="{QUENOTH_FLAME_POS 4 4}" halo="{QUENOTH_FLAME_POS 4 4}"
@ -89,7 +89,7 @@
layer=41 layer=41
auto_vflip=no auto_vflip=no
auto_hflip=yes auto_hflip=yes
[/backglow_frame] [/backglow_frame]
[/standing_anim] [/standing_anim]
[healing_anim] [healing_anim]
start_time=-250 start_time=-250
@ -97,7 +97,7 @@
image="units/quenoth/sun_sylph/sun-sylph-fly1.png:50" image="units/quenoth/sun_sylph/sun-sylph-fly1.png:50"
[/frame] [/frame]
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph-fly[2~5].png:[80*4]" image="units/quenoth/sun_sylph/sun-sylph-fly[2~5].png:[80*4]"
halo=halo/elven/shaman-heal-halo-[1~7].png halo=halo/elven/shaman-heal-halo-[1~7].png
[/frame] [/frame]
[frame] [frame]
@ -109,23 +109,23 @@
name=touch name=touch
[/filter_attack] [/filter_attack]
start_time=-250 start_time=-250
offset="0~0.6:200,0.6~0:200" offset="0~0.6:200,0.6~0:200"
[if] [if]
terrain_type={QUENOTH_UNWALKABLE_TERRAINS} terrain_type={QUENOTH_UNWALKABLE_TERRAINS}
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph-fly1.png:400" image="units/quenoth/sun_sylph/sun-sylph-fly1.png:400"
[/frame] [/frame]
[/if] [/if]
[else] [else]
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph.png:400" image="units/quenoth/sun_sylph/sun-sylph.png:400"
[/frame] [/frame]
[/else] [/else]
missile_start_time=0 missile_start_time=0
[if] [if]
hits=yes hits=yes
{FIRE_BURST_SMALL} {FIRE_BURST_SMALL}
[/if] [/if]
{SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -250} {SOUND:HIT_AND_MISS flame-big.ogg flame-big-miss.ogg -250}
[/attack_anim] [/attack_anim]
[attack_anim] [attack_anim]
@ -135,17 +135,17 @@
start_time=-350 start_time=-350
elfhalo_start_time=-350 elfhalo_start_time=-350
{MISSILE_FRAME_FAERIE_FIRE} {MISSILE_FRAME_FAERIE_FIRE}
[if] [if]
terrain_type={QUENOTH_UNWALKABLE_TERRAINS} terrain_type={QUENOTH_UNWALKABLE_TERRAINS}
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph-fly1.png" image="units/quenoth/sun_sylph/sun-sylph-fly1.png"
[/frame] [/frame]
[/if] [/if]
[else] [else]
[frame] [frame]
image="units/quenoth/sun_sylph/sun-sylph.png" image="units/quenoth/sun_sylph/sun-sylph.png"
[/frame] [/frame]
[/else] [/else]
[elfhalo_frame] [elfhalo_frame]
duration=500 duration=500
halo=halo/elven/faerie-fire-halo[1~7].png halo=halo/elven/faerie-fire-halo[1~7].png

26
data/campaigns/Under_the_Burning_Suns/utils/animation_macros.cfg
View File

@ -7,21 +7,19 @@
misc/blank-hex.png~BLIT(units/quenoth/fire/flame-color.png,{X},{Y2})~MASK(units/quenoth/fire/flame-mask.png,{X},{Y}):75#enddef 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 #define QUENOTH_FLAME_POS X Y
{QUENOTH_FLAME_INTERNAL {X} {Y} 15}, {QUENOTH_FLAME_INTERNAL {X} {Y} 15},
{QUENOTH_FLAME_INTERNAL {X} {Y} 14}, {QUENOTH_FLAME_INTERNAL {X} {Y} 14},
{QUENOTH_FLAME_INTERNAL {X} {Y} 13}, {QUENOTH_FLAME_INTERNAL {X} {Y} 13},
{QUENOTH_FLAME_INTERNAL {X} {Y} 12}, {QUENOTH_FLAME_INTERNAL {X} {Y} 12},
{QUENOTH_FLAME_INTERNAL {X} {Y} 11}, {QUENOTH_FLAME_INTERNAL {X} {Y} 11},
{QUENOTH_FLAME_INTERNAL {X} {Y} 10}, {QUENOTH_FLAME_INTERNAL {X} {Y} 10},
{QUENOTH_FLAME_INTERNAL {X} {Y} 9}, {QUENOTH_FLAME_INTERNAL {X} {Y} 9},
{QUENOTH_FLAME_INTERNAL {X} {Y} 8}, {QUENOTH_FLAME_INTERNAL {X} {Y} 8},
{QUENOTH_FLAME_INTERNAL {X} {Y} 7}, {QUENOTH_FLAME_INTERNAL {X} {Y} 7},
{QUENOTH_FLAME_INTERNAL {X} {Y} 6}, {QUENOTH_FLAME_INTERNAL {X} {Y} 6},
{QUENOTH_FLAME_INTERNAL {X} {Y} 5}, {QUENOTH_FLAME_INTERNAL {X} {Y} 5},
{QUENOTH_FLAME_INTERNAL {X} {Y} 4}#enddef {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. # not all unwalkable, but still supposed to provide some visual cue that movement is different. may need revision.
#define QUENOTH_UNWALKABLE_TERRAINS #define QUENOTH_UNWALKABLE_TERRAINS
!,Wwf*^*,Kme*^*,*^B*,!,A*^*,Uu*^*,Uh*^*,*^Uf*,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