Tweaks to the use of HttT portrait variations.

wesnoth · Feb 11, 2014 · a81dfae · a81dfae
1 parent 5293851
commit a81dfae
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
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
@@ -450,6 +450,7 @@
         [message]
             speaker=second_unit
             message= _ "Die, villain, die!"
+            {KONRAD_VARIATION_ELF mad}
         [/message]
     [/event]
 
@@ -460,7 +461,6 @@
         [/filter_second]
         [message]
             speaker=second_unit
-            {DELFADOR_VARIATION_ELF mad}
             message= _ "Only the foolish oppose me!"
         [/message]
     [/event]

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
@@ -155,6 +155,8 @@
 
         {NAMED_LOYAL_UNIT 1 (Merman Fighter) 27 12 (Kalba) ( _ "Kalba")}
         {NAMED_LOYAL_UNIT 1 (Merman Fighter) 31 14 (Gnaba) ( _ "Gnaba")}
+        # wmllint: recognize Kalba
+        # wmllint: recognize Gnaba
 
         [message]
             speaker=Konrad
@@ -176,6 +178,7 @@
         [/message]
 
         {NAMED_LOYAL_UNIT 1 (Outlaw) 20 10 (Delurin) ( _ "Delurin")}
+        # wmllint: recognize Delurin
 
         [redraw]
             side=1
@@ -430,7 +433,7 @@
         name=enemies defeated
         [message]
             speaker=Konrad
-            {KONRAD_VARIATION_ELF mad}
+            {KONRAD_VARIATION_ELF glad}
             message= _ "We have wrested control of the island from the evil undead! Now all we have to do is wait for the ship to arrive, so we can make our way to Elensefar!"
         [/message]
 

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
@@ -256,7 +256,7 @@
         [/message]
         [message]
             speaker=unit
-            {LISAR_VARIATION glad}
+            {LISAR_VARIATION defeat}
             message= _ "(Ha ha, little do they know just how many undead have wandered the northern road of late. Surely they are doomed!)"
         [/message]
 

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
@@ -250,7 +250,6 @@
         [/message]
         [message]
             speaker=Delfador
-            {DELFADOR_VARIATION mad}
             message= _ "Let us hold them off as long as we can!"
         [/message]
     [/event]

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
@@ -173,7 +173,6 @@
         name=turn 2
         [message]
             speaker=Delfador
-            {DELFADOR_VARIATION mad}
             message= _ "It appears that we are not the only ones interested in this mountain. Once again the Queen opposes us!"
         [/message]
         [message]