From 77f85655536c561bb4abe67424847c931cac8738 Mon Sep 17 00:00:00 2001
From: sigurdfdragon <jjwcoat@gmail.com>
Date: Mon, 5 Mar 2018 18:05:04 -0500
Subject: [PATCH] NR S13a: Ensure correct unit type and facing for opening
 animations

Only needed type fix for Krash, Eryssa, & Tallin, but did them all.

[ci skip]

Add facing for entrance - merge with other commit
---
 .../scenarios/13a_Showdown.cfg                | 58 +++++++++++++++++--
 1 file changed, 52 insertions(+), 6 deletions(-)

diff --git a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
index 3162dbf8722c..e89dee327cd1 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/13a_Showdown.cfg
@@ -593,12 +593,19 @@
                     message= _ "The group that went to the north was led by Krash and his drake friends."
                     image=wesnoth-icon.png
                 [/message]
+                [store_unit]
+                    [filter]
+                        id=Krash
+                    [/filter]
+                    variable=krash_store
+                [/store_unit]
                 [move_unit_fake]
-                    type=Drake Flare
+                    type=$krash_store.type
                     side=7
                     x=30,30,30,30,30,30,30,30,30,30,30
                     y=1,2,3,4,5,6,7,8,9,10,11
                 [/move_unit_fake]
+                {CLEAR_VARIABLE krash_store}
             [/then]
             [else]
                 [message]
@@ -606,14 +613,22 @@
                     message= _ "The group that went to the north was led by Ro’Arthian and was composed of trolls, ogres and some selected mages."
                     image=wesnoth-icon.png
                 [/message]
+                [store_unit]
+                    [filter]
+                        id="Ro'Arthian"
+                    [/filter]
+                    variable=ro_arthian_store
+                [/store_unit]
                 [move_unit_fake]
-                    type=Ancient Lich
+                    type=$ro_arthian_store.type
                     side=7
                     x=30,30,30,30,30,30,30,30,30,30,30
                     y=1,2,3,4,5,6,7,8,9,10,11
                 [/move_unit_fake]
+                {CLEAR_VARIABLE ro_arthian_store}
             [/else]
         [/if]
+        {MODIFY_UNIT (x,y=$side_seven_starts_at.x,$side_seven_starts_at.y) facing se}
         [unhide_unit]
             x=$side_seven_starts_at.x
             y=$side_seven_starts_at.y
@@ -632,12 +647,19 @@
                     message= _ "Eryssa and the remaining elves, eager to avenge Hidel, went south, while Tallin himself led the western group."
                     image=wesnoth-icon.png
                 [/message]
+                [store_unit]
+                    [filter]
+                        id=Eryssa
+                    [/filter]
+                    variable=eryssa_store
+                [/store_unit]
                 [move_unit_fake]
-                    type=Elvish Sorceress
+                    type=$eryssa_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 eryssa_store}
                 [if]
                     [have_unit]
                         id=Sisal
@@ -654,24 +676,40 @@
                     message= _ "Ro’Arthian’s brother, Ro’Sothian, went south with another crew of trolls, ogres and mages. Tallin himself led the western group."
                     image=wesnoth-icon.png
                 [/message]
+                [store_unit]
+                    [filter]
+                        id="Ro'Sothian"
+                    [/filter]
+                    variable=ro_sothian_store
+                [/store_unit]
                 [move_unit_fake]
-                    type=Lich
+                    type=$ro_sothian_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 ro_sothian_store}
             [/else]
         [/if]
+        {MODIFY_UNIT (x,y=$side_nine_starts_at.x,$side_nine_starts_at.y) facing nw}
         [unhide_unit]
             x=$side_nine_starts_at.x
             y=$side_nine_starts_at.y
         [/unhide_unit]
+        [store_unit]
+            [filter]
+                id=Tallin
+            [/filter]
+            variable=tallin_store
+        [/store_unit]
         [move_unit_fake]
-            type=General
+            type=$tallin_store.type
             side=1
             x=60,59,58,57,56
             y=30,30,30,30,30
         [/move_unit_fake]
+        {CLEAR_VARIABLE tallin_store}
+        {MODIFY_UNIT (x,y=$side_one_starts_at.x,$side_one_starts_at.y) facing sw}
         [unhide_unit]
             x=$side_one_starts_at.x
             y=$side_one_starts_at.y
@@ -754,12 +792,20 @@
             [/else]
         [/if]
         # And the dwarves' grand entrance
+        [store_unit]
+            [filter]
+                id=Hamel
+            [/filter]
+            variable=hamel_store
+        [/store_unit]
         [move_unit_fake]
-            type=Dwarvish Lord
+            type=$hamel_store.type
             side=8
             x=1,2,3,4,5,6,7,8,9,10,11
             y=31,31,31,31,31,31,31,31,32,32,32
         [/move_unit_fake]
+        {CLEAR_VARIABLE hamel_store}
+        {MODIFY_UNIT (x,y=$side_eight_starts_at.x,$side_eight_starts_at.y) facing ne}
         [unhide_unit]
             x=$side_eight_starts_at.x
             y=$side_eight_starts_at.y