bugfix for httt not starting,

gryphon goodie for 1.3, and possible bugfix for rogue armor

data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg

@@ -110,7 +110,7 @@
 		x,y=13,16
 		letter=m
 		[/terrain]
-
+		{VARIABLE gryphon_disposition 1}
 	[/event]
 
 	[event]
@@ -161,6 +161,18 @@
 		[/set_variable]
 	[/event]
 
+	[event]
+	name=turn 2
+		[message]
+		description=Delfador
+		message= _ "It appears that we are not the only ones interested in this mountain. Once again the Queen opposes us!"
+		[/message]
+		[message]
+		description=Konrad
+		message= _ "Quickly, men! Onward!"
+		[/message]
+	[/event]
+
 	#if the enemy gets to the gryphon eggs first
 	[event]
 	name=die
@@ -174,19 +186,40 @@
 		speaker=second_unit
 		message= _ "Ha ha! We have killed this foul beast of the air, and can deny the rebels its eggs!"
 		[/message]
+		{VARIABLE_OP gryphon_disposition add -1}
+	[/event]
+	[event]
+	name=attack
+		[filter]
+		side=2
+		[/filter]
+		[filter_second]
+		side=3
+		[/filter_second]
+		{VARIABLE_OP gryphon_disposition add 2}
+	[/event]
+	[event]
+	name=attack
+	first_time_only=no
+		[filter]
+		side=1
+		[/filter]
+		[filter_second]
+		side=3
+		[/filter_second]
+		{VARIABLE_OP gryphon_disposition add -1}
+	[/event]
+	[event]
+	name=die
+		[filter]
+		side=3
+		[/filter]
+		[filter_second]
+		side=1
+		[/filter_second]
+		{VARIABLE_OP gryphon_disposition add -10}
 	[/event]
 
-	[event]
-	name=turn 2
-		[message]
-		description=Delfador
-		message= _ "It appears that we are not the only ones interested in this mountain. Once again the Queen opposes us!"
-		[/message]
-		[message]
-		description=Konrad
-		message= _ "Quickly, men! Onward!"
-		[/message]
-	[/event]
 
 	[event]
 	name=victory
@@ -210,10 +243,81 @@
 				[/message]
 			[/then]
 			[else]
-				[message]
-				description=Konrad
-				message= _ "It is a shame we could not get those gryphon eggs - they would surely have given us an advantage sometime. Still, we must continue."
-				[/message]
+				[if]
+				[and]
+					[variable]
+					name=gryphon_disposition
+					greater_than_equal_to=2
+					[/variable]
+					[have_unit]
+					side=3
+					[/have_unit]
+				[/and]
+				[then]
+					[message]
+					description=Konrad
+					message= _ "It is a shame we could not get those gryphon eggs. Still... (looks back at the mountain) I am glad we did not slaughter any gryphons. They are magnificent animals."
+					[/message]
+					[store_unit]
+					variable=gryphon_store
+						[filter]
+						side=3
+						[/filter]
+					[/store_unit]
+					{FOREACH gryphon_store i}
+					{VARIABLE gryphon_store.type Gryphon}
+					[unstore_unit]
+					variable=gryphon_store[$i]
+					[/unstore_unit]
+					{NEXT i}
+					{UNIT (Gryphon) (Graik) ( _ "Graik") 3 12 18}
+					{UNIT (Gryphon) (Griok) ( _ "Griok") 3 16 16}
+					{UNIT (Gryphon) (Griak) ( _ "Griak") 3 10 14}
+					[message]
+					speaker=narrator
+					image="wesnoth-icon.png"
+					message= _ "Indeed, gryphons were now circling the mountain's peak. Several glared in Konrad's direction, their eagle eyes fixed on him at an incredible distance."
+					[/message]
+					[scroll_to]
+					x,y=13,16
+					[/scroll_to]
+					[message]
+					description=Konrad
+					message= _ "Woah!!"
+					[/message]
+					[sound]
+					name=eagle.wav
+					[/sound]
+					[store_unit]
+					variable=gryphon_store
+						[filter]
+						side=3
+						[/filter]
+					[/store_unit]
+					{FOREACH gryphon_store i}
+						[kill]
+						x=gryphon_store[$i].x
+						y=gryphon_store[$i].y
+						[/kill]
+						[move_unit_fake]
+						type=Gryphon
+						x=gryphon_store[$i].x,24
+						y=gryphon_store[$i].y,1
+						[/move_unit_fake]
+					{NEXT i}
+					{CLEAR_VARIABLE gryphon_store}
+					[message]
+					description=Delfador
+					message= _ "Amazing. Come now, the show is over."
+					[/message]
+				[/then]
+				[else]
+					[message]
+					description=Konrad
+					message= _ "It is a shame we could not get those gryphon eggs - they would surely have given us an advantage sometime. Still, we must continue."
+					[/message]
+				[/else]
+				[/if]
 			[/else]
 		[/if]
 		[message]

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

@@ -188,6 +188,7 @@
 name=die
 	[filter]
 	description={NAME}
+	type=Death Knight
 	[/filter]
 	[message]
 	speaker=narrator
@@ -209,15 +210,13 @@ name=die
 #enddef
 
 #
-# 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.
+# 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]
 
 #

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

@@ -2,7 +2,7 @@
 	id=20c_The_Cliffs_of_Thoria
 	#textdomain wesnoth-httt
 	name= _ "The Cliffs of Thoria"
-	map_data="{campaigns/Heir_To_The_Throne/maps/Cliffs_of_Thoria
+	map_data="{campaigns/Heir_To_The_Throne/maps/Cliffs_of_Thoria}"
 	{SCENARIO_MUSIC "gameplay03.ogg"}
 	{TURNS 20 20 20}
 

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

@@ -216,6 +216,11 @@
 	[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