UtBS: Make assassin appear in scenario 5

Event name was improperly identifying variable names.
wesnoth · Jun 2, 2014 · 31d4596 · 31d4596
1 parent 44c993e
commit 31d4596
Showing 1 changed file with 32 additions and 28 deletions.
diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg
@@ -2448,34 +2448,36 @@
     # Find the location of Kaleh and then find an adjacent
     # hex the cloaked figure can pop up in. (any hex that is not impassable)
 
-#define CALL_ASSASSIN
-    {FIND_LOCATION_FOR_DARK_ASSASSIN}
+    [event]
+        name=call_assassin
+        {FIND_LOCATION_FOR_DARK_ASSASSIN}
 
-    [unit]
-        type=Dark Assassin2
-        id=Cloaked Figure
-        name= _ "Cloaked Figure"
-        side=7
-        x,y=$dark_assassin_location.x,$dark_assassin_location.y
-        placement=map_passable
-        [modifications]
-            {TRAIT_INTELLIGENT}
-            {TRAIT_RESILIENT}
-        [/modifications]
-    [/unit]
+        [unit]
+            type=Dark Assassin2
+            id=Cloaked Figure
+            name= _ "Cloaked Figure"
+            side=7
+            x,y=$dark_assassin_location.x,$dark_assassin_location.y
+            placement=map_passable
+            [modifications]
+                {TRAIT_INTELLIGENT}
+                {TRAIT_RESILIENT}
+            [/modifications]
+        [/unit]
 
-    [message]
-        speaker=Cloaked Figure
-        image=portraits/cloaked.png
-        message= _ "Did you think you had escaped me, Kaleh? I am your shadow, I will always be there until you pay for what you have done."
-    [/message]
-
-    [message]
-        speaker=Cloaked Figure
-        image=portraits/cloaked.png
-        message= _ "You want to flee, don’t you? But you cannot. They couldn’t escape her either. Even death could not save them. She will devour us all. But first I shall have my revenge. Do the dance of death for me, Kaleh! Dance! Dance!"
-    [/message]
-#enddef
+        [message]
+            speaker=Cloaked Figure
+            image=portraits/cloaked.png
+            message= _ "Did you think you had escaped me, Kaleh? I am your shadow, I will always be there until you pay for what you have done."
+        [/message]
+
+        [message]
+            speaker=Cloaked Figure
+            image=portraits/cloaked.png
+            message= _ "You want to flee, don’t you? But you cannot. They couldn’t escape her either. Even death could not save them. She will devour us all. But first I shall have my revenge. Do the dance of death for me, Kaleh! Dance! Dance!"
+        [/message]
+        {CLEAR_VARIABLE dark_assassin_location}
+    [/event]
 
     [event]
         name=queue_battle_events
@@ -2499,9 +2501,11 @@
             rand=13..23
         [/set_variable]
         [event]
-            name="turn $($turn_number+$assassin_turn)"
+            name="turn $($turn_number|+$assassin_turn|)"
             delayed_variable_substitution=no
-            {CALL_ASSASSIN}
+            [fire_event]
+                name=call_assassin
+            [/fire_event]
         [/event]
         {CLEAR_VARIABLE assassin_turn}
     [/event]