httt story enhancements, added armor.png placeholder image

data/campaigns/Heir_To_The_Throne/maps/Swamp_Of_Dread

@@ -1,46 +1,46 @@
-dddwwrrrdwwwddrrdddwwwddwwwwwddddrrrrY
+fYrrrrddddwwwwwddwwwdddrrddwwwdrrrwwddd
-wwwwddrrddwwwdrYrddwwwddwYwrrrdrdrrddd
+ddddrrdrdrrrwYwddwwwddrYrdwwwddrrddwwww
-wwwwdNdrdrddwwrrrdddwddrrrrrrrrrrrdndd
+dddndrrrrrrrrrrrddwdddrrrwwddrdrdNdwwww
-wwwwN2NrrrrrwwrdrwwwwrrdrdddwwrrYrn1nY
+dYn1nrYrrwwdddrdrrwwwwrdrwwrrrrrN2Nwwww
-wdwddddrrrrddwddddwwrwddddddwwwwrwnnnd
+ddnnnwrwwwwddddddwrwwddddwddrrrrddddwdw
-dddrdrrrrddwwwwwddrrwwddYddrrwwwwwdddd
+dddddwwwwwrrddYddwwrrddwwwwwddrrrrdrddd
-dwrrrYrrrddwwwwwwwrrdwdddrrYrwwwwrrrdd
+dddrrrwwwwrYrrdddwdrrwwwwwwwddrrrYrrrwd
-dwrrrrrrrrddwwwwwdrrrwrrrrrrrwwwwrrrYr
+rrYrrrwwwwrrrrrrrwrrrdwwwwwddrrrrrrrrwd
-wwwrrrrrrrrrwwwrrdrrrwwwrrrwwwwwwdrddr
+rrddrdwwwwwwrrrwwwrrrdrrwwwrrrrrrrrrwww
-wwwwrdrrrrrrwwrrrdddrrwwwrrwwwrddYdddd
+dddddYddrwwwrrwwwrrdddrrrwwrrrrrrdrwwww
-rwwwddddrdwwwrrrddddrrrrwwwrwwrddddddd
+ddddddddrwwrwwwrrrrddddrrrwwwdrddddwwwr
-rrwdddddddwwrrrrdddddrrwwwrrrwdwdddddd
+dddddddwdwrrrwwwrrdddddrrrrwwdddddddwrr
-rrddddYdddwdrrrrrrddddrdwdYwwwwwdddddd
+dddddddwwwwwYdwdrddddrrrrrrdwdddYddddrr
-rrdddddddddddrrYrrrrdddddddwwwwrdrdYdr
+rrdYdrdrwwwwdddddddrrrrYrrdddddddddddrr
-rrrdddddddddrrrrrrrrdddddddwwrrrrrrrrr
+rrrrrrrrrrwwdddddddrrrrrrrrdddddddddrrr
-rrrrdrdwdwwwrrrddrrrwwdddddddrrrrrrrrr
+rrrrrrrrrrdddddddwwrrrddrrrwwwdwdrdrrrr
-rrrrrwrrwwwwrrrddwwwwwwdddddrrYrrrddrr
+rrrddrrrYrrdddddwwwwwwddrrrwwwwrrwrrrrr
-rrYrrwwwwwwwrdddwwwwwrdddddwrrrrddddrr
+rrrddddrrrrwdddddrwwwwwdddrwwwwwwwrrYrr
-rrrdddwdwrddddddwwwrrrrrrrwwwwrddddddr
+rrddddddrwwwwrrrrrrrwwwddddddrwdwdddrrr
-rwdddddddrddddddddddrYrrrrwwwwwddddddr
+rrddddddwwwwwrrrrYrddddddddddrdddddddwr
-wwwwwwdNdrrYdwdddddrrrrrrrwwwwwdddddrr
+rrrdddddwwwwwrrrrrrrdddddwdYrrdNdwwwwww
-wwwwwwN3Nrrwwwrrrrrrrrrdddddwwwddddwrr
+rrrwddddwwwdddddrrrrrrrrrwwwrrN3Nwwwwww
-wwwwwddddwwwwwrrrrrrrrdddN6Ndrrrdrdwww
+wwwwdrdrrrdN6Ndddrrrrrrrrwwwwwddddwwwww
-wrwdddddwwwwwdrdrdrwwwddddNddrrrrrwwww
+wwwwwrrrrrddNddddwwwrdrdrdwwwwwdddddwrw
-rrrddddrrwwrddddddwwwwwddddddrYrrrwwwr
+rrwwwrrrYrddddddwwwwwddddddrwwrrddddrrr
-rYrrdrrrrwwrddddddwwwwwdddddrrrrrdddrr
+rrrdddrrrrrdddddwwwwwddddddrwwrrrrdrrYr
-rrrrrrrrwwrYdddddddrrrdddddwrwrdddddrr
+rrrdddddrwrwdddddrrrdddddddYrwwrrrrrrrr
-rdrdrwrwwwrrrddddrrrYrrrrrwwwwwwddddrr
+rrrddddwwwwwwrrrrrYrrrddddrrrwwwrwrdrdr
-ddddddwwwwwrrrrrwwwwrrrdrdwwwwwwdddrrr
+rrrrdddwwwwwwdrdrrrwwwwrrrrrwwwwwdddddd
-ddddddwwwwwrrdrwwwwwrddddddrwwwddddrYr
+rrYrddddwwwrddddddrwwwwwrdrrwwwwwdddddd
-dddddddwwdddddddwwwwwddddrrrrddddrrrrw
+wwrrrrddddrrrrddddwwwwwdddddddwwddddddd
-dddddrrrrrddddddrrwwwddddrrrdddwrwwwww
+wwwwwwrwdddrrrddddwwwrrddddddrrrrrddddd
-rrdrrYrrrddddddddrrddddrrrrrrrrwwwwwww
+wwwwwwwwrrrrrrrrddddrrddddddddrrrYrrdrr
-rwwrrrrrrdddddddrrrdddddrrrrYrrwwwrrwr
+rrwrrwwwrrYrrrrdddddrrrdddddddrrrrrrwwr
-wwwwrrrrrrdddddrrYrrdddddddrrrrrwwwwrr
+rrrwwwwrrrrrdddddddrrYrrdddddrrrrrrwwww
-wwwwwdddrrrrrrrrrrrrrrdddddrrrrrrdwddr
+rrddwdrrrrrrdddddrrrrrrrrrrrrrrdddwwwww
-wrdddNdddrrrrrrdddddrrrwrrrrrddddddddr
+rrddddddddrrrrrwrrrdddddrrrrrrdddNdddrw
-rrddN4NdwwrwrrddddddddwwwwrddddNdddddr
+rrdddddNddddrwwwwddddddddrrwrwwdN4Nddrr
-rrddNNNdwwwwwdddddddddwwwwwwddN5Ndddrr
+rrrdddN5NddwwwwwwdddddddddwwwwwdNNNddrr
-rddddddrwwwwwdddddddddwwwwwdddddddddrr
+rrrdddddddddwwwwwdddddddddwwwwwrddddddr
-dddddrdrwwwwwdddddddddwwwrrddddddwwwrr
+rrrwwwddddddrrwwwdddddddddwwwwwrdrddddd
-dddrrrrrrrrrrddddddddrrrrrrrddddwwwwww
+wwwwwwwddddrrrrrrrddddddddrrrrrrrrrrddd
-rrdrrrYrrdrrrrdddYdddrrrrdrYrrdrwwwwww
+wwwwwwwrdrrYrdrrrrdddYdddrrrrdrrYrrrdrr
-rwwwrrrdddddrrrwdwdrrrrrddddrdrrwwwwww
+wwwwwwwrrdrddddrrrrrdwdwrrrdddddrrrwwwr
-rwwwwddddddddrwwwwwwrrrdddddddrrYrwwwr
+rrwwwrYrrdddddddrrrwwwwwwrddddddddwwwwr
-rrwwwddddddddrwwwwwwwrdddddddddrrrrrrr
+rrrrrrrrdddddddddrwwwwwwwrddddddddwwwrr

