Updated some Airship/port npcs

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12182 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 210 insertions, 263 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 3ca52bb3a..74cac8755 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/02/07
+	* Rev. 12182 Updated some Airship/port npcs. [L0ne_W0lf]
 	* Rev. 12181 Updated "Old Blue Box quest" and enabled it. [L0ne_W0lf]
 	- This quest no longer gives unlimited Old Blue Boxes,
 	  and was apparently never meant to.
@@ -11,6 +12,7 @@ Date		Added
 	* Corrected a Cutin Problem in Cooking Quest and a Delitem. (bugreport:911)
 	* Corrected some typo error with "rouge". (bugreport:909)
 	* Moved Custom Event folder to Custom Folder.
+	* Corrected again the Cooking quest changed a close; to close2;
 2008/01/31
 	* Rev. 12156 Started fixing bugreport:899 and fixed bugreport:875 [L0ne_W0lf]
 	* Rev. 12155 Updated Lighthalzen Town NPCs and Speed Potion quest. [L0ne_W0lf]
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 9ebaa2706..0fa0557db 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.0
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
@@ -28,10 +28,11 @@
 //= 0.9 Fixed a incorrect variable changed form "mob_inv" to "mobinv". [Samuray22]
 //= 0.9b Fixed a typo and bad variable use in the Typing Challenge [ultramage]
 //= 1.0 Fixed bad NPC header data to comply with rev. 11603. [L0ne_W0lf]
+//= 1.1 Touch-ups, and changed references of "Yuno" to "Juno",  [L0ne_W0lf]
 //============================================================ 
 
 //============================================================ 
-//= The Airship System (Yuno -> Hugel -> Einbroch -> Lighthalzen -> repeat)
+//= The Airship System (Juno -> Hugel -> Einbroch -> Lighthalzen -> repeat)
 //============================================================ 
 
 airplane,243,74,4	script	#AirshipWarp-1	45,2,2,{
@@ -152,13 +153,13 @@ OnTimer195000:
 	donpcevent "#AirshipWarp-2::OnHide";
 	disablenpc "#AirshipWarp-1";
 	disablenpc "#AirshipWarp-2";
-	mapannounce "airplane","The Airship is now taking off. Our next destination is Yuno.",1,0x70DBDB;
+	mapannounce "airplane","The Airship is now taking off. Our next destination is Juno.",1,0x70DBDB;
 	end;
 OnTimer210000:
-	mapannounce "airplane","We are heading to Yuno.",1,0x70DBDB;
+	mapannounce "airplane","We are heading to Juno.",1,0x70DBDB;
 	end;
 OnTimer225000:
-	mapannounce "airplane","We will arrive in Yuno shortly.",1,0x70DBDB;
+	mapannounce "airplane","We will arrive in Juno shortly.",1,0x70DBDB;
 	end;
 OnTimer240000:
 	set $@airplanelocation,2;
@@ -166,10 +167,10 @@ OnTimer240000:
 	enablenpc "#AirshipWarp-2";
 	donpcevent "#AirshipWarp-1::OnUnhide";
 	donpcevent "#AirshipWarp-2::OnUnhide";
-	mapannounce "airplane","Welcome to Yuno. Have a safe trip.",1,0x70DBDB;
+	mapannounce "airplane","Welcome to Juno. Have a safe trip.",1,0x70DBDB;
 	end;
 OnTimer250000:
-	mapannounce "airplane","Currently, we are in Yuno. The Airship will leave shortly.",1,0x70DBDB;
+	mapannounce "airplane","Currently, we are in Juno. The Airship will leave shortly.",1,0x70DBDB;
 	end;
 OnTimer260000:
 	stopnpctimer;
@@ -183,9 +184,7 @@ OnTimer260000:
 //============================================================ 
 
 airplane,240,64,5	script	Exit#01::Exit2	857,{
-
-end;
-
+	end;
 }
 
 airplane,247,64,5	duplicate(Exit2)	Exit#02	857
