From 7168a0255a24f1c36fda7416c3b02910e00c326d Mon Sep 17 00:00:00 2001
From: Scott Klempner <n1401e@hotmail.com>
Date: Fri, 19 May 2006 19:00:58 +0000
Subject: [PATCH] music macro, dialog tweaks,

...implemented tentative narrator graphic, balanced Moremirmu
appearing for HttT
---
 .../scenarios/01_Elves_Besieged.cfg           | 14 ++--
 .../scenarios/02_Blackwater_Port.cfg          | 10 +--
 .../scenarios/03_Isle_of_Anduin.cfg           |  8 +--
 .../scenarios/04_Bay_of_Pearls.cfg            |  7 +-
 .../scenarios/05a_Muff_Malal_Peninsula.cfg    |  8 +--
 .../scenarios/05b_Isle_of_the_Damned.cfg      | 67 ++++++++++++++-----
 .../scenarios/06_Siege_of_Elensefar.cfg       | 12 +++-
 .../scenarios/07_Crossroads.cfg               | 13 +---
 .../scenarios/08_Princess_of_Wesnoth.cfg      |  9 +--
 .../scenarios/09_Valley_of_Death.cfg          |  8 +--
 .../scenarios/10_Gryphon_Mountain.cfg         | 10 +--
 .../scenarios/11_Ford_of_Abez.cfg             |  4 +-
 .../scenarios/12_Northern_Winter.cfg          |  5 +-
 .../scenarios/13_Mountain_Pass.cfg            |  4 +-
 .../scenarios/14_Dwarven_Doors.cfg            |  5 +-
 .../15_Plunging_Into_the_Darkness.cfg         |  1 +
 .../scenarios/16_Lost_General.cfg             |  7 +-
 .../scenarios/17_Hasty_Alliance.cfg           |  4 +-
 .../scenarios/18_Scepter_of_Fire.cfg          |  2 +
 .../scenarios/19_A_Choice_Must_Be_Made.cfg    |  4 +-
 .../scenarios/20a_Snow_Plains.cfg             |  4 +-
 .../scenarios/20b_Swamp_Of_Dread.cfg          |  8 ++-
 .../scenarios/21_Home_North_Elves.cfg         |  4 +-
 .../scenarios/22_Elven_Council.cfg            |  4 +-
 .../scenarios/23_Valley_of_Statues.cfg        |  5 +-
 .../scenarios/24_Return_to_Wesnoth.cfg        |  9 +--
 .../scenarios/25_Test_of_the_Clans.cfg        |  5 +-
 .../scenarios/26_Battle_for_Wesnoth.cfg       |  3 +
 .../utils/{sof_utils.cfg => httt_utils.cfg}   | 35 ++++++++++
 .../Heir_To_The_Throne/utils/intro.cfg        |  2 +-
 30 files changed, 165 insertions(+), 116 deletions(-)
 rename data/campaigns/Heir_To_The_Throne/utils/{sof_utils.cfg => httt_utils.cfg} (91%)

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/01_Elves_Besieged.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/01_Elves_Besieged.cfg
index 68bfbb8e86c..c8a49a7ccf6 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/01_Elves_Besieged.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/01_Elves_Besieged.cfg
@@ -3,9 +3,8 @@ id=01_The_Elves_Besieged
 #textdomain wesnoth-httt
 name= _ "The Elves Besieged"
 map_data="{campaigns/Heir_To_The_Throne/maps/Elves_Besieged}"
-turns=16
-# Music is defined in prestart due to a story music key
-{campaigns/Heir_To_The_Throne/utils/intro.cfg}
+{SCENARIO_MUSIC "gameplay03.ogg"}
+{TURNS 18 14 10}
 
 {DAWN}
 {MORNING}
@@ -40,6 +39,7 @@ name=prestart
 	[/objectives]
 [/event]
 
+{campaigns/Heir_To_The_Throne/utils/intro.cfg}
 {BIGMAP_ELVES_BESIEGED}
 
 {STARTING_VILLAGES 5 10}
@@ -221,17 +221,11 @@ team_name=elves
 
 {PLACE_IMAGE items/signpost.png 1 1}
 
-[event]
-name=prestart
-	[music]
-	name="gameplay03.ogg"
-	[/music]
-[/event]
-
 [event]
 name=start
 	[message]
 	speaker=narrator
+	image="wesnoth-icon.png"
 	message= _ "Sixteen years into her rule, Asheviere turned her attention to the Wood Elves living in the great forest southwest of Wesnoth, whom she despised. Orcish mercenaries were hired and dispatched to bring about their ruin."
 	[/message]
 	[message]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
