From b24b79b3d4f391c415268af3db2d268214bcfd70 Mon Sep 17 00:00:00 2001 From: Dastgir Date: Sun, 17 Jan 2016 17:50:51 +0530 Subject: Script Standardization: changed select format in pre-re folder --- npc/pre-re/guides/guides_alberta.txt | 6 +++--- npc/pre-re/guides/guides_aldebaran.txt | 4 ++-- npc/pre-re/guides/guides_amatsu.txt | 4 ++-- npc/pre-re/guides/guides_ayothaya.txt | 4 ++-- npc/pre-re/guides/guides_comodo.txt | 2 +- npc/pre-re/guides/guides_einbroch.txt | 12 ++++++------ npc/pre-re/guides/guides_geffen.txt | 6 +++--- npc/pre-re/guides/guides_gonryun.txt | 2 +- npc/pre-re/guides/guides_hugel.txt | 6 +++--- npc/pre-re/guides/guides_izlude.txt | 6 +++--- npc/pre-re/guides/guides_juno.txt | 2 +- npc/pre-re/guides/guides_lighthalzen.txt | 6 +++--- npc/pre-re/guides/guides_louyang.txt | 8 ++++---- npc/pre-re/guides/guides_morroc.txt | 6 +++--- npc/pre-re/guides/guides_moscovia.txt | 4 ++-- npc/pre-re/guides/guides_niflheim.txt | 4 ++-- npc/pre-re/guides/guides_payon.txt | 12 ++++++------ npc/pre-re/guides/guides_prontera.txt | 6 +++--- npc/pre-re/guides/guides_rachel.txt | 6 +++--- npc/pre-re/guides/guides_umbala.txt | 4 ++-- npc/pre-re/guides/guides_veins.txt | 6 +++--- 21 files changed, 58 insertions(+), 58 deletions(-) (limited to 'npc/pre-re/guides') diff --git a/npc/pre-re/guides/guides_alberta.txt b/npc/pre-re/guides/guides_alberta.txt index 8511de33c..c3cac4750 100644 --- a/npc/pre-re/guides/guides_alberta.txt +++ b/npc/pre-re/guides/guides_alberta.txt @@ -49,7 +49,7 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) { + switch(select("City Guide", "Remove Marks from Mini-Map", "Notice", "Cancel")) { case 1: mes "[Alberta Guide]"; mes "Please select"; @@ -60,14 +60,14 @@ alberta,23,238,4 script Guide#alb::AlbGuide 8W_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes:No") == 1) .@compass_check = 1; + if (select("Yes", "No") == 1) .@compass_check = 1; } .@loop2 = 1; while (.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("^FF0000Merchant Guild^000000:Weapon Shop:Tool Shop:Inn:Forge:Cancel")) { + switch(select("^FF0000Merchant Guild^000000", "Weapon Shop", "Tool Shop", "Inn", "Forge", "Cancel")) { case 1: mes "[Alberta Guide]"; mes "The Merchant Guild"; diff --git a/npc/pre-re/guides/guides_aldebaran.txt b/npc/pre-re/guides/guides_aldebaran.txt index b82ad9348..d5cdde68e 100644 --- a/npc/pre-re/guides/guides_aldebaran.txt +++ b/npc/pre-re/guides/guides_aldebaran.txt @@ -49,7 +49,7 @@ aldebaran,139,63,4 script Soldier#alde 8W_SOLDIER,{ mes "I am in charge of the Service Guides from the Al De Baran Garrison. Let me guide you"; mes "through our town!"; next; - if (select("Get Location Guide.:End conversation.") == 1) { + if (select("Get Location Guide.", "End conversation.") == 1) { viewpoint 1,61,229,0,0xFF6633; viewpoint 1,72,197,1,0x0000FF; viewpoint 1,223,222,2,0x00FFFF; @@ -88,7 +88,7 @@ aldebaran,133,108,4 script Soldier#2alde 8W_SOLDIER,{ mes "populace, I'm here giving directions to adventurers"; mes "like yourself."; next; - switch(select("Kafra Main Office :Weapon Shop :Sorcerer Guild :Pub :Item Shop :Alchemist Guild :End Conversation ")) { + switch(select("Kafra Main Office ", "Weapon Shop ", "Sorcerer Guild ", "Pub ", "Item Shop ", "Alchemist Guild ", "End Conversation ")) { case 1: viewpoint 1,61,229,0,0xFF6633; mes "^FF6633+^000000 -> Kafra Main Office "; diff --git a/npc/pre-re/guides/guides_amatsu.txt b/npc/pre-re/guides/guides_amatsu.txt index b8ffe19bf..3409b71ae 100644 --- a/npc/pre-re/guides/guides_amatsu.txt +++ b/npc/pre-re/guides/guides_amatsu.txt @@ -48,7 +48,7 @@ amatsu,207,89,3 script Amatsu Guide#ama 4_F_JPN,{ mes "Please tell me"; mes "if you want to know something."; next; - switch(select("Palace:Tool Shop:Weapon Shop:Bar")) { + switch(select("Palace", "Tool Shop", "Weapon Shop", "Bar")) { case 1: viewpoint 1,85,235,0,0xFF3355; mes "[Amachang]"; @@ -97,7 +97,7 @@ amatsu,251,283,4 script Guide Man#2ama 8_M_JPNSOLDIER,{ mes "[Guide Man]"; mes "What are you looking for?"; next; - switch(select("Palace:Tool Shop:Weapon Shop:Bar")) { + switch(select("Palace", "Tool Shop", "Weapon Shop", "Bar")) { case 1: viewpoint 1,85,235,0,0xFF3355; mes "[Guide Man]"; diff --git a/npc/pre-re/guides/guides_ayothaya.txt b/npc/pre-re/guides/guides_ayothaya.txt index 9c497dd50..ed9656f7e 100644 --- a/npc/pre-re/guides/guides_ayothaya.txt +++ b/npc/pre-re/guides/guides_ayothaya.txt @@ -47,13 +47,13 @@ ayothaya,203,169,3 script Noi#ayo 4_F_THAIGIRL,{ mes "Please feel free"; mes "to take a look around."; next; - switch(select("Building Locations.:Remove marks from mini-map.:Cancel.")) { + switch(select("Building Locations.", "Remove marks from mini-map.", "Cancel.")) { case 1: mes "[Noi]"; mes "Where would"; mes "you like to visit?"; next; - switch(select("Weapon Shop:Tool Shop:Tavern:Shrine:Fishing Spot:Cancel")) { + switch(select("Weapon Shop", "Tool Shop", "Tavern", "Shrine", "Fishing Spot", "Cancel")) { case 1: mes "[Noi]"; mes "At our Weapon Shop,"; diff --git a/npc/pre-re/guides/guides_comodo.txt b/npc/pre-re/guides/guides_comodo.txt index 2ddc75f27..a53f8ec72 100644 --- a/npc/pre-re/guides/guides_comodo.txt +++ b/npc/pre-re/guides/guides_comodo.txt @@ -56,7 +56,7 @@ function script F_CmdGuide { mes "so let me know if you need"; mes "directions anywhere here."; next; - switch(select("Casino:Hula Dance Stage ^3355FF(Dancer Job Change)^000000:Weapon and Armor Shop:Tool Shop:Tourist Shop:Kafra Co. Western Branch:Chief's House:Pub:Campground:End Conversation")) { + switch(select("Casino", "Hula Dance Stage ^3355FF(Dancer Job Change)^000000", "Weapon and Armor Shop", "Tool Shop", "Tourist Shop", "Kafra Co. Western Branch", "Chief's House", "Pub", "Campground", "End Conversation")) { case 1: viewpoint 1,140,98,0,0xFF6633; mes "Please refer to the cross mark,"; diff --git a/npc/pre-re/guides/guides_einbroch.txt b/npc/pre-re/guides/guides_einbroch.txt index 1b390a982..1f9f1f3fc 100644 --- a/npc/pre-re/guides/guides_einbroch.txt +++ b/npc/pre-re/guides/guides_einbroch.txt @@ -47,7 +47,7 @@ einbroch,72,202,4 script Guide#ein::EinGuide 4_M_EIN_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide.:Remove Marks from Mini-Map.:Notice.:Cancel.")) { + switch(select("City Guide.", "Remove Marks from Mini-Map.", "Notice.", "Cancel.")) { case 1: mes "[Einbroch Guide]"; mes "Please select"; @@ -58,13 +58,13 @@ einbroch,72,202,4 script Guide#ein::EinGuide 4_M_EIN_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes.:No.") == 1) .@compass_check = 1; + if (select("Yes.", "No.") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("^FF0000Airport^000000:Train Station:Factory:Plaza:Hotel:Weapon Shop:Laboratory:Blacksmith Guild:Einbroch Tower:Cancel")) { + switch(select("^FF0000Airport^000000", "Train Station", "Factory", "Plaza", "Hotel", "Weapon Shop", "Laboratory", "Blacksmith Guild", "Einbroch Tower", "Cancel")) { case 1: mes "[Einbroch Guide]"; mes "The ^FF0000Airport^000000 is located"; @@ -235,7 +235,7 @@ einbech,67,37,4 script Guide#4ein::EinGuide2 4_M_EIN_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide.:Remove Marks from Mini-Map.:Notice.:Cancel.")) { + switch(select("City Guide.", "Remove Marks from Mini-Map.", "Notice.", "Cancel.")) { case 1: mes "[Einbech Guide]"; mes "Please select"; @@ -246,13 +246,13 @@ einbech,67,37,4 script Guide#4ein::EinGuide2 4_M_EIN_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes.:No.") == 1) .@compass_check = 1; + if (select("Yes.", "No.") == 1) .@compass_check = 1; } .@loop2 = 1; while (.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("Train Station:Tavern:Tool Shop:Swordman Guild:Mine:Cancel")) { + switch(select("Train Station", "Tavern", "Tool Shop", "Swordman Guild", "Mine", "Cancel")) { case 1: mes "[Einbech Guide]"; mes "The Train Stations are"; diff --git a/npc/pre-re/guides/guides_geffen.txt b/npc/pre-re/guides/guides_geffen.txt index e7f5cd2f8..5558eeca2 100644 --- a/npc/pre-re/guides/guides_geffen.txt +++ b/npc/pre-re/guides/guides_geffen.txt @@ -48,7 +48,7 @@ geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) { + switch(select("City Guide", "Remove Marks from Mini-Map", "Notice.", "Cancel")) { case 1: mes "[Geffen Guide]"; mes "Please select"; @@ -59,14 +59,14 @@ geffen,203,116,0 script Guide#gef::GefGuide 4_M_GEF_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes:No") == 1) .@compass_check = 1; + if (select("Yes", "No") == 1) .@compass_check = 1; } .@loop2 = 1; while (.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; // next; - switch(select("^FF0000Magic Acedemy^000000:Forge Shop:Weapon Shop:Tool Shop:Pub:Inn:Geffen Tower:Cancel")) { + switch(select("^FF0000Magic Acedemy^000000", "Forge Shop", "Weapon Shop", "Tool Shop", "Pub", "Inn", "Geffen Tower", "Cancel")) { case 1: mes "[Geffen Guide]"; mes "The Magic Academy in"; diff --git a/npc/pre-re/guides/guides_gonryun.txt b/npc/pre-re/guides/guides_gonryun.txt index 2ac45187d..c6f3ff863 100644 --- a/npc/pre-re/guides/guides_gonryun.txt +++ b/npc/pre-re/guides/guides_gonryun.txt @@ -46,7 +46,7 @@ gonryun,163,60,4 script Kunlun Guide#gon 8_M_TWSOLDIER,{ mes "with any questions you may have."; mes "Please feel free to ask me anything."; next; - switch(select("Residence of the Chief:Tool Dealer:Weapon Dealer:Armor Dealer:Wine Maker")) { + switch(select("Residence of the Chief", "Tool Dealer", "Weapon Dealer", "Armor Dealer", "Wine Maker")) { case 1: viewpoint 1,109,131,0,0xFF3355; mes "[He Yuen Zhe]"; diff --git a/npc/pre-re/guides/guides_hugel.txt b/npc/pre-re/guides/guides_hugel.txt index a7ce8f80d..262a21483 100644 --- a/npc/pre-re/guides/guides_hugel.txt +++ b/npc/pre-re/guides/guides_hugel.txt @@ -41,7 +41,7 @@ hugel,98,56,3 script Hugel Guide Granny#huge 4_F_LGTGRAND,0,0,{ mes "If this is the first time for you to use the guide services, why don't you check the ''Notice'' menu first?"; while(1) { next; - switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) { + switch(select("Village Guide", "Remove Marks from Mini-Map", "Notice", "Cancel")) { case 1: mes "[Hugel Guide Granny]"; mes "I can tell you any building location as long as it is in Hugel."; @@ -51,13 +51,13 @@ hugel,98,56,3 script Hugel Guide Granny#huge 4_F_LGTGRAND,0,0,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes.:No.") == 1) .@compass_check = 1; + if (select("Yes.", "No.") == 1) .@compass_check = 1; } .@loop = 1; while(.@loop) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("Church:Inn:Pub:Airport:Weapon Shop:Tool Shop:Party Supplies Shop:^3131FFHunter Job Change Place^000000:^3131FFShrine Expedition's Place^000000:Monster Race Arena:Bingo Game Room:Cancel")) { + switch(select("Church", "Inn", "Pub", "Airport", "Weapon Shop", "Tool Shop", "Party Supplies Shop", "^3131FFHunter Job Change Place^000000", "^3131FFShrine Expedition's Place^000000", "Monster Race Arena", "Bingo Game Room", "Cancel")) { case 1: mes "[Hugel Guide Granny]"; mes "Well, to me, this Church is rather like a place for old folks like me, you know..."; diff --git a/npc/pre-re/guides/guides_izlude.txt b/npc/pre-re/guides/guides_izlude.txt index dd0643be6..3087210aa 100644 --- a/npc/pre-re/guides/guides_izlude.txt +++ b/npc/pre-re/guides/guides_izlude.txt @@ -48,7 +48,7 @@ izlude,121,87,6 script Guide#iz 8W_SOLDIER,{ .@loop1 = 1; while(.@loop1) { next; - switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) { + switch(select("City Guide", "Remove Marks from Mini-Map", "Notice.", "Cancel")) { case 1: mes "[Izlude Guide]"; mes "Please select"; @@ -59,14 +59,14 @@ izlude,121,87,6 script Guide#iz 8W_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes:No") == 1) .@compass_check = 1; + if (select("Yes", "No") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("^FF0000Swordman Association^000000:Swordman Hall:Arena:Izlude Marina:Weapon Shop:Tool Shop:Cancel")) { + switch(select("^FF0000Swordman Association^000000", "Swordman Hall", "Arena", "Izlude Marina", "Weapon Shop", "Tool Shop", "Cancel")) { case 1: mes "[Izlude Guide]"; mes "The Swordman Association"; diff --git a/npc/pre-re/guides/guides_juno.txt b/npc/pre-re/guides/guides_juno.txt index c7e2a983a..f39511ed9 100644 --- a/npc/pre-re/guides/guides_juno.txt +++ b/npc/pre-re/guides/guides_juno.txt @@ -43,7 +43,7 @@ yuno,153,47,4 script Juno Guide#yuno 8_F_GIRL,{ mes "A place that takes the vision of the future, and gives it form in the present. Welcome to"; mes "the city of Juno!"; next; - switch(select("Armory:Tool Shop:Sage Castle (Sage Job Change Place):Street of Book Stores:Juphero Plaza:Library of the Republic:Schweicherbil Magic Academy:Monster Museum:Forge:Airport:End Conversation")) { + switch(select("Armory", "Tool Shop", "Sage Castle (Sage Job Change Place)", "Street of Book Stores", "Juphero Plaza", "Library of the Republic", "Schweicherbil Magic Academy", "Monster Museum", "Forge", "Airport", "End Conversation")) { case 1: viewpoint 1,120,138,0,0xFF3355; mes "[Ms. Yoon]"; diff --git a/npc/pre-re/guides/guides_lighthalzen.txt b/npc/pre-re/guides/guides_lighthalzen.txt index c0602a9d3..25ea062be 100644 --- a/npc/pre-re/guides/guides_lighthalzen.txt +++ b/npc/pre-re/guides/guides_lighthalzen.txt @@ -46,7 +46,7 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 4_M_EIN_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) { + switch(select("City Guide", "Remove Marks from Mini-Map", "Notice.", "Cancel")) { case 1: mes "[Lighthalzen Guide]"; mes "Please be aware that I'm"; @@ -63,13 +63,13 @@ lighthalzen,207,310,5 script Guide#lhz::LhzGuide 4_M_EIN_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes.:No.") == 1) .@compass_check = 1; + if (select("Yes.", "No.") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("^FF0000Rekenber Corporation^000000:Train Station:Police Station:Bank:Hotel:Airport:Merchant Guild:Jewelry Shop:Weapon Shop:Departement Store:Cancel")) { + switch(select("^FF0000Rekenber Corporation^000000", "Train Station", "Police Station", "Bank", "Hotel", "Airport", "Merchant Guild", "Jewelry Shop", "Weapon Shop", "Departement Store", "Cancel")) { case 1: mes "[Lighthalzen Guide]"; mes "Rekenber Corporation,"; diff --git a/npc/pre-re/guides/guides_louyang.txt b/npc/pre-re/guides/guides_louyang.txt index 8a977982c..855e44498 100644 --- a/npc/pre-re/guides/guides_louyang.txt +++ b/npc/pre-re/guides/guides_louyang.txt @@ -54,12 +54,12 @@ louyang,213,213,3 script Soldier#BA::LouGuide 4_M_CHNSOLDIER,{ mes "and we invite you to enjoy"; mes "your trip here in Louyang."; next; - switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) { + switch(select("Ask Building Locations.", "Remove all marks from mini-map.", "Cancel.")) { case 1: mes "[Soldier]"; mes "Where would you like to go?"; next; - switch(select("Dragon Castle:Doctor's Office:City Hall:Weapon Shop:Tool Shop:Tavern:Cancel")) { + switch(select("Dragon Castle", "Doctor's Office", "City Hall", "Weapon Shop", "Tool Shop", "Tavern", "Cancel")) { case 1: mes "[Soldier]"; mes "The Dragon Castle is located at ^FF3355+^000000. It is where all the nobles reside, including our lord."; @@ -160,13 +160,13 @@ louyang,224,104,3 script Representative#lou 4_F_CHNWOMAN,{ mes "Louyang is famous for"; mes "its elaborate history, as well as specialties that are unique to this nation. Please take your time and enjoy your stay."; next; - switch(select("Ask Building Locations.:Remove all marks from mini-map.:Cancel.")) { + switch(select("Ask Building Locations.", "Remove all marks from mini-map.", "Cancel.")) { case 1: .@compass_check = 1; mes "[Representative]"; mes "Where would you like to go?"; next; - switch(select("Dragon Castle:Doctor's Office:City Hall:Weapon Shop:Tool Shop:Tavern:Cancel")) { + switch(select("Dragon Castle", "Doctor's Office", "City Hall", "Weapon Shop", "Tool Shop", "Tavern", "Cancel")) { case 1: mes "[Representative]"; mes "The Dragon Castle is located at ^FF3355+^000000. It is where all the nobles reside, including our lord."; diff --git a/npc/pre-re/guides/guides_morroc.txt b/npc/pre-re/guides/guides_morroc.txt index cdadb92c8..6ea77bcc5 100644 --- a/npc/pre-re/guides/guides_morroc.txt +++ b/npc/pre-re/guides/guides_morroc.txt @@ -48,7 +48,7 @@ morocc,153,286,6 script Guide#moc::MocGuide 4_M_MOC_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) { + switch(select("City Guide", "Remove Marks from Mini-Map", "Notice", "Cancel")) { case 1: mes "[Morroc Guide]"; mes "Please select"; @@ -59,14 +59,14 @@ morocc,153,286,6 script Guide#moc::MocGuide 4_M_MOC_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes.:No.") == 1) .@compass_check = 1; + if (select("Yes.", "No.") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) { + switch(select("^FF0000Thief Guild^000000", "Weapon Shop", "Inn", "Pub", "Mercenary Guild", "Forge", "Cancel")) { case 1: mes "[Morroc Guide]"; mes "The Thief Guild is"; diff --git a/npc/pre-re/guides/guides_moscovia.txt b/npc/pre-re/guides/guides_moscovia.txt index 1324f5310..f7c9d2c05 100644 --- a/npc/pre-re/guides/guides_moscovia.txt +++ b/npc/pre-re/guides/guides_moscovia.txt @@ -46,12 +46,12 @@ moscovia,161,76,4 script Moscovia Guide#mosk 4_F_RUSWOMAN1,{ mes "information on this town."; mes "If you have some questions, please ask me."; next; - switch(select("Ask where you can go.:Delete all the marks on the mini-map.:Cancel.")) { + switch(select("Ask where you can go.", "Delete all the marks on the mini-map.", "Cancel.")) { case 1: mes "[Moscovia Guide]"; mes "Where would you like to go?"; next; - switch(select("The Palace:Armor Shop:Tool Shop:An Inn:Cancel")) { + switch(select("The Palace", "Armor Shop", "Tool Shop", "An Inn", "Cancel")) { case 1: mes "[Moscovia Guide]"; mes "The Palace can be found ^ff0000+^000000 at the"; diff --git a/npc/pre-re/guides/guides_niflheim.txt b/npc/pre-re/guides/guides_niflheim.txt index 6b4525a4a..5b0548800 100644 --- a/npc/pre-re/guides/guides_niflheim.txt +++ b/npc/pre-re/guides/guides_niflheim.txt @@ -51,12 +51,12 @@ niflheim,107,156,6 script Roaming Man#nif 4_M_NFMAN,{ mes "layout might help you escape"; mes "if it weren't so futile."; next; - switch(select("Ask building locations.:Remove marks on the mini-map.:Cancel.")) { + switch(select("Ask building locations.", "Remove marks on the mini-map.", "Cancel.")) { case 1: mes "[Ricael]"; mes "So, um, which place do you want to know about?"; next; - switch(select("Witch's castle:Tool shop:Weapon shop:Pub:Cancel")) { + switch(select("Witch's castle", "Tool shop", "Weapon shop", "Pub", "Cancel")) { case 1: mes "[Ricael]"; mes "There. I made a ^FF3355+^000000 mark"; diff --git a/npc/pre-re/guides/guides_payon.txt b/npc/pre-re/guides/guides_payon.txt index 7a359709e..1d583eac8 100644 --- a/npc/pre-re/guides/guides_payon.txt +++ b/npc/pre-re/guides/guides_payon.txt @@ -49,7 +49,7 @@ payon,162,67,4 script Guide#pay 4_M_PAY_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide:Remove Marks from Mini-Map:Notice.:Cancel")) { + switch(select("City Guide", "Remove Marks from Mini-Map", "Notice.", "Cancel")) { case 1: mes "[Payon Guide]"; mes "Please select"; @@ -60,13 +60,13 @@ payon,162,67,4 script Guide#pay 4_M_PAY_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes.:No.") == 1) .@compass_check = 1; + if (select("Yes.", "No.") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("^FF0000Archer Guild^000000:Weapon Shop:Tool Shop:Pub:Central Palace:The Empress:Palace Annex:Royal Kitchen:Forge:Cancel")) { + switch(select("^FF0000Archer Guild^000000", "Weapon Shop", "Tool Shop", "Pub", "Central Palace", "The Empress", "Palace Annex", "Royal Kitchen", "Forge", "Cancel")) { case 1: mes "[Payon Guide]"; mes "The Archer Guild handles"; @@ -218,20 +218,20 @@ pay_arche,85,30,2 script Guide#2pay 4_M_PAY_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide:Remove Marks from Mini-Map:Notice:Cancel")) { + switch(select("City Guide", "Remove Marks from Mini-Map", "Notice", "Cancel")) { case 1: mes "[Payon Guide]"; mes "Please, select a menu."; if (.@compass_check == 0) { mes "Would you like to leave indicators on the mini-map?"; next; - if (select("Yes.:No.") == 1) .@compass_check = 1; + if (select("Yes.", "No.") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("^FF0000Archer Guild^000000:Tool Shop:Payon Dungeon:Cancel")) { + switch(select("^FF0000Archer Guild^000000", "Tool Shop", "Payon Dungeon", "Cancel")) { case 1: mes "[Payon Guide]"; mes "The Archer Guild,"; diff --git a/npc/pre-re/guides/guides_prontera.txt b/npc/pre-re/guides/guides_prontera.txt index 5336f4d36..a4d1d2e1f 100644 --- a/npc/pre-re/guides/guides_prontera.txt +++ b/npc/pre-re/guides/guides_prontera.txt @@ -48,7 +48,7 @@ prontera,154,187,4 script Guide#prt::PrtGuide 8W_SOLDIER,{ .@loop1 = 1; while (.@loop1) { next; - switch(select("City Guide.:Remove Marks from Mini-Map:Notice:Cancel")) { + switch(select("City Guide.", "Remove Marks from Mini-Map", "Notice", "Cancel")) { case 1: mes "[Prontera Guide]"; mes "Please select"; @@ -59,14 +59,14 @@ prontera,154,187,4 script Guide#prt::PrtGuide 8W_SOLDIER,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes:No") == 1) .@compass_check = 1; + if (select("Yes", "No") == 1) .@compass_check = 1; } .@loop2 = 1; while (.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("Swordman Association:^0000FFSanctuary^000000:Prontera Chivalry:Weapon Shop:Tool Shop:Inn:Trading Post:Pub:Library:Job Agency:Prontera Castle:City Hall:Cancel")) { + switch(select("Swordman Association", "^0000FFSanctuary^000000", "Prontera Chivalry", "Weapon Shop", "Tool Shop", "Inn", "Trading Post", "Pub", "Library", "Job Agency", "Prontera Castle", "City Hall", "Cancel")) { case 1: mes "[Prontera Guide]"; mes "The Swordman Association,"; diff --git a/npc/pre-re/guides/guides_rachel.txt b/npc/pre-re/guides/guides_rachel.txt index d2702058c..08b7ca1bb 100644 --- a/npc/pre-re/guides/guides_rachel.txt +++ b/npc/pre-re/guides/guides_rachel.txt @@ -44,7 +44,7 @@ rachel,138,146,5 script Rachel Guide 4_M_RASWORD,{ .@loop1 = 1; while(.@loop1) { next; - switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) { + switch(select("Village Guide", "Remove Marks from Mini-Map", "Notice", "Cancel")) { case 1: mes "[Rachel Guide]"; mes "I can tell you any building location as long as it is in Rachel."; @@ -54,14 +54,14 @@ rachel,138,146,5 script Rachel Guide 4_M_RASWORD,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes:No") == 1) .@compass_check = 1; + if (select("Yes", "No") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("Cheshrumnir:Inn:Weapon Shop:Tool Shop:Airport:Cancel")) { + switch(select("Cheshrumnir", "Inn", "Weapon Shop", "Tool Shop", "Airport", "Cancel")) { case 1: mes "[Rachel Guide]"; mes "Cheshrumnir is a holy ground where pope, the incarnation of goddess Freya stays."; diff --git a/npc/pre-re/guides/guides_umbala.txt b/npc/pre-re/guides/guides_umbala.txt index 1b909473f..c2b6c509c 100644 --- a/npc/pre-re/guides/guides_umbala.txt +++ b/npc/pre-re/guides/guides_umbala.txt @@ -50,12 +50,12 @@ umbala,128,94,4 script Adventurer#um 4_F_GON,{ mes "You're welcome to ask me about the"; mes "locations of buildings."; next; - switch(select("Locations of buildings.:Remove marks on the mini map.:Quit.")) { + switch(select("Locations of buildings.", "Remove marks on the mini map.", "Quit.")) { case 1: mes "[Adventurer]"; mes "So, which one do you want to check?"; next; - switch(select("Chief's House:Shaman's House:Weapon Shop:Tool Shop:Bungee Jump Place:Cancel")) { + switch(select("Chief's House", "Shaman's House", "Weapon Shop", "Tool Shop", "Bungee Jump Place", "Cancel")) { case 1: mes "[Adventurer]"; mes "I have made a ^FF3355+^000000 mark"; diff --git a/npc/pre-re/guides/guides_veins.txt b/npc/pre-re/guides/guides_veins.txt index bd62f8b06..aa0f712ae 100644 --- a/npc/pre-re/guides/guides_veins.txt +++ b/npc/pre-re/guides/guides_veins.txt @@ -39,7 +39,7 @@ veins,210,345,5 script Veins Guide#1::ve_guide 4_M_RASWORD,{ .@loop1 = 1; while(.@loop1) { next; - switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) { + switch(select("Village Guide", "Remove Marks from Mini-Map", "Notice", "Cancel")) { case 1: mes "[Veins Guide]"; mes "I can tell you any building location as long as it is in Veins."; @@ -49,14 +49,14 @@ veins,210,345,5 script Veins Guide#1::ve_guide 4_M_RASWORD,{ mes "to mark locations"; mes "on your Mini-Map?"; next; - if (select("Yes:No") == 1) .@compass_check = 1; + if (select("Yes", "No") == 1) .@compass_check = 1; } .@loop2 = 1; while(.@loop2) { if (.@wait_button_chk == 0) .@wait_button_chk = 1; else next; - switch(select("Temple:Inn:Weapon Shop:Tool Shop:Airship:Tavern:Geological Research Institute:Cancel")) { + switch(select("Temple", "Inn", "Weapon Shop", "Tool Shop", "Airship", "Tavern", "Geological Research Institute", "Cancel")) { case 1: mes "[Veins Guide]"; mes "Our temple is located north,"; -- cgit v1.2.3-70-g09d2