From 249b63a1689179b2c72e8dacdbc4c693c27e67c0 Mon Sep 17 00:00:00 2001
From: nemaara <nemaara@gmail.com>
Date: Mon, 21 Oct 2019 03:43:57 -0400
Subject: [PATCH] DiD: clean up special unit defines and extra code

---
 .../units/Mal_Keshar.cfg                      | 33 ++++----
 .../units/Spectral_Servant.cfg                | 81 +++++--------------
 2 files changed, 36 insertions(+), 78 deletions(-)

diff --git a/data/campaigns/Descent_Into_Darkness/units/Mal_Keshar.cfg b/data/campaigns/Descent_Into_Darkness/units/Mal_Keshar.cfg
index bc0c1470cf6d..13fa52493821 100644
--- a/data/campaigns/Descent_Into_Darkness/units/Mal_Keshar.cfg
+++ b/data/campaigns/Descent_Into_Darkness/units/Mal_Keshar.cfg
@@ -54,7 +54,7 @@
     {MAL_KESHAR_ADVANCEMENT 3 25 (
         id=lich_movement_melee
         description= _ "+1 movement"
-        image=attacks/touch-undead.png
+        image=icons/sandals.png
         [effect]
             apply_to=movement
             increase=1
@@ -226,23 +226,6 @@
     {DID_FROST_NOVA}
     {DID_SOUL_REND}
     {DID_SHADOW_VEIL_HANDLER}
-
-    [event]
-        name=post advance
-        [filter]
-            id=Mal Keshar
-            level=4
-        [/filter]
-
-        [modify_unit]
-            [filter]
-                id=Mal Keshar
-            [/filter]
-            [base_unit]
-                id=Ancient Lich
-            [/base_unit]
-        [/modify_unit]
-    [/event]
 #enddef
 
 #define MAL_KESHAR_ANCIENT_LICH_BASE
@@ -501,4 +484,16 @@
         inherit=yes
         {AMLA_MAL_KESHAR}
     [/variation]
-[/unit_type]
\ No newline at end of file
+[/unit_type]
+
+#undef MAL_KESHAR_ADVANCEMENT
+#undef LICH_MELEE
+#undef LICH_RANGED
+#undef LICH_MOVEMENT
+#undef ANCIENT_LICH_MALICE
+#undef ANCIENT_LICH_RESIST
+#undef ANCIENT_LICH_NOVA
+#undef ANCIENT_LICH_SPELLBIND
+#undef ANCIENT_LICH_REND
+#undef MAL_KESHAR_LICH_BASE
+#undef MAL_KESHAR_ANCIENT_LICH_BASE
diff --git a/data/campaigns/Descent_Into_Darkness/units/Spectral_Servant.cfg b/data/campaigns/Descent_Into_Darkness/units/Spectral_Servant.cfg
index 373580bc2c6a..cef01aaae353 100644
--- a/data/campaigns/Descent_Into_Darkness/units/Spectral_Servant.cfg
+++ b/data/campaigns/Descent_Into_Darkness/units/Spectral_Servant.cfg
@@ -315,64 +315,6 @@
     ) Eidolon}
 #enddef
 
-############## ANCIENT LICH ABILITIES ##############
-
-#define WRAITH_MALEVOLENCE VARIANT_NAME
-    {GHOST_ADVANCEMENT 1 50 (
-        id=wraith_malevolence
-        description= _ "Wail gains the malevolence special"
-        image=attacks/wail.png
-        [effect]
-            apply_to=attack
-            name=wail
-            [set_specials]
-                {WEAPON_SPECIAL_MALEVOLENCE}
-            [/set_specials]
-        [/effect]
-    ) {VARIANT_NAME}}
-#enddef
-
-#define ANCIENT_LICH_MALICE VARIANT_NAME
-    {GHOST_ADVANCEMENT 0 60 (
-        id=ancient_lich_malice
-        description= _ "Nearby undead units gain 15% damage"
-        image=attacks/wail.png
-        [effect]
-            apply_to=new_ability
-            [abilities]
-                {ABILITY_MALICE15}
-            [/abilities]
-        [/effect]
-    ) {VARIANT_NAME}}
-#enddef
-
-
-#define ANCIENT_LICH_REND VARIANT_NAME
-    {GHOST_ADVANCEMENT 5 0 (
-        id=ancient_lich_blood
-        description= _ "Drain HP from nearby enemies, but lose HP every turn"
-        image=attacks/curse.png
-        [effect]
-            apply_to=new_ability
-            [abilities]
-                {ABILITY_SOUL_REND}
-            [/abilities]
-        [/effect]
-        [effect]
-            apply_to=attack
-            name=touch
-            [set_specials]
-                {WEAPON_SPECIAL_REAP}
-            [/set_specials]
-        [/effect]
-        [effect]
-            apply_to=attack
-            name=touch
-            increase_damage=1
-        [/effect]
-    ) {VARIANT_NAME}}
-#enddef
-
 #define GHOST_BASE
     name= _ "Spectral Servant"
     hitpoints=17
@@ -557,4 +499,25 @@
         id=Spectre
     [/base_unit]
     {AMLA_EIDOLON}
-[/unit_type]
\ No newline at end of file
+[/unit_type]
+
+#undef GHOST_ADVANCEMENT
+#undef GHOST_ADVANCE
+#undef AUTO_ADVANCE
+#undef GHOST_MELEE
+#undef GHOST_RANGED
+#undef GHOST_MOVEMENT
+#undef GHOST_MELEE_ADVANCE
+#undef GHOST_RANGED_ADVANCE
+#undef GHOST_MOVE_ADVANCE
+#undef WRAITH_MELEE
+#undef WRAITH_MALEVOLENCE
+#undef WRAITH_HYSTERIA
+#undef WRAITH_MELEE_ADVANCE
+#undef WRAITH_RANGED_ADVANCE
+#undef WRAITH_MALEVOLENCE_ADVANCE
+#undef WRAITH_HYSTERIA_ADVANCE
+#undef WRAITH_RESIST_ADVANCE
+#undef GHOST_BASE
+#undef WRAITH_BASE
+#undef SPECTRE_BASE