index fc154fc81d2..43ba1547b53 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Blackwater Port"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Blackwater_Port}"
-	[music]
-	name="wesnoth-2.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-2.ogg"}
 	{TURNS 12 12 9}
 
 	{DAWN}
@@ -15,8 +13,6 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}
 
-	{BIGMAP_BLACKWATER_PORT}
-
 	next_scenario=03_The_Isle_of_Anduin
 
 	[event]
@@ -46,6 +42,8 @@
 		[/objectives]
 	[/event]
 
+	{BIGMAP_BLACKWATER_PORT}
+
 	[label]
 	x,y=27,8
 	text= _ "Blackwater Port"
@@ -61,6 +59,7 @@
 	side=1
 	canrecruit=1
 	recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Elvish Shaman
+	gold=100
 	team_name=elves
 	controller=human
 	[/side]
@@ -181,6 +180,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "You may now recruit horsemen!"
 		[/message]
 		[message]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/03_Isle_of_Anduin.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/03_Isle_of_Anduin.cfg
index 41ecdd4a693..8f954dc0cb4 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/03_Isle_of_Anduin.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/03_Isle_of_Anduin.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Isle of Anduin"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Isle_of_Anduin}"
-	[music]
-	name="gameplay02.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay02.ogg"}
 	{TURNS 34 24 21}
 
 	{AFTERNOON}
@@ -50,9 +48,9 @@
 	experience=0
 	unrenamable=yes
 	side=1
-	gold=140
 	canrecruit=1
 	recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Elvish Shaman
+	gold=140
 	enemy=2
 	controller=human
 	[/side]
@@ -174,6 +172,7 @@
 
 	[message]
 	speaker=narrator
+	image="wesnoth-icon.png"
 	message= _ "And so the party landed on the Isle of Anduin."
 	[/message]
 	[message]
@@ -228,6 +227,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "You can now recruit magi!"
 		[/message]
 #ifdef EASY
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_Bay_of_Pearls.cfg
index d78fc443695..dc06e508b8f 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/04_Bay_of_Pearls.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/04_Bay_of_Pearls.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Bay of Pearls"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Bay_of_Pearls}"
-	[music]
-	name="gameplay03.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay03.ogg"}
 	{TURNS 27 24 21}
 
 	{DAWN}
@@ -50,8 +48,8 @@
 	side=1
 	canrecruit=1
 	recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman
+	gold=140
 	controller=human
-	{GOLD 150 0 0}
 	[/side]
 	
 	[side]
@@ -658,6 +656,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "You may now recruit the noble merfolk!"
 		[/message]
 		[message]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
index 4628d2b3cd3..ed82e310b6d 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Muff Malal's Peninsula"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Muff_Malal_Peninsula}"
-	[music]
-	name="wesnoth-1.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-1.ogg"}
 	{TURNS 27 24 21}
 
 	{DAWN}
@@ -51,8 +49,8 @@
 	canrecruit=1
 	controller=human
 	recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman,Merman Fighter
+	gold=140
 	enemy=2
-	{GOLD 100 0 0}
 	[/side]
 
 	[side]
@@ -107,6 +105,7 @@
 	name=start
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "But the road to Elensefar was a treacherous one. Konrad and his men were set upon by the fiends of the undead."
 		[/message]
 		[message]
@@ -150,6 +149,7 @@
 
 		[message]
 			speaker=narrator
+			image="signpost-portrait.png"
 			message= _ "To Elensefar"
 		[/message]
 
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 1c1f5226a40..4758bf8683d 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
@@ -4,9 +4,7 @@
 	next_scenario=06_The_Siege_of_Elensefar
 	name= _ "Isle of the Damned"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Isle_of_the_Damned}"
-	[music]
-	name="wesnoth-1.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-1.ogg"}
 	{TURNS 27 24 21}
 
 	{DAWN}
@@ -211,6 +209,21 @@
 		[/message]
 	[/event]
 
+#define EMPTY_TEMPLE_TRAP X Y
+	[event]
+	name=moveto
+		[filter]
+		side=1
+		x={X}
+		y={Y}
+		[/filter]
+		[message]
+		speaker=unit
+		message= _ "The temple seems to be empty."
+		[/message]
+	[/event]
+#enddef
+
 #define MOREMIRMU_TRAP X Y
 	[event]
 	name=moveto
@@ -308,36 +321,58 @@
 
 	[event]
 	name=start
