From aaf3ea6ecd4d28714b8e4028acc730d18366630e Mon Sep 17 00:00:00 2001 From: Dastgir Date: Sat, 16 Jan 2016 20:20:50 +0530 Subject: Script Standardization: changed select format in airports folder --- npc/airports/airships.txt | 24 ++++++++++++------------ npc/airports/einbroch.txt | 8 ++++---- npc/airports/hugel.txt | 2 +- npc/airports/izlude.txt | 4 ++-- npc/airports/lighthalzen.txt | 8 ++++---- npc/airports/rachel.txt | 2 +- npc/airports/yuno.txt | 12 ++++++------ 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'npc/airports') diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 89e5cbae6..afec61992 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -303,7 +303,7 @@ airplane,250,58,2 script Airship Staff#airplane 1_F_02,{ mes "to the Airship."; mes "How may I help you?"; next; - switch (select("Using the Airship:Captain's Cabin:Facilities:Cancel")) { + switch (select("Using the Airship", "Captain's Cabin", "Facilities", "Cancel")) { case 1: mes "[Airship Staff]"; mes "When you see a broadcast"; @@ -483,7 +483,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ mes "purchase Apples or grind"; mes "them to make Apple Juice."; next; - switch (select("Buy Apples.:Make Apple Juice.:Why are you here?:Cancel.")) { + switch (select("Buy Apples.", "Make Apple Juice.", "Why are you here?", "Cancel.")) { case 1: mes "[Fruitz]"; mes "Please enter the amount"; @@ -520,7 +520,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ mes "will cost you ^FF0000" + .@pay + " Zeny^000000 zeny."; mes "Would you like to continue?"; next; - if (select("Yes:No") == 2) { + if (select("Yes", "No") == 2) { mes "[Fruitz]"; mes "Thanks for stopping"; mes "by my shop. Farewell!"; @@ -565,7 +565,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ mes "to make 1 Apple Juice for you."; mes "Would you like to proceed?"; next; - switch (select("Yes:No")) { + switch (select("Yes", "No")) { case 1: if (countitem(Apple) < 3 || countitem(Empty_Bottle) < 1) { mes "[Fruitz]"; @@ -784,7 +784,7 @@ airplane_01,250,58,2 script Airship Staff#airplane01 1_F_02,{ mes "to the Airship."; mes "How may I help you?"; next; - switch (select("Using the Airship:Captain's Cabin:Facilities:Cancel")) { + switch (select("Using the Airship", "Captain's Cabin", "Facilities", "Cancel")) { case 1: mes "[Airship Staff]"; mes "When you see a broadcast"; @@ -844,7 +844,7 @@ airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{ mes "purchase Apples or grind"; mes "them to make Apple Juice."; next; - switch (select("Buy Apples.:Make Apple Juice.:Cancel.")) { + switch (select("Buy Apples.", "Make Apple Juice.", "Cancel.")) { case 1: mes "[Meltz]"; mes "Please enter the amount"; @@ -881,7 +881,7 @@ airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{ mes "will cost you ^FF0000" + .@pay + "^000000 zeny."; mes "Would you like to continue?"; next; - if (select("Yes:No") == 2) { + if (select("Yes", "No") == 2) { mes "[Meltz]"; mes "Thanks for stopping"; mes "by my shop. Farewell!"; @@ -926,7 +926,7 @@ airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{ mes "to make 1 Apple Juice for you."; mes "Would you like to proceed?"; next; - switch (select("Yes:No")) { + switch (select("Yes", "No")) { case 1: if (countitem(Apple) < 3 || countitem(Empty_Bottle) < 1) { mes "[Meltz]"; @@ -1078,7 +1078,7 @@ airplane_01,32,61,4 script Nils#ein 1_M_03,1,1,{ mes "Would you like to play"; mes "a quick typing game?"; next; - switch (select("Play ^ff0000RO Typing Challenge^000000:Information:View Top Records:Cancel")) { + switch (select("Play ^ff0000RO Typing Challenge^000000", "Information", "View Top Records", "Cancel")) { case 1: mes "[Nils]"; mes "Okay, we have"; @@ -1257,7 +1257,7 @@ airplane_01,33,68,4 script Clarice 1_F_MERCHANT_02,{ function script applegamble { - switch (select("Play Dice Game:Learn Dice Game Rules:Cancel")) { + switch (select("Play Dice Game", "Learn Dice Game Rules", "Cancel")) { case 3: mes "["+getarg(0)+"]"; mes "I'm up for a game of"; @@ -1348,7 +1348,7 @@ function script applegamble { mes "betting ^FF0000"+.@amount+"^000000 Apples."; mes "Is that right?"; next; - if (select("Yes:No") == 2) { + if (select("Yes", "No") == 2) { mes "["+getarg(0)+"]"; mes "Mm, made a mistake?"; mes "Alright, please enter the"; @@ -1409,7 +1409,7 @@ function script applegamble { mes "Currently my total is ^0000FF" + .@tablesub + "^000000 and ^FF0000" + strcharinfo(0) + "^000000, your total is ^FF0000" + .@playersub + "^000000. I am winning this game. Would you like to cast dice again?"; } next; - switch (select("Cast dice.:Cancel.")) { + switch (select("Cast dice.", "Cancel.")) { case 1: mes "^3355FF*Rolling and rumbling*^000000"; .@player3 = rand(1,6); diff --git a/npc/airports/einbroch.txt b/npc/airports/einbroch.txt index 2d1ff70ba..8840ef121 100644 --- a/npc/airports/einbroch.txt +++ b/npc/airports/einbroch.txt @@ -37,7 +37,7 @@ airport,143,43,5 script Airport Staff#airport1a::airport1 4_F_01,{ mes "flights to the cities of"; mes "Juno, Lighthalzen and Hugel."; 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"; @@ -45,7 +45,7 @@ airport,143,43,5 script Airport Staff#airport1a::airport1 4_F_01,{ mes "the fee will be waived. Will"; mes "you board the Airship?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { if (countitem(Free_Flying_Ship_Ticket) > 0) { delitem Free_Flying_Ship_Ticket,1; warp "airport",148,51; @@ -83,7 +83,7 @@ airport,143,49,3 script Arrival Staff#airport2a::airport2 4_F_01,{ mes "main terminal. Otherwise, please board the Airship to depart to"; mes "Juno, Lighthalzen and Hugel."; next; - if (select("Exit to main terminal.:Cancel.") == 1) { + if (select("Exit to main terminal.", "Cancel.") == 1) { mes "[Arrival Staff]"; mes "Once you're in the main terminal, you will need to pay the fee again"; mes "to board an Airship. You should"; @@ -91,7 +91,7 @@ airport,143,49,3 script Arrival Staff#airport2a::airport2 4_F_01,{ mes "is your intended destination."; mes "Proceed to the main terminal?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { warp "airport",142,40; end; } diff --git a/npc/airports/hugel.txt b/npc/airports/hugel.txt index 67d010ab5..238bfb8a6 100644 --- a/npc/airports/hugel.txt +++ b/npc/airports/hugel.txt @@ -35,7 +35,7 @@ OnTouch: mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket."; mes "Would you like to use the service?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { if (countitem(Free_Flying_Ship_Ticket) > 0) { delitem Free_Flying_Ship_Ticket,1; warp "airplane",244,58; diff --git a/npc/airports/izlude.txt b/npc/airports/izlude.txt index 7f794de1f..9cae6a912 100644 --- a/npc/airports/izlude.txt +++ b/npc/airports/izlude.txt @@ -38,7 +38,7 @@ mes "departs on the flight wich stops"; mes "in Juno and Rachel?"; next; - if (select("Board the Airship to Juno/Rachel.:Cancel.") == 1) { + if (select("Board the Airship to Juno/Rachel.", "Cancel.") == 1) { mes "[Airship Staff]"; mes "The boarding fee is"; mes "1,200 zeny. However, this"; @@ -46,7 +46,7 @@ mes "a Free Ticket for Airship. Now,"; mes "would you still like to board?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { if (countitem(Free_Flying_Ship_Ticket) > 0) { delitem Free_Flying_Ship_Ticket,1; warp "airplane_01",244,58; diff --git a/npc/airports/lighthalzen.txt b/npc/airports/lighthalzen.txt index 959da9c96..89935a24a 100644 --- a/npc/airports/lighthalzen.txt +++ b/npc/airports/lighthalzen.txt @@ -38,14 +38,14 @@ lhz_airport,143,43,5 script Airport Staff#lhz_air1a::lhz_airport1 4_F_01,{ mes "where we offer nonstop"; mes "flights to Einbroch, Juno and Hugel."; next; - if (select("Board the Airship.:Cancel.") == 1) { + if (select("Board the Airship.", "Cancel.") == 1) { mes "[Airport Staff]"; mes "The boarding fee is"; mes "1,200 zeny, but you can"; mes "waive the fee if you redeem"; mes "a Free Ticket for Airship."; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { if (countitem(Free_Flying_Ship_Ticket) > 0) { delitem Free_Flying_Ship_Ticket,1; warp "lhz_airport",148,51; @@ -80,14 +80,14 @@ lhz_airport,143,49,3 script Arrival Staff#lhz_air2a::lhz_airport2 4_F_01,{ mes "main terminal if you are arriving from your flight. 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 "[Arrival Staff]"; mes "Once you're in the main terminal, you will need to pay the fee again"; mes "to board an Airship. You should"; mes "only exit if Lighthalzen is your intended destination. Shall we"; mes "proceed to the main terminal?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { warp "lhz_airport",142,40; end; } diff --git a/npc/airports/rachel.txt b/npc/airports/rachel.txt index 1faa33979..e3a1f7067 100644 --- a/npc/airports/rachel.txt +++ b/npc/airports/rachel.txt @@ -37,7 +37,7 @@ OnTouch: mes "To use the airship, you are required to pay 1,200 zeny or a Free Airship Ticket."; mes "Would you like to use the service?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { if (countitem(Free_Flying_Ship_Ticket) > 0) { delitem Free_Flying_Ship_Ticket,1; warp "airplane_01",245,60; diff --git a/npc/airports/yuno.txt b/npc/airports/yuno.txt index dbda7d5e3..56e5bc97e 100644 --- a/npc/airports/yuno.txt +++ b/npc/airports/yuno.txt @@ -37,14 +37,14 @@ y_airport,143,43,5 script Airport Staff#y_air1a::y_airport1 4_F_01,{ 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 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 (select("Yes", "No") == 1) { if (countitem(Free_Flying_Ship_Ticket) > 0) { delitem Free_Flying_Ship_Ticket,1; warp "y_airport",148,51; @@ -77,14 +77,14 @@ y_airport,143,49,3 script Arrival Staff#y_air2a::y_airport2 4_F_01,{ 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 "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) { + if (select("Yes", "No") == 1) { warp "y_airport",142,40; end; } @@ -108,7 +108,7 @@ y_airport,145,63,5 script Domestic Boarding 4_F_02,{ mes "please let me guide you to that"; mes "Airship's boarding area."; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { warp "yuno",59,244; end; } @@ -128,7 +128,7 @@ y_airport,140,63,5 script International Boarding 4_F_02,{ mes "If so, let me guide"; mes "you to the boarding area."; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { warp "yuno",47,244; end; } -- cgit v1.2.3-70-g09d2