From 0bc014b040a826e289596bba17f4cac96ec58c2f Mon Sep 17 00:00:00 2001
From: Lari Nieminen <lari.nieminen@iki.fi>
Date: Mon, 30 Jun 2008 21:57:13 +0000
Subject: [PATCH] Wired in the new portraits.

---
 .../Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg      | 2 ++
 .../Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg    | 2 ++
 .../Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg        | 1 +
 .../Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg   | 1 +
 .../scenarios/09_Shan_Taum_The_Smug.cfg                     | 6 +++---
 .../Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg     | 4 ++++
 .../Son_Of_The_Black_Eye/scenarios/11_Clash_Of_Armies.cfg   | 2 ++
 .../Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg  | 2 ++
 .../Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg    | 1 +
 .../Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg         | 3 +++
 data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg | 5 +++--
 .../Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg       | 5 +++++
 .../Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg | 3 +++
 data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg         | 3 +++
 14 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
index 3f74f2228ca..8ccaa7d6a88 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
@@ -183,6 +183,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Die, human-worm."
+            image=portraits/kapoue-angry.png
         [/message]
 
         [kill]
@@ -287,6 +288,7 @@
                     [message]
                         speaker="Kapou'e"
                         message= _ "Prepare for battle, my grunts! We shall show these humans what happens when you try to steal from Kapou'e, Son of the Black-Eye!"
+                        image=portraits/kapoue-angry.png
                     [/message]
 
                     [endlevel]
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
index c40e98cd3f3..45300edabbb 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
@@ -53,6 +53,7 @@
         type=General
         id="Lanbec'h"
         name= _ "Lanbec'h"
+        profile=portraits/lanbech.png
         side=2
         canrecruit=yes
         facing=sw
@@ -266,6 +267,7 @@
                 [message]
                     speaker="Kapou'e"
                     message= _ "In your dreams, human-worms. When the time comes you will pay for all this with your life!"
+                    image=portraits/kapoue-angry.png
                 [/message]
 
                 [endlevel]
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
index 3fd57717eb8..1c1cd8f2a9a 100644
--- 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
@@ -500,6 +500,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Finally, you pay for what you did to my orc brothers!"
+            image=portraits/kapoue-angry.png
         [/message]
     [/event]
 
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
index bb5b75a7264..bab70c57d47 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/07_Desert_Of_Death.cfg
@@ -150,6 +150,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Ack! This blasted sand!"
+            image=portraits/kapoue-angry.png
         [/message]
         [message]
             speaker="Grüü"
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
index 6e3e07c4126..6f553bdc233 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/09_Shan_Taum_The_Smug.cfg
@@ -55,6 +55,7 @@
         type=Orcish Warlord
         id=Shan Taum
         name= _ "Shan Taum"
+        profile=portraits/shan_taum.png
         side=2
         canrecruit=yes
         [ai]
@@ -118,7 +119,6 @@
         [/message]
         [message]
             speaker="Shan Taum"
-            image=portraits/James_Woo/orc-warlord.png
             message= _ "Who is that? Kapou'e! What are you doing in my lands you weakling runt?"
         [/message]
         [message]
@@ -127,21 +127,21 @@
         [/message]
         [message]
             speaker="Shan Taum"
-            image=portraits/James_Woo/orc-warlord.png
             message= _ "Bwahaha! You are nothing! Where is your land? You became a beggar. You are as pathetic as your father!"
         [/message]
         [message]
             speaker="Kapou'e"
             message= _ "How can you talk that way about my father, you miserable coward?! I'll make a mug with your skull!"
+            image=portraits/kapoue-angry.png
         [/message]
         [message]
             speaker="Shan Taum"
-            image=portraits/James_Woo/orc-warlord.png
             message= _ "Really? What would you drink with it? Mint cordial?"
         [/message]
         [message]
             speaker="narrator"
             message= _ "Exasperated, Kapou'e launched an attack on his fellow orc Shan Taum the Smug."