@@ -195,7 +194,6 @@ airplane,240,39,1	duplicate(Exit2)	Exit#03	857
 airplane,247,39,1	duplicate(Exit2)	Exit#04	857
 
 airplane,100,69,2	script	Airship Crew#01::Airship Crew	852,{
-
 	mes "[Airship Crew]";
 	mes "If we've landed at";
 	mes "your destination and";
@@ -204,11 +202,9 @@ airplane,100,69,2	script	Airship Crew#01::Airship Crew	852,{
 	mes "stairs up ahead. Thank";
 	mes "you for you patronage.";
 	close;
-
 }
 
 airplane,250,59,3	script	Airship Staff::AirshipInfo	67,{
-
 	mes "[Airship Staff]";
 	mes "Welcome";
 	mes "to the Airship.";
@@ -610,29 +606,29 @@ airplane_01,221,158,6	script	Pilot#air-0::Pilot	852,{
 		mes "(See what I mean?)";
 		close;
 	}
-		mes "[Pilot]";
-		mes "This uniform is";
-		mes "really dapper, but";
-		mes "it's way too thick to";
-		mes "wear around the Airship.";
-		next;
-		mes "[Pilot]";
-		mes "...";
-		mes "......";
-		mes "No one ever really";
-		mes "comes into this room.";
-		mes "And the captain IS a reindeer.";
-		mes "I could just strip to my boxers.";
-		next;
-		//Emotion "Pilot#airplane_01" ET_HUK
-		mes "[Pilot]";
-		mes "Oh...! Hello there!";
-		mes "E-e-enjoying your flight?!";
-		close;
+	mes "[Pilot]";
+	mes "This uniform is";
+	mes "really dapper, but";
+	mes "it's way too thick to";
+	mes "wear around the Airship.";
+	next;
+	mes "[Pilot]";
+	mes "...";
+	mes "......";
+	mes "No one ever really";
+	mes "comes into this room.";
+	mes "And the captain IS a reindeer.";
+	mes "I could just strip to my boxers.";
+	next;
+	//Emotion "Pilot#airplane_01" ET_HUK
+	mes "[Pilot]";
+	mes "Oh...! Hello there!";
+	mes "E-e-enjoying your flight?!";
+	close;
 }
 
 //============================================================ 
-//= The Airship System (Izlude -> Yuno -> Rachel -> Repeat)
+//= The Airship System (Izlude -> Juno -> Rachel -> Repeat)
 //============================================================ 
 
 airplane_01,243,74,4	script	#AirshipWarp-3	45,2,2,{
@@ -709,13 +705,13 @@ OnTimer65000:
 	donpcevent "#AirshipWarp-4::OnHide";
 	disablenpc "#AirshipWarp-3";
 	disablenpc "#AirshipWarp-4";
-	mapannounce "airplane_01","The Airship is leaving the ground. Our next destination is Yuno.",1,0x70DBDB;
+	mapannounce "airplane_01","The Airship is leaving the ground. Our next destination is Juno.",1,0x70DBDB;
 	end;
 OnTimer80000:
-	mapannounce "airplane_01","We are heading to Yuno.",1,0x70DBDB;
+	mapannounce "airplane_01","We are heading to Juno.",1,0x70DBDB;
 	end;
 OnTimer95000:
-	mapannounce "airplane_01","We will arrive in Yuno shortly.",1,0x70DBDB;
+	mapannounce "airplane_01","We will arrive in Juno shortly.",1,0x70DBDB;
 	end;
 OnTimer110000:
 	set $@airplanelocation2,2;
@@ -723,10 +719,10 @@ OnTimer110000:
 	enablenpc "#AirshipWarp-4";
 	donpcevent "#AirshipWarp-3::OnUnhide";
 	donpcevent "#AirshipWarp-4::OnUnhide";
-	mapannounce "airplane_01","Welcome to Yuno. Have a safe trip.",1,0x70DBDB;
+	mapannounce "airplane_01","Welcome to Juno. Have a safe trip.",1,0x70DBDB;
 	end;
 OnTimer120000:
