From 8c044a01db213eb27394403e2bc53bae28d06450 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 28 Mar 2013 11:33:43 -0400 Subject: [PATCH] Mainline campaigns are wmllint/wmlscope clean again. 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. --- data/core/macros/animation-utils.cfg | 8 ++++++++ data/core/terrain-graphics/internal-generic.cfg | 2 ++ data/core/units/drakes/Hurricane.cfg | 6 ++++++ data/core/units/drakes/Sky.cfg | 4 ++++ data/core/units/humans/Mage.cfg | 2 ++ data/core/units/humans/Mage_Silver.cfg | 2 ++ data/multiplayer/scenarios/2p_Aethermaw.cfg | 2 +- 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/data/core/macros/animation-utils.cfg b/data/core/macros/animation-utils.cfg index c5db2719dc0..71aaf9c1a2b 100644 --- a/data/core/macros/animation-utils.cfg +++ b/data/core/macros/animation-utils.cfg @@ -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 diff --git a/data/core/terrain-graphics/internal-generic.cfg b/data/core/terrain-graphics/internal-generic.cfg index bdfcc48a288..62d2cbd8011 100644 --- a/data/core/terrain-graphics/internal-generic.cfg +++ b/data/core/terrain-graphics/internal-generic.cfg @@ -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 diff --git a/data/core/units/drakes/Hurricane.cfg b/data/core/units/drakes/Hurricane.cfg index e6854b3db38..d18ffc99234 100644 --- a/data/core/units/drakes/Hurricane.cfg +++ b/data/core/units/drakes/Hurricane.cfg @@ -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 diff --git a/data/core/units/drakes/Sky.cfg b/data/core/units/drakes/Sky.cfg index 85b71afe5f9..3b36365c590 100644 --- a/data/core/units/drakes/Sky.cfg +++ b/data/core/units/drakes/Sky.cfg @@ -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 diff --git a/data/core/units/humans/Mage.cfg b/data/core/units/humans/Mage.cfg index 538813523c0..c777c6bf862 100644 --- a/data/core/units/humans/Mage.cfg +++ b/data/core/units/humans/Mage.cfg @@ -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] diff --git a/data/core/units/humans/Mage_Silver.cfg b/data/core/units/humans/Mage_Silver.cfg index 681ead764f2..0e4dfc4d144 100644 --- a/data/core/units/humans/Mage_Silver.cfg +++ b/data/core/units/humans/Mage_Silver.cfg @@ -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] diff --git a/data/multiplayer/scenarios/2p_Aethermaw.cfg b/data/multiplayer/scenarios/2p_Aethermaw.cfg index 1ec14c56eac..b4efcabc0b5 100644 --- a/data/multiplayer/scenarios/2p_Aethermaw.cfg +++ b/data/multiplayer/scenarios/2p_Aethermaw.cfg @@ -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}