added new 'test of the clans' scenario to CVS

data/maps/mapplains

@@ -0,0 +1,60 @@
+gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggvgggggggggggvgggggggggggggggggggggvgggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggvgggggggggggdddddddgggggggggggggggggggggggggg
+gggggggggggggggggggggggggggCCCgggggggggggggggggggggggggddcccccccddgggggggggggggggggggggggg
+gggggggggggggggggggvgggggggC2Cgggggggggggggggggggggggggdcccssssccdgggggggggggggggggggggggg
+gggggggvgghhhgggggggggggggggCgggggggggggggggggggggggggdccsssssssccdggggggggvgggggggggggggg
+ggggggggghhhhggggggggggggggggggggggggggggggggggggvggggdcssssssssscdggggggggggggggggggggggg
+gggggggggghhggggggggggggggggggggggggvggggggggggggggggddcssssssssccdggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggggggggggdcccsssssssscdgggggdddddddggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggggggggggdcsssssssssccdggddddddddddggggggggggg
+ggggggvgggggggggggdddddddddggggggggggggggggggggggggggdccssssssssscdgggdddddddggggggvgggggg
+gggggggggggggggggvddddddddddggggghhhhgggggggggggggggggdccsssssssccdvgggdddddddgggggggggggg
+ggggggggggggggggdddddddddddddgggghhhhhggggggggggggggggdcsssssscccddgggggdddddggggggggggggg
+gggggggggggggggggdddddddddggvggggghhhgggggggggvgggggggdcccccccccdggggggggggggggggggggggggg
+ggggggggggggggggggddddddggggggggggggggggggggggggggggggdcdddddddddggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggggggggggggccggggggggggggggggggggggggggggggggggg
+ggggggggggggggggggggggggggggggggggggggggggggggggggggcggggvgggggggggggggggggggggggggCgggggg
+ggggggggggggggggggggvggggggggggggggggggggggggggggggccgggggggggggggggggggggggggggggC1Cggggg
+ggggggggggggggggggggggggggggggggggggggggggggggggggcgggggggggggggghhhhgggggggggggggCCCggggg
+gggggggggggggggggggggggggggggggggggggvgggggggggggccggggggggggggghhhhhhgvgggggggggggggggggg
+gggvgggggggggggggggggggggggggggggggggggggggggggggcgggggggggggggghhhhhggggggggggggggggggggg
+gggggggggggggCgggggggggggggggggggggggggggggggggggcggggggggggggggghhhhggggggggggggggggggggg
+ggggggggggggC4Cggggggggghhhhgggggggggggggggggggvgcggggggggggggggghhhgggggggggggggggggggggg
+ggggggggggggCCCgggggggvhhhhhgggggggggggggggggggccggggggggggggggggggggggggggggggggggggggggg
+ggggggggggggggggggggggggghhhhggggggggggggggggcccgggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggvgggggggcccggggggggggggggvggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggvgggggggggg
+ggggggggggggggggggggggggggggggggggggggggggcgggggggggggggggddddddgggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggggggccgggggggggggggdddddddggggggggggggggggggggggggggg
+gggggggggggggggggvgggggggggggggggggggggggcgggggggggggggggddddddddggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggvggg\cgggggggggggggggvdddddddggggghhhhhgggggggggggvgggg
+gggggggggggggggggggggggggggggggggggggccggggggggggggggggggddddddggggghhhhhggggggggggggggggg
+ggggggggggggggghhhggggggggggggggggggcggggggggggggggggggddddddgggggggghhhhhgggggggggggggggg
+gggggggggggggghhhhggggggggggggggggggcggggggggggggggggggggggggggggggggghhhhgggggggggggggggg
+ggggggggggggggghhhhgggggvgggggggggggcggggggggCgggggggggggggggggggggggggggggggggggggggggggg
+ggggvggggggggggggggggggggggggggggggccgggggggC3Cggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggcggggggggCCCgggggggggggggggggggggggggvggggggggggggggggg
+gggggggggggggggggggggggggggggggggggcvggggggggggggggggvgggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggggggggggggggvgggggg
+gggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggvggggggggggggggggggggccgggggggggggggggggggggggggggggggggggggggggggggggggggg
+gggggggggggggggggggggggggggggggggggggg/cggggggggggddddddgggggggggggggggggggggggCgggggggggg
+gggvggggggggggggggggggggggggggggggggggggccggggggggddddddddgggggggggvggggggggggC5Cggggggggg
+gggggggggggggggggggggggggggggvggggggggggggccggggggdddddddgggggggggggggggggggggCCCggggggggg
+ggggggggggggggggggggggggggggggggggggggggggggccccgggddddddggggggggggggggggggggggggggggggggg
+gggggggggggggggggggghhhhggggggggggggggggggggggggccgggdddddgggggggggggggggggggggggggggggggg
+gggggggggggggggggggghhhhhggggggggggggggggggggvgggcgggggggggggggggggggggggggggggggvgggggggg
+ggggggggggggggggggghhhhhggggggggggggggggggggggggg/gggggggggggggggggggggggggggggggggggggggg
+ggggggggggggggvggggggggggggggggggdddddddggggggggggccggggggggggggggggghhhhhhggggggggggggggg
+ggggggggggggggggggggggggggggggggdddddddgggggggggggggccgggggggggggggghhhhhhhggggggggggggggg
+ggggggggggggggggggggggggggggggggddddddddgggggggggggggcggggggvggggggghhhhhhgggggggggggggggg
+gggvgggggggggggggggggggggggggggggddddddggggggggggggggcggggggggggggggghhhhgggggggggggggggdd
+ggggggggggggggggggggggggggggggggvggddddddggggggggggggcggggggggggggggghhhgggggggggggggggddd
+gggggggggggCggggggggggggggggggggggggddddggggggggggggcggggggggggggggggggggvggggggggggggdddd
+ggggggggggC6Cgggggggggggggggggggggggggggggggggggggggccggggggggggggggggggggggggggggggggdddd
+ggggggggggCCCggggggggggggggggggggggggggggggggggggggggcgggggggggggggggggggggggggggddggddddd
+gggggggggggggggggggggvgghhhgggggggggggggggggggggvgggggccggggggggggggggggggggggggddddggvddd
+gggggggggggggggggggggghhhhhhgggggggggggggggggggggggggggcgggggggggggggggggggggddddddddddddd
+gggggggggggggggggggggghhhhhhhhhhggggggggggggggggggggggggccgggggggggggggggggddddddddddddddd