+            image=wesnoth-icon.png
         [/message]
     [/event]
 
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
index 2db5205af68..4652684eb45 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/10_Saving_Inarix.cfg
@@ -333,6 +333,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "If Inarix falls prey to those humans then we won't be able to count on their help in this struggle. We must do something!"
+            image=portraits/kapoue-angry.png
         [/message]
         [message]
             speaker="Grüü"
@@ -455,6 +456,7 @@
                             [message]
                                 speaker="Kapou'e"
                                 message= _ "Shut up, I'm in charge here not you!"
+                                image=portraits/kapoue-angry.png
                             [/message]
                         [/command]
                     [/option]
@@ -471,6 +473,7 @@
                 [message]
                     speaker="Kapou'e"
                     message= _ "Hurry up! The southern bridge is going to explode! Retreat! "
+                    image=portraits/kapoue-angry.png
                 [/message]
                 {VARIABLE saurians_safe 1}
             [/then]
@@ -586,6 +589,7 @@
                     type="General"
                     id="Earl Lanbec'h"
                     name= _ "Earl Lanbec'h"
+                    profile=portraits/lanbech.png
                     side=2
                     x=8
                     y=42
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
index 421aca42cc0..b2a1aa5f8f3 100644
--- 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
@@ -167,6 +167,7 @@
         type=General
         id="Earl Lanbec'h"
         name= _ "Earl Lanbec'h"
+        profile=portraits/lanbech.png
         side=4
         canrecruit=yes
         grouping=no
@@ -309,6 +310,7 @@
         [message]
             speaker="narrator"
             message= _ "Then, the battle for Prestim began."
+            image=wesnoth-icon.png
         [/message]
     [/event]
 
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
index 0a0f9d637f3..595b5c2afa9 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/12_Giving_Some_Back.cfg
@@ -177,6 +177,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Earl Lanbec'h, you slimy coward, come out and face me if you have the guts!"
+            image=portraits/kapoue-angry.png
         [/message]
 
         [message]
@@ -187,6 +188,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Foolish human. Attack, men, I want that city to be orcish territory within the week. Smite, stab, and slay!"
+            image=portraits/kapoue-angry.png
         [/message]
 
         [message]
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
index 4b357153c08..166daa034db 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/13_Dwarvish_Stand.cfg
@@ -268,6 +268,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Let's make them pay for what they did to our people. Blood and steel!"
+            image=portraits/kapoue-angry.png
         [/message]
 
         [role]
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
index 59be022314d..3c3d3a071fc 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/14_Back_Home.cfg
@@ -486,6 +486,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Blood and stone, Grüü! You were supposed to be in position by first watch. It is now dawn!"
+            image=portraits/kapoue-angry.png
         [/message]
 
         [message]
@@ -630,6 +631,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "WHAT! The human-worms and tree-shaggers have gone too far! BLOOD AND STEEL! I want every human and elf in this area slaughtered! Show no mercy or quarter!"
+            image=portraits/kapoue-angry.png
         [/message]
 
         [message]
@@ -640,6 +642,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Throw him in the lake. If he freezes to death, all the better."
+            image=portraits/kapoue-angry.png
         [/message]
     [/event]
 
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
index 52212028898..3cf0596bfc5 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/16_Coward.cfg
@@ -171,6 +171,7 @@
             type=Orcish Warlord
             id=Shan Taum
             name= _ "Shan Taum"
+            profile=portraits/shan_taum.png
             x=8
             y=57
         [/unit]
@@ -178,6 +179,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Good morning, Shan Taum."
+            image=portraits/kapoue-angry.png
         [/message]
 
         [message]
@@ -214,7 +216,6 @@
 
         [message]
             speaker="Shan Taum"
-
             message= _ "LIES! THESE ARE ALL LIES!"
         [/message]
 
@@ -225,7 +226,6 @@
 
         [message]
             speaker="Shan Taum"
