From 9e8fb2d3e09b8c50a9eb1abd976efaf7d316ca66 Mon Sep 17 00:00:00 2001
From: DisherProject <pycchio@tiscali.it>
Date: Sun, 9 Sep 2018 22:06:44 +0200
Subject: [PATCH] SoF: General cleanup

1) Clear variables and macros
2) Remove default AI values
3) S7: Remove the ghost ship
---
 .../scenarios/1_A_Bargain_is_Struck.cfg                |  2 --
 .../Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg  |  6 +++---
 .../scenarios/3_Searching_for_the_Runecrafter.cfg      |  3 +++
 .../scenarios/5_Hills_of_the_Shorbear_Clan.cfg         |  2 ++
 .../scenarios/7_Outriding_the_Outriders.cfg            | 10 ++--------
 .../Sceptre_of_Fire/scenarios/8_The_Dragon.cfg         |  1 +
 .../Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg   |  5 +++++
 data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg  |  1 +
 8 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
index a60ebacd636d..6c4bb483b81d 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
@@ -93,7 +93,6 @@
         user_team_name= _ "Elves"
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
-            {AI_SIMPLE_ALWAYS_ASPECT grouping offensive}
             {AI_SIMPLE_ALWAYS_ASPECT passive_leader yes}
             [goal]
                 [criteria]
@@ -368,7 +367,6 @@
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
             [/modifications]
-            {IS_HERO}
         [/unit]
         [message]
             speaker=Alanin
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
index a83d5ca7eef5..3a99c88955a2 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
@@ -40,9 +40,6 @@
         {GOLD 200 250 300}
         team_name=elves
         user_team_name= _ "Elves"
-        [ai]
-            grouping=offensive
-        [/ai]
         {FLAG_VARIANT wood-elvish}
     [/side]
 
@@ -824,3 +821,6 @@
         [/image]
     [/terrain_graphics]
 [/scenario]
+
+#undef GLYPH_ON
+#undef GLYPH_OFF
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
index 2c9738aed049..6abd7974794f 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
@@ -628,6 +628,7 @@
             id=Baglur
             image=misc/loyal-icon.png
         [/unit_overlay]
+        {CLEAR_VARIABLE thur_x,thur_y}
         [endlevel]
             result=victory
             bonus=yes
@@ -645,3 +646,5 @@
         [/endlevel]
     [/event]
 [/scenario]
+
+#undef WINTERENEMY
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
index f750529491ef..9eb7df7eb11b 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
@@ -835,3 +835,5 @@
         [/gold]
     [/event]
 [/scenario]
+
+#undef IN_CAVES
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
index f2243cb517d5..fca210370b49 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
@@ -96,11 +96,6 @@
                 carryover_percentage=0
             [/gold_carryover]
         [/objectives]
-        [unit]
-            x,y=1,1
-            type=Galleon
-            side=2
-        [/unit]
     [/event]
 
     [event]
@@ -172,9 +167,6 @@
                 {TRAIT_RESILIENT}
             [/modifications]
         [/unit]
-        [kill]
-            type=Galleon
-        [/kill]
         [scroll_to]
             x,y=18,1
         [/scroll_to]
@@ -265,6 +257,8 @@
             [/modifications]
             {IS_LOYAL}
         [/unit]
+
+        {CLEAR_VARIABLE random}
     [/event]
 
     [event]
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
index 3e3aefcd91fd..e3c028781d41 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
@@ -461,6 +461,7 @@
                 variable=thur
                 find_vacant=yes
             [/unstore_unit]
+            {CLEAR_VARIABLE thur}
 
             [object]
                 id=sceptre of fire
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
index 69163612a13a..e71a66a36654 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
@@ -835,6 +835,8 @@
         [unstore_unit]
             variable=alanin
         [/unstore_unit]
+        {CLEAR_VARIABLE move_x,move_y}
+        {CLEAR_VARIABLE alanin}
         [endlevel]
             result=victory
             carryover_report=no
@@ -843,3 +845,6 @@
         [/endlevel]
     [/event]
 [/scenario]
+
+#undef RANDOM_MERCENARY_2
+#undef CHANGE_MAP
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
index ae7e2b6a1612..ec06a138ae1c 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
@@ -176,6 +176,7 @@
         [unstore_unit]
             variable=krawg
         [/unstore_unit]
+        {CLEAR_VARIABLE krawg}
         #/MUF
         [message]
             speaker=Gatekeeper