Skip to content

Commit

Permalink
Merge pull request #1110 from dastgir/22-ScriptClean-Phase2
Browse files Browse the repository at this point in the history 
Script CleanUp Phase 2
  • Loading branch information
@MishimaHaruna
MishimaHaruna committed Feb 7, 2016
2 parents e68aa1f + 0462bc8 commit 1fd628e
Show file tree
Hide file tree
Showing 448 changed files with 5,096 additions and 5,096 deletions.
24 changes: 12 additions & 12 deletions npc/airports/airships.txt
View file
Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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!";
Expand Down Expand Up @@ -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]";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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!";
Expand Down Expand Up @@ -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]";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions npc/airports/einbroch.txt
View file
Expand Up @@ -37,15 +37,15 @@ 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";
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 (select("Yes", "No") == 1) {
if (countitem(Free_Flying_Ship_Ticket) > 0) {
delitem Free_Flying_Ship_Ticket,1;
warp "airport",148,51;
Expand Down Expand Up @@ -83,15 +83,15 @@ 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";
mes "only exit if the city of Einbroch";
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;
}
Expand Down
2 changes: 1 addition & 1 deletion npc/airports/hugel.txt
View file
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions npc/airports/izlude.txt
View file
Expand Up @@ -38,15 +38,15 @@
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";
mes "charged is waived if you use";
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;
Expand Down
8 changes: 4 additions & 4 deletions npc/airports/lighthalzen.txt
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion npc/airports/rachel.txt
View file
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions npc/airports/yuno.txt
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand Down

0 comments on commit 1fd628e

Please sign in to comment.