Merged 14065 14066 into trunk

data/campaigns/Heir_To_The_Throne/scenarios/26_Battle_for_Wesnoth.cfg

@@ -299,6 +299,11 @@
 		image="wesnoth-icon.png"
 		message= _ "Li'sar strikes a killing blow!"
 		[/message]
+		[kill]
+			description=Asheviere
+			animate=yes
+			fire_event=no
+		[/kill]
 	[/event]
 	[event]
 	name=die
@@ -335,12 +340,21 @@
 		[message]
 		description=Konrad
 		message= _ "Oh, wretched lady, I am very real. The land burns from your greed and ambition. You will now be held to account for your misdeeds. For the young prince Konrad! For WESNOTH!"
+		image=portraits/konrad-angry.png
 		[/message]
 		[message]
 		speaker=narrator
 		image="wesnoth-icon.png"
 		message= _ "Konrad strikes a killing blow!"
 		[/message]
+		[kill]
+			description=Asheviere
+			animate=yes
+			fire_event=no
+		[/kill]
+		[endlevel]
+		result=continue
+		[/endlevel]
 	[/event]
 	[event]
 	name=die
@@ -423,6 +437,11 @@
 		[sound]
 		name=lightning.ogg
 		[/sound]
+		[kill]
+			description=Asheviere
+			animate=yes
+			fire_event=no
+		[/kill]
 		[colour_adjust]
 		red=100
 		green=100
@@ -433,6 +452,9 @@
 		green=0
 		blue=0
 		[/colour_adjust]
+		[endlevel]
+		result=continue
+		[/endlevel]
 	[/event]
 
 	[event]
@@ -444,10 +466,27 @@
 		description=Asheviere
 		message= _ "Treason! The evil ones have slain me!"
 		[/message]
+		[object]
+		name= _ "The Queen is Dead"
+		duration=forever
+		silent=yes
+			[filter]
+			type=Dark Queen
+			[/filter]
+			[effect]
+			apply_to=variation
+			name=dead_queen
+			[/effect]
+		[/object]
 		[music]
 		name="main_menu_new.ogg"
 		immediate=yes
 		[/music]
+		[kill]
+			description=Asheviere
+			animate=yes
+			fire_event=no
+		[/kill]
 		[message]
 		description=Delfador
 		message= _ "And so passes Asheviere, the dark queen of Wesnoth."

data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg

@@ -17,19 +17,6 @@
 	usage=fighter
 	unit_description= _ "The evil queen mother Asheviere has terrorized Wesnoth for many years. Her knowledge of magic makes her a worthy foe in combat, although her power is mostly derived from those she commands."
 	get_hit_sound={SOUND_LIST:HUMAN_FEMALE_HIT}
-	die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
-	[death]
-		[frame]
-			begin=0
-			end=200
-			image="human-queen-die-1.png"
-		[/frame]
-		[frame]
-			begin=200
-			end=400
-			image="human-queen-die-2.png"
-		[/frame]
-	[/death]
 	[attack]
 		name=scepter
 		icon=attacks/staff-magic.png
@@ -39,17 +26,25 @@
 		number=2
 		[animation]
 			hits=yes
+			[frame]
+				begin=-200
+				end=-100
+			[/frame]
 			[frame]
 				begin=-100
-				end=0
+				end=200
 				sound=staff.wav
 			[/frame]
 		[/animation]
 		[animation]
 			hits=no
+			[frame]
+				begin=-200
+				end=-100
+			[/frame]
 			[frame]
 				begin=-100
-				end=0
+				end=200
 				sound={SOUND_LIST:MISS}
 			[/frame]
 		[/animation]
@@ -97,7 +92,7 @@
 		name= _ "female^Dark Queen"
 		gender=female
 		race=human
-		image="human-queen-die-2.png"
+		image="human-queen.png"
 		profile=portraits/asheviere.png
 		hitpoints=48
 		movement_type=smallfoot
@@ -110,12 +105,25 @@
 		cost=35
 		usage=fighter
 		unit_description= _ "The evil queen mother Asheviere has terrorized Wesnoth for many years. Her knowledge of magic makes her a worthy foe in combat, although her power is mostly derived from those she commands."
+		die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
 		[attack]
-			name=sword
-			type=blade
+			name=scepter
+			type=impact
 			range=melee
 			damage=1
 			number=1
 		[/attack]
+		[death]
+			[frame]
+				begin=0
+				end=200
+				image="human-queen-die-1.png"
+			[/frame]
+			[frame]
+				begin=200
+				end=400
+				image="human-queen-die-2.png"
+			[/frame]
+		[/death]
 	[/variation]
 [/unit]