NR S13: use Sisal as fallback for Eryssa

The situation of having her but not Eryssa is new.
wesnoth · Jan 17, 2021 · 2d94d90 · 2d94d90
1 parent c5bc4e9
commit 2d94d90
Showing 1 changed file with 70 additions and 11 deletions.
diff --git a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
@@ -451,28 +451,60 @@
         [/hide_unit]
 
         # Check if Eryssa is alive. If yes place her at the helm of side 9;
-        # if not, younger lich assumes command and elves are scrubbed from
+        # Alternatively, let Sisal take her place, and if that's not possible
+        # either, younger lich assumes command and elves are scrubbed from
         # the side’s recall list.
-        [recall]
-            id=Eryssa
-        [/recall]
         [store_starting_location]
             side=9
             variable=side_nine_starts_at
         [/store_starting_location]
         [if]
             [have_unit]
                 id=Eryssa
+                search_recall_list=yes
             [/have_unit]
             [then]
-                {TELEPORT_UNIT id="Eryssa" $side_nine_starts_at.x $side_nine_starts_at.y}
-                {MODIFY_UNIT id="Eryssa" canrecruit yes}
-                {MODIFY_UNIT id="Eryssa" side 9}
+                [modify_unit]
+                    [filter]
+                        id=Eryssa
+                    [/filter]
+                    side=9
+                    canrecruit=yes
+                [/modify_unit]
+                [recall]
+                    id=Eryssa
+                    location_id=9
+                    show=no
+                [/recall]
                 [modify_side]
                     side=9
                     side_name= _ "Eryssa"
                 [/modify_side]
             [/then]
+            [elseif]
+                [have_unit]
+                    id=Sisal
+                    search_recall_list=yes
+                [/have_unit]
+                [then]
+                    [modify_unit]
+                        [filter]
+                            id=Sisal
+                        [/filter]
+                        side=9
+                        canrecruit=yes
+                    [/modify_unit]
+                    [recall]
+                        id=Sisal
+                        location_id=9
+                        show=no
+                    [/recall]
+                    [modify_side]
+                        side=9
+                        side_name= _ "Sisal"
+                    [/modify_side]
+                [/then]
+            [/elseif]
             [else]
                 [store_unit]
                     [filter]
@@ -743,6 +775,31 @@
                     [/then]
                 [/if]
             [/then]
+            [elseif]
+                [have_unit]
+                    id=Sisal
+                [/have_unit]
+                [then]
+                    [message]
+                        speaker=narrator
+                        message= _ "Sisal and the remaining elves, eager to avenge Hidel and Eryssa, went south, while Tallin himself led the western group."
+                        image=wesnoth-icon.png
+                    [/message]
+                    [store_unit]
+                        [filter]
+                            id=Sisal
+                        [/filter]
+                        variable=sisal_store
+                    [/store_unit]
+                    [move_unit_fake]
+                        type=$sisal_store.type
+                        side=9
+                        x=31,31,31,31,31,31,31
+                        y=60,59,58,57,56,55,54
+                    [/move_unit_fake]
+                    {CLEAR_VARIABLE sisal_store}
+                [/then]
+            [/elseif]
             [else]
                 [message]
                     speaker=narrator
@@ -805,10 +862,12 @@
         [/recall]
         {RECALL_OR_REPLACE id=Elenia}
         [if]
-            #if not recalled above
+            # If not recalled above by Eryssa If she's the leader,
+            # recall someone else, for Eryssa not being around (anymore).
             [not]
                 [have_unit]
                     id=Sisal
+                    canrecruit=no
                 [/have_unit]
             [/not]
             [then]
@@ -953,7 +1012,7 @@
             message= _ "FOR FUN!"
         [/message]
         [message]
-            id=Eryssa
+            id=Eryssa,Sisal
             message= _ "FOR HIDEL!!"
         [/message]
         [message]
@@ -998,7 +1057,7 @@
             message= _ "Learn the fate of one who offends the Dwarves of Knalga."
         [/message]
         [message]
-            id=Eryssa,Sisal
+            id=Eryssa,Sisal,Elenia
             message= _ "Or the elves of the Northern Forests."
         [/message]
         [message]
@@ -1074,7 +1133,7 @@
             message= _ "Ahhhh! Farewell, friends. I now go to join Hidel."
         [/message]
         [message]
-            id=Eryssa
+            id=Eryssa,Elenia
             message= _ "Sisal! Noooo! Not you too!"
         [/message]
     [/event]