-	mapannounce "airplane_01","Currently, we are in Yuno. The Airship will take off shortly.",1,0x70DBDB;
+	mapannounce "airplane_01","Currently, we are in Juno. The Airship will take off shortly.",1,0x70DBDB;
 	end;
 OnTimer130000:
 	set $@airplanelocation2,0;
@@ -802,7 +798,6 @@ OnTouch:
 }
 
 airplane_01,69,63,2	script	Old Man#06	55,{
-
 	mes "[Mendel]";
 	mes "As I expected, the";
 	mes "in-flight meals are";
@@ -811,7 +806,6 @@ airplane_01,69,63,2	script	Old Man#06	55,{
 	mes "have brought my chef so that";
 	mes "I could enjoy a real meal.";
 	close;
-
 }
 
 airplane_01,33,68,4	script	Clarice	74,{
@@ -845,13 +839,11 @@ airplane_01,71,31,6	script	Swordman Shimizu	106,{
 //============================================================
 
 izlude,201,54,3	script	Airship Staff#izl	91,{
-
 	mes "[Airship Staff]";
 	mes "Welcome to the International Airship.";
 	mes "How may I help you?";
 	next;
-	menu "Board the Airship",-,"Cancel",L_Cancel;
-
+	if (select("Board the Airship:Cancel") == 1) {
 		mes "[Airship Staff]";
 		mes "The Airship boarding fee";
 		mes "is 1,200 zeny, but if you've";
@@ -859,29 +851,26 @@ izlude,201,54,3	script	Airship Staff#izl	91,{
 		mes "the fee will be waived. Will";
 		mes "you board the Airship?";
 		next;
-		menu "Yes",-,"No",L_Cancel;
-
-		if(countitem(7311) > 0) goto L_GotTicket;
-		if(Zeny < 1200) goto L_NoZeny;
-			set Zeny, Zeny - 1200;
-			warp "airplane_01",224,64;
+		if (select("Yes:No") == 1) {
+			if(countitem(7311) > 0) {
+				delitem 7311,1;
+				warp "airplane_01",224,64;
+				close;
+			}
+			if(Zeny > 1200) {
+				set Zeny, Zeny - 1200;
+				warp "airplane_01",224,64;
+				close;
+			}
+			mes "[Airship Staff]";
+			mes "You don't have enough zeny.";
 			close;
-
-		L_GotTicket:
-			delitem 7311,1;
-			warp "airplane_01",224,64;
-			close;
-
-	L_NoZeny:
-		mes "[Airship Staff]";
-		mes "You don't have enough zeny.";
-		close;
-
-	L_Cancel:
-		mes "[Airship Staff]";
-		mes "Thank you and";
-		mes "have a nice day.";
-		close;
+		}
+	}
+	mes "[Airship Staff]";
+	mes "Thank you and";
+	mes "have a nice day.";
+	close;
 }
 
 //============================================================ 
@@ -889,13 +878,11 @@ izlude,201,54,3	script	Airship Staff#izl	91,{
 //============================================================
 
 hugel,182,150,3	script	Airship Staff#hu	91,{
-
 	mes "[Airship Staff]";
-	mes "Welcome to the Schwarzwald Republic's Airship.";
+	mes "Welcome to the International Airship.";
 	mes "How may I help you?";
 	next;
-	menu "Board the Airship",-,"Cancel",L_Cancel;
-
+	if (select("Board the Airship:Cancel") == 1) {
 		mes "[Airship Staff]";
 		mes "The Airship boarding fee";
 		mes "is 1,200 zeny, but if you've";
@@ -903,126 +890,99 @@ hugel,182,150,3	script	Airship Staff#hu	91,{
 		mes "the fee will be waived. Will";
 		mes "you board the Airship?";
 		next;
-		menu "Yes",-,"No",L_Cancel;
-
-		if(countitem(7311) > 0) goto L_GotTicket;
-		if(Zeny < 1200) goto L_NoZeny;
-			set Zeny, Zeny - 1200;
-			warp "airplane",224,64;
+		if (select("Yes:No") == 1) {
+			if(countitem(7311) > 0) {
+				delitem 7311,1;
+				warp "airplane_01",224,64;
+				close;
+			}
+			if(Zeny > 1200) {
+				set Zeny, Zeny - 1200;
+				warp "airplane_01",224,64;
+				close;
+			}
+			mes "[Airship Staff]";
+			mes "You don't have enough zeny.";
 			close;
-
-		L_GotTicket:
-			delitem 7311,1;
-			warp "airplane",224,64;
-			close;
-
-	L_NoZeny:
-		mes "[Airship Staff]";
-		mes "You don't have enough zeny.";
-		close;
-
-	L_Cancel:
-		mes "[Airship Staff]";
-		mes "Thank you and";
-		mes "have a nice day.";
-		close;
+		}
+	}
+	mes "[Airship Staff]";
+	mes "Thank you and";
+	mes "have a nice day.";
+	close;
 }
 
 //============================================================ 
 //= The Rachel Airship Staff
 //============================================================
 