+
+#
+# Determine the contents of the temples:
+# - on easy, Moremirmu shows up in 1 close temple and the others are empty
+# - on normal, Moremirmu shows up in 1 close temple and the far one has the revenant
+# - on hard, Moremirmu and the revenant show up in the 2 close temples (far one is empty)
+#
 		{RANDOM 1..2}
 		[if]
 			[variable]
 			name=random
 			numerical_equals=1
 			[/variable]
+#ifdef EASY
+			[then]
+				{MOREMIRMU_TRAP 11 13}
+				{EMPTY_TEMPLE_TRAP 10 17}
+				{EMPTY_TEMPLE_TRAP 9 15}
+			[/then]
+			[else]
+				{MOREMIRMU_TRAP 10 17}
+				{EMPTY_TEMPLE_TRAP 11 13}
+				{EMPTY_TEMPLE_TRAP 9 15}
+			[/else]
+#endif
+#ifdef NORMAL
+			[then]
+				{MOREMIRMU_TRAP 11 13}
+				{EMPTY_TEMPLE_TRAP 10 17}
+				{XAKAE_TRAP 9 15}
+			[/then]
+			[else]
+				{MOREMIRMU_TRAP 10 17}
+				{EMPTY_TEMPLE_TRAP 11 13}
+				{XAKAE_TRAP 9 15}
+			[/else]
+#endif
+#ifdef HARD
 			[then]
 				{MOREMIRMU_TRAP 11 13}
 				{XAKAE_TRAP 10 17}
+				{EMPTY_TEMPLE_TRAP 9 15}
 			[/then]
 			[else]
 				{MOREMIRMU_TRAP 10 17}
 				{XAKAE_TRAP 11 13}
+				{EMPTY_TEMPLE_TRAP 9 15}
 			[/else]
+#endif
 		[/if]
 	[/event]
 
-	[event]
-	name=moveto
-		[filter]
-		side=1
-		x=9
-		y=15
-		[/filter]
-		[message]
-		speaker=unit
-		message= _ "The temple seems to be empty."
-		[/message]
-	[/event]
-
 	[event]
 	name=die
 		[filter]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_Siege_of_Elensefar.cfg
index 3c4d032f1e1..981a3078710 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/06_Siege_of_Elensefar.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_Siege_of_Elensefar.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Siege of Elensefar"
 	map_data="{campaigns/Heir_To_The_Throne/maps/The_Siege_of_Elensefar}"
-	[music]
-	name="gameplay01.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay01.ogg"}
 	{TURNS 40 32 29}
 
 	{DAWN}
@@ -55,6 +53,8 @@
 	team_name=elves
 #ifdef EASY
 	gold=200
+#else
+	gold=140
 #endif
 	[/side]
 
@@ -154,6 +154,7 @@
 	name=start
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "The party arrived at Elensefar at last, but found that the city had already fallen to the savage orcs."
 		[/message]
 		[message]
@@ -251,6 +252,7 @@
 
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "As night began to fall, three dark figures crept out of the forest."
 		[/message]
 		[message]
@@ -336,6 +338,7 @@
 				[/filter]
 				[message]
 				speaker=narrator
+				image="wesnoth-icon.png"
 				message= _ "As the banner was raised, sounds of fighting could be heard from across the city."
 				[/message]
 
@@ -429,10 +432,12 @@
 
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "On the banks of Elensefar's port district, three shadowy figures appeared."
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "To Konrad's surprise, they quickly made their way across the river's mouth. The turbulent waters hid a nearly invisible ford, wide enough for two soldiers to march shoulder-to-shoulder."
 		[/message]
 	#create units
@@ -512,6 +517,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "The party rested for three days, after which an old friend returned."
 		[/message]
 
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 92a6d632123..ceab256d14a 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Crossroads"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Crossroads}"
-	[music]
-	name="gameplay03.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay03.ogg"}
 	{TURNS 39 36 33}
 
 	next_scenario=08_The_Princess_of_Wesnoth
@@ -332,12 +330,6 @@
 	[/event]
 #enddef
 
-
-
-
-
-
-
 	[event]
 	name=start
 		[recall]
@@ -356,7 +348,7 @@
 		[/message]
 		[message]
 		description=Konrad
-		message= _ "Then fight we shall. Let it begin!"
+		message= _ "Then fight we shall. Fortunately, now that we have liberated Elensefar, they are providing what gold they can spare to help us swell our ranks with new recruits. Let it begin!"
 		[/message]
 	[/event]
 
