wmllint run on core, campaigns and multiplayer directories

wesnoth · Mar 24, 2016 · 2cd4298 · 2cd4298
1 parent 56b8ed9
commit 2cd4298
Show file tree

Hide file tree

Showing 38 changed files with 65 additions and 65 deletions.
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/16_Dark_Sky_Over_Weldyn.cfg
@@ -61,7 +61,7 @@
             story={CAPTION ( _ "Delfador")} + _ "I have fought these things, and I know what I am talking about. This is a deadly serious threat."
         [/part]
         [part]
-            background="portraits/humans/transparent/mage-red.png"
+            background="portraits/humans/mage-red.png"
             #background=story/portraits/Artuman.png
             story={CAPTION ( _ "Artuman")} + _ "Are you saying Master Sagus speaks idly? Somebody needs to teach you respect!"
         [/part]

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
@@ -60,7 +60,7 @@
         type=Orcish Warlord
         id=Borth
         name= _ "Borth"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
 
         facing=se
@@ -97,7 +97,7 @@
         type=Orcish Warlord
         id="P'Gareth"
         name= _ "P’Gareth"
-        profile=portraits/orcs/transparent/grunt-3.png
+        profile=portraits/orcs/grunt-3.png
         canrecruit=yes
 
         facing=ne
@@ -134,7 +134,7 @@
         type=Orcish Warlord
         id="K'Vark"
         name= _ "K’Vark"
-        profile=portraits/orcs/transparent/grunt-5.png
+        profile=portraits/orcs/grunt-5.png
         canrecruit=yes
 
         facing=nw

diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
@@ -64,7 +64,7 @@
         type=Orcish Warlord
         id=Borth
         name= _ "Borth"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
 
         facing=sw

diff --git a/data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg b/data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
@@ -277,6 +277,7 @@
                 [message]
                     speaker=narrator
                     message= _ "Some time later..."
+                    image=wesnoth-icon.png
                 [/message]
 
                 [endlevel]

diff --git a/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg b/data/campaigns/Eastern_Invasion/scenarios/11_Captured.cfg
@@ -40,7 +40,7 @@
         type=Orcish Warlord
         id=King Dra-Nak
         name= _ "King Dra-Nak"
-        profile=portraits/orcs/transparent/grunt-5.png
+        profile=portraits/orcs/grunt-5.png
         facing=sw
         side=2
         canrecruit=yes

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
@@ -178,7 +178,7 @@
         name= _ "Urug-Telfar"
         side=2
         canrecruit=yes
-        image=portraits/orcs/transparent/grunt-2.png
+        image=portraits/orcs/grunt-2.png
         recruit=Orcish Warrior,Goblin Knight,Goblin Pillager,Orcish Crossbowman,Orcish Assassin,Troll
         gold=400
         [ai]

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
@@ -75,7 +75,7 @@
         type=Grand Knight
         id=Kaylan
         name= _ "Sir Kaylan"
-        profile=portraits/humans/transparent/grand-knight-2.png
+        profile=portraits/humans/grand-knight-2.png
 
         side=2
         canrecruit=yes
@@ -100,7 +100,7 @@
         type=Orcish Warrior
         id=Mokolo Qimur
         name= _ "Mokolo Qimur"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         side=3
         canrecruit=yes
         team_name=orcs

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
@@ -63,7 +63,7 @@
         name= _ "Dwaba-Kukai"
         side=2
         canrecruit=yes
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         recruit=Vampire Bat,Naga Fighter
         [ai]
             recruitment_pattern=scout,fighter

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
@@ -282,7 +282,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         type=Orcish Warrior
         id=Qumseh
         name= _ "Qumseh"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
         x=28
         y=2
@@ -319,7 +319,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         type=Orcish Warrior
         id=Graur-Tan
         name= _ "Graur-Tan"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
         x=2
         y=4

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/03_Kalian_under_Attack.cfg
@@ -455,7 +455,7 @@
             type=Orcish Warlord
             id=Mutaf-uru
             name= _ "Mutaf-uru"
-            profile=portraits/orcs/transparent/grunt-2.png
+            profile=portraits/orcs/grunt-2.png
             side=7
             canrecruit=yes
             x=9

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/07_Elves_Last_Stand.cfg
@@ -249,7 +249,7 @@
             type=Orcish Warlord
             id=Urug-Pir
             name=_ "Urug-Pir"
