From d1c2413b2b4c86c6ff7fba15b78c59d0119a1510 Mon Sep 17 00:00:00 2001
From: newfrenchy83 <eric.belleux@gmail.com>
Date: Fri, 4 Dec 2020 18:03:52 +0100
Subject: [PATCH] put [remove_event] instead of [event]remove=yes

---
 macros/weapon-specials.cfg           |  5 ++---
 scenarios/05a_Crossfire.cfg          |  5 ++---
 scenarios/09_The_Library.cfg         | 10 ++++------
 scenarios/10_The_Source_of_Light.cfg | 10 ++++------
 scenarios/11_Strike_on_Herthgar.cfg  |  5 ++---
 scenarios/16_Dawn_of_War.cfg         |  5 ++---
 6 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/macros/weapon-specials.cfg b/macros/weapon-specials.cfg
index f5fb5c7f..44ea94b2 100644
--- a/macros/weapon-specials.cfg
+++ b/macros/weapon-specials.cfg
@@ -130,10 +130,9 @@ This attack is only available on offense against living targets, and always has
                     [/effect]
                 [/object]
 
-                [event]
-                    remove=yes
+                [remove_event]
                     id=shrapnel:hit_handler
-                [/event]
+                [/remove_event]
             [/then]
             #
             # Update counter in the attack name.
diff --git a/scenarios/05a_Crossfire.cfg b/scenarios/05a_Crossfire.cfg
index 4877bd7a..fdf472a3 100644
--- a/scenarios/05a_Crossfire.cfg
+++ b/scenarios/05a_Crossfire.cfg
@@ -753,10 +753,9 @@
                             #
                             # Never run this handler again.
                             #
-                            [event]
+                            [remove_event]
                                 id=ring_regen_ctl
-                                remove=yes
-                            [/event]
+                            [/remove_event]
                         [/then]
                     [/object]
                 [/command]
diff --git a/scenarios/09_The_Library.cfg b/scenarios/09_The_Library.cfg
index f4f7e8f2..9b35fb2b 100644
--- a/scenarios/09_The_Library.cfg
+++ b/scenarios/09_The_Library.cfg
@@ -758,15 +758,13 @@ Should I leave, or take a look inside?"
             id=Igor
         [/scroll_to_unit]
 
-        [event]
+        [remove_event]
             id=igors_hideout_found_by_undead
-            remove=yes
-        [/event]
+        [/remove_event]
 
-        [event]
+        [remove_event]
             id=igors_hideout_found_by_living
-            remove=yes
-        [/event]
+        [/remove_event]
     [/event]
 
     [event]
diff --git a/scenarios/10_The_Source_of_Light.cfg b/scenarios/10_The_Source_of_Light.cfg
index ae928263..ff55a459 100644
--- a/scenarios/10_The_Source_of_Light.cfg
+++ b/scenarios/10_The_Source_of_Light.cfg
@@ -1114,15 +1114,13 @@
     [event]
         name=glyph scrying complete
 
-        [event]
+        [remove_event]
             id=glyph_scrying_progress_incrementor_eh
-            remove=yes
-        [/event]
+        [/remove_event]
 
-        [event]
+        [remove_event]
             id=glyph_scrying_finish_eh
-            remove=yes
-        [/event]
+        [/remove_event]
 
         # Flag for the objectives screen.
         {VARIABLE glyph_scrying_progress -1}
diff --git a/scenarios/11_Strike_on_Herthgar.cfg b/scenarios/11_Strike_on_Herthgar.cfg
index a5204949..8e63f0ca 100644
--- a/scenarios/11_Strike_on_Herthgar.cfg
+++ b/scenarios/11_Strike_on_Herthgar.cfg
@@ -576,10 +576,9 @@
                 [/event]
 
                 # Self-destruct
-                [event]
+                [remove_event]
                     id=elynia_malin_dialog_controller
-                    remove=yes
-                [/event]
+                [/remove_event]
             [/then]
         [/if]
     [/event]
diff --git a/scenarios/16_Dawn_of_War.cfg b/scenarios/16_Dawn_of_War.cfg
index 690ed9f1..6ac9bdad 100644
--- a/scenarios/16_Dawn_of_War.cfg
+++ b/scenarios/16_Dawn_of_War.cfg
@@ -517,10 +517,9 @@
 
         {MYSTERIOUS_VOICE ( _ "And you will suffer the same fate as she if you refuse our generous offer.")}
 
-        [event]
-            remove=yes
+        [remove_event]
             id=shadowm_talk_controller
-        [/event]
+        [/remove_event]
 
         {CLEAR_VARIABLE shadowm_talk}
     [/event]