@@ -454,6 +446,7 @@
 		[/redraw]
 		[message]
 			speaker=narrator
+			image="signpost-portrait.png"
 			message= _ "NE - Dan'Tonk
 SE - Fort Tahn"
 		[/message]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_Princess_of_Wesnoth.cfg
index cc58bfff1e5..461dffb979f 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/08_Princess_of_Wesnoth.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/08_Princess_of_Wesnoth.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Princess of Wesnoth"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Princess_of_Wesnoth}"
-	[music]
-	name="gameplay02.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay02.ogg"}
 	{TURNS 31 28 25}
 
 	{DAWN}
@@ -77,7 +75,9 @@
 	controller=human
 	enemy=2
 
-#ifdef EASY
+#ifdef HARD
+	gold=100
+#else
 	gold=300
 #endif
 	[/side]
@@ -155,6 +155,7 @@
 	name=start
 		[message]
 			speaker=narrator
+			image="wesnoth-icon.png"
 			message= _ "On the road to Knalga, the party was opposed by the forces of Asheviere."
 		[/message]
 		[message]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
index c366e5989ee..c8d417d465a 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/09_Valley_of_Death.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Valley of Death - The Princess's Revenge"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Valley_of_Death}"
-	[music]
-	name="wesnoth-5.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-5.ogg"}
 	turns=12
 
 	{DAWN}
@@ -54,7 +52,9 @@
 	side=1
 	canrecruit=1
 	controller=human
-#ifdef EASY
+#ifdef HARD
+	gold=100
+#else
 	gold=300
 #endif
 	[/side]
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 b7d2277dca1..e49e8874a88 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
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Gryphon Mountain"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Gryphon_Mountain}"
-	[music]
-	name="gameplay01.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay01.ogg"}
 	{TURNS 27 24 21}
 
 	{DAWN}
@@ -59,7 +57,11 @@
 	side=1
 	canrecruit=1
 	controller=human
-	{GOLD 330 200 150}
+#ifdef HARD
+	gold=100
+#else
+	gold=300
+#endif
 	[/side]
 
 	[side]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg
index 8f0e63787fc..06fcf8558ec 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_Ford_of_Abez.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Ford of Abez"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Ford_of_Abez}"
-	[music]
-	name="wesnoth-2.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-2.ogg"}
 	{TURNS 27 24 21}
 
 	{DAWN}
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 1d6540a6f98..0ec95d1374a 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
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Northern Winter"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Northern_Winter}"
-	[music]
-	name="gameplay02.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay02.ogg"}
 	{TURNS 50 40 40}
 
 	{DAWN}
@@ -212,6 +210,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "And so after many days of rest, the party set out once again for the dwarven kingdom..."
 		[/message]
 	[/event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/13_Mountain_Pass.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/13_Mountain_Pass.cfg
index 4122529be7b..ab5236ddf78 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/13_Mountain_Pass.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/13_Mountain_Pass.cfg
@@ -4,9 +4,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Mountain Pass"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Mountain_Pass}"
-	[music]
-	name="wesnoth-1.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-1.ogg"}
 	{TURNS 27 24 21}
 
 	{DAWN}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg
index b2f5a862bf0..8cc86b2d47e 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/14_Dwarven_Doors.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Dwarven Doors"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Dwarven_Doors}"
-	[music]
-	name="gameplay03.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay03.ogg"}
 	{TURNS 26 20 15}
 	victory_when_enemies_defeated=no
 
@@ -691,6 +689,7 @@
 
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "But Konrad's party was not alone in entering the caves..."
 		[/message]
 
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg
index fcb934ab503..1c308da9a7f 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/15_Plunging_Into_the_Darkness.cfg
@@ -656,6 +656,7 @@ name=moveto
 
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "You can now recruit fearsome Gryphon Riders!"
 		[/message]
 
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg
index f5629a4456e..1ba6d0e5c43 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/16_Lost_General.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Lost General"
 	map_data="{campaigns/Heir_To_The_Throne/maps/The_Lost_General}"
-	[music]
-	name="underground.ogg"
-	[/music]
+	{SCENARIO_MUSIC "underground.ogg"}
 	{TURNS 64 60 54}
 
 	{UNDERGROUND}
@@ -122,6 +120,7 @@
 		[/filter]
 		[message]
 		speaker=narrator
+		image="signpost-portrait.png"
 		message= _ "The sign says 'Guest quarters'."
 		[/message]
 	[/event]
