From 64eeddcc72c0b0dd463dfe10b80adbde8f922a60 Mon Sep 17 00:00:00 2001
From: James Spencer <ashade@gna.org>
Date: Sun, 3 Apr 2005 04:54:02 +0000
Subject: [PATCH] Some minor non-playable scenario tweaks

---
 .../A_Spy_in_the_Woods.cfg                    | 15 ++++--
 .../The_Rise_of_Wesnoth/Epilogue.cfg          | 46 +++++++++++++++----
 .../The_Rise_of_Wesnoth/The_Midlands.cfg      |  2 +-
 .../The_Rise_of_Wesnoth/The_Plan.cfg          |  3 +-
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg b/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
index fa2870fb90e..e138cbceda4 100644
--- a/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
+++ b/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
@@ -59,7 +59,6 @@
 	name=prestart
 
 		{PLACE_IMAGE (items/pine2.png) 13 12}
-		{HERO (Outlaw Queen) (Jessica in Hiding) ( _ "Jessica in Hiding") 4 19 16}
 
 		[teleport]
 			[filter]
@@ -79,14 +78,22 @@
 
 	[event]
 	name=start
+
+		[move_unit_fake]
+			type=Outlaw Queen
+			gender=female
+			x=22,21,20,19
+			y=16,17,16,16
+		[/move_unit_fake]
+
+		{HERO (Outlaw Queen) (Jessica in Hiding) ( _ "Jessica in Hiding") 4 19 16}
+
 		[scroll_to_unit]
 			description=Jessica in Hiding
 			x=19
 			y=16
 		[/scroll_to_unit]
-		[delay]
-			time=1500
-		[/delay]
+
 		[message]
 			description=Lord Logalmier
 			image="portraits/The_Rise_of_Wesnoth/logalmier.png"
diff --git a/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg b/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
index 0d96b80e3ae..6ccbe9b4232 100644
--- a/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
+++ b/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
@@ -59,13 +59,14 @@
 			description=Minister Edmond
 		[/recall]
 
-		[teleport]
+		[store_unit]
+			variable=haldric_s
+			kill=yes
 			[filter]
-				description=Prince Haldric
+			description=Prince Haldric
 			[/filter]
-			x=11
-			y=7
-		[/teleport]
+		[/store_unit]
+
 		[teleport]
 			[filter]
 				description=Lady Jessica
@@ -134,12 +135,39 @@
 	[event]
 	name=start
 		[scroll_to_unit]
-			description=Prince Haldric
-			x=11
-			y=7
+			description=Lady Jessica
+			x=8
+			y=5
 		[/scroll_to_unit]
+
+		[move_unit_fake]
+			type=$haldric_s.type
+			x=12,13,13,13,13,12,11,11
+			y=10,10,9,8,7,6,6,7
+		[/move_unit_fake]
+
+		[set_variable]
+			name=haldric_s.facing
+			value=reverse
+		[/set_variable]
+		[set_variable]
+			name=haldric_s.x
+			value=11
+		[/set_variable]
+		[set_variable]
+			name=haldric_s.y
+			value=7
+		[/set_variable]
+
+		[unstore_unit]
+			variable=haldric_s
+			find_vacant=yes
+		[/unstore_unit]
+
+		{CLEAR_VARIABLE haldric_s}
+
 		[delay]
-			time=2500
+			time=1250
 		[/delay]
 
 		[message]
diff --git a/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg b/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
index 504275c8cb2..93f26437c4f 100644
--- a/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
+++ b/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
@@ -4,7 +4,7 @@
 	name= _ "The Midlands"
 	map_data="{maps/The_Rise_of_Wesnoth/The_Midlands}"
 	{TURNS 45 42 39}
-	
+
 	{scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg}
 
 	{DAWN}
diff --git a/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg b/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
index 4ed1de471b5..e0d83b3f21e 100644
--- a/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
+++ b/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
@@ -129,8 +129,9 @@
 				x=11
 				y=7
 		[/scroll_to_unit]
+
 		[delay]
-			time=1500
+			time=1250
 		[/delay]
 
 		[message]