AOI: tweaked Erlornas's line on Linaera's death so it can be used in …

…both S5 and S6
wesnoth · Feb 2, 2015 · 42d9bf3 · 42d9bf3
1 parent cc6db86
commit 42d9bf3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/05_Linaera_the_Quick.cfg
@@ -311,5 +311,5 @@ Use Elven Scouts and Linaera’s power of teleportation to mount hit-and-run att
     [/event]
 
     {HERODEATH_ERLORNAS}
-    {HERODEATH_LINAERA ()}
+    {HERODEATH_LINAERA}
 [/scenario]
diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/06_A_Detour_through_the_Swamp.cfg
@@ -140,10 +140,5 @@ Undead are resistant to physical attack. Use mages to attack the undead, and elv
     [/event]
 
     {HERODEATH_ERLORNAS}
-    {HERODEATH_LINAERA (
-        [message]
-            speaker=Erlornas
-            message= _ "All is lost! Without Linaera’s help, I cannot hope to defeat these horrifying apparitions!"
-        [/message]
-    )}
+    {HERODEATH_LINAERA}
 [/scenario]
diff --git a/data/campaigns/An_Orcish_Incursion/utils/deaths.cfg b/data/campaigns/An_Orcish_Incursion/utils/deaths.cfg
@@ -25,7 +25,7 @@
     [/event]
 #enddef
 
-#define HERODEATH_LINAERA DEATH_MESSAGE
+#define HERODEATH_LINAERA
     [event]
         name=last breath
         [filter]
@@ -44,7 +44,10 @@
             id=Linaera
         [/filter]
 
-        {DEATH_MESSAGE}
+        [message]
+            speaker=Erlornas
+            message= _ "All is lost! Without Linaera’s help, I cannot hope to defeat these abominations!"
+        [/message]
 
         [endlevel]
             result=defeat