impassable mountain terrain.

data/campaigns/The_South_Guard/scenarios/1.Born_To_The_Banner.cfg

@@ -186,6 +186,7 @@
 
 	[message]
 		speaker=Deoran
+		image=portraits/deoran-mad.png
 		message= _ "My kind?  I am a soldier of Wesnoth, a messenger of King Haldric, and the new commander of the South Guard!  What do you mean, 'my kind'?"
 	[/message]
 
@@ -677,6 +678,7 @@
 
 	[message]
 		speaker=Deoran
+		image=portraits/deoran-sad.png
 		message= _ "This is worse than even my darkest fears.  We must ride to Westin at once, and hope that Sir Loris is there and well!  Come men!  Ride for Westin!"
 	[/message]
 

data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg

@@ -230,6 +230,7 @@
 	[unit]
 		type=White Mage
 		description=Minister Hylas
+		profile=portraits/hylas.png
 		user_description= _ "Minister Hylas"
 		{IS_HERO}
 		side=1
@@ -243,6 +244,7 @@
 
 	[message]
 		speaker=Deoran
+		image=portraits/deoran-mad.png
 		message= _ "More bandits?!  They'll feel the deadly bite of my lance!"
 	[/message]
 	[message]
@@ -259,6 +261,7 @@
 	[/message]
 	[message]
 		speaker=Deoran
+		image=portraits/deoran-sad.png
 		message= _ "It grieves me to learn of his death, foolish though he may have been!  Now, though, there are more pressing matters.  Rise men of Wesnoth!  We must drive these bandits from our city!"
 	[/message]
 
@@ -371,6 +374,7 @@
 			[/message]
 			[message]
 				speaker=Deoran
+				image=portraits/deoran-sad.png
 				message= _ "Westin has fallen!  This is a problem too great for me to handle - I must return to Haldric and tell him of our loss..."
 			[/message]
 

data/campaigns/The_South_Guard/scenarios/3.A_Desparate_Errand.cfg

@@ -268,6 +268,7 @@
 			#endif
 			description=Ethiliel
 			user_description= _ "Ethiliel"
+			profile=portraits/ethiliel.png
 			{IS_HERO}
 			side=1
 			x,y=18,6
@@ -294,6 +295,7 @@
 
 		[message]
 			speaker=Deoran
+			image=portraits/deoran-mad.png
 			message= _ "Deora..."
 		[/message]
 
@@ -324,6 +326,7 @@
 
 		[message]
 			speaker=Deoran
+			image=portraits/deoran-glad.png
 			message= _ "My thanks, lady."
 		[/message]
 	

data/campaigns/The_South_Guard/scenarios/4.Vale_of_Tears.cfg

@@ -173,6 +173,7 @@
 
 		[message]
 			speaker=Ethiliel
+			image=portraits/ethiliel-mad.png
 			message= _ "What!?  Those are no friends of the elves!  They are brigands, and they must be destroyed!"
 		[/message]
 		
@@ -219,10 +220,6 @@
 					description= _ "Death of Sir Gerrick"
 					condition=lose
 				[/objective]
-				[objective]
-					description= _ "Death of Minister Hylas"
-					condition=lose
-				[/objective]
 				[objective]
 					description= _ "Death of Ethiliel"
 					condition=lose
@@ -530,6 +527,7 @@
 
 	[message]
 		speaker=Ethiliel
+		image=portraits/ethiliel-mad.png
 		message= _ "We must follow these footprints into the woods!  Whoever took our greatest sage must pay!  Nothing will stop the vengeance of the elves!"
 	[/message]
 

data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg

@@ -66,6 +66,7 @@
 	type=Outlaw
 	description=Urza Afalas
 	user_description= _ "Urza Afalas"
+	profile=portraits/urza-afalas-masked.png
 
 	{GOLD 50 70 90}
 	{INCOME 2 3 5}
@@ -133,6 +134,7 @@
 	type=Lich
 	description=Mal M'brin
 	user_description= _ "Mal M'brin"
+	profile=portraits/lich.png
 
 	team_name=undead
 	controller=ai
@@ -183,6 +185,7 @@
 
 	[message]
 		speaker=Deoran
+		image=portraits/deoran-mad.png
 		message= _ "The heat in this forest is oppressive, and this fog cannot be natural.  I wonder what evil lurks nearby?"
 	[/message]
 
@@ -362,6 +365,7 @@
 
 	[message]
 		speaker=Ethiliel
+		image=portraits/ethiliel-mad.png
 		message= _ "Lies!  Mebrin would never fight for the undead, much less lead them!"
 	[/message]
 