data/campaigns/Heir_To_The_Throne/scenarios/A_Choice_Must_Be_Made.cfg

@@ -16,7 +16,7 @@
 
 	[story]
 		[part]
-		story= _ "The Scepter, initially dulled from decades of dust and debris, began to glow from the ruby's inner fire. Dwarvish runes on the golden handle gently started to pulsate blue. The heat and light were comforting in the pitch black."
+		story= _ "The Scepter, initially dulled from decades of dust and debris, began to glow from the ruby's inner fire. Dwarvish runes on the golden handle started to gently pulsate blue. The heat and light were comforting in the pitch black."
 		#background="maps/wesnoth.png"
 		show_title=no
 		[/part]

data/campaigns/Heir_To_The_Throne/scenarios/Gryphon_Mountain.cfg

@@ -320,6 +320,7 @@
 		variable=sleepy_gryphon_store[$i]
 		[/unstore_unit]
 		{NEXT i}
+		{CLEAR_VARIABLE sleepy_gryphon_store}
 	[/event]
 
 	{campaigns/Heir_To_The_Throne/utils/deaths.cfg}

data/campaigns/Heir_To_The_Throne/scenarios/Scepter_of_Fire.cfg

@@ -4,16 +4,6 @@ id=Scepter
 name= _ "The Scepter of Fire"
 scenario_generation=cave
 