-            profile=portraits/orcs/transparent/grunt-2.png
+            profile=portraits/orcs/grunt-2.png
             canrecruit=yes
             x=6
             y=23
@@ -557,7 +557,7 @@
             x=1
             y=43
             facing=ne
-            profile=portraits/orcs/transparent/grunt-2.png
+            profile=portraits/orcs/grunt-2.png
         [/unit]
         {MOVE_UNIT id=Pirorr 1 41}
 

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
@@ -179,7 +179,7 @@ Chapter Four"
             type=Orcish Warlord
             id=Tan-Grub
             name=_ "Tan-Grub"
-            profile="portraits/orcs/transparent/warlord.png"
+            profile="portraits/orcs/warlord.png"
             canrecruit=yes
             x=10
             y=33
@@ -332,7 +332,7 @@ Chapter Four"
             speaker=narrator
             message= _ "The brazen cry of a war-horn is heard in the distance."
             sound=horn-signals/horn-2.ogg
-            image="portraits/goblins/transparent/rouser-2.png"
+            image="portraits/goblins/rouser-2.png"
         [/message]
 
         [unit]
@@ -605,7 +605,7 @@ Chapter Four"
             message= _ "The not-at-all-brazen cry of a war-horn is heard in the distance."
             #TODO rethink about which signal to use here
             sound=horn-signals/horn-8.ogg
-            image="portraits/goblins/transparent/rouser-2.png"
+            image="portraits/goblins/rouser-2.png"
         [/message]
 
         [endlevel]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
@@ -97,7 +97,7 @@
         type=Orcish Warlord
         id=Tamitahan
         name=_ "Tamitahan"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         side=3
         allow_player=no
         canrecruit=yes
@@ -137,7 +137,7 @@
         id=Khrubar
         type=Orcish Warlord
         name=_ "Khrubar"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
         {GOLD 100 100 100 }
 #ifdef EASY
@@ -169,7 +169,7 @@
         type=Orcish Warlord
         id=Gvur
         name=_ "Gvur"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         side=5
         allow_player=no
         canrecruit=yes
@@ -206,7 +206,7 @@
         type=Orcish Warlord
         id=Ozul
         name=_ "Ozul"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         side=6
         allow_player=no
         canrecruit=yes

diff --git a/data/campaigns/Legend_of_Wesmere/units/Great_Ogre.cfg b/data/campaigns/Legend_of_Wesmere/units/Great_Ogre.cfg
@@ -15,7 +15,7 @@
     #original movement was 4, raised to 5 to avoid RIPLIB. Elvish_Hunter
     movement=5
     #Wired mainline Ogre portrait. Elvish_Hunter
-    profile="portraits/monsters/transparent/ogre.png"
+    profile="portraits/monsters/ogre.png"
     #It advances from L2 Ogre. Elvish_Hunter
     [advancefrom]
         unit=Ogre

diff --git a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
@@ -65,7 +65,7 @@
         type=Orcish Warrior
         id="Urk Delek"
         name= _ "Urk Delek"
-        profile=portraits/orcs/transparent/grunt-3.png
+        profile=portraits/orcs/grunt-3.png
         facing=sw
         side=3
         canrecruit=yes

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
@@ -186,7 +186,7 @@
         [/message]
         [message]
             speaker="Slowhand"
-            image=/portraits/humans/transparent/general.png~FL()~RIGHT()
+            image=/portraits/humans/general.png~FL()~RIGHT()
             message= _ "Haha! Our plan is going well, let’s surround them on land while our allies attack them from sea!"
         [/message]
 

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/11_Clash_of_Armies.cfg
@@ -1171,13 +1171,13 @@
                 [message]
                     role=greathordewarlord1
                     message= _ "What’s this? This weakling has let humans enter Prestim? I will lead the horde and push them to the river!"
-                    image=portraits/orcs/transparent/grunt-6.png
+                    image=portraits/orcs/grunt-6.png
                 [/message]
 
                 [message]
                     role=greathordewarlord2
                     message= _ "Bah! I’m the only one strong enough to drive out the humans! The Great Horde follows me!"
-                    image=portraits/orcs/transparent/grunt-5.png
+                    image=portraits/orcs/grunt-5.png
                 [/message]
 
                 [message]

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg
@@ -66,7 +66,7 @@
         name= _ "Braga"
         side=2
         canrecruit=yes
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         recruit=Goblin Pillager,Orcish Grunt,Orcish Slayer,Orcish Archer
         {GOLD 200 300 400}
         team_name=rebels