-
             message= _ "How dare you accuse me of being a traitor, you turdlicker! Orga, kill this kid for me. I'll be in my keep."
         [/message]
 
@@ -247,6 +247,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "What! Fight like an orc, you gutless coward!"
+            image=portraits/kapoue-angry.png
         [/message]
     [/event]
 
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
index 28554e1b641..5a952b9a3d4 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/17_Human_Horde.cfg
@@ -14,6 +14,7 @@
     [message]
         speaker="Kapou'e"
         message= _ "Just who do you think you are, human-worm?"
+        image=portraits/kapoue-angry.png
     [/message]
 
     [message]
@@ -44,6 +45,7 @@
     [message]
         speaker="Kapou'e"
         message= _ "Ha ha, very funny, human-worm. You think we are stupid enough to fall for that? We haven't forgotten what you people did to my father."
+        image=portraits/kapoue-angry.png
     [/message]
 
     [message]
@@ -54,6 +56,7 @@
     [message]
         speaker="Kapou'e"
         message= _ "I am Kapou'e, son of the Black-Eye Karun. Twenty-seven years ago you people assassinated my father after inviting him to join the Northern Alliance."
+        image=portraits/kapoue-angry.png
     [/message]
 
     [message]
@@ -64,6 +67,7 @@
     [message]
         speaker="Kapou'e"
         message= _ "Messenger, what messenger?"
+        image=portraits/kapoue-angry.png
     [/message]
 
     [message]
@@ -160,6 +164,7 @@
         type=Grand Marshal
         id="Earl Lanbec'h"
         name= _ "Earl Lanbec'h"
+        profile=portraits/lanbech.png
         side=4
         canrecruit=yes
         recruit=Dragoon, Swordsman, Pikeman, Longbowman,Shock Trooper,Mage,Duelist,White Mage,Red Mage,Lancer,Knight,Spearman,Bowman,Cavalryman,Horseman
diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
index 94f0b04bf8a..be2375632d8 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/18_Northern_Alliance.cfg
@@ -87,6 +87,7 @@
         type=Grand Marshal
         id="Earl Lanbec'h"
         name= _ "Earl Lanbec'h"
+        profile=portraits/lanbech.png
         side=4
         canrecruit=yes
         recruit=Dragoon, Swordsman, Pikeman, Longbowman,Shock Trooper,Mage,Duelist,White Mage,Red Mage,Lancer,Knight,Spearman,Bowman,Cavalryman,Horseman
@@ -104,6 +105,7 @@
         type=Orcish Warlord
         id=Shan Taum
         name= _ "Shan Taum"
+        profile=portraits/shan_taum.png
         side=5
         canrecruit=yes
         recruit= Wolf Rider, Goblin Knight, Orcish Grunt, Ogre, Orcish Archer, Orcish Crossbowman, Orcish Warrior, Orcish Assassin, Orcish Slayer
@@ -669,6 +671,7 @@
         [message]
             speaker="Kapou'e"
             message= _ "Agreed. Let's get to it. BLOOD AND STEEL!"
+            image=portraits/kapoue-angry.png
         [/message]
 
         [move_unit_fake]
diff --git a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
index 2c47e04ede4..a38c4b5e3e3 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
@@ -123,6 +123,7 @@
         id={ID_STRING}
         name={NAME_STRING}
         type=Old Orcish Shaman
+        profile=portraits/orcish_shaman.png
         side=1
         x={X}
         y={Y}
@@ -138,6 +139,7 @@
         id={ID_STRING}
         name={NAME_STRING}
         type=Novice Orcish Shaman
+        profile=portraits/young_orcish_shaman.png
         side=1
         x={X}
         y={Y}
@@ -153,6 +155,7 @@
         id={ID_STRING}
         name={NAME_STRING}
         type=Orcish Shaman
+        profile=portraits/young_orcish_shaman.png
         side=1
         x={X}
         y={Y}