NR: added a no-dialog version of Morvin/Thera's death events, for use…

… in S6 on
wesnoth · Feb 21, 2015 · 8a9a1b9 · 8a9a1b9
1 parent 98e3006
commit 8a9a1b9
Showing 1 changed file with 84 additions and 1 deletion.
diff --git a/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg b/data/campaigns/Northern_Rebirth/utils/herodeaths.cfg
@@ -337,7 +337,7 @@
 
 # Death event for Thera and Morvin
 # This version includes death dialog
-#define HERODEATH_THERA_AND_MORVIN
+#define HERODEATH_THERA_AND_MORVIN_WITH_DIALOG
     [event]
         name=last breath
         first_time_only=no
@@ -880,6 +880,89 @@
     [/event]
 #enddef
 
+# Death event for Thera and Morvin
+# This version does NOT include death dialog
+#define HERODEATH_THERA_AND_MORVIN_NO_DIALOG
+    [event]
+        name=last breath
+        first_time_only=no
+        [filter]
+            id=Sister Thera
+        [/filter]
+
+        {FIND_NR_WHITE_MAGE_RESPAWN (Father Morvin)}
+
+        {FLASH_WHITE (
+            # Store unit to check if it advanced to mage of light
+            [store_unit]
+                [filter]
+                    id=Sister Thera
+                [/filter]
+                variable=type_check
+                kill=yes
+                fire_event=no
+            [/store_unit]
+
+            [unit]
+                type=$type_check.type
+                gender=female
+                id=Sister Thera
+                name= _ "Sister Thera"
+                profile=portraits/Sister_Thera.png
+                side=1
+                x=$respawn_point.x
+                y=$respawn_point.y
+                [modifications]
+                    {TRAIT_LOYAL}
+                    {TRAIT_QUICK}
+                [/modifications]
+                {IS_LOYAL}
+            [/unit]
+        )}
+
+        {CLEAR_VARIABLE respawn_point,type_check}
+    [/event]
+
+    # Father Morvin - See above
+    [event]
+        name=last breath
+        first_time_only=no
+        [filter]
+            id=Father Morvin
+        [/filter]
+
+        {FIND_NR_WHITE_MAGE_RESPAWN (Sister Thera)}
+
+        {FLASH_WHITE (
+            [store_unit]
+                [filter]
+                    id=Father Morvin
+                [/filter]
+                variable=type_check
+                kill=yes
+                fire_event=no
+            [/store_unit]
+
+            [unit]
+                type=$type_check.type
+                id=Father Morvin
+                name= _ "Father Morvin"
+                profile=portraits/Father_Morvin.png
+                side=1
+                x=$respawn_point.x
+                y=$respawn_point.y
+                [modifications]
+                    {TRAIT_LOYAL}
+                    {TRAIT_RESILIENT}
+                [/modifications]
+                {IS_LOYAL}
+            [/unit]
+        )}
+
+        {CLEAR_VARIABLE type_check,respawn_point}
+    [/event]
+#enddef
+
 #undef FIND_NR_WHITE_MAGE_RESPAWN
 
 # Elenia death