@@ -382,6 +386,7 @@
 
 	[message]
 		speaker=Ethiliel
+		image=portraits/ethiliel-mad.png
 		message= _ "But think of the destruction they wrought on your borders!  You cannot ally yourselves with these evil men!  Vengeance!"
 	[/message]
 	
@@ -392,7 +397,27 @@
 			id=accept_bandits
 			message= _ "Very well. All men must unite against the undead."
 			[command]
-			
+				
+				[store_unit]
+					variable=afalas_store
+					[filter]
+						description=Urza Afalas
+					[/filter]
+					kill=yes
+				[/store_unit]
+				{VARIABLE afalas_store.canrecruit 0}
+				{VARIABLE afalas_store.side 1}
+				{VARIABLE afalas_store.profile=portraits/uzra-afalas.png}
+				[unit_overlay]
+					x=$afalas_store.x
+					y=$afalas_store.y
+					image="misc/hero-icon.png"
+				[/unit_overlay]
+				[unstore_unit]
+					variable=afalas_store
+					
+				[/unstore_unit]
+				
 				[message]
 					speaker=Urza Afalas
 					message= _ "We will now fight alongside you, and I will place my thugs and footpads at your service."
@@ -400,6 +425,7 @@
 
 				[message]
 					speaker=Ethiliel
+					image=portraits/ethiliel-mad.png
 					message= _ "You are no better than these criminals!  We shall see if you can find your own way out of the forest!  Come my people let us return to our lands.  We were foolish to ever have any dealings with these humans.  Do not set foot in our land ever again Deoran, you have brought us nothing but grief."
 				[/message]
 
@@ -425,23 +451,6 @@
 					value=yes
 				[/set_variable]
 
-				[store_unit]
-					variable=afalas_store
-					[filter]
-						description=Urza Afalas
-					[/filter]
-					kill=yes
-				[/store_unit]
-				{VARIABLE afalas_store.canrecruit 0}
-				{VARIABLE afalas_store.side 1}
-				[unit_overlay]
-					x=$afalas_store.x
-					y=$afalas_store.y
-					image="misc/hero-icon.png"
-				[/unit_overlay]
-				[unstore_unit]
-					variable=afalas_store
-				[/unstore_unit]
 
 				[allow_recruit]
 					side=1
@@ -623,6 +632,7 @@
 			[/message]
 			[message]
 				speaker=Deoran
+				image=portraits/deoran-glad.png
 				message= _ "Indeed.  The dark king has fallen.  Now that the elves have abandoned us, our lives depend on Urza Afalas.  Will you lead us from this accursed forest?"
 			[/message]
 			[message]
@@ -654,6 +664,7 @@
 			[/message]
 			[message]
 				speaker=Deoran
+				image=portraits=deoran-glad.png
 				message= _ "We should make haste to return to Wesnoth before the harvest.  Fall has already been upon us for some time."
 			[/message]
 			[message]
@@ -662,6 +673,7 @@
 			[/message]
 			[message]
 				speaker=Deoran
+				image=portraits=deoran-sad.png
 				message= _ "My men are not dwarves!  How are we to fight in catacombs and tunnels?"
 			[/message]
 			[message]

data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg

@@ -51,9 +51,19 @@
 
 [side]
 	side=2
+	#ifdef EASY
+		type=Lich
+	#endif
+	#ifdef MEDIUM
+		type=Lich
+	#endif
+	#ifdef HARD
+		type=Ancient Lich
+	#endif
 	type=Ancient Lich
 	description=Mal M'Brin
 	user_description= _ "Mal M'Brin"
+	profile=portraits/lich.png
 
 	team_name=undead_hordes
 	controller=ai
@@ -455,12 +465,40 @@
 
 [/event]
 
+# Confrontation with Mal Brin
+[event]
+	name=moveto
+	[filter]
+		side=1
+		x,y=28,23
+	[/filter]
+	
+	[message]
+		speaker=M'Brin
+		message= _ "Petty mortals, bow down and cower in fear before me, and I may make your passing swift. For I once one such as you, full of doubt and weakness,but now I have passed over and become more than you could possibly imagine."
+	[/message]
+	[message]
+		speaker=Deoran
+		image=portraits/deoran-mad.png
+		message= _ "For all your vaunted powers you are a mockery to all that you once believed in. I will destroy you and your works if it's the last thing I do!"
+	[/message]
+	[message]
+		speaker=M'Brin
+		message= _ "Foolish boy! you do not understand. Come closer and I will show you my power.  I will end your brief, miserable life. Thereafter, it may amuse me to cause your bones to serve me."
+	[/message]
+[/event]
+
 [event]
 	name=die
 	[filter]
 		description=Mal M'Brin
 	[/filter]
 	