-ra_fild12,294,206,3	script	Airship Staff#ra	91,{
-
-	mes "[Airship Staff]";
-	mes "Welcome to the International Airship.";
-	mes "How may I help you?";
+ra_fild12,295,208,3	script	Airship Staff#ra	45,1,1,{
+OnTouch:
+	mes "T use the airship, you are";
+	mes "required to pay 1,200 zeny or a";
+	mes "Free Airship Ticket. Would you like to use the service?";
 	next;
-	menu "Board the Airship",-,"Cancel",L_Cancel;
-
-		mes "[Airship Staff]";
-		mes "The Airship boarding fee";
-		mes "is 1,200 zeny, but if you've";
-		mes "got a Free Ticket for Airship,"; 
-		mes "the fee will be waived. Will";
-		mes "you board the Airship?";
-		next;
-		menu "Yes",-,"No",L_Cancel;
-
-		if(countitem(7311) > 0) goto L_GotTicket;
-		if(Zeny < 1200) goto L_NoZeny;
-			set Zeny, Zeny - 1200;
+	if (select("Yes:No") == 1) {
+		if (countitem(7311) > 0) {
+			delitem 7311,1;
 			warp "airplane_01",224,64;
 			close;
-
-		L_GotTicket:
-			delitem 7311,1;
+		}
+		if (Zeny >= 1200) {
+			set Zeny, Zeny - 1200;
 			warp "airplane_01",224,64;
 			close;
-
-	L_NoZeny:
-		mes "[Airship Staff]";
+		}
 		mes "You don't have enough zeny.";
 		close;
-
-	L_Cancel:
-		mes "[Airship Staff]";
-		mes "Thank you and";
-		mes "have a nice day.";
-		close;
+	}
+	mes "Thank you and, please come again.";
+	close;
 }
 
 //============================================================ 
-//= Yuno Airport NPCs
+//= Juno Airport NPCs
 //============================================================
 
 y_airport,144,63,4	script	Airport Staff#Ein	91,{
-
 	mes "[Airship Staff]";
 	mes "Good day!";
 	mes "Would you like to go";
 	mes "to ^FF0000Einbroch^000000,^FF0000Hugel^000000 or";
 	mes "^FF0000Lighthalzen^000000?";
 	next;
-	menu "Yes.",s_Warp,"No.",-;
-
+	if (select("Yes.:No.") == 1) {
+		mes "[Airship Staff]";
+		mes "Thank you and";
+		mes "have a nice day.";
+		close2;
+		warp "yuno",57,240;
+		end;
+	}
 	mes "[Airship Staff]";
 	mes "Thank you and";
 	mes "have a nice day.";
 	close;
-
-s_Warp:
-	mes "[Airship Staff]";
-	mes "Thank you and";
-	mes "have a nice day.";
-	close2;
-	warp "yuno",57,240;
-	end;
-
 }
 	
 y_airport,141,63,4	script	Airport Staff#Izl	91,{
-
 	mes "[Airship Staff]";
 	mes "Good day!";
 	mes "Would you like to go";
 	mes "to ^FF0000Izlude^000000 or ^FF0000Rachel^000000?";
 	next;
