Updated Airship NPCs to official.

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

1 files changed, 114 insertions, 41 deletions

diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt
index 815280d27..ca2556fed 100644
--- a/npc/airports/yuno.txt
+++ b/npc/airports/yuno.txt
@@ -2,46 +2,42 @@
 //= Yuno Airport Staff
 //===== By: ================================================== 
 //= L0ne_W0lf, Muad_Dib
-//===== Current Version: ===================================== 
-//= 1.3
 //===== Compatible With: ===================================== 
-//= rAthena Revision 3000+
+//= rAthena SVN
 //===== Description: ========================================= 
 //= Yuno Airport Staff
 //===== Additional Comments: ================================= 
-//= 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]
-//============================================================
+//= Official NPCs.
+//============================================================ 
 
-
-y_airport,126,43,4	script	Airport Staff#001::AirportY	90,{
+y_airport,143,43,5	script	Airport Staff#y_air1a::y_airport1	90,{
 	mes "[Airport Staff]";
-	mes "Welcome to the Airport.";
-	mes "How may I help you?";
+	mes "Welcome to Juno Airport where we offer domestic flights to Einbroch, Lighthalzen and Hugel,";
+	mes "and international flights to Izlude and Rachel.";
+	mes "How may I be of service?";
 	next;
-	if (select("Board the Airship:Cancel") == 1) {
+	if (select("Board the Airship.:Cancel.") == 1) {
 		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?";
+		mes "The boarding fee for all";
+		mes "flights is 1,200 zeny. If you";
+		mes "use a Free Ticket for Airship,";
+		mes "the boarding fee will be waived.So would you like to depart?";
 		next;
 		if (select("Yes:No") == 1) {
-			if(countitem(7311) > 0) {
-				delitem 7311,1;
+			if (countitem(7311) > 0) {
+				delitem 7311,1; //Free_Flying_Ship_Ticket
 				warp "y_airport",148,51;
-				close;
+				end;
 			}
-			if(zeny >= 1200) {
-				set Zeny,zeny-1200;
+			if (Zeny >= 1200) {
+				set Zeny, Zeny - 1200;
 				warp "y_airport",148,51;
-				close;
+				end;
 			}
 			mes "[Airport Staff]";
-			mes "You don't have enough zeny.";
+			mes "I'm sorry, but you don't";
+			mes "have 1,200 zeny to pay";
+			mes "for the boarding fee.";
 			close;
 		}
 	}
@@ -51,27 +47,25 @@ y_airport,126,43,4	script	Airport Staff#001::AirportY	90,{
 	close;
 }
 
-y_airport,143,43,4	duplicate(AirportY)	Airport Staff#002	90
-y_airport,156,43,4	duplicate(AirportY)	Airport Staff#003	90
+y_airport,158,43,5	duplicate(y_airport1)	Airport Staff#y_air1b	90
+y_airport,126,43,5	duplicate(y_airport1)	Airport Staff#y_air1c	90
 
-y_airport,126,51,4	script	Airport Staff#004::AirportY2	90,{
+y_airport,143,49,3	script	Arrival Staff#y_air2a::y_airport2	90,{
 	mes "[Airport Staff]";
-	mes "Welcome~";
-	mes "Please head this";
-	mes "way to board the Airship.";
+	mes "Welcome to Juno Airport. If you've just arrived from your";
+	mes "flight, let me guide you to the main terminal. Otherwise, please";
+	mes "board the departing Airship to reach your intended destination.";
 	next;
-	if (select("Exit to Main Terminal:Cancel") == 1) {
+	if (select("Exit to main terminal:Cancel") == 1) {
 		mes "[Airport Staff]";
-		mes "If you leave the";
-		mes "main terminal, you'll";
-		mes "have to pay the admission";
-		mes "fee again in order to board";
-		mes "the Airship. Are you sure";
-		mes "that you want to exit?";
+		mes "Once you're in the main terminal, you must pay the fee once again";
+		mes "to board a departing Airship. You should only exit if your intended";
+		mes "destination is Juno. Proceed to";
+		mes "exit to the main terminal?";
 		next;
 		if (select("Yes:No") == 1) {
 			warp "y_airport",142,40;
-			close;
+			end;
 		}
 	}
 	mes "[Airport Staff]";
@@ -82,5 +76,84 @@ y_airport,126,51,4	script	Airport Staff#004::AirportY2	90,{
 	close;
 }
 
-y_airport,143,51,4	duplicate(AirportY2)	Airport Staff#005	90
-y_airport,156,51,4	duplicate(AirportY2)	Airport Staff#006	90
+y_airport,126,51,3	duplicate(y_airport2)	Arrival Staff#y_air2b	90
+y_airport,158,50,3	duplicate(y_airport2)	Arrival Staff#y_air2c	90
+
+y_airport,145,63,5	script	Domestic Boarding	91,{
+	mes "[Boarding Staff]";
+	mes "Would you like to board the";
+	mes "Airship that flies to Einbroch,";
+	mes "Lighthalzen and Hugel? If so,";
+	mes "please let me guide you to that";
+	mes "Airship's boarding area.";
+	next;
+	if (select("Yes:No") == 1) {
+		warp "yuno",59,244;
+		end;
+	}
+	mes "[Boarding Staff]";
+	mes "Very well, then.";
+	mes "Thank you for your";
+	mes "patronage, and I hope";
+	mes "you enjoy your travels~";
+	close;
+}
+
+y_airport,140,63,5	script	International Boarding	91,{
+	mes "[Boarding Staff]";
+	mes "Would you like to board";
+	mes "the Airship which flies to";
+	mes "Juno, Izlude and Rachel?";
+	mes "If so, let me guide";
+	mes "you to the boarding area.";
+	next;
+	if (select("Yes:No") == 1) {
+		warp "yuno",47,244;
+		end;
+	}
+	mes "[Boarding Staff]";
+	mes "Alright, then.";
+	mes "Thank you for flying";
+	mes "with us, and I hope you";
+	mes "enjoy your travels on our";
+	mes "state of the art Airships.";
+	close;
+}
+
+yuno,14,262,5	script	Airship Staff#yuno01	91,{
+	mes "[Airship Staff]";
+	mes "Welcome to Juno Airport.";
+	mes "Please use this door to";
+	mes "board the Airship that will";
+	mes "be flying all the way to Izlude";
+	mes "in the Rune-Midgarts Kingdom,";
+	mes "and to Rachel in the Arunafeltz";
+	mes "Republic.";
+	next;
+	mes "[Airship Staff]";
+	mes "Otherwise, if Juno is";
+	mes "your intended destination,";
+	mes "please head down the stairs";
+	mes "and ask the Arrival Staff to lead";
+	mes "you to the main terminal. Thank";
+	mes "you, and enjoy your travels.";
+	close;
+}
+
+yuno,88,263,3	script	Airship Staff#yuno02	91,{
+	mes "[Airship Staff]";
+	mes "Welcome to Juno Airport.";
+	mes "Please use this door to";
+	mes "board the Airship which stops";
+	mes "over Einbroch, Lighthalzen and";
+	mes "Hugel in the Schwaltzvalt Republic.";
+	next;
+	mes "[Airship Staff]";
+	mes "Otherwise, if Juno is";
+	mes "your intended destination,";
+	mes "please head down the stairs";
+	mes "and ask the Arrival Staff to lead";
+	mes "you to the main terminal. Thank";
+	mes "you, and enjoy your travels.";
+	close;
+}