From a2811dd620f73e05469ed7aaf1435cecd205bca3 Mon Sep 17 00:00:00 2001
From: Gregory A Lundberg <gregory_lundberg@gmx.com>
Date: Sat, 6 Aug 2016 13:00:00 -0500
Subject: [PATCH] HttT Remove variable artifacts

---
 .../scenarios/03_The_Isle_of_Alduin.cfg                   | 1 +
 .../scenarios/05b_Isle_of_the_Damned.cfg                  | 3 +++
 .../scenarios/06_The_Siege_of_Elensefar.cfg               | 1 +
 .../Heir_To_The_Throne/scenarios/07_Crossroads.cfg        | 3 +--
 .../scenarios/09_The_Valley_of_Death.cfg                  | 1 +
 .../Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg  | 1 +
 .../Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg  | 1 +
 .../Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg   | 3 ++-
 .../Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg | 8 --------
 .../scenarios/14_Plunging_Into_the_Darkness.cfg           | 1 +
 .../Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg   | 3 ++-
 .../Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg   | 1 +
 .../Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg | 5 +++++
 .../Heir_To_The_Throne/scenarios/20a_North_Elves.cfg      | 5 -----
 .../Heir_To_The_Throne/scenarios/21_Elven_Council.cfg     | 1 +
 .../scenarios/24_Battle_for_Wesnoth.cfg                   | 1 +
 data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg    | 8 +++++++-
 17 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
index ccd8b4ad7a6..a2d5ec72002 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
@@ -352,6 +352,7 @@
                 [/allow_recruit]
             [/then]
         [/if]
+        {CLEAR_VARIABLE received_mages}
 
         [kill]
             id=Seimus
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
index 095297d7c2c..b1a08bee278 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
@@ -390,6 +390,7 @@
             [/else]
 #endif
         [/if]
+        {CLEAR_VARIABLE random}
     [/event]
 
     [event]
@@ -474,6 +475,7 @@
             message= _ "You regain your lost troops and $isle_damned_starting_gold gold!"
             image=wesnoth-icon.png
         [/message]
+        {CLEAR_VARIABLE isle_damned_starting_gold}
 
         [allow_recruit]
             side=1
@@ -535,6 +537,7 @@
             message= _ "You regain your lost troops and $isle_damned_starting_gold gold!"
             image=wesnoth-icon.png
         [/message]
+        {CLEAR_VARIABLE isle_damned_starting_gold}
 
         [allow_recruit]
             side=1
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
index 34a2fd90038..6477d18c751 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
@@ -646,6 +646,7 @@
             message= _ "We cannot go to Wesmere, for Asheviere’s orcs have the approaches ringed about with steel; Kalenz and I barely escaped, and Chantal cannot get out. Until we are stronger, we must go where the orcs are not."
         [/message]
 
+        {CLEAR_VARIABLE thieves_ford}
         [endlevel]
             result=victory
             bonus=yes
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
index f0d94954132..322be413e05 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
@@ -363,6 +363,7 @@
             [/object]
         [/command]
     [/random_placement]
+    {CLEAR_VARIABLE ambush_location}
 
 #enddef
 
@@ -390,10 +391,8 @@
         {ORC_AMBUSH_AREA 3 26-40 16-23 7}
 #endif
 
-        {CLEAR_VARIABLE possible_ambush_locations}
         {CLEAR_VARIABLE random_ambusher_type_table}
         {CLEAR_VARIABLE random_ambusher_type_i}
