summaryrefslogtreecommitdiff
path: root/npc/airports/yuno.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/airports/yuno.txt')
-rw-r--r--npc/airports/yuno.txt65
1 files changed, 30 insertions, 35 deletions
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