-#define BIGMAP_SCEPTER_OF_FIRE
-	[story]
-		[part]
-			background=maps/wesnoth.png
-			show_title=yes
-			{CROSS 406 72} 
-		[/part]
-	[/story]
-#enddef
-
 #
 # If you think this is laying it on a bit thick, I'm open to suggestions
 # for better wording or something less melodramatic.

data/campaigns/Heir_To_The_Throne/scenarios/Swamp_Of_Dread.cfg

@@ -3,7 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Swamp Of Dread"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Swamp_Of_Dread}"
-	music="wesnoth-7.ogg"
+	music="wesnoth-3.ogg"
 	{TURNS 33 30 27}
 
 	next_scenario="North_Elves"
@@ -22,7 +22,11 @@
 		[objectives]
 		side=1
 			[objective]
-				description= _ "Defeat all enemy leaders"
+				description= _ "Defeat the Lich Lord Aimucasur"
+				condition=win
+			[/objective]
+			[objective]
+				description= _ "Defeat the Death Knights (Bonus)"
 				condition=win
 			[/objective]
 			[objective]
@@ -158,11 +162,167 @@
 		[/recall]
 		[message]
 		description=Delfador
-		message= _ "This land is cursed. The Liches have lived here for years amassing great armies and fortunes."
+		message= _ "This land is cursed. Liches have existed here for ages, luring adventurers and soldiers to their deaths and amassing great armies and fortunes."
 		[/message]
 		[message]
 		description=Konrad
-		message= _ "The Liches are all over this swamp. I hope I have made a wise choice in taking this path."
+		message= _ "Look there! The swamp is infested with all manner of skeletons, corpses, and worse. I hope I have made a wise choice in taking this path."
+		[/message]
+		[message]
+		description=Delfador
+		message= _ "These Death Knights appear to be minions enslaved by the Lich Lord. This one must be particularly powerful, since Death Knights are usually strong-willed spirits on their own."
+		[/message]
+		[message]
+		description=Kalenz
+		message= _ "I believe we can destroy the master and release the minions. There is much fighting to be done before we can pass through these swamps in peace. May our bones not join these fallen warriors who now oppose us."
 		[/message]
 	[/event]
