0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mainline campaigns are wmllint/wmlscope clean again.

Browse source 
Unfortunately, this required telling wmlscope to ignore all present
instances of new-style animation wildcarding. Some rather messy changes
to wmlscope will have to be considered if it gets more widely used.
This commit is contained in:
Eric S. Raymond 2013-03-28 11:33:43 -04:00
parent 31376d4f70
commit 8c044a01db
7 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/core/macros/animation-utils.cfg
View file

@ -252,10 +252,12 @@
[filter_attack]
range={RANGE}
[/filter_attack]
# wmlscope: start ignoring
[frame]
image={BASE_IMAGE}:50,{REACTION_IMAGE}:250,{BASE_IMAGE}:75
halo=halo/elven/elven-shield-halo-[20,40,60,80,100,80,60,40,20]pct.png:[25*2,50*2,100,50,25*3]
[/frame]
# wmlscope: stop ignoring
[if]
hit_sound_start_time=-26
hits=hit
@ -763,12 +765,14 @@
start_time=0
terrain_type={DRAKE_UNWALKABLE_TERRAINS}
submerge=0.01
# wmlscope: start ignoring
[frame]
image="units/drakes/{DRAKE_NAME}-fly-[1~5,4].png:100"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fly-[3,2]-upstroke.png:100"
[/frame]
# wmlscope: stop ignoring
[/standing_anim]
[pre_movement_anim]
start_time=0
@ -780,12 +784,14 @@
[movement_anim]
start_time=0
submerge=0.01
# wmlscope: start ignoring
[frame]
image="units/drakes/{DRAKE_NAME}-fly-[1~5,4].png:100"
[/frame]
[frame]
image="units/drakes/{DRAKE_NAME}-fly-[3,2]-upstroke.png:100"
[/frame]
# wmlscope: stop ignoring
[/movement_anim]
[post_movement_anim]
terrain_type=!,{DRAKE_UNWALKABLE_TERRAINS}
@ -1083,9 +1089,11 @@
#define DRAKE_MOVEMENT_ANIM DRAKE_NAME
[movement_anim]
start_time=0
# wmlscope: start ignoring
[frame]
image="units/drakes/{DRAKE_NAME}-fly-[1~5,4].png:100,units/drakes/{DRAKE_NAME}-fly-[3,2]-upstroke.png:100"
[/frame]
# wmlscope: stop ignoring
[/movement_anim]
#enddef

2
data/core/terrain-graphics/internal-generic.cfg
View file

@ -363,10 +363,12 @@
set_no_flag=transition-@R0
# we put [image] in [tile] for performance reason
# this assumes that the image fit into the hex
# wmlscope: start ignoring
[image]
name={IMAGESTEM}-A[01~15]-@R0.png{IPF}:{TIME}
layer={LAYER}
[/image]
# wmlscope: stop ignoring
[/tile]
[tile]
pos=2

6
data/core/units/drakes/Hurricane.cfg
View file

@ -44,16 +44,20 @@
start_time=0
submerge=0.01
layer=60
# wmlscope: start ignoring
[frame]
image="units/drakes/hurricane-fly-[1~5,4].png:100,units/drakes/hurricane-fly-[3,2]-upstroke.png:100"
[/frame]
# wmlscope: stop ignoring
[/standing_anim]
[movement_anim]
start_time=0
submerge=0.01
# wmlscope: start ignoring
[frame]
image="units/drakes/hurricane-fly-[1~5,4].png:100,units/drakes/hurricane-fly-[3,2]-upstroke.png:100"
[/frame]
# wmlscope: stop ignoring
[/movement_anim]
[attack]
name=slam
@ -78,9 +82,11 @@
[/attack]
[draw_weapon_anim]
#landing, only do it when we are not already flying
# wmlscope: start ignoring
[frame]
image="units/drakes/hurricane-takeoff-[4~1].png:100"
[/frame]
# wmlscope: stop ignoring
[/draw_weapon_anim]
[sheath_weapon_anim]
#landing, only do it when we are not already flying

4
data/core/units/drakes/Sky.cfg
View file

@ -43,16 +43,20 @@
start_time=0
submerge=0.01
layer=60
# wmlscope: start ignoring
[frame]
image="units/drakes/sky-fly-[1~5,4].png:100,units/drakes/sky-fly-[3,2]-upstroke.png:100"
[/frame]
# wmlscope: stop ignoring
[/standing_anim]
[movement_anim]
start_time=0
submerge=0.01
# wmlscope: start ignoring
[frame]
image="units/drakes/sky-fly-[1~5,4].png:100,units/drakes/sky-fly-[3,2]-upstroke.png:100"
[/frame]
# wmlscope: stop ignoring
[/movement_anim]
[attack]
name=slam

2
data/core/units/humans/Mage.cfg
View file

@ -72,7 +72,9 @@ Physically frail, and lacking familiarity with combat, magi do possess certain a
[frame]
image="units/human-magi/mage-attack-magic[1,2,1].png:[100,700,200]"
[/frame]
# wmlscope: start ignoring
{SOUND:HIT_AND_MISS magic-missile-[1~3].ogg magic-missile-[1~3]-miss.ogg -350}
# wmlscope: stop ignoring
[/attack_anim]
[attack_anim]
[filter_attack]

2
data/core/units/humans/Mage_Silver.cfg
View file

@ -78,7 +78,9 @@ Silver magi are often more physically adept than other magi, and their skills ar
[frame]
image="units/human-magi/silver-mage-attack-magic[1,2,1].png:[100,700,200]"
[/frame]
# wmlscope: start ignoring
{SOUND:HIT_AND_MISS magic-missile-[1~3].ogg magic-missile-[1~3]-miss.ogg -350}
# wmlscope: stop ignoring
[/attack_anim]
[attack_anim]
[filter_attack]

2
data/multiplayer/scenarios/2p_Aethermaw.cfg
View file

@ -137,7 +137,7 @@
{PLACE_IMAGE "units/dwarves/runesmith-attack-se-2.png~FL()~RC(magenta>4)" 46 21}
{PLACE_IMAGE "units/dwarves/runesmith-attack-se-4.png~RC(magenta>4)" 49 22}
{PLACE_IMAGE "units/dwarves/sentinel-defend-2.png~RC(magenta>4)" 49 20}
{PLACE_IMAGE "units/dwarves/lord-hammer.png~FL()~RC(magenta>4)" 47 22}
{PLACE_IMAGE "units/dwarves/lord-ne-hammer.png~FL()~RC(magenta>4)" 47 22}
{PLACE_IMAGE "units/human-magi/elder-mage-ranged3.png~FL()~RC(magenta>4)" 44 32}
{PLACE_IMAGE "units/human-magi/mage+female-attack-staff1.png" 46 37}