Second part of portrait directory renaming.

All mainline references are fixed, and wmllint knows what to do.

data/campaigns/An_Orcish_Incursion/_main.cfg

@@ -7,7 +7,7 @@
 [campaign]
     id=An_Orcish_Incursion
     icon="units/elves-wood/lord.png~TC(1,magenta)"
-    image="portraits/elves/elvish-lord.png"
+    image="portraits/elves/lord.png"
     name= _ "An Orcish Incursion"
     abbrev= _ "AOI"
     rank=15

data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg

@@ -67,7 +67,7 @@
         type=Orcish Warlord
         id=Borth
         name=_ "Borth"
-        profile=portraits/orcs/orc-warlord2.png
+        profile=portraits/orcs/warlord2.png
         canrecruit=yes
         recruit=Goblin Spearman,Orcish Archer,Orcish Crossbowman,Wolf Rider,Orcish Grunt,Goblin Knight,Orcish Warrior,Troll Whelp
         {GOLD 110 130 150}
@@ -97,7 +97,7 @@
         type=Orcish Slurbow
         id="P'Gareth"
         name=_ "P'Gareth"
-        profile=portraits/orcs/orc-warlord5.png
+        profile=portraits/orcs/warlord5.png
         canrecruit=yes
         recruit=Orcish Archer,Orcish Crossbowman,Goblin Pillager,Orcish Grunt,Orcish Assassin
         {GOLD 110 130 150}
@@ -127,7 +127,7 @@
         type=Orcish Warlord
         id="K'Vark"
         name=_ "K'Vark"
-        profile=portraits/orcs/orc-warlord.png
+        profile=portraits/orcs/warlord.png
         canrecruit=yes
         recruit=Orcish Archer,Orcish Crossbowman,Troll Whelp,Wolf Rider,Orcish Grunt
         {GOLD 110 130 150}

data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg

@@ -52,7 +52,7 @@
         type=Orcish Warlord
         id=Borth
         name=_ "Borth"
-        profile=portraits/orcs/orc-warlord2.png
+        profile=portraits/orcs/warlord2.png
         canrecruit=yes
         {GOLD 120 160 200}
 #ifdef EASY

data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg

@@ -264,7 +264,7 @@
         [/message]
         [message]
             speaker=Urug-Telfar
-            image=portraits/orcs/orc-warlord4.png
+            image=portraits/orcs/warlord4.png
             message= _ "Attack the elves, my grunts, and take their villages. Let us claim this land for the Queen!"
         [/message]
 
@@ -272,13 +272,13 @@
 #ifdef HARD
         [message]
             speaker=Knafa-Tan
-            image=portraits/orcs/orc-warlord.png
+            image=portraits/orcs/warlord.png
             message= _ "Remember, it is rumored that the filthy mage and one that he protects are in these parts. They are the ones we want!"
         [/message]
 #else
         [message]
             speaker=Knafa-Tan
-            image=portraits/orcs/orc-warlord.png
+            image=portraits/orcs/warlord.png
             message= _ "Ha ha! We will rip the filthy elves to pieces!"
         [/message]
 #endif

data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg

@@ -317,7 +317,7 @@
         [/message]
         [message]
             speaker=Mokolo Qimur
-            image=portraits/orcs/orc-warlord3.png
+            image=portraits/orcs/warlord3.png
             message= _ "So many foul humans riding on horses! There is no way we can defeat them. Quick, we must make our escape!"
         [/message]
         [endlevel]

data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg

@@ -59,7 +59,7 @@
         name= _ "Dwaba-Kukai"
         side=2
         canrecruit=yes
-        profile=portraits/orcs/orc-warlord2.png
+        profile=portraits/orcs/warlord2.png
         recruit=Vampire Bat,Naga Fighter
         [ai]
             recruitment_pattern=scout,fighter

data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg

@@ -242,7 +242,7 @@
         [/message]
         [message]
             speaker=Gaga-Breuk
-            image=portraits/orcs/orc-warlord2.png
+            image=portraits/orcs/warlord2.png
             message= _ "Look! Some of the southerners, men of Wesnoth, are trying to cross into our lands! We will slaughter them by the river's edge!"
         [/message]
         [message]

data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg

@@ -191,7 +191,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
             type=Orcish Warrior
             id=Qumseh
             name= _ "Qumseh"
-            profile=portraits/orcs/orc-warlord2.png
+            profile=portraits/orcs/warlord2.png
             canrecruit=yes
             x=28
             y=2
@@ -228,7 +228,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
             type=Orcish Warrior
             id=Graur-Tan
             name= _ "Graur-Tan"
-            profile=portraits/orcs/orc-warlord.png
+            profile=portraits/orcs/warlord.png
             canrecruit=yes
             x=2
             y=4

data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg

@@ -99,7 +99,7 @@
             type=Orcish Warlord
             id=Mutaf-uru
             name= _ "Mutaf-uru"
-            profile=portraits/orcs/orc-warlord3.png
+            profile=portraits/orcs/warlord3.png
             canrecruit=yes
             x=17
             y=6

data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg

@@ -112,7 +112,7 @@
             type=Orcish Warlord
             id=Mordrum
             name=_ "Mordrum"
-            profile=portraits/orcs/orc-warlord4.png
+            profile=portraits/orcs/warlord4.png
             canrecruit=yes
             x=4
             y=12
@@ -146,7 +146,7 @@
             type=Orcish Warlord
             id=Urug-Pir
             name=_ "Urug-Pir"
-            profile=portraits/orcs/orc-warlord3.png
+            profile=portraits/orcs/warlord3.png
             canrecruit=yes
             x=6
             y=21
@@ -227,7 +227,7 @@
             type=Orcish Warlord
             id=Grubr
             name= _ "Grubr"
-            profile=portraits/orcs/orc-warlord5.png
+            profile=portraits/orcs/warlord5.png
             canrecruit=yes
             x=25
             y=42

data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg

@@ -97,7 +97,7 @@
         type=Orcish Warlord
         id=Tan-Grub
         name=_ "Tan-Grub"
-        profile="portraits/orcs/orc-warlord.png"
+        profile="portraits/orcs/warlord.png"
         side=4
         canrecruit=yes
 #ifdef EASY

data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg

@@ -91,7 +91,7 @@ My eyes are open. To the danger, and...to you. You glow like a star in the night
         type=Orcish Warlord
         id=Tamitahan
         name=_ "Tamitahan"
-        profile=portraits/orcs/orc-warlord.png
+        profile=portraits/orcs/warlord.png
         side=3
         canrecruit=yes
 
@@ -128,7 +128,7 @@ My eyes are open. To the danger, and...to you. You glow like a star in the night
         id=Khrubar
         type=Orcish Warlord
         name=_ "Khrubar"
-        profile=portraits/orcs/orc-warlord2.png
+        profile=portraits/orcs/warlord2.png
         canrecruit=yes
 
         {GOLD 100 100 100 }
@@ -157,7 +157,7 @@ My eyes are open. To the danger, and...to you. You glow like a star in the night
         type=Orcish Warlord
         id=Gvur
         name=_ "Gvur"
-        profile=portraits/orcs/orc-warlord3.png
+        profile=portraits/orcs/warlord3.png
         side=5
         canrecruit=yes
 
@@ -192,7 +192,7 @@ My eyes are open. To the danger, and...to you. You glow like a star in the night
         type=Orcish Warlord
         id=Ozul
         name=_ "Ozul"
-        profile=portraits/orcs/orc-warlord4.png
+        profile=portraits/orcs/warlord4.png
         side=6
         canrecruit=yes
         {GOLD 100 100 100}

data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg

@@ -64,7 +64,7 @@
         type=Orcish Warrior
         id="Urk Delek"
         name= _ "Urk Delek"
-        profile=portraits/orcs/orc-warlord5.png
+        profile=portraits/orcs/warlord5.png
         facing=sw
         side=3
         canrecruit=yes
@@ -93,7 +93,7 @@
         id=Thhsthss
         name= _ "Thhsthss"
         # FIXME: This unit needs its own portrait
-        profile=portraits/saurians/saurian-augur.png
+        profile=portraits/saurians/augur.png
         side=4
         canrecruit=yes
         controller=ai

data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg

@@ -72,7 +72,7 @@
         name= _ "Braga"
         side=2
         canrecruit=yes
-        profile=portraits/orcs/orc-warlord2.png
+        profile=portraits/orcs/warlord2.png
         recruit=Goblin Pillager,Orcish Grunt,Orcish Slayer,Orcish Archer
         {GOLD 200 300 400}
         team_name=rebels
@@ -92,7 +92,7 @@
         name= _ "Meato"
         side=3
         canrecruit=yes
-        profile=portraits/orcs/orc-warlord3.png
+        profile=portraits/orcs/warlord3.png
         recruit=Goblin Knight,Orcish Warrior,Troll,Wolf Rider
         {GOLD 200 300 400}
         team_name=rebels
@@ -112,7 +112,7 @@
         name= _ "Ragvan"
         side=4
         canrecruit=yes
-        profile=portraits/orcs/orc-warlord4.png
+        profile=portraits/orcs/warlord4.png
         recruit=Goblin Pillager,Orcish Warrior,Orcish Assassin,Orcish Crossbowman
         {GOLD 200 300 400}
         team_name=rebels
@@ -132,7 +132,7 @@
         name= _ "Kergai"
         side=5
         canrecruit=yes
-        profile=portraits/orcs/orc-warlord.png
+        profile=portraits/orcs/warlord.png
         recruit=Troll Rocklobber,Orcish Warrior,Orcish Slayer,Goblin Impaler
         {GOLD 200 300 400}
         team_name=rebels

