DM: Expand use of wmllint validate to silence warnings

wesnoth · Jul 29, 2019 · 887dd1c · 887dd1c
1 parent 31e1a21
commit 887dd1c
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 7 deletions.
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/01_Overture.cfg
@@ -9,6 +9,7 @@
 
     {INTRO_AND_SCENARIO_MUSIC revelation.ogg heroes_rite.ogg}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -45,6 +46,7 @@
         {NAMED_UNIT 2 (Great Mage)  8  13 "Third Oracle"  (_"Third Oracle")  (profile=portraits/oracle3.png)} {FACING nw}
         {NAMED_UNIT 2 (Great Mage)  6  11 "Fourth Oracle" (_"Fourth Oracle") (profile=portraits/oracle4.png)} {FACING ne}
     [/side]
+    # wmllint: validate-on
 
     [story]
         [part]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/02_This_Valley_Belongs_to_Me.cfg
@@ -14,6 +14,7 @@
 
     {MEMOIRS_ITEM_WELL 24 19}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -53,6 +54,7 @@
             village_value=2 # they want to pillage!
         [/ai]
     [/side]
+    # wmllint: validate-on
 
     [story]
         [part]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/03_The_Road_to_Weldyn.cfg
@@ -14,6 +14,7 @@
 
     {DM_TRACK {SEARCH_STAGE3}}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -57,6 +58,7 @@
             caution=0.50
         [/ai]
     [/side]
+    # wmllint: validate-on
 
     {SET_LABEL  9  4 ( _"The Great Valley" )}
     {SET_LABEL  6 16 ( _"Fort Brell" )} # wmllint: no spellcheck

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/04_Leollyn.cfg
@@ -14,6 +14,7 @@
 
     {DM_TRACK {SEARCH_STAGE4}}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -99,6 +100,7 @@
             aggression=0.0
         [/ai]
     [/side]
+    # wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/05_Council_in_Weldyn.cfg
@@ -11,6 +11,7 @@
 
     {DM_TRACK {SEARCH_STAGE5}}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -50,6 +51,7 @@
             facing=se
         [/unit]
     [/side]
+    # wmllint: validate-on
 
     [event]
         name=start

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/06_Swamps_of_Illuven.cfg
@@ -15,6 +15,7 @@
 
     {DM_TRACK {SEARCH_STAGE6}}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -74,6 +75,7 @@
         [/ai]
     [/side]
     {STARTING_VILLAGES 3 4}
+    # wmllint: validate-on
 
     # reward for the player who defeats Garrath without paying him
     {PLACE_IMAGE items/chest-plain-closed.png 4 3}

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/07_Night_in_the_Swamp.cfg
@@ -29,6 +29,7 @@
 
     {DM_TRACK {SEARCH_STAGE7}}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -52,6 +53,7 @@
         {FLAG_VARIANT undead}
         no_leader=yes
     [/side]
+    # wmllint: validate-on
 
 #ifdef EASY
     {MEMOIRS_GENERATOR_SKELETON 18 3}

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/08_Ur_Thorodor.cfg
@@ -15,6 +15,7 @@
 
     {DM_TRACK {SEARCH_STAGE8}}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -66,6 +67,7 @@
         user_team_name= _ "Pillagers"
         no_leader=yes
     [/side]
+    # wmllint: validate-on
 
     [event]
         name=start

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/09_Houses_of_the_Undead.cfg
@@ -12,6 +12,7 @@
     # Could use "The Deep Path", but monotony is what we want here
     {SCENARIO_MUSIC underground.ogg}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -70,6 +71,7 @@
         user_team_name= _ "Undead Followers"
         no_leader=yes
     [/side]
+    # wmllint: validate-on
 
     [story]
         [part]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/10_The_Gate_Between_Worlds.cfg
@@ -10,6 +10,7 @@
     # Could use "The Deep Path", but monotony is what we want here
     {SCENARIO_MUSIC underground.ogg}
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -36,6 +37,7 @@
         [/leader]
     [/side]
     {STARTING_VILLAGES 2 5}
