added 'Lancer' unit; rebalancing of 'Mountain Pass' and 'Dwarvern Doors'

data/maps/Heir_To_The_Throne/Dwarven_Doors

@@ -17,7 +17,7 @@ ghgggggfthmhhgrhgghgggtggffgg
 ghhggggghghhhgrghgghggggggffg
 gghgggggggfhhggggghhghgfffffg
 ggghhhgggfffhgggggggggfffmmhg
-gggghgggffffCCgCCggggggmmghhh
+gggghgggffffCCgKCggggggmmghhh
 ggggggggffffChggCgggggggftgC2
 ggfgfgfggfffgggggggggtggffgCC
 ggggftfgggfgggggggggggggffggf

data/maps/Heir_To_The_Throne/Mountain_Pass

@@ -1,22 +1,22 @@
-mmmmmmmmmmmmmmmmmRRmRmRmRRmmmm
-mmmmmmmmmmmmmmmmmRmmmmmmmmRmmm
-mmmmmmmmmmmmmmmmmmRRRRRRmmRRRm
-mRmRmRmRmmmmmmmmmRmRRRRmRmmmRm
-RmRRRmRRRRmRmmmmmRRRRmmmC3CmRR
+mmmmmmmmmmmmmmmmmRRmmmmmmmmmmm
+mmmmmmmmmmmmmmmmmRmmmmmmmmmmmm
+mmmmmmmmmmmmmmmmmmRRRRRRmmmmmm
+mRmRmRmRmmmmmmmmmRmRRRRmRmmmmm
+RmRRRmRRRRmRmmmmmRRRRmmmC3CmmR
 mmmmmmmtRRRRRRmRRRRmmmmmCCCmRg
 mmmmmmmmRRRRRRRRRmmmmmmmmmmRRt
-mmmmmmmmmmRmRmRmmmmmmmmmmmmmRm
-mmmmmmmmmmmcmcmmmmmmmmmmmmmmRR
-ccmmmmmmmmcscsscmcmcmcmmmcmmRm
-ssccmcmcmccssssssssssssscsctRm
-sssssscccccsssssssssssscssmRRm
-ssssssssssssscsccccccmcmccmmRm
-sssssssssssccccmcmcmmmmRtRcrrc
-ssssssssssscmmmmmmmmmhhRRmRrrm
-scccctccccccmmmmmmmhhhmRhhmmtm
-mmcmmmmmcmcmmmmhthhhhhRRhmmmmm
-mmmmmmmmmmmmmhhhhhhhhhhRhmmmmm
-mmmmmmmmmmmmmhhhhhhRRRRhhmmmmm
+mmmmmmmmmmRmRmRrmmmmmmmmmmmmRm
+mmmmmmmmmmmcmcmrmmmmmmmmmmmmRR
+ccmmmmmmmmcscss|mcmcmcmmmcmmRm
+ssccmcmcmccssss|sssssssscsctRm
+sssssscccccssss|ssssssscssmRRm
+ssssssssssssscs|cccccmcmccmmRm
+sssssssssssccccrcmcmmmmRtRcrrc
+ssssssssssscmmmmrrmmmhhRRmRrrm
+scccctccccccmmmmmRmhhhmRhhmmtm
+mmcmmmmmcmcmmmmhtRhhhhRRhmmmmm
+mmmmmmmmmmmmmhhhhRhhhhhRhmmmmm
+mmmmmmmmmmmmmhhhhRhRRRRhhmmmmm
 mmmtmhmhmhthhhhRRRRRRmthhmmmmm
 mhhhhhhhhhhhhRRmRtmmmmhhhmmmmm
 hhhhhhhhhhhhRmmmmmmmmmmmmmmCmm

data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg

@@ -77,20 +77,14 @@ Defeat:
 	description=Knafa-Telfar
 	side=2
 	canrecruit=1
-#ifdef EASY
-	gold=150
-	recruit=Orcish Warrior,Wolf Rider,Orcish Crossbow,Orcish Assassin,Troll
-#endif
-#ifdef NORMAL
-	gold=200
-	income=10
-	recruit=Orcish Warrior,Goblin Pillager,Orcish Crossbow,Orcish Assassin,Troll Warrior
-#endif
-#ifdef HARD
-	gold=250
-	income=15
-	recruit=Orcish Warrior,Goblin Pillager,Orcish Crossbow,Orcish Assassin,Troll Warrior
-#endif
+	recruit=Troll Whelp,Orcish Grunt,Orcish Crossbow
+	{GOLD 200 300 400}
+	{INCOME 10 20 30}
+		[ai]
+		aggression=1.0
+		grouping=no
+		caution=-5.0
+		[/ai]
 	team_name=orcs
 	[/side]
 