@@ -397,6 +396,7 @@
 		{TREMOR}
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "The earth shakes."
 		[/message]
 # just to open another exit to the undeads
@@ -460,6 +460,7 @@
 			[/message]
 			[message]
 			speaker=narrator
+			image="wesnoth-icon.png"
 			message= _ "You may now recruit the legendary dwarvish guardsmen!"
 			[/message]
 			[allow_recruit]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg
index 8310f26d14b..19dbff4c0fc 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Hasty_Alliance.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Hasty Alliance"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Hasty_Alliance}"
-	[music]
-	name="underground.ogg"
-	[/music]
+	{SCENARIO_MUSIC "underground.ogg"}
 	{TURNS 33 30 27}
 
 	{DEEP_UNDERGROUND}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg
index 0a110dbcdbb..c70d7748df8 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/18_Scepter_of_Fire.cfg
@@ -170,6 +170,7 @@ scenario_generation=cave
 			[/sound]
 			[message]
 			speaker=narrator
+			image="wesnoth-icon.png"
 			message= _ "You receive 300 pieces of gold!"
 			[/message]
 			[gold]
@@ -186,6 +187,7 @@ scenario_generation=cave
 #			[/message]
 #			[message]
 #			speaker=narrator
+#			image="wesnoth-icon.png"
 #			message= _ "If Delfador rests, he can concentrate on the location of the Scepter of Fire."
 #			[/message]
 		[/event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19_A_Choice_Must_Be_Made.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19_A_Choice_Must_Be_Made.cfg
index 6b4003801c5..b03e60d5dac 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19_A_Choice_Must_Be_Made.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/19_A_Choice_Must_Be_Made.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "A Choice Must Be Made"
 	map_data="{campaigns/Heir_To_The_Throne/maps/A_Choice_Must_Be_Made}"
-	[music]
-	name="gameplay03.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay03.ogg"}
 	{TURNS 33 30 27}
 
 	{DAWN}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg
index 4ed129ad7ab..49d33faa5e8 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/20a_Snow_Plains.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Snow Plains"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Snow_Plains}"
-	[music]
-	name="gameplay02.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay02.ogg"}
 	{TURNS 43 40 37}
 
 	next_scenario="North_Elves"
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg
index dd9cf9a5ea7..b5ab9e28eb5 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/20b_Swamp_Of_Dread.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Swamp Of Dread"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Swamp_Of_Dread}"
-	[music]
-	name="gameplay02.ogg"
-	[/music]
+	{SCENARIO_MUSIC "gameplay02.ogg"}
 	{TURNS 33 30 27}
 
 	next_scenario=21_North_Elves
@@ -206,6 +204,7 @@
 						{VARIABLE armor_taken 1}
 						[message]
 						speaker=narrator
+						image="wesnoth-icon.png"
 						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]
@@ -259,6 +258,7 @@ name=die
 	[/filter]
 	[message]
 	speaker=narrator
+	image="wesnoth-icon.png"
 	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]
@@ -310,6 +310,7 @@ first_time_only=no
 	[then]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		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]
@@ -337,6 +338,7 @@ name=die
 	[/kill]
 	[message]
 	speaker=narrator
+	image="wesnoth-icon.png"
 	message= _ "A final blow destroys the Lich, releasing a small shockwave of energy outwards. The Death Knights silently fall to the ground, inanimate. A giant cloud of dust bellows out as the remnants of the Lich's once-mortal skin and centuries of grime and gristle are lodged loose for the last time."
 	[/message]
 	[message]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
index 927c1f775d7..3a62ec58730 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/21_Home_North_Elves.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Home of the North Elves"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Home_North_Elves}"
-	[music]
-	name="wesnoth-1.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-1.ogg"}
 	{TURNS 21 18 15}
 
 	{DAWN}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/22_Elven_Council.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/22_Elven_Council.cfg
index 6876dfe7690..9b9660e1f20 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/22_Elven_Council.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/22_Elven_Council.cfg
@@ -27,9 +27,7 @@ fffffffffffffcffffff"
 
 	turns=1
 	theme=FullScreen
-	[music]
-	name="elf-land.ogg"
-	[/music]
+	{SCENARIO_MUSIC "elf-land.ogg"}
 
 	next_scenario=24_return_to_wesnoth
 
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/23_Valley_of_Statues.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/23_Valley_of_Statues.cfg
index fe6bc601e40..761f8ea2d96 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/23_Valley_of_Statues.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/23_Valley_of_Statues.cfg
@@ -4,9 +4,7 @@
 	#textdomain wesnoth-httt
 	name= _ "The Valley of Statues"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Valley_of_Statues}"
