possible fix for rogue armor in HttT

data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg

@@ -83,13 +83,9 @@
 	name=start
 		#For Home of the Northern Elves: where do we come from?
 		[set_variable]
-		name=path_snow_plains
-		value=yes
+		name=A_Choice_Was_Made
+		value=c
 		[/set_variable]
-	[/event]
-
-	[event]
-	name=start
 		[recall]
 		description=Delfador
 		[/recall]

data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg

@@ -151,6 +151,11 @@
 
 	[event]
 	name=start
+		#For Home of the Northern Elves: where do we come from?
+		[set_variable]
+		name=A_Choice_Was_Made
+		value=b
+		[/set_variable]
 		[recall]
 		description=Delfador
 		[/recall]
@@ -183,6 +188,7 @@
 name=die
 	[filter]
 	description={NAME}
+	type=Death Knight
 	[/filter]
 	[message]
 	speaker=narrator
@@ -204,26 +210,17 @@ name=die
 #enddef
 
 #
-# Give some great armor to one of the Death Knights - this does not work as of
-# v1.1.1 so the middle line is disabled
-#
-
-#
-# 1.1.4 PROBLEMS: if you kill the endowed knight last, the lich event doesn't fire.
-# Also, the void armor event is triggered every time any character steps somewhere.
-# Also, the "cannot use" condition isn't working (but that might be me).
+# 1.1.7 PROBLEMS: if you kill the endowed knight last, the lich event doesn't fire.
 #
 
 [event]
 name=prestart
 	{VARIABLE_OP armored_knight random (Clarustus,Merlunius,Secadius,Dafeis)}
 	{ENDOWED_KNIGHT ($armored_knight)}
-	{CLEAR_VARIABLE armored_knight}
 [/event]
 
 #
-# Reward the player for killing all 4 Death Knights - right now, nothing really happens
-# except for a spiffy message and the Lich is weaker
+# Reward the player for killing all 4 Death Knights - the Lich is weaker
 #
 [event]
 name=prestart

data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg

@@ -203,13 +203,7 @@
 
 	{STARTING_VILLAGES 4 24}
 
-	[event]
-	name=prestart
 
-	#
-	# Add a bunch of strong guardians to discourage you from attacking the leaders
-	# These are full-fledged war camps, after all
-	#
 #define GUARDIAN TYPE SIDE X_LOC Y_LOC
 	[unit]
 	side={SIDE}
@@ -219,6 +213,19 @@
 	[/unit]
 #enddef
 
+	[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, after all
+	#
+
 	#
 	# Camp guards
 	#