@@ -99,21 +93,15 @@ Defeat:
 	description=Urug-Tan
 	side=3
 	canrecruit=1
-#ifdef EASY
-	recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Orcish Assassin,Troll
-	gold=100
-	income=5
-#endif
-#ifdef NORMAL
-	recruit=Orcish Grunt,Wolf Rider,Orcish Crossbow,Orcish Assassin,Troll
-	gold=150
-	income=16
-#endif
-#ifdef HARD
-	recruit=Orcish Warrior,Goblin Knight,Orcish Crossbow,Orcish Assassin,Troll Warrior
-	gold=250
-	income=20
-#endif
+	recruit=Troll Whelp,Orcish Grunt,Orcish Crossbow
+	{GOLD 200 250 350}
+	{INCOME 5 16 20}
+
+		[ai]
+		aggression=1.0
+		grouping=no
+		caution=-5.0
+		[/ai]
 	team_name=orcs
 	[/side]
 
@@ -126,6 +114,11 @@ Defeat:
 	{GOLD 100 150 250}
 	{INCOME 5 15 20}
 	team_name=orcs
+		[ai]
+		aggression=1.0
+		grouping=no
+		caution=-5.0
+		[/ai]
 	[/side]
 
 	[event]

data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg

@@ -1,6 +1,6 @@
 [scenario]
 	name="Mountain Pass"
-	turns=30
+	turns=24
 	map_data="{maps/Heir_To_The_Throne/Mountain_Pass}"
 
     {DAWN}
@@ -24,7 +24,7 @@
 
 	objectives="
 Victory:
-@Move Konrad to the end of the road
+@Move Konrad to the end of the road in the north-west
 @Defeat all enemies
 Defeat:
 #Death of Konrad
@@ -58,6 +58,13 @@ Defeat:
 		recruitment_pattern=fighter
 		villages_per_scout=0
 		[/ai]
+		[ai]
+		time_of_day=dusk,first_watch,second_watch
+		turns=8-100
+		caution=-1.0
+		aggression=1.0
+		grouping=no
+		[/ai]
 
 	{GOLD 150 200 280}
 	{INCOME 8 15 20}
@@ -84,7 +91,7 @@ Defeat:
 		leader_value=10
 		aggression=1.0
 		[/ai]
-	{GOLD 50 100 200}
+	{GOLD 50 150 250}
 	{INCOME 15 30 50}
 	team_name=mages
 	[/side]

data/units/Horseman.cfg

@@ -10,7 +10,7 @@ movement=8
 experience=44
 level=1
 alignment=lawful
-advanceto=Knight
+advanceto=Knight,Lancer
 cost=23
 usage=fighter
 unit_description="Trained from childhood to ride and to follow a strict code of honor, Horsemen are both fast and powerful attackers. Charging at their enemies, they do double damage, but also receive double damage when struck. Rebels against Asheviere's tyranny often use Horsemen against her."

data/units/Lancer.cfg

@@ -0,0 +1,34 @@
+[unit]
+name=Lancer
+race=human
+image=lancer.png
+image_defensive=lancer-defend.png
+hitpoints=48
+movement_type=mounted
+movement=10
+experience=500
+level=2
+alignment=lawful
+advanceto=null
+cost=40
+usage=fighter
+unit_description="The Lancers are some of the bravest and most feared riders in all of Wesnoth. They wear very little armor, and thus ride swiftly. Ideal for offensive use, their charge attack inflicts very large amounts of damage, but also exposes the Lancer to great risk."
+get_hit_sound=groan.wav
+	[attack]
+	name=lance
+	type=pierce
+	special=charge
+	range=short
+	damage=14
+	number=3
+		[frame]
+		begin=-150
+		end=100
+		image=lancer-attack.png
+		[/frame]
+		[sound]
+		time=-100
+		sound=horse-canter.wav
+		[/sound]
+	[/attack]
+[/unit]

src/filesystem.cpp

@@ -416,7 +416,6 @@ std::string get_binary_file_location(const std::string& type, const std::string&
 	const std::vector<std::string>& paths = get_binary_paths(type);
 	for(std::vector<std::string>::const_iterator i = paths.begin(); i != paths.end(); ++i) {
 		const std::string file = *i + filename;
-		std::cerr << "checking existence of file: '" << file << "'\n";
 		if(file_exists(file)) {
 			return file;
 		}