+
+#define VOID_ARMOR X_LOC Y_LOC
+	{PLACE_IMAGE items/armor.png ({X_LOC}) ({Y_LOC})}
+	[event]
+	name=moveto
+	first_time_only=no
+		[filter]
+		side=1
+		x,y={X_LOC},{Y_LOC}
+		[/filter]
+
+		[if]
+		[variable]
+		name=armor_taken
+		numerical_equals=0
+		[/variable]
+		[then]
+			[message]
+			speaker=narrator
+			image="items/armor.png"
+				message= _ "Do you want this unit to pick up the armor?"
+				[option]
+				message= _ "Yes"
+					[command]
+						{VARIABLE armor_taken 1}
+						[message]
+						speaker=narrator
+						message= _ "You struggle to lift and don the heavy plate. Once worn, however, it is amazingly comfortable. You have increased resistance to all physical damage!"
+						[/message]
+						[removeitem]
+						x={X_LOC}
+						y={Y_LOC}
+						[/removeitem]
+						[store_unit]
+						variable=armor_store
+							[filter]
+							x={X_LOC}
+							y={Y_LOC}
+							[/filter]
+						[/store_unit]
+						{VARIABLE_OP armor_store.modifications.resistance.pierce add 20}
+						{VARIABLE_OP armor_store.modifications.resistance.blade add 20}
+						{VARIABLE_OP armor_store.modifications.resistance.impact add 20}
+						[unstore_unit]
+						variable=armor_store
+						[/unstore_unit]
+						{CLEAR_VARIABLE armor_store}
+						[object]
+						id=void_armor
+						name= _ "Void Armor"
+						image="items/armor.png"
+						description= _ "A beautiful chest plate crafted from shimmering black steel, the Void Armor is virtually impenetrable to physical weapons!"
+						cannot_use_message= _ "Only a powerful warrior may don this armor!"
+						duration=forever
+							[filter]
+							side=1
+							x,y={X_LOC},{Y_LOC}
+							[/filter]
+							[effect]
+							[/effect]
+						[/object]
+					[/command]
+				[/option]
+				[option]
+				message= _ "No"
+				[/option]
+			[/message]
+		[/then]
+		[/if]
+	[/event]
+#enddef
+
+#define ENDOWED_KNIGHT NAME
+[event]
+name=die
+	[filter]
+	description={NAME}
+	[/filter]
+	[message]
+	speaker=narrator
+	message= _ "The Death Knight explodes into a cloud of dust as it is eradicated. Its armor, however, drops to the ground and remains intact. The heavy black steel is polished to a mirror shine."
+	[/message]
+	[message]
+	description=Li'sar
+	message= _ "Delfador... that breastplate... how did it end up here?"
+	[/message]
+	[message]
+	description=Delfador
+	message= _ "Its owner was surely a famous warrior in life. I wonder who it was. That plate must have a powerful enchantment to have resisted centuries of decay. Choose wisely who will bear it."
+	[/message]
+	{VARIABLE armor_taken 0}
+	{VOID_ARMOR ($x1) ($y1)}
+[/event]
+#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
+#
+
+[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
+#
+[event]
+name=prestart
+	{VARIABLE dk_kill_count 0}
+[/event]
+[event]
+name=die
+first_time_only=no
+	[filter]
+	type=Death Knight
+	[/filter]
+	{VARIABLE_OP dk_kill_count add 1}
+
+	[if]
+	[variable]
+	name=dk_kill_count
+	numerical_equals=4
+	[/variable]
+	[then]
+		[message]
+		speaker=narrator
+		message= _ "As the last Death Knight falls, an ear-splitting screech escapes from the Lich. It is is clear that controlling such powerful spirits has drained it significantly, and it is seething in anger towards you."
+		[/message]
+		[store_unit]
+		variable=Lich_store
+			[filter]
+			type=Lich
+			[/filter]
+		[/store_unit]
+		{VARIABLE_OP Lich_store.hitpoints multiply 0.5}
+		[unstore_unit]
+		variable=Lich_store
+		[/unstore_unit]
+		{CLEAR_VARIABLE Lich_store}
+	[/then]
+	[/if]
+[/event]
+
 [/scenario]