AToTB Standardize Arvith's last breath

Use a consistent message instead of sometimes 'all' and sometimes 'everything'. Do it with a macro.
wesnoth · Aug 19, 2016 · 955b847 · 955b847
1 parent 21320f7
commit 955b847
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 60 deletions.
diff --git a/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg b/data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
@@ -370,19 +370,5 @@ Will he heed the call? I do not know if he has kept the amulet; we have not spok
         [/message]
     [/event]
 
-    [event]
-        name=last breath
-        [filter]
-            id=Arvith
-        [/filter]
-
-        [message]
-            speaker=Arvith
-            message= _ "All is lost now that I am dead..."
-        [/message]
-
-        [endlevel]
-            result=defeat
-        [/endlevel]
-    [/event]
+    {ARVITH_LAST_BREATH}
 [/scenario]
diff --git a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
@@ -596,19 +596,5 @@ Besides... I want my brother back."
         [/objectives]
     [/event]
 
-    [event]
-        name=last breath
-        [filter]
-            id=Arvith
-        [/filter]
-
-        [message]
-            speaker=Arvith
-            message= _ "All is lost now that I am dead..."
-        [/message]
-
-        [endlevel]
-            result=defeat
-        [/endlevel]
-    [/event]
+    {ARVITH_LAST_BREATH}
 [/scenario]
diff --git a/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg b/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
@@ -775,21 +775,7 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
         {CLEAR_VARIABLE Got_Key,delay_guards}
     [/event]
 
-    [event]
-        name=last breath
-        [filter]
-            id=Arvith
-        [/filter]
-
-        [message]
-            speaker=Arvith
-            message= _ "Everything is lost now that I am dead..."
-        [/message]
-
-        [endlevel]
-            result=defeat
-        [/endlevel]
-    [/event]
+    {ARVITH_LAST_BREATH}
 
     [event]
         name=time over

diff --git a/data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg b/data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
@@ -333,21 +333,7 @@ But I am still troubled. I wonder... is this sense of foreboding I feel merely a
         [/endlevel]
     [/event]
 
-    [event]
-        name=last breath
-        [filter]
-            id=Arvith
-        [/filter]
-
-        [message]
-            speaker=Arvith
-            message= _ "Everything is lost now that I am dead..."
-        [/message]
-
-        [endlevel]
-            result=defeat
-        [/endlevel]
-    [/event]
+    {ARVITH_LAST_BREATH}
 
     [event]
         name=time over

diff --git a/data/campaigns/Two_Brothers/utils/characters.cfg b/data/campaigns/Two_Brothers/utils/characters.cfg
@@ -8,3 +8,21 @@
     canrecruit=yes
     unrenamable=yes
 #enddef
+
+#define ARVITH_LAST_BREATH
+    [event]
+        name=last breath
+        [filter]
+            id=Arvith
+        [/filter]
+
+        [message]
+            speaker=Arvith
+            message= _ "All is lost now that I am dead..."
+        [/message]
+
+        [endlevel]
+            result=defeat
+        [/endlevel]
+    [/event]
+#enddef