data/scenarios/Home_Clan.cfg

@@ -0,0 +1,251 @@
+[scenario]
+	name="Test of the Clans"
+	map=mapplains
+	music=wesnoth-1.ogg
+
+	{DAWN}
+	{MORNING}
+	{AFTERNOON}
+	{DUSK}
+	{FIRST_WATCH}
+	{SECOND_WATCH}
+
+	turns=64
+	id=trial_clans
+	next_scenario=null
+
+	objectives="
+Victory:
+@Defeat the Clan Leader, Bayar Khan
+Defeat:
+#Death of Konrad
+#Death of Delfador
+#Death of Kalenz
+#Death of Li'sar
+#Turns run out"
+
+	[bigmap]
+		image=misc/map.png
+		{DOT 336 180}
+		{DOT 344 174}
+		{CROSS 354 167}
+	[/bigmap]
+
+	[side]
+	team_name=elves
+	type=Commander
+	description=Konrad
+	side=1
+	canrecruit=1
+	controller=human
+	[/side]
+
+	[side]
+	team_name=clan
+	type=Grand Knight
+	description=Toghrul
+	side=2
+	canrecruit=1
+	recruit=Horseman,Knight,Bowman
+	recruitment_pattern=fighter,fighter,archer
+	{GOLD 200 300 400}
+	{INCOME 20 20 30}
+	[/side]
+	
+	[side]
+	team_name=clan
+	type=Grand Knight
+	description=Jaran
+	side=3
+	canrecruit=1
+	recruit=Horseman,Knight,Bowman
+	recruitment_pattern=fighter,fighter,archer
+	{GOLD 200 300 400}
+	{INCOME 20 20 30}
+	[/side]
+
+	[side]
+	team_name=clan
+	type=Grand Knight
+	description=Subotai
+	side=4
+	canrecruit=1
+	recruit=Horseman,Knight,Bowman
+	recruitment_pattern=fighter,fighter,archer
+	{GOLD 200 300 400}
+	{INCOME 20 20 30}
+	[/side]
+
+	[side]
+	team_name=clan
+	type=Grand Knight
+	description=Minghan
+	side=5
+	canrecruit=1
+	recruit=Horseman,Knight,Bowman
+	recruitment_pattern=fighter,fighter,archer
+	{GOLD 200 300 400}
+	{INCOME 20 20 30}
+	[/side]
+
+	[side]
+	team_name=clan
+	type=Grand Knight
+	description=Bayar Khan
+	side=6
+	canrecruit=1
+	recruit=Knight,Longbowman
+	recruitment_pattern=fighter,fighter,archer
+	{GOLD 200 300 400}
+	{INCOME 40 40 60}
+	[/side]
+	
+#define KNIGHT X Y
+[unit]
+type=Knight
+side=5
+x={X}
+y={Y}
+[/unit]
+#enddef
+
+	[event]
+	name=start
+		[recall]
+		description=Delfador
+		[/recall]
+		[recall]
+		description=Kalenz
+		[/recall]
+		[recall]
+		description=Li'sar
+		[/recall]
+		[message]
+		description=Konrad
+		message="Greetings, men of the plains."
+		[/message]
+		[message]
+		description=Subotai
+		message="What do these intruders want? We did not invite them here, that is for sure."
+		[/message]
+		[message]
+		description=Delfador
+		message="We come in peace! We wish for you to aid us in our struggle against Ashievere, the evil Queen Mother."
+		[/message]
+		[message]
+		description=Minghan
+		message="We will not join you."
+		[/message]
+		[message]
+		description=Bayar Khan
+		message="Wait. We may join them. But only if they can prove they are worthy to have us fight with them."
+		[/message]
+		[message]
+		description=Jaran
+		message="Yes. We will not join you unless you can prove yourself worthy by defeating us in battle!"
+		[/message]
+		[message]
+		description=Kalenz
+		message="Very well."
+		[/message]
+		[message]
+		description=Bayar Khan
+		message="Remember, this is a fight to the death. If you cannot defeat us, you are unworthy, and we shall slay you for that."
+		[/message]
+	[/event]
+
+	[event]
+	name=die
+		[filter]
+		description=Bayar Khan
+		[/filter]
+		[message]
+		description=Bayar Khan
+		message="Stop! Very well, you have defeated me, and proved yourself worthy for us to help you. I will join you in fighting these foes of yours."
+		[/message]
+		[message]
+		description=Li'sar
+		message="Thank you. We will now go onward, into the heart of Wesnoth, to defeat Ashievere, my evil mother."
+		[/message]
+		[endlevel]
+		result=victory
+		bonus=yes
+		[/endlevel]
+	[/event]
+	[event]
+	name=die
+		[filter]
+		description=Minghan
+		[/filter]
+		[message]
+		description=Minghan
+		message="I have lost! You have defeated me, but I still doubt you will be able to defeat my leader. You will still be unworthy, in the end."
+		[/message]
+		{KNIGHT }
+#ifdef HARD
+		{KNIGHT }
+#endif
+		[message]
+		description=Bayar Khan
+		message="They have defeated Minghan! Come, my clan brothers, we must stop them!"
+		[/message]
+	[/event]
+	[event]
+	name=die
+		[filter]
+		description=Subotai
+		[/filter]
+		[message]
+		description=Subotai
+		message="You can defeat me, but more will take my place!"
+		[/message]
+		{KNIGHT }
+		{KNIGHT }
+#ifdef HARD
+		{KNIGHT }
+#endif
+		[message]
+		description=Bayar Khan
+		message="See, you cannot defeat me. There are too many in my clan."
+		[/message]
+	[/event]
+	[event]
+	name=die
+		[filter]
+		description=Jaran
+		[/filter]
+		[message]
+		description=Jaran
+		message="Argh! This is how I die? Well, it was for the glory of the Clan."
+		[/message]
+		{KNIGHT }
+#ifdef HARD
+		{KNIGHT }
+#endif
+		[message]
+		description=Bayar Khan
+		message="The clan rises. The more of us you kill, the stronger we get!"
+		[/message]
+	[/event]
+	[event]
+	name=die
+		[filter]
+		description=Toghrul
+		[/filter]
+		[message]
+		description=Toghrul
+		message="Although I die, it is for the Clan. You shall be defeated, and I will be right in saying you are no match for the Clan's might."
+		[/message]
+		{KNIGHT }
+		{KNIGHT }
+#ifdef HARD
+		{KNIGHT }
+#endif
+		[message]
+		description=Bayar Khan
+		message="Well said, brother. The warrior of the Clan hear you, are come to fight with us!"
+		[/message]
+	[/event]
+
+	{deaths.cfg}
+[/scenario]

data/scenarios/Return_to_Wesnoth.cfg

@@ -3,7 +3,7 @@
 	id=return_to_wesnoth
 	map=mapentrance
 	turns=18
-	next_scenario=null
+	next_scenario=trial_clans
 
 	{DAWN}
 	{MORNING}