-	[music]
-	name="wesnoth-1.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-1.ogg"}
 	turns=45
 	next_scenario=24_return_to_wesnoth
 
@@ -71,6 +69,7 @@
 	[/filter]
 	[message]
 	speaker=narrator
+	image=monolith-marker.png
 	message= _ "Be warned, a great monster lives in the hills ahead."
 	[/message]
 	[/event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
index 37734139bd3..689bfd88ee2 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/24_Return_to_Wesnoth.cfg
@@ -3,7 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Return to Wesnoth"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Return_to_Wesnoth}"
-	# Music is defined in prestart due to a story music key
+	{SCENARIO_MUSIC "gameplay01.ogg"}
 	{TURNS 31 28 25}
 
 	next_scenario=25_test_clans
@@ -139,13 +139,6 @@
 	team_name=evil
 	[/side]
 
-	[event]
-	name=prestart
-		[music]
-		name="gameplay01.ogg"
-		[/music]
-	[/event]
-
 	[event]
 	name=start
 		[recall]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
index b0520236a8a..5553e06ac3f 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/25_Test_of_the_Clans.cfg
@@ -3,9 +3,7 @@
 	#textdomain wesnoth-httt
 	name= _ "Test of the Clan"
 	map_data="{campaigns/Heir_To_The_Throne/maps/Home_Clan}"
-	[music]
-	name="wesnoth-5.ogg"
-	[/music]
+	{SCENARIO_MUSIC "wesnoth-5.ogg"}
 	{TURNS 53 50 47}
 
 	{DAWN}
@@ -381,6 +379,7 @@
 
 	[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "The mighty riders of the easten plains, the Knights of the Clans, are now yours to command!"
 	[/message]
 	[allow_recruit]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
index ae72ac64420..fff51ffc62a 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg
@@ -296,6 +296,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "Li'sar strikes a killing blow!"
 		[/message]
 	[/event]
@@ -337,6 +338,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "Konrad strikes a killing blow!"
 		[/message]
 	[/event]
@@ -398,6 +400,7 @@
 		[/message]
 		[message]
 		speaker=narrator
+		image="wesnoth-icon.png"
 		message= _ "In a horrific inferno of magical rage, Asheviere is completely annihilated!"
 		[/message]
 
diff --git a/data/campaigns/Heir_To_The_Throne/utils/sof_utils.cfg b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
similarity index 91%
rename from data/campaigns/Heir_To_The_Throne/utils/sof_utils.cfg
rename to data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
index add9d083f99..c71c1157368 100644
--- a/data/campaigns/Heir_To_The_Throne/utils/sof_utils.cfg
+++ b/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
@@ -1,3 +1,38 @@
+################################
+#
+# HTTT MACROS FOLLOW
+#
+################################
+
+#
+# This music macro ensures that the correct music is selected
+# for a scenario just in case it is changed by [story].
+# It should be positioned at the top of the scenario file
+# so it can be overridden by other prestart or start events.
+#
+# It also allows for the convenient use of a standardized
+# intra-scenario music, should we decide to use one.
+#
+
+#define SCENARIO_MUSIC MUSIC
+[music]
+name="wesnoth-2.ogg"
+[/music]
+[event]
+name=prestart
+	[music]
+	name={MUSIC}
+	[/music]
+[/event]
+#enddef
+
+################################
+#
+# SCEPTER OF FIRE MACROS FOLLOW
+#
+################################
+
+
 #define SOF_TERRAIN_MASK
 
 [terrain_mask]
diff --git a/data/campaigns/Heir_To_The_Throne/utils/intro.cfg b/data/campaigns/Heir_To_The_Throne/utils/intro.cfg
index fc298c3e89c..aabc349eacb 100644
--- a/data/campaigns/Heir_To_The_Throne/utils/intro.cfg
+++ b/data/campaigns/Heir_To_The_Throne/utils/intro.cfg
@@ -27,7 +27,7 @@
 	[/part]
 	[part]
 	story= _ "Eldred made war upon Delfador and his forces with his mother's advice ringing in his ears: 'Fight no one great or small except the old mage, whose head should be severed from his shoulders.'"
-	background=maps/wesnoth.png
+	background=story/httt_story4.jpg
 	[/part]
 	[part]
 	story= _ "And Eldred did indeed meet Delfador face-to-face in battle that day. Sword clashed against staff, as the wise old mage fought the brash young warrior."