-        {CLEAR_VARIABLE ambusher}
     [/event]
 
     [event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
index ffee66a2433..aa2647f41b6 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
@@ -458,6 +458,7 @@
                 [/kill]
             [/then]
         [/if]
+        {CLEAR_VARIABLE moremirmu}
     [/event]
 
     {campaigns/Heir_To_The_Throne/utils/deaths.cfg}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
index fb04807ce75..a99c988ccda 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
@@ -414,6 +414,7 @@
             message= _ "Let us continue onward!"
         [/message]
 
+        {CLEAR_VARIABLE gryphon_disposition}
         [endlevel]
             result=victory
             bonus=yes
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
index ce2dc705ba0..e618f9326b4 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
@@ -455,6 +455,7 @@
             [/then]
         [/if]
 
+        {CLEAR_VARIABLE lisar_still_here}
         [endlevel]
             result=victory
             bonus=yes
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
index beb7e355c72..5d04c7e4764 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
@@ -335,7 +335,7 @@
                 [/do]
             [/while]
 
-            {CLEAR_VARIABLE non_snowy_locs}
+            {CLEAR_VARIABLE non_snowy_locs,i,num_of_falling_snow,random,terrain,turns_left}
         [/event]
     [/event]
 
@@ -396,6 +396,7 @@
             [/else]
         [/if]
 
+        {CLEAR_VARIABLE turn_limit}
         [endlevel]
             result=victory
             bonus=yes
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
index e2431e869a5..5aeacd2568b 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
@@ -552,10 +552,6 @@
                     speaker=Konrad
                     message= _ "Pray that we live to see sunlight again."
                 [/message]
-                [set_variable]
-                    name=killed_enemies
-                    value=false
-                [/set_variable]
                 [endlevel]
                     result=victory
                     bonus=yes
@@ -582,10 +578,6 @@
                     speaker=Konrad
                     message= _ "Pray that we live to see sunlight again."
                 [/message]
-                [set_variable]
-                    name=killed_enemies
-                    value=false
-                [/set_variable]
                 [endlevel]
                     result=victory
                     bonus=yes
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
index f82b5eedbc4..24614e30933 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
@@ -670,6 +670,7 @@
             [/then]
         [/if]
 
+        {CLEAR_VARIABLE get_gryphons}
         [endlevel]
             result=victory
             bonus=no
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
index d4b7a3a5242..35ff3866d66 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
@@ -244,6 +244,7 @@
                         [/terrain]
                     [/do]
                 [/foreach]
+                {CLEAR_VARIABLE scepter_vicinity}
                 [terrain]
                     x=$scepter_x
                     y=$scepter_y
@@ -345,7 +346,7 @@
             [event]
                 name=victory
 
-                {CLEAR_VARIABLE concentrating,moved_too_close}
+                {CLEAR_VARIABLE concentrating,moved_too_close,lava_body,lava_count,scepter_x,scepter_y}
             [/event]
 
             [event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
index 9549fddc2ce..345dfad571d 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
@@ -389,6 +389,7 @@
         {CLEAR_VARIABLE temp_armor_x}
         {CLEAR_VARIABLE temp_armor_y}
         {CLEAR_VARIABLE armor_taken}
+        {CLEAR_VARIABLE armored_knight,dk_kill_count}
         [endlevel]
             result=victory
             bonus=yes
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
index a537fef4f58..695312bfd15 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
@@ -503,6 +503,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
             message= _ "We’ve found $random gold in the drake nest."
             image=items/gold-coins-medium.png
         [/message]
+        {CLEAR_VARIABLE random}
 
         # Remove the current location from the array
         [for]
@@ -527,6 +528,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
                 [/if]
             [/do]
         [/for]
+        {CLEAR_VARIABLE i}
     [/event]
 
     [event]
@@ -627,6 +629,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
                                                 [+unit]
                                                     ai_special=guardian
                                                 [/unit]
+                                                {CLEAR_VARIABLE spawn_type}
                                             [/case]
 
                                             [case]
@@ -645,6 +648,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
                                                 {VARIABLE this_item.delayed_spawning_on_turn "$($turn_number + 2)"}
                                             [/case]
                                         [/switch]
+                                        {CLEAR_VARIABLE spawn_level}
                                     [/then]
                                 [/if]
                             [/else]
@@ -951,6 +955,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
                     speaker=Konrad
                     message= _ "Everybody inside..."
                 [/message]
+                {CLEAR_VARIABLE waterfall_sighted,drake_bases}
                 [endlevel]
                     result=victory
                     bonus=yes
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
index 304bb0b6526..ce16e4b6dfc 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
@@ -261,11 +261,6 @@
     [event]
         name=prestart
 
-        #
-        # Variable cleanup from last scenario
-        #
-        {CLEAR_VARIABLE armored_knight}
-
         #
         # Add a bunch of strong guardians to discourage you from
         # attacking the leaders These are full-fledged war camps,
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
index 6414673d8cf..d5263ed5614 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
@@ -305,6 +305,7 @@
             speaker=Parandra
             message= _ "Yes, rest. Your soldiers will be tended to and refreshed. We have made sure you will leave our protection with the resources to finish your journey."
         [/message]
+        {CLEAR_VARIABLE scepter}
         [endlevel]
             result=victory
             bonus=no
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
index 1dbe6728761..fd217553dff 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
@@ -212,6 +212,7 @@
                 {NAMED_LOYAL_UNIT 1 (Grand Knight) 39 8 (Sir Alric) (_ "Sir Alric")}
             [/then]
         [/if]
+        {CLEAR_VARIABLE clan_alric,clan_bayar,clan_daryn,clan_ruga}
     [/event]
 
     [event]
diff --git a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
index 5715120daa0..c62e34223eb 100644
--- a/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
+++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
@@ -58,6 +58,10 @@
 
         {PLACE_IMAGE items/flame-sword.png ({X}) ({Y})}
         {VARIABLE sword_taken 0}
+        [event]
+            name=victory
+            {CLEAR_VARIABLE sword_taken}
+        [/event]
     [/event]
     [event]
         name=moveto
@@ -446,6 +450,7 @@ fire:  +10%"
         y=$y_range
         terrain={TERRAIN}
     [/terrain]
+    {CLEAR_VARIABLE side_store,min_x,min_y,max_x,max_y,x_range,y_range}
 #enddef
 
 #textdomain wesnoth-help
@@ -503,15 +508,16 @@ fire:  +10%"
             {CLEAR_VARIABLE lava_body}
             {VARIABLE lava_body.x $potential_locs[$random].x}
             {VARIABLE lava_body.y $potential_locs[$random].y}
+            {CLEAR_VARIABLE random}
             [terrain]
                 x=$lava_body.x
                 y=$lava_body.y
                 terrain=Ql
             [/terrain]
-            {CLEAR_VARIABLE potential_locs}
             {CLEAR_VARIABLE randrange}
         [/then]
     [/if]
+    {CLEAR_VARIABLE potential_locs}
 #enddef
 
 #define EXPAND_LAVA