+	[message]
+		speaker=M'Brin
+		message= _ "Nooo! This cannot be. The elves I once lead have destroyed me. After all I have sacrificed, I still die...."
+	[/message]
+	
 	[if]
 		[variable]
 			troll_allies=true

data/campaigns/The_South_Guard/scenarios/8b.The_Tides_of_War.cfg

@@ -221,7 +221,7 @@
 				message= _ "And I have summoned the great council of Westin!  They will battle with all their might!"
 			[/message]
 			{SG_GUARD (Silver Mage) (Minister Mefel) (_"Minister Mefel") 1 19 18}
-			{SG_GUARD (Red Mage) (Minister Romand) (_"Minister Romand") 1 20 18}
+			{SG_GUARD (Red Mage) (Minister Romand) (_"Minister Romand)") 1 20 18}
 			{SG_GUARD (White Mage) (Minister Alanafel) (_"Minister Alanafel") 1 22 18}
 			[message]
 				speaker=Minister Mefel

data/campaigns/The_South_Guard/units/1.Junior_Commander.cfg

@@ -6,7 +6,7 @@
 	image=deoran/junior-commander.png
 	
 	image_leading=deoran/junior-commander-leading.png
-	profile=portraits/deoran-junior.png
+	profile=portraits/deoran.png
 	hitpoints=32
 	alignment=lawful
 	cost=17

data/campaigns/The_South_Guard/units/2.Horseman_Commander.cfg

@@ -6,7 +6,7 @@
 	image=deoran/horseman-commander.png
 	
 	image_leading=deoran/horseman-commander-defend.png
-	profile=portraits/deoran-knight.png
+	profile=portraits/deoran.png
 	hitpoints=38
 	alignment=lawful
 	cost=32

data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg

@@ -6,6 +6,7 @@
 	image=deoran/dismounted-commander.png
 
 	image_leading=deoran/dismounted-commander-leading.png
+	profile=portraits/deoran.png
 	hitpoints=60
 	alignment=lawful
 	cost=40

data/campaigns/The_South_Guard/units/Demilich.cfg

@@ -4,7 +4,6 @@
 	race=undead
 	image="lich/demilich.png"
 	
-	profile="portraits/gwiti-demilich.png"
 	hitpoints=80
 	movement_type=undeadfoot
 	movement=6

data/campaigns/The_South_Guard/utils/sg_deaths.cfg

@@ -9,6 +9,7 @@
 	[/filter]
 	[message]
 		speaker=unit
+		image=portraits/deoran-sad.png
 		message= _ "I have failed my kingdom and duty..."
 	[/message]
 	[endlevel]
@@ -23,6 +24,7 @@
 	[/filter]
 	[message]
 		speaker=Deoran
+		image=portraits/deoran-mad.png
 		message= _ "Taste cold steel!"
 	[/message]
 [/event]
@@ -62,6 +64,7 @@
 	[/filter]
 	[message]
 		speaker=unit
+		image=portraits/hylas.png
 		message= _ "Now I will never see Westin free again..."
 	[/message]
 	[endlevel]

data/terrain-graphics.cfg

@@ -48,20 +48,20 @@
 # macros found in terrain-graphics/mountains.cfg
 
 #TWOBYFOUR TYPE NAME1 NAME2 NAME3 NAME4 NAME5 FLAG PROB
-{TWOBYFOUR mb mountain_range3_1 mountain_range3_2 mountain_range3_3 mountain_range3_4 mountain_range3_5 overlay 6}
+{TWOBYFOUR mb& mountain_range3_1 mountain_range3_2 mountain_range3_3 mountain_range3_4 mountain_range3_5 overlay 6}
 
 #TWOBYFOUR2 TYPE NAME1 NAME2 NAME3 NAME4 NAME5 FLAG PROB
-{TWOBYFOUR2 mb mountain_range4_1 mountain_range4_2 mountain_range4_3 mountain_range4_4 mountain_range4_5 overlay 12}
+{TWOBYFOUR2 mb& mountain_range4_1 mountain_range4_2 mountain_range4_3 mountain_range4_4 mountain_range4_5 overlay 12}
 
 #ONEBYTHREE TYPE NAME1 NAME2 NAME3 FLAG PROB