+    # wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
@@ -16,6 +16,7 @@
 
     {DM_TRACK {CHANTAL_STAGE1} }
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -73,6 +74,7 @@
         {CAPTURE_VILLAGES 3 33 11 1}
         {CAPTURE_VILLAGES 3 21 12 1}
     [/event]
+    # wmllint: validate-on
 
     # Move hero to the starting position, and eat recall list
     [event]

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/12_Terror_at_the_Ford_of_Parthyn.cfg
@@ -15,6 +15,7 @@
 
     {DM_TRACK {CHANTAL_STAGE2} }
 
+    # wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -163,6 +164,7 @@
     [/side]
     # Mages get the villages right near their keep
     {STARTING_VILLAGES 5 2}
+    # wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/13_The_Return_of_Trouble.cfg
@@ -44,7 +44,6 @@
         canrecruit=yes
         facing=sw
     [/side]
-    # wmllint: validate-on
 
     ### Protagonist switching ###
     [event]
@@ -172,6 +171,7 @@
             facing=nw
         [/leader]
     [/side]
+    # wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/14_Shadows.cfg
@@ -37,7 +37,6 @@
             placement=leader
         [/unit]
     [/side]
-    #wmllint: validate-on
 
     [side]
         side=2
@@ -113,6 +112,7 @@
             aggression=0.2
         [/ai]
     [/side]
+    #wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/15_Save_the_King.cfg
@@ -46,7 +46,6 @@
             placement=leader
         [/unit]
     [/side]
-    #wmllint: validate-on
 
     [side]
         side=2
@@ -173,6 +172,7 @@
             facing=sw
         [/leader]
     [/side]
+    #wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/17_A_New_Ally.cfg
@@ -26,6 +26,7 @@
     [/story]
     {DM_TRACK {TRIUMPH_STAGE1}}
 
+    #wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -91,6 +92,7 @@
             facing=sw
         [/leader]
     [/side]
+    #wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/18_The_Portal_of_Doom.cfg
@@ -30,6 +30,7 @@
     [/story]
     {DM_TRACK {TRIUMPH_STAGE2}}
 
+    #wmllint: validate-off
     [side]
         side=1
         controller=human
@@ -161,6 +162,7 @@
         {FLAG_VARIANT undead}
         no_leader=yes #Iliah-Malal arrives later
     [/side]
+    #wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/19_Showdown_in_the_Northern_Swamp.cfg
@@ -42,7 +42,6 @@
             placement=leader
         [/unit]
     [/side]
-    #wmllint: validate-on
     [event]
         name=prestart
         {KALENZ_REJOINS_DELFADOR 26 22}
@@ -142,6 +141,7 @@
             recruitment_pattern=scout,fighter,archer
         [/ai]
     [/side]
+    #wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/20_Prince_of_Wesnoth.cfg
@@ -54,7 +54,6 @@
         canrecruit=yes
         placement=leader
     [/side]
-    #wmllint: validate-on
     {STARTING_VILLAGES_ALL 1}
     [event]
         name=prestart
@@ -112,6 +111,7 @@
             caution=0.0
         [/ai]
     [/side]
+    #wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/21_Clash_at_the_Manor.cfg
@@ -60,7 +60,6 @@
             placement=leader
         [/unit]
     [/side]
-    # wmllint: validate-on
     [event]
         name=prestart
         {MODIFY_UNIT (side=1) facing ne}
@@ -111,6 +110,7 @@
         [/ai]
     [/side]
     {LIMIT_CONTEMPORANEOUS_RECRUITS 2 (Royal Guard) 1}
+    # wmllint: validate-on
 
     [event]
         name=prestart

diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/22_Face_of_the_Enemy.cfg
@@ -44,7 +44,6 @@
             placement=leader
         [/unit]
     [/side]
-    #wmllint: validate-on
 
     [side]
         side=2
@@ -82,6 +81,7 @@
             [/goal]
         [/ai]
     [/side]
+    #wmllint: validate-on
 
     [event]
         name=prestart