[Wesnoth-cvs-commits] wesnoth/data/scenarios/Eastern_Invasion Evacuat... (February 14, 2005 - 01:25)

 

CVSROOT:	/cvsroot/wesnoth
Module name:	wesnoth
Branch: 	
Changes by:	Joseph Simmons <turin@xxxxxxxxxxxxxxxx>	05/02/13 23:59:39

Modified files:
	data/scenarios/Eastern_Invasion: Evacuation.cfg 

Log message:
	Finally found the source of the Evacuation bug, and fixed it
	
	(And I'm going to be asking Dave why [not] does odd things with [kill] events)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.21 wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.22
--- wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg:1.21	Sun Feb 13 23:14:54 2005
+++ wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg	Sun Feb 13 23:59:38 2005
@@ -146,14 +146,6 @@
 		[/item]
 	[/event]
 	
-#define NORTH_OF_BRIDGE
-side=1
-[not]
-x=1-31,1-20
-y=21-24,18-20
-[/not]
-#enddef
-
 	[event]
 	name=moveto
 	first_time_only=no
@@ -164,147 +156,156 @@
 		[message]
 		description=Engineer
 		message= _ "So, d'ya want me to blow up der bridge yet, Cap'n?"
+		[/message]
+		[message]
+		description=Gweddry
+		message= _ "Hm..."
 			[option]
-			name=Yes
+			message= _ "Yes, blow it up."
 				[command]
-					[message]
-					description=Engineer
-					message= _ "I believe you owe me some money first."
-					[/message]
-					[message]
-					description=Gweddry
-					message= _ "Here it is. Now blow collapse the bridge!"
-					[/message]
-					[store_gold]
-					side=1
-					variable=gold
-					[/store_gold]
-					[if]
-						[variable]
-						name=gold
-						greater_than=49
-						[/variable]
-						[then]
-							[message]
-							description=Engineer
-							message= _ "Alright! Blast'n time!"
-							[/message]
-							[gold]
-							amount=-50
-							[/gold]
-							[sound]
-							name=gunshot.wav
-							[/sound]
-							[delay]
-							time=200
-							[/delay]
-							[sound]
-							name=gunshot.wav
-							[/sound]
-							[delay]
-							time=200
-							[/delay]
-							[sound]
-							name=gunshot.wav
-							[/sound]
-							[delay]
-							time=500
-							[/delay]
-							[sound]
-							name=fire.wav
-							[/sound]
-							[message]
-							speaker=narrator
-							id=msg_cmpg_ei_15_11
-							message= _ "BOOM!!!"
-							[/message]
-							[terrain]
-							x=8
-							y=16-19
-							letter=c
-							[/terrain]
-							[if]
-								[have_unit]
+				[message]
+				description=Engineer
+				message= _ "I believe you owe me some money first."
+				[/message]
+				[message]
+				description=Gweddry
+				message= _ "Here it is. Now blow collapse the bridge!"
+				[/message]
+				[store_gold]
+				side=1
+				variable=gold
+				[/store_gold]
+				[if]
+					[variable]
+					name=gold
+					greater_than=49
+					[/variable]
+					[then]
+						[message]
+						description=Engineer
+						message= _ "Alright! Blast'n time!"
+						[/message]
+						[gold]
+						amount=-50
+						[/gold]
+						[sound]
+						name=gunshot.wav
+						[/sound]
+						[delay]
+						time=200
+						[/delay]
+						[sound]
+						name=gunshot.wav
+						[/sound]
+						[delay]
+						time=200
+						[/delay]
+						[sound]
+						name=gunshot.wav
+						[/sound]
+						[delay]
+						time=500
+						[/delay]
+						[sound]
+						name=fire.wav
+						[/sound]
+						[message]
+						speaker=narrator
+						message= _ "BOOM!!!"
+						[/message]
+						[terrain]
+						x=8
+						y=16-19
+						letter=c
+						[/terrain]
+						[if]
+							[have_unit]
+							description=Gweddry
+							x=1-31,1-20
+							y=21-24,18-20
+							[/have_unit]
+							[else]
+								[message]
 								description=Gweddry
-								{NORTH_OF_BRIDGE}
-								[/have_unit]
-								[then]
-									[message]
-									description=Gweddry
-									message= _ "Oops... I'm north of the bridge! That was bad planning on my part."
-									[/message]
-									[endlevel]
-									result=defeat
-									[/endlevel]
-								[/then]
-							[/if]
-							[if]
-								[have_unit] 
+								message= _ "Oops... I'm north of the bridge! That was bad planning on my part."
+								[/message]
+								[endlevel]
+								result=defeat
+								[/endlevel]
+							[/else]
+						[/if]
+						[if]
+							[have_unit] 
+							description=Dacyn
+							x=1-31,1-20
+							y=21-24,18-20
+							[/have_unit]
+							[else]
+								[message]
 								description=Dacyn 
-								{NORTH_OF_BRIDGE} 
-								[/have_unit]
-								[then]
-									[message]
-									description=Dacyn 
-									message= _ "You idiot! You left me north of the bridge!"
-									[/message]
-									[endlevel]
-									result=defeat
-									[/endlevel]
-								[/then]
-							[/if]
-							[if]
-								[have_unit]
+								message= _ "You idiot! You left me north of the bridge!"
+								[/message]
+								[endlevel]
+								result=defeat
+								[/endlevel]
+							[/else]
+						[/if]
+						[if]
+							[have_unit]
+							description=Owaec
+							x=1-31,1-20
+							y=21-24,18-20
+							[/have_unit]
+							[else]
+								[message]
 								description=Owaec
-								{NORTH_OF_BRIDGE}
-								[/have_unit]
-								[then]
-									[message]
-									description=Owaec
-									message= _ "I'm still north of the bridge, Gweddry! Why'd you blow it up!?!"
-									[/message]
-									[endlevel]
-									result=defeat
-									[/endlevel]
-								[/then]
-							[/if]
-							[kill]
-							{NORTH_OF_BRIDGE}
-							animate=yes
-							[/kill]
-							[message]
-							description=Gweddry
-							message= _ "Good, we have escaped from these orcs. Now we have to go south. I think the undead probably aren't as numerous this far west, so we won't get immediately killed, anyway."
-							[/message]
-							[message]
-							description=Engineer
-							message= _ "I aint goin' to be going with yah. Best o' luck t'yah!"
-							[/message]
-							[kill]
-							description=Engineer
-							[/kill]
-							[endlevel]
-							result=victory
-							bonus=yes
-							[/endlevel]
-						[/then]
-						[else]
-							[message]
-							description=Engineer
-							message="Ya can't afford it. Try again later."
-							[/message]
-						[/else]
-						{CLEAR_VARIABLE gold}
-					[/if]
+								message= _ "I'm still north of the bridge, Gweddry! Why'd you blow it up!?!"
+								[/message]
+								[endlevel]
+								result=defeat
+								[/endlevel]
+							[/else]
+						[/if]
+						[kill]
+						x=0-31
+						y=0-20
+						side=1
+						fire_event=yes
+						animate=yes
+						[/kill]
+						[message]
+						description=Gweddry
+						message= _ "Good, we have escaped from these orcs. Now we have to go south. I think the undead probably aren't as numerous this far west, so we won't get immediately killed, anyway."
+						[/message]
+						[message]
+						description=Engineer
+						message= _ "I aint goin' to be going with yah. Best o' luck t'yah!"
+						[/message]
+						[kill]
+						description=Engineer
+						[/kill]
+						[endlevel]
+						result=victory
+						bonus=yes
+						[/endlevel]
+					[/then]
+					[else]
+						[message]
+						description=Engineer
+						message="Ya can't afford it. Try again later."
+						[/message]
+					[/else]
+					{CLEAR_VARIABLE gold}
+				[/if]
 				[/command]
 			[/option]
 			[option]
-			name=No
+			message= _ "No, wait until later."
 				[command]
-					[message]
-					description=Engineer
-					message= _ "Neh? Alright then, we'll wait fa' later, eh?"
-					[/message]
+				[message]
+				description=Engineer
+				message= _ "Neh? Alright then, we'll wait fa' later, eh?"
+				[/message]
 				[/command]
 			[/option]
 		[/message]



You are on the gna.org mail server.

Generated by mhonarc, Tue Sep 20 16:46:56 2005