-{ONEBYTHREE mb mountain_range1_1 mountain_range1_2 mountain_range1_3 overlay 16}
+{ONEBYTHREE mb& mountain_range1_1 mountain_range1_2 mountain_range1_3 overlay 16}
 
 #ONEBYTHREE2 TYPE NAME1 NAME2 NAME3 FLAG PROB
-{ONEBYTHREE2 mb mountain_range2_1 mountain_range2_2 mountain_range2_3 overlay 16}
+{ONEBYTHREE2 mb& mountain_range2_1 mountain_range2_2 mountain_range2_3 overlay 16}
 
 # TWOBYTWO TYPE NAME1 NAME2 NAME3 FLAG PROB
-{TWOBYTWO mb mountain5_1 mountain5_2 mountain5_3 overlay 30}
-{TWOBYTWO mb mountain6_1 mountain6_2 mountain6_3 overlay 30}
+{TWOBYTWO mb& mountain5_1 mountain5_2 mountain5_3 overlay 30}
+{TWOBYTWO mb& mountain6_1 mountain6_2 mountain6_3 overlay 30}
 
 #Macro for Single Hex
 #define SHEX TYPE FLAG PROB TILE
@@ -91,9 +91,9 @@
 #enddef
 
 #Single hex mountain tiles (mountain + village)
-{SHEX mb overlay 33 mountains3}
-{SHEX mb overlay 33 mountains2}
-{SHEX mb overlay 100 mountains}
+{SHEX mb& overlay 33 mountains3}
+{SHEX mb& overlay 33 mountains2}
+{SHEX mb& overlay 100 mountains}
 
 #Single hex normal forest tiles
 {SHEX f overlay 33 forest}
@@ -124,6 +124,49 @@
 {SHEX ' overlay 33 cave-beam2} 
 {SHEX ' overlay 100 cave-beam1}
 
+#Macro for clouds
+#define CLOUDS TYPE NAME1 NAME2 NAME3 FLAG PROB
+[terrain_graphics]
+      map="
+.   .
+  *
+*   *
+  2
+*   *
+  *"
+
+         [tile]
+                 pos=2
+                 type={TYPE}
+                 no_flag={FLAG}
+                 set_flag={FLAG}
+         [/tile]
+
+         [image]
+                 name={NAME1}
+                 position=vertical
+                 base=32,208
+         [/image]
+
+         [image]
+                 name={NAME2}
+                 position=vertical
+                 base=88,372
+         [/image]
+
+         [image]
+                 name={NAME3}
+                 position=vertical
+                 base=142,308
+         [/image]
+
+         probability={PROB}
+[/terrain_graphics]
+#enddef
+
+{CLOUDS & cloud1_1 cloud1_2 cloud1_3 clouds 33}
+{CLOUDS & cloud1_1 cloud2_2 cloud1_3 clouds 50}
+{CLOUDS & cloud1_1 cloud3_2 cloud1_3 clouds 100}
 #
 # Villages
 # Flagged as 'village' so they can be placed on
@@ -188,7 +231,6 @@
 {TERRAIN_BASE BU desert}
 {TERRAIN_BASE L savanna}
 
-
 # Castle-specific transitions. Those are placed before base terrains, as they
 # override the normal base terrain.
 {CASTLE_TRANSITION CK T tropical-forest-ctrans}
@@ -570,8 +612,8 @@
 {TERRAIN_ADJACENT_VERTICAL             T      !TNQq      tropical-forest}
 {TERRAIN_ADJACENT          -168        mHhfF?  N       grassland}
 {TERRAIN_ADJACENT          -169        M     !MX      desert-mountains}
-{TERRAIN_ADJACENT          -170        mb     HSJ      mountains-small}
-{TERRAIN_ADJACENT          -171        mb     !mbXh    mountains}
+{TERRAIN_ADJACENT          -170        mb&     HSJ      mountains-small}
+{TERRAIN_ADJACENT          -171        mb&     !mbXh    mountains}
 {TERRAIN_ADJACENT          -172        HA     ks      snow-hills-to-water}
 {TERRAIN_ADJACENT          -173        HA     cZp\|/  snow-hills-to-water}
 {TERRAIN_ADJACENT          -174        HA     s       snow-hills-to-water}

data/terrain.cfg

@@ -406,6 +406,13 @@ aliasof=u
 light=1
 [/terrain]
 
+[terrain]
+symbol_image=cloud-tile
+id=cloud
+name= _ "Impassable Mountains"
+char=&
+aliasof=W
+[/terrain]
 
 [terrain]
 symbol_image=cavewall