Macros for the new death event inclusion.

data/campaigns/Under_the_Burning_Suns/utils/deaths.cfg

@@ -2,9 +2,7 @@
 # This file contains message to display when heroes die
 # It is used until Scenario 6, when player get troll/dwarf ally hero
 
-#ifdef ALL_LOSE
-
-# Kaleh death
+#define KALEH_DEATH
 [event]
     name=die
     [filter]
@@ -20,7 +18,9 @@
         result=defeat
     [/endlevel]
 [/event]
+#enddef
 
+#define FRIEND_DEATH
 [event]
     name=die
 
@@ -38,7 +38,6 @@
     [/endlevel]
 [/event]
 
-# Zhul death
 [event]
     name=die
     [filter]
@@ -54,8 +53,9 @@
         result=defeat
     [/endlevel]
 [/event]
+#enddef
 
-# Garak death
+#define GARAK_DEATH
 [event]
     name=die
 
@@ -72,30 +72,9 @@
         result=defeat
     [/endlevel]
 [/event]
+#enddef
 
-#ifdef ELYSSA_FEATURING
-# Elyssa death
-[event]
-    name=die
-
-    [filter]
-        description=Elyssa
-    [/filter]
-
-    [message]
-        speaker=unit
-        message= _ "This can't be the end, I have too much left to see."
-    [/message]
-
-    [message]
-        description=Kaleh
-        message= _ "How could we have let her die? I've never seen fire magic like that before. She will be sorely missed."
-    [/message]
-[/event]
-#endif
-
-#ifdef ALLY_FEATURING
-# Dwarf/Troll ally death
+#define ALLY_DEATH
 [event]
     name=die
 
@@ -154,9 +133,10 @@
         value=1
     [/set_variable]
 [/event]
+#enddef
 
-# Esanoo's death
 
+#define ESANOO_DEATH
 [event]
     name=die
     [filter]
@@ -173,9 +153,9 @@
         message= _ "Farewell Esanoo. You were my favorite of the merfolk."
     [/message]
 [/event]
+#enddef
 
-# Kromph's death
-
+#define KROMPH_DEATH
 [event]
     name=die
     [filter]
@@ -187,8 +167,9 @@
         message= _ "Aaauurrrgghhh!!!"
     [/message]
 [/event]
+#enddef
 
-# Dwarf/Troll ally death
+#define LATE_ALLY_DEATH
 [event]
     name=die
 
@@ -227,12 +208,9 @@
         value=1
     [/set_variable]
 [/event]
+#enddef
 
-#endif
-
-#else
-
-# Kaleh death
+#define LATE_KALEH_DEATH
 [event]
     name=die
     [filter]
@@ -248,51 +226,24 @@
         result=defeat
     [/endlevel]
 [/event]
+#enddef
 
-# Nym death
+#ifdef ELYSSA_FEATURING
 [event]
     name=die
+
     [filter]
-        description=Nym
+        description=Elyssa
     [/filter]
 
     [message]
         speaker=unit
-        message= _ "Save me Kaleh, I'm dying..."
+        message= _ "This can't be the end, I have too much left to see."
     [/message]
 
-    [set_variable]
-        name=allies_killed
-        add=1
-    [/set_variable]
-
-    [set_variable]
-        name=nym_dead
-        value=1
-    [/set_variable]
-[/event]
-
-# Zhul death
-[event]
-    name=die
-    [filter]
-        description=Zhul
-    [/filter]
-
     [message]
-        speaker=unit
-        message= _ "Eloh protect us, I have fallen."
+        description=Kaleh
+        message= _ "How could we have let her die? I've never seen fire magic like that before. She will be sorely missed."
     [/message]
-
-    [set_variable]
-        name=allies_killed
-        add=1
-    [/set_variable]
-
-    [set_variable]
-        name=zhul_dead
-        value=1
-    [/set_variable]
 [/event]
-
 #endif