data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg

@@ -41,7 +41,7 @@
         type="Orcish Warrior"
         id="Marth-Tak"
         name=_"Marth-Tak"
-        profile=portraits/orcs/orc-warlord4.png
+        profile=portraits/orcs/warlord4.png
         canrecruit="1"
         side="2"
         team_name="northern_alliance"

data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg

@@ -52,7 +52,7 @@
         type=Orcish Warlord
         id=Tan-Malgar
         name= _ "Tan-Malgar"
-        profile=portraits/orcs/orc-warlord3.png
+        profile=portraits/orcs/warlord3.png
         side=2
         canrecruit=yes
         recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Spearman
@@ -78,7 +78,7 @@
         type=Orcish Warlord
         id=Tan-Grolak
         name= _ "Tan-Grolak"
-        profile=portraits/orcs/orc-warlord5.png
+        profile=portraits/orcs/warlord5.png
         side=3
         canrecruit=yes
 #ifdef EASY
@@ -123,7 +123,7 @@
         type=Orcish Warlord
         id="Tan-Uthkar"
         name= _ "Tan-Uthkar"
-        profile=portraits/orcs/orc-warlord2.png
+        profile=portraits/orcs/warlord2.png
         side=4
         canrecruit=yes
         recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Warrior, Goblin Spearman

data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg

@@ -72,7 +72,7 @@
         type=Orcish Warlord
         id=Tan-Morgh
         name= _ "Tan-Morgh"
-        profile=portraits/orcs/orc-warlord4.png
+        profile=portraits/orcs/warlord4.png
         side=3
         canrecruit=yes
 #ifdef EASY
@@ -119,7 +119,7 @@
         type=Orcish Warlord
         id=Tan-Garukh
         name= _ "Tan-Garukh"
-        profile=portraits/orcs/orc-warlord3.png
+        profile=portraits/orcs/warlord3.png
         side=4
         canrecruit=yes
         recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Spearman
@@ -152,7 +152,7 @@
         type=Orcish Warlord
         id="Tan-Wagran"
         name= _ "Tan-Wagran"
-        profile=portraits/orcs/orc-warlord.png
+        profile=portraits/orcs/warlord.png
         side=5
         canrecruit=yes
         recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Warrior, Goblin Spearman

data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg

@@ -179,20 +179,20 @@
 
         [message]
             speaker=Tan-Vrodis
-            image="portraits/orcs/orc-warlord.png"
+            image="portraits/orcs/warlord.png"
             message= _ "HUMANS... I see humans!"
         [/message]
 
         [message]
             speaker=Tan-Bok
-            image="portraits/orcs/orc-warlord2.png"
+            image="portraits/orcs/warlord2.png"
             # wmllint: local spelling Hogar
             message= _ "Ha, Hogar! You said we wouldn't see any action this far back from the front."
         [/message]
 
         [message]
             speaker=Tan-Hogar
-            image="portraits/orcs/orc-warlord3.png"
+            image="portraits/orcs/warlord3.png"
             message= _ "Shut yer mouth! Let's just get 'em."
         [/message]
     [/event]

data/campaigns/The_South_Guard/scenarios/08a_Return_To_Kerlath.cfg

@@ -244,7 +244,7 @@
         [message]
             side=2
             canrecruit=no
-            image="portraits/humans/human-poacher.png"
+            image="portraits/humans/poacher.png"
             message= _ "Tharzo! That meddler who killed the Urza brothers approaches from the south. His men and horses look worn out."
         [/message]
 

data/campaigns/tutorial/scenarios/2_Speaking.cfg

@@ -35,7 +35,7 @@ You can press 'u' to undo most things; useful for correcting mistakes.")}
     # Pretend this is narrator, since otherwise we scroll back.
     [message]
         speaker=narrator
-        image=portraits/elves/elvish-captain.png
+        image=portraits/elves/captain.png
         message=_ "*Galdrad" + "
 " + {MESSAGE}
     [/message]
@@ -45,7 +45,7 @@ You can press 'u' to undo most things; useful for correcting mistakes.")}
     # Pretend this is narrator, since otherwise we scroll back.
     [message]
         speaker=narrator
-        image=portraits/elves/elvish-captain.png
+        image=portraits/elves/captain.png
         message=_ "*Galdrad" + "
 " + {MESSAGE}
     [/message]
@@ -58,7 +58,7 @@ You can press 'u' to undo most things; useful for correcting mistakes.")}
     # Pretend this is narrator, since otherwise we scroll back.
     [message]
         speaker=narrator
-        image=portraits/elves/elvish-captain.png
+        image=portraits/elves/captain.png
         message=_ "*Galdrad" + "
 " + {MESSAGE}
     [/message]