@@ -86,7 +86,7 @@
         name= _ "Meato"
         side=3
         canrecruit=yes
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         recruit=Goblin Knight,Orcish Warrior,Troll,Wolf Rider
         {GOLD 200 300 400}
         team_name=rebels
@@ -106,7 +106,7 @@
         name= _ "Ragvan"
         side=4
         canrecruit=yes
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         recruit=Goblin Pillager,Orcish Warrior,Orcish Assassin,Orcish Crossbowman
         {GOLD 200 300 400}
         team_name=rebels
@@ -126,7 +126,7 @@
         name= _ "Kergai"
         side=5
         canrecruit=yes
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         recruit=Troll Rocklobber,Orcish Warrior,Orcish Slayer,Goblin Impaler
         {GOLD 200 300 400}
         team_name=rebels
@@ -196,13 +196,13 @@
 
         [message]
             speaker=Braga
-            image=portraits/orcs/transparent/warlord.png~FL()~RIGHT()
+            image=portraits/orcs/warlord.png~FL()~RIGHT()
             message= _ "Black-Eye! We won’t submit to an upstart like you!"
         [/message]
 
         [message]
             speaker=Meato
-            image=portraits/orcs/transparent/grunt-2.png~FL()~RIGHT()
+            image=portraits/orcs/grunt-2.png~FL()~RIGHT()
             message= _ "Turn around and go back to where you came from or you’ll find your head on a pike! Right?"
         [/message]
 

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_The_Coward.cfg
@@ -265,7 +265,7 @@
 
         [message]
             speaker=Orga
-            image=portraits/orcs/transparent/warlord.png~FL()~RIGHT()
+            image=portraits/orcs/warlord.png~FL()~RIGHT()
             message= _ "Yes, sir!"
         [/message]
 

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
@@ -62,7 +62,7 @@
         type=Orcish Warrior
         id=Marth-Tak
         name= _ "Marth-Tak"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         canrecruit=yes
 
         facing=ne

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
@@ -56,7 +56,7 @@
         type=Orcish Warlord
         id=Tan-Malgar
         name= _ "Tan-Malgar"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         canrecruit=yes
 
         facing=sw
@@ -94,7 +94,7 @@
         type=Orcish Warlord
         id=Tan-Grolak
         name= _ "Tan-Grolak"
-        profile=portraits/orcs/transparent/grunt-3.png
+        profile=portraits/orcs/grunt-3.png
         canrecruit=yes
 
         facing=sw
@@ -131,7 +131,7 @@
         type=Orcish Warlord
         id=Tan-Uthkar
         name= _ "Tan-Uthkar"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
 
         facing=nw

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
@@ -85,7 +85,7 @@
         type=Orcish Warlord
         id=Tan-Morgh
         name= _ "Tan-Morgh"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         canrecruit=yes
 
         facing=sw
@@ -131,7 +131,7 @@
         type=Orcish Warlord
         id=Tan-Garukh
         name= _ "Tan-Garukh"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         canrecruit=yes
 
         facing=ne
@@ -173,7 +173,7 @@
         type=Orcish Warlord
         id=Tan-Wagran
         name= _ "Tan-Wagran"
-        profile=portraits/orcs/transparent/warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
 
         facing=ne

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
@@ -67,7 +67,7 @@
         type=Orcish Warlord
         id=Tan-Rarbag
         name= _ "Tan-Rarbag"
-        profile=portraits/orcs/transparent/grunt-3.png
+        profile=portraits/orcs/grunt-3.png
         side=3
         canrecruit=yes
         recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Goblin Spearman

diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg
@@ -33,7 +33,7 @@
         type=Orcish Warlord
         id=Tan-Schmog
         name= _ "Tan-Schmog"
-        profile=portraits/orcs/transparent/grunt.png
+        profile=portraits/orcs/grunt.png
         side=2
         canrecruit=yes
         {GOLD 80 140 200}
@@ -58,7 +58,7 @@
         type=Orcish Warlord
         id=Tan-NauVong
         name= _ "Tan-NauVong"
-        profile=portraits/orcs/transparent/grunt-2.png
+        profile=portraits/orcs/grunt-2.png
         side=3
         canrecruit=yes
         {GOLD 80 140 200}