-	menu "Yes.",s_Warp,"No.",-;
-
+	if (select("Yes.:No.") == 1) {
+		mes "[Airship Staff]";
+		mes "Thank you and";
+		mes "have a nice day.";
+		close2;
+		warp "yuno",50,240;
+		end;
+	}
 	mes "[Airship Staff]";
 	mes "Thank you and";
 	mes "have a nice day.";
 	close;
-
-s_Warp:
-	mes "[Airship Staff]";
-	mes "Thank you and";
-	mes "have a nice day.";
-	close2;
-	warp "yuno",50,240;
-	end;
-
 }
 
 yuno,14,262,3	script	Airship Staff#yuno01::Airship Staff	91,{
diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt
index 8aa8222c6..eb4fddd57 100644
--- a/npc/airports/einbroch.txt
+++ b/npc/airports/einbroch.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.3
+//= 1.4
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.1 Fixed wrong check, added extra condition [Justin84]
 //= 1.2 Removed Duplicates [Silent]
 //= 1.3 Fixed syntax errors for duplicate [KarLaeda]
+//= 1.4 Removed use of goto. [L0ne_W0lf]
 //============================================================
 
 
@@ -21,8 +22,7 @@ airport,126,43,4	script	Airport Staff#01::AirportE	90,{
 	mes "Welcome to the Airport.";
 	mes "How may I help you?";
 	next;
-	menu "Board the Airship",-,"Cancel",L_Cancel;
-
+	if (select("Board the Airship:Cancel") == 1) {
 		mes "[Airport Staff]";
 		mes "The Airship boarding fee";
 		mes "is 1,200 zeny, but if you've";
@@ -30,29 +30,26 @@ airport,126,43,4	script	Airport Staff#01::AirportE	90,{
 		mes "the fee will be waived. Will";
 		mes "you board the Airship?";
 		next;
-		menu "Yes",-,"No",L_Cancel;
-
-		if(countitem(7311) > 0) goto L_GotTicket;
-		if(Zeny < 1200) goto L_NoZeny;
-			set Zeny, Zeny - 1200;
-			warp "airport",148,51;
-			close;
-
-		L_GotTicket:
-			delitem 7311,1;
-			warp "airport",148,51;
+		if (select("Yes:No") == 1) {
+			if(countitem(7311) > 0) {
+				delitem 7311,1;
+				warp "airport",148,51;
+				close;
+			}
+			if(Zeny >= 1200) {
+				set Zeny, Zeny - 1200;
+				warp "airport",148,51;
+				close;
+			}
+			mes "[Airport Staff]";
+			mes "You don't have enough zeny.";
 			close;
-
-	L_NoZeny:
-		mes "[Airport Staff]";
-		mes "You don't have enough zeny.";
-		close;
-
-	L_Cancel:
-		mes "[Airport Staff]";
-		mes "Thank you and";
-		mes "have a nice day.";
-		close;
+		}
+	}
+	mes "[Airport Staff]";
+	mes "Thank you and";
+	mes "have a nice day.";
+	close;
 }
 
 airport,143,43,4	duplicate(AirportE)	Airport Staff#02	90
@@ -64,8 +61,7 @@ airport,126,51,4	script	Airport Staff#04::AirportE2	90,{
 	mes "Please head this";
 	mes "way to board the Airship.";
 	next;
-	menu "Exit to Main Terminal",-,"Cancel",L_Cancel;
-
+	if (select("Exit to Main Terminal:Cancel") == 1) {
 		mes "[Airport Staff]";
 		mes "If you leave the";
 		mes "main terminal, you'll";
@@ -74,18 +70,17 @@ airport,126,51,4	script	Airport Staff#04::AirportE2	90,{
 		mes "the Airship. Are you sure";
 		mes "that you want to exit?";
 		next;
-		menu "Yes",-,"No",L_Cancel;
-
+		if (select("Yes:No") == 1) {
 			warp "airport",142,40;
 			close;
-
-	L_Cancel:
-		mes "[Airport Staff]";
-		mes "Alright, thank you";
-		mes "for your patronage";
-		mes "and I hope you have";
-		mes "a pleasant flight~";
-		close;
+		}
+	}
+	mes "[Airport Staff]";
+	mes "Alright, thank you";
+	mes "for your patronage";
+	mes "and I hope you have";
+	mes "a pleasant flight~";
+	close;
 }
 
 airport,143,51,4	duplicate(AirportE2)	Airport Staff#05	90
diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt
index 64bfe03a9..551ae93e8 100644
--- a/npc/airports/lighthalzen.txt
+++ b/npc/airports/lighthalzen.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Cloned from einbroch.txt [Justin84]
 //= 1.1 Removed Duplicates [Silent]
 //= 1.2 Fixed syntax errors for duplicate [KarLaeda]
+//= 1.3 Removed use of goto. [L0ne_W0lf]
 //============================================================
 
 
@@ -20,38 +21,34 @@ lhz_airport,126,43,4	script	Airport Staff#1::AirportL	90,{
 	mes "Welcome to the Airport.";
 	mes "How may I help you?";
 	next;
-	menu "Board the Airship",-,"Cancel",L_Cancel;
-
-	mes "[Airport Staff]";
-	mes "The Airship boarding fee";
-	mes "is 1,200 zeny, but if you've";
-	mes "got a Free Ticket for Airship,"; 
-	mes "the fee will be waived. Will";
-	mes "you board the Airship?";
-	next;
-	menu "Yes",-,"No",L_Cancel;
-
-		if(countitem(7311) > 0) goto GotTicket;
-		if(zeny < 1200) goto L_NoZeny;
-		set Zeny,zeny-1200;
-		warp "lhz_airport",148,51;
-		close;
-
-	GotTicket:
-		delitem 7311,1;
-		warp "lhz_airport",148,51;
-		close;
-
-	L_NoZeny:
-		mes "[Airport Staff]";
-		mes "You don't have enough zeny.";
-		close;
-
-	L_Cancel:
+	if (select("Board the Airship:Cancel") == 1) {
 		mes "[Airport Staff]";
-		mes "Thank you and";
-		mes "have a nice day.";
-		close;
+		mes "The Airship boarding fee";
+		mes "is 1,200 zeny, but if you've";
+		mes "got a Free Ticket for Airship,"; 
+		mes "the fee will be waived. Will";
+		mes "you board the Airship?";
+		next;
+		if (select("Yes:No") == 1) {
+			if(countitem(7311) > 0) {
+				delitem 7311,1;
+				warp "lhz_airport",148,51;
+				close;
+			}
+			if(zeny >= 1200) {
+				set Zeny,zeny-1200;
+				warp "lhz_airport",148,51;
+				close;
+			}
+			mes "[Airport Staff]";
+			mes "You don't have enough zeny.";
+			close;
+		}
+	}
+	mes "[Airport Staff]";
+	mes "Thank you and";
+	mes "have a nice day.";
+	close;
 }
 
 lhz_airport,143,43,4	duplicate(AirportL)	Airport Staff#2	90
@@ -63,8 +60,7 @@ lhz_airport,126,51,4	script	Airport Staff#4::AirportL2	90,{
 	mes "Please head this";
 	mes "way to board the Airship.";
 	next;
-	menu "Exit to Main Terminal",-,"Cancel",L_Cancel;
-
+	if (select("Exit to Main Terminal:Cancel") == 1) {
 		mes "[Airport Staff]";
 		mes "If you leave the";
 		mes "main terminal, you'll";
@@ -73,18 +69,17 @@ lhz_airport,126,51,4	script	Airport Staff#4::AirportL2	90,{
 		mes "the Airship. Are you sure";
 		mes "that you want to exit?";
 		next;
-		menu "Yes",-,"No",L_Cancel;
-
+		if (select("Yes:No") == 1) {
 			warp "lhz_airport",142,40;
 			close;
-
-	L_Cancel:
-		mes "[Airport Staff]";
-		mes "Alright, thank you";
-		mes "for your patronage";
-		mes "and I hope you have";
-		mes "a pleasant flight~";
-		close;
+		}
+	}
+	mes "[Airport Staff]";
+	mes "Alright, thank you";
+	mes "for your patronage";
+	mes "and I hope you have";
+	mes "a pleasant flight~";
+	close;
 }
 
 lhz_airport,143,51,4	duplicate(AirportL2)	Airport Staff#5	90
diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt
index 3203f4d2a..bc01e1d3d 100644
--- a/npc/airports/yuno.txt
+++ b/npc/airports/yuno.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Cloned from Einbroch [Justin84]
 //= 1.1 Removed Duplicates [Silent]
 //= 1.2 Fixed syntax errors for duplicate [KarLaeda]
+//= 1.3 Removed use of goto. [L0ne_W0lf]
 //============================================================
 
 
@@ -20,8 +21,7 @@ y_airport,126,43,4	script	Airport Staff#001::AirportY	90,{
 	mes "Welcome to the Airport.";
 	mes "How may I help you?";
 	next;
-	menu "Board the Airship",-,"Cancel",L_Cancel;
-
+	if (select("Board the Airship:Cancel") == 1) {
 		mes "[Airport Staff]";
 		mes "The Airship boarding fee";
 		mes "is 1,200 zeny, but if you've";
@@ -29,29 +29,26 @@ y_airport,126,43,4	script	Airport Staff#001::AirportY	90,{
 		mes "the fee will be waived. Will";
 		mes "you board the Airship?";
 		next;
-		menu "Yes",-,"No",L_Cancel;
-
-			if(countitem(7311) > 0) goto GotTicket;
-			if(zeny < 1200) goto L_NoZeny;
-			set Zeny,zeny-1200;
-			warp "y_airport",148,51;
-			close;
-
-		GotTicket:
-			delitem 7311,1;
-			warp "y_airport",148,51;
-			close;
-
-		L_NoZeny:
+		if (select("Yes:No") == 1) {
+			if(countitem(7311) > 0) {
+				delitem 7311,1;
+				warp "y_airport",148,51;
+				close;
+			}
+			if(zeny >= 1200) {
+				set Zeny,zeny-1200;
+				warp "y_airport",148,51;
+				close;
+			}
 			mes "[Airport Staff]";
 			mes "You don't have enough zeny.";
 			close;
-
-	L_Cancel:
-		mes "[Airport Staff]";
-		mes "Thank you and";
-		mes "have a nice day.";
-		close;
+		}
+	}
+	mes "[Airport Staff]";
+	mes "Thank you and";
+	mes "have a nice day.";
+	close;
 }
 
 y_airport,143,43,4	duplicate(AirportY)	Airport Staff#002	90
@@ -63,8 +60,7 @@ y_airport,126,51,4	script	Airport Staff#004::AirportY2	90,{
 	mes "Please head this";
 	mes "way to board the Airship.";
 	next;
-	menu "Exit to Main Terminal",-,"Cancel",L_Cancel;
-
+	if (select("Exit to Main Terminal:Cancel") == 1) {
 		mes "[Airport Staff]";
 		mes "If you leave the";
 		mes "main terminal, you'll";
@@ -73,18 +69,17 @@ y_airport,126,51,4	script	Airport Staff#004::AirportY2	90,{
 		mes "the Airship. Are you sure";
 		mes "that you want to exit?";
 		next;
-		menu "Yes",-,"No",L_Cancel;
-
+		if (select("Yes:No") == 1) {
 			warp "y_airport",142,40;
 			close;
-
-	L_Cancel:
-		mes "[Airport Staff]";
-		mes "Alright, thank you";
-		mes "for your patronage";
-		mes "and I hope you have";
-		mes "a pleasant flight~";
-		close;
+		}
+	}
+	mes "[Airport Staff]";
+	mes "Alright, thank you";
+	mes "for your patronage";
+	mes "and I hope you have";
+	mes "a pleasant flight~";
+	close;
 }
 
 y_airport,143,51,4	duplicate(AirportY2)	Airport Staff#005	90