diff options
Diffstat (limited to 'npc/pre-re')
52 files changed, 546 insertions, 349 deletions
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..955497cf8 100644 --- a/npc/pre-re/guides/guides_payon.txt +++ b/npc/pre-re/guides/guides_payon.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) 2012-2016 Hercules Dev Team //= Copyright (C) Silent //= Copyright (C) erKURITA //= Copyright (C) MasterOfMuppets @@ -35,10 +35,10 @@ //================= Description =========================================== //= Guides for the City of Payon //================= Current Version ======================================= -//= 1.6 +//= 1.6.1 //========================================================================= -payon,162,67,4 script Guide#pay 4_M_PAY_SOLDIER,{ +payon,160,67,4 script Guide#pay 4_M_PAY_SOLDIER,{ cutin "pay_soldier",2; mes "[Payon Guide]"; mes "Welcome to the"; @@ -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,"; diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 9f4ab27d4..60726edb5 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -88,7 +88,7 @@ prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{ mes "[Father Mareusis]"; mes "What is it that you seek?"; next; - switch(select("Father, I want to be a Acolyte.:Acolyte Requirements.:Just looking around.")) { + switch(select("Father, I want to be a Acolyte.", "Acolyte Requirements.", "Just looking around.")) { case 1: mes "[Father Mareusis]"; if (BaseJob == Job_Acolyte) { @@ -104,7 +104,7 @@ prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{ mes "wish to become"; mes "a servant of God?"; next; - if (select("Yes Father, I do.:Nope, I lied.") == 1) { + if (select("Yes Father, I do.", "Nope, I lied.") == 1) { mes "[Father Mareusis]"; mes "Good. I accept " + strcharinfo(0) + "'s will to become an Acolyte. You understand that you must do penance before you can become a servant of God, right?"; next; diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt index 946638d64..49616260a 100644 --- a/npc/pre-re/jobs/1-1/archer.txt +++ b/npc/pre-re/jobs/1-1/archer.txt @@ -86,7 +86,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ mes "[Archer Guildsman]"; mes "Good day. How may I help you?"; next; - switch(select("I want to be an Archer.:I need the requirements, please.:Nothing, thanks.")) { + switch(select("I want to be an Archer.", "I need the requirements, please.", "Nothing, thanks.")) { case 1: if (BaseJob == Job_Archer) { mes "[Archer Guildsman]"; @@ -107,7 +107,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ mes "Do you want to be an Archer?"; mes "If so, you need to fill out this application form."; next; - if (select("Apply.:Cancel") == 1) { + if (select("Apply.", "Cancel") == 1) { job_archer_q = 1; setquest 1004; mes "[Archer Guildsman]"; @@ -117,7 +117,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{ mes "If you think you've met them already, we can check that now."; mes "Are you ready?"; next; - if (select("Yes, I am.:No, not yet.") == 1) { + if (select("Yes, I am.", "No, not yet.") == 1) { mes "[Archer Guildsman]"; mes "Alright, let me check."; next; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 4836258c4..4d41a22fd 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -84,7 +84,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ mes "[Mage Guildsman]"; mes "Yo. What's up?"; next; - switch(select("I want to be a Mage.:Tell me the Requirements.:Pretty much nothing.")) { + switch(select("I want to be a Mage.", "Tell me the Requirements.", "Pretty much nothing.")) { case 1: mes "[Mage Guildsman]"; if (BaseJob == Job_Mage) { @@ -100,7 +100,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ } if (job_magician_q == 0) { mes "Wanna be a Mage, eh...?"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, look at you! You're kinda cute~! Not my type though..."; else { mes "Oooh, you're such a hot babe~!"; @@ -110,7 +110,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ mes "[Mage Guildsman]"; mes "Right, you said that you wanna be a Mage? Alright then, please sign the Mage Application."; next; - if (select("Sign Up.:Quit.") == 1) { + if (select("Sign Up.", "Quit.") == 1) { mes "[Mage Guildsman]"; mes "Okay. Sign right there. Oh, you're very good at spelling. Alright. So your name is... " + strcharinfo(0) + "."; next; @@ -245,7 +245,7 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ case 2: mes "[Mage Guildsman]"; mes "Wanna be a Mage, eh?"; - if (Sex) + if (Sex == SEX_MALE) mes "For a cutie like you, I'd be happy to explain the requirements!"; else mes "I'd be happy to explain the requirements for a pretty girl like you!"; @@ -304,13 +304,13 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes."; next; - if (select("Use Machine.:Cancel.") == 1) { + if (select("Use Machine.", "Cancel.") == 1) { mes "[Mixing Machine]"; mes "Choose the"; mes "Solvent for"; mes "the Solution."; next; - switch(select("Payon Solution.:Morroc Solution.:No Solvent.")) { + switch(select("Payon Solution.", "Morroc Solution.", "No Solvent.")) { case 1: if (countitem(Payon_Potion) == 0) { mes "[Mixing Machine]"; @@ -350,7 +350,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "Please choose if you wish to begin mixing, or to re-enter the number of items to be mixed."; next; - switch(select("Begin Mixing.:Re-Enter Number of Items.:Reset.")) { + switch(select("Begin Mixing.", "Re-Enter Number of Items.", "Reset.")) { case 1: mes "[Mixing Machine]"; mes "Please place the items into the Mixing Receptacle. Make sure the item amounts are correct."; @@ -361,7 +361,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "If everything is correct, press the 'Mix' button when you are ready. Otherwise, press the 'Cancel' button."; next; - if (select("Press 'Mix' Button.:Press 'Cancel' Button.") == 1) { + if (select("Press 'Mix' Button.", "Press 'Cancel' Button.") == 1) { mes "[Mixing Machine]"; mes "Place items into the Mixing Receptacle now. Please wait."; next; @@ -417,7 +417,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "Reset Complete."; mes "Initiate again?"; next; - if (select("Yes.:No.") == 1) + if (select("Yes.", "No.") == 1) break; mes "[Mixing Machine]"; mes "Process Halted."; @@ -434,7 +434,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "Select items to mix."; while(1) { - switch(select("Jellopy.:Fluff.:Milk.:Ready to Mix.")) { + switch(select("Jellopy.", "Fluff.", "Milk.", "Ready to Mix.")) { case 1: while(1) { input .@input; @@ -505,7 +505,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ if (.@input == 0) { mes "Do you want to skip this Menu?"; next; - if (select("Yes.:No.") == 1) { + if (select("Yes.", "No.") == 1) { break; } } @@ -519,7 +519,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "[Mixing Machine]"; mes "The Serial Number is #" + .@input + ", correct?"; next; - if (select("Confirm.:Cancel.") == 1) { + if (select("Confirm.", "Cancel.") == 1) { if (.@input == 8472) .@magic_powder = 1; else if (.@input == 3735) @@ -538,7 +538,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "Choose a"; mes "Catalyst Stone."; next; - switch(select("Yellow Gemstone.:Red Gemstone.:Blue Gemstone.:1carat Diamond.:Skip.")) { + switch(select("Yellow Gemstone.", "Red Gemstone.", "Blue Gemstone.", "1carat Diamond.", "Skip.")) { case 1: .@mixitem3 = 1; break; case 2: .@mixitem3 = 2; break; case 3: .@mixitem3 = 3; break; @@ -621,7 +621,7 @@ geffen_in,177,112,4 script Bookshelf HIDDEN_NPC,{ mes "[Guide Book]"; mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care."; next; - switch(select("Solution No. 1.:Solution No. 2.:Solution No. 3.:Solution No. 4.:Close.")) { + switch(select("Solution No. 1.", "Solution No. 2.", "Solution No. 3.", "Solution No. 4.", "Close.")) { case 1: mes "[Mage Test Solution No. 1]"; mes "* Ingredients List *"; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 8ba33489d..8319e6e30 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -131,7 +131,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "The only thing to take care of is your Membership Fee."; mes "Are you ready?"; next; - switch(select("Pay the rest of the 500 Zeny:Quit")) { + switch(select("Pay the rest of the 500 Zeny", "Quit")) { case 1: mes "[Chief Mahnsoo]"; if (Zeny < 500) { @@ -295,7 +295,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "Is there anything"; mes "I can help you with?"; next; - switch(select("I want to be a Merchant.:Tell me about Merchants.:Tell me the requirements.:Nope.")) { + switch(select("I want to be a Merchant.", "Tell me about Merchants.", "Tell me the requirements.", "Nope.")) { case 1: mes "[Chief Mahnsoo]"; mes "Do you want to"; @@ -327,7 +327,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "So what do you think?"; mes "Are you ready to join now?"; next; - if (select("Yes, I will.:Ummm, maybe later...") ==1 ) { + if (select("Yes, I will.", "Ummm, maybe later...") ==1 ) { mes "[Chief Mahnsoo]"; mes "Let me check if you"; mes "filled out everything"; @@ -345,7 +345,7 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "How do you wish to"; mes "handle the fee?"; next; - switch(select("Pay all 1,000 Zeny now!:Two payments of 500 Zeny.:Quit")) { + switch(select("Pay all 1,000 Zeny now!", "Two payments of 500 Zeny.", "Quit")) { case 1: mes "[Chief Mahnsoo]"; if (Zeny >= 1000) { @@ -600,7 +600,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "So how did"; mes "the delivery go?"; next; - if (select("*Sob* I lost the package.:Fine.") == 1) { + if (select("*Sob* I lost the package.", "Fine.") == 1) { job_merchant_q = 9; mes "[Union Staff Kay]"; mes "Are you kidding me? You'll fail the test if you lose the package!"; @@ -618,7 +618,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "[Union Staff Kay]"; mes "Hey, what are you still doing here? Shouldn't you be on your way already?"; next; - if (select("I need a new package.:Oh, yeah. You're right!") == 1) { + if (select("I need a new package.", "Oh, yeah. You're right!") == 1) { if (countitem(Merchant_Box_1) == 0 && countitem(Merchant_Box_2) == 0 && countitem(Merchant_Box_3) == 0 && countitem(Merchant_Box_Etc) == 0) { mes "[Union Staff Kay]"; mes "Wha--?"; @@ -626,7 +626,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "the package go?"; mes "Where is it?!"; next; - if (select("*Sob* I lost it!:I have it right here.") == 1) { + if (select("*Sob* I lost it!", "I have it right here.") == 1) { job_merchant_q = 9; mes "[Union Staff Kay]"; mes "You..."; @@ -673,7 +673,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "what brings"; mes "you here?"; next; - switch(select("My Merchant License test.:I'm looking for part time work.:Nothing.")) { + switch(select("My Merchant License test.", "I'm looking for part time work.", "Nothing.")) { case 1: mes "[Union Staff Kay]"; mes "I see."; @@ -694,7 +694,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ mes "[Union Staff Kay]"; mes "Alright, there you go. Lemme give you the package. Now, choose the destination of the delivery."; next; - switch(select("Prontera.:Geffen.:Morocc.:Byalan Island.")) { + switch(select("Prontera.", "Geffen.", "Morocc.", "Byalan Island.")) { case 1: .@where_village = 1; break; case 2: .@where_village = 2; break; case 3: .@where_village = 3; break; @@ -709,7 +709,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ if (.@input == 0) { mes "[Union Staff Kay]"; mes "Are you sure that you wanna cancel?"; - if (select("Yes.:Let me try again.") == 1) { + if (select("Yes.", "Let me try again.") == 1) { mes "Alright, we'll cancel for now."; close; } @@ -733,7 +733,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ else mes "Lucky you! Your destination is Byalan Island. The Serial Number is " + .@input + ". Are you positive?"; next; - if (select("Positive.:Whoops! Wrong number!") == 1) { + if (select("Positive.", "Whoops! Wrong number!") == 1) { break; } } @@ -1057,7 +1057,7 @@ prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{ mes "Currently, we offer a Teleport"; mes "Service to Izlude for 600 zeny."; next; - if (select("Use:Cancel") == 1) { + if (select("Use", "Cancel") == 1) { if (Zeny < 600) { mes "[Kafra Employee]"; mes "I'm sorry, but you"; diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt index 45da68fa8..d3f230921 100644 --- a/npc/pre-re/jobs/1-1/swordman.txt +++ b/npc/pre-re/jobs/1-1/swordman.txt @@ -102,7 +102,7 @@ izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{ mes "What business"; mes "brings you to us?"; next; - switch(select("Job Change:About Swordman.:About the Job requirements.:Cancel.")) { + switch(select("Job Change", "About Swordman.", "About the Job requirements.", "Cancel.")) { case 1: if (BaseJob == Job_Swordman) { mes "[Swordman]"; @@ -118,7 +118,7 @@ izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{ mes "[Swordman]"; mes "So you wish to become a proud Swordman? By all means, please sign up!"; next; - if (select("Sign up.:Cancel.") == 1) { + if (select("Sign up.", "Cancel.") == 1) { savepoint "izlude_in",65,165; job_sword_q = 1; setquest 1014; @@ -128,7 +128,7 @@ izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{ mes "[Swordman]"; mes "If you have already met the requirements, you can take an interview right now. Would you like to?"; next; - if (select("Yes.:No.") == 1) { + if (select("Yes.", "No.") == 1) { mes "[Swordman]"; mes "Good, good."; mes "Now, let's see..."; @@ -341,7 +341,7 @@ function script F_JobSwdStaff { mes "[Test Hall Staff]"; mes "Do you surrender?"; next; - if (select("Yes.:No.") == 1) { + if (select("Yes.", "No.") == 1) { mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test.",bc_map; warp "izlude_in",65,165; end; @@ -356,7 +356,7 @@ OnTouch: mes "[Test Hall Staff]"; mes "Applicant " + strcharinfo(0) + ". Do you surrender??"; next; - if (select("Yes.:No.") == 1) { + if (select("Yes.", "No.") == 1) { mapannounce "job_sword1","Applicant " + strcharinfo(0) + " quit the test..",bc_map; warp "izlude_in",65,165; end; diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt index 32f2f0d75..c36c0eeda 100644 --- a/npc/pre-re/jobs/1-1/thief.txt +++ b/npc/pre-re/jobs/1-1/thief.txt @@ -66,7 +66,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ } else { mes "[Thief Guide]"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, dude."; else mes "Hey, baby~"; @@ -75,7 +75,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ } else { mes "[Thief Guide]"; - if (Sex) + if (Sex == SEX_MALE) mes "Hey, dude."; else mes "Hey, baby."; @@ -167,7 +167,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "Mushroom Farm?"; mes "Have any fun?"; next; - if (select("Yeah, kinda Cool.:It was horrible.") == 1) { + if (select("Yeah, kinda Cool.", "It was horrible.") == 1) { mes "[Thief Guide]"; mes "Heh heh! That's a good attitude. In our line of work, you gotta enjoy getting your hands dirty, one way or another."; close; @@ -180,7 +180,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "[Thief Guide]"; mes "Hey, whaddya doin' here? Aren't you supposed to be gathering Mushrooms? Or did you need it explained to you again?"; next; - if (select("Yes.:No, that's okay.") == 1) { + if (select("Yes.", "No, that's okay.") == 1) { mes "[Thief Guide]"; mes "*Sigh* Well, there's always one in the bunch. Alright, listen carefully."; next; @@ -225,7 +225,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "ready to try again?"; } next; - if (select("Hey, I came here to be a Thief!:Nah, I'm just looking around.") == 1) { + if (select("Hey, I came here to be a Thief!", "Nah, I'm just looking around.") == 1) { if (job_thief_q == 0) { mes "[Thief Guide]"; mes "Heh, I like your confidence. Still, you know being a Thief isn't all what it's cracked up to be."; @@ -236,7 +236,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "want to be"; mes "a Thief?"; next; - switch(select("Yeah.:No, just wasting your time.:Why did you become a Thief?")) { + switch(select("Yeah.", "No, just wasting your time.", "Why did you become a Thief?")) { case 1: mes "[Thief Guide]"; mes "Really..."; @@ -258,7 +258,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "apply to become"; mes "a Thief or not?"; next; - switch(select("Yes, I will.:I'm too scared to be a Thief!")) { + switch(select("Yes, I will.", "I'm too scared to be a Thief!")) { case 1: mes "[Thief Guide]"; mes "Alright, tell"; @@ -272,7 +272,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "[Thief Guide]"; mes "Alright, your registration has been processed. Okay, you can begin your test if you're ready."; next; - switch(select("Yeah, I'm ready.:No, I'm not ready yet.")) { + switch(select("Yeah, I'm ready.", "No, I'm not ready yet.")) { case 1: break; case 2: @@ -318,7 +318,7 @@ moc_prydb1,39,129,2 script Thief Guide 1_F_04,{ mes "[Thief Guide]"; mes "Now, your actual abilities will need to be tested. Do you know anything about the test?"; next; - switch(select("Yes, I do.:Sorry, I don't.")) { + switch(select("Yes, I do.", "Sorry, I don't.")) { case 1: mes "[Thief Guide]"; mes "Oh yeah? Well, this makes things a lot easier."; diff --git a/npc/pre-re/jobs/1-1e/taekwon.txt b/npc/pre-re/jobs/1-1e/taekwon.txt new file mode 100644 index 000000000..3e9814dee --- /dev/null +++ b/npc/pre-re/jobs/1-1e/taekwon.txt @@ -0,0 +1,34 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2012-2016 Hercules Dev Team +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Taekwon Job Quest (Pre-Renewal) +//================= Description =========================================== +//= Official TaeKwon Job Change Quest +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +payon,157,141,5 duplicate(Pheonix) Phoenix#TKJobChangePRE 4_M_MONK diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index 16efb4a59..369e98c4e 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -102,7 +102,7 @@ new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{ mes "menu for more information."; next; while (1) { - switch(select("Apply for training.:Direct access to Ragnarok Online.:^3355FFTraining Grounds Introduction.^000000:I need a moment to think.")) { + switch(select("Apply for training.", "Direct access to Ragnarok Online.", "^3355FFTraining Grounds Introduction.^000000", "I need a moment to think.")) { case 1: mes "[Training Grounds Receptionist]"; mes "Thank you for applying for Novice training. For detailed information of each training course, please inquire the Guides for assistance."; @@ -297,7 +297,7 @@ new_1-1,53,114,4 script Shion#nv1 4_F_JOB_HUNTER,{ mes "Now that we've met, is there anything I can help you with?"; mes "I'm here for your questions~"; next; - switch(select("Where should I go?:About Basic Interfaces.:Who the crap are you?")) { + switch(select("Where should I go?", "About Basic Interfaces.", "Who the crap are you?")) { case 1: mes "[Shion]"; mes "Do you see the bridge to your"; @@ -371,7 +371,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ mes "[Kris]"; mes "You've completed all the essential courses. Have you spoken to the assistant tutors already? The field combat training will be your next course. Would you like to proceed?"; next; - switch(select("Sure!:No, I'll come back later.:Send me to a town!")) { + switch(select("Sure!", "No, I'll come back later.", "Send me to a town!")) { case 1: mes "[Kris]"; mes "Your next course is Field Combat training. Please listen carefully to your next trainer, and I hope you pass the course. Godspeed."; @@ -429,7 +429,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ mes "more about interface"; mes "fundamentals?"; next; - switch(select("Yes.:Nah, I'm a pro~:Cancel.")) { + switch(select("Yes.", "Nah, I'm a pro~", "Cancel.")) { case 1: mes "[Kris]"; mes "First, it's possible to move every interface window on your screen by dragging the window. Just click on the window, hold down the mouse button and move your mouse."; @@ -566,7 +566,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ mes "[Kris]"; mes "It seems that you haven't attended the Skill Information class yet. Please talk to a tutor to the very left of this room to attend his class."; next; - switch(select("Thank you!:I'm tired of classes~:Cancel")) { + switch(select("Thank you!", "I'm tired of classes~", "Cancel")) { case 1: mes "[Kris]"; mes "When you attend the Skill Information class, you'll gain a better understanding of the use of skills."; @@ -580,7 +580,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ mes "[Kris]"; mes "I see. In that case, you must be ready for the Field Combat Training Course. Shall I send you there right away?"; next; - if (select("No! W-wait!:Please do~!") == 1) { + if (select("No! W-wait!", "Please do~!") == 1) { mes "[Kris]"; mes "...?!"; mes "O...kay then."; @@ -609,7 +609,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ mes "[Kris]"; mes "It looks like you still haven't attended the Item Information class yet. Please speak to the tutor to the very right of this room to attend her class."; next; - switch(select("Thank you.:I'm tired of classes~:Cancel")) { + switch(select("Thank you.", "I'm tired of classes~", "Cancel")) { case 1: mes "[Kris]"; mes "The Item Information class is very useful for you to learn how to use your Hot keys and Hot key bars. Come, let me guide you there."; @@ -620,7 +620,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{ mes "[Kris]"; mes "I see. In that case, you must be ready for the Field Combat Training Course. Shall I send you there right away?"; next; - if (select("No! W-wait!:Please do~!") == 1) { + if (select("No! W-wait!", "Please do~!") == 1) { mes "[Kris]"; mes "...?!"; mes "O...kay then."; @@ -650,7 +650,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{ mes "Did you need more help?"; mes "I see that you've completed all the essential courses. Did you speak to the assistant tutors too?"; next; - switch(select("Send me to the next course!:Assistant tutors?:Take me to a town!")) { + switch(select("Send me to the next course!", "Assistant tutors?", "Take me to a town!")) { case 1: mes "[Cecil]"; mes "Ah! Right, right."; @@ -713,7 +713,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{ } mes "Then, shall we begin the class?"; next; - switch(select("What do you teach?:I want Field Combat Training now!:Cancel")) { + switch(select("What do you teach?", "I want Field Combat Training now!", "Cancel")) { case 1: mes "[Cecil]"; mes "I live for power"; @@ -821,7 +821,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{ mes "[Cecil]"; mes "Well, that's it for the essential fundamentals. If you want a more comprehensive lesson, you gotta speak to the assistant tutors."; next; - switch(select("Okay.:Send me to Field Combat Training, now!:Cancel")) { + switch(select("Okay.", "Send me to Field Combat Training, now!", "Cancel")) { case 1: mes "[Cecil]"; mes "Everyone in the"; @@ -858,7 +858,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{ mes "I help you?"; mes "Whoa, you haven't attended the Basic Interface class yet? Oh well, I know that class is kinda boring~"; next; - switch(select("Oh, I better take that class.:Send me to Field Combat Training.:Cancel")) { + switch(select("Oh, I better take that class.", "Send me to Field Combat Training.", "Cancel")) { case 1: mes "[Cecil]"; mes "Yeah, that's a good idea. After all, you'll gain experience and items while you take that class. Alright then, the Interfaces Tutor is in the center of this room. Go for it~"; @@ -881,7 +881,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{ mes "I help you?"; mes "Whoa, you haven't attended the Item Information class yet? Oh well, I know that class is kinda boring~"; next; - switch(select("Oh, I better take that class.:Send me to Field Combat Training.:Cancel")) { + switch(select("Oh, I better take that class.", "Send me to Field Combat Training.", "Cancel")) { case 1: mes "[Cecil]"; mes "Yeah, that's a good idea. After all, you'll gain experience and items while you take that class. Alright then, the Item Tutor is on the far right side of this room. Go for it~"; @@ -906,14 +906,14 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "Huh...?"; mes "Do you need help looking for someone? You seem to have completed all of the essential courses. Where do you need to go?"; next; - switch(select("I'm not sure~!:Send me to a town.:Cancel")) { + switch(select("I'm not sure~!", "Send me to a town.", "Cancel")) { case 1: mes "[Alice]"; mes "Hmm..."; mes "You've learned everything else,"; mes "so I guess the only thing left is Field Combat Training. Did you want to attend that class now?"; next; - switch(select("Yes.:Oh, w-wait.")) { + switch(select("Yes.", "Oh, w-wait.")) { case 1: mes "[Alice]"; mes "Make sure you keep the items I've given you handy, and that you equip all of your armor, alright? Now, take care."; @@ -958,7 +958,7 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "So, have you come to attend"; mes "my Item Information class?"; next; - switch(select("Yes!:No, thanks.:How do I get to a town?")) { + switch(select("Yes!", "No, thanks.", "How do I get to a town?")) { case 1: mes "[Alice]"; mes "Don't worry, it'll be short."; @@ -1114,7 +1114,7 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "I was gonna give you some job experience points, but I think you have enough job experience for now."; } next; - switch(select("Now what?:Send me to the actual fighting class!:Cancel")) { + switch(select("Now what?", "Send me to the actual fighting class!", "Cancel")) { case 1: mes "[Alice]"; mes "Why don't you walk around"; @@ -1147,7 +1147,7 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "[Alice]"; mes "Are you sure you really want to go into Field Combat Training? Have you spoken to every tutor? You better do that beforehand."; next; - switch(select("No, no! Send me to the actual fight class!:Oh, wait!")) { + switch(select("No, no! Send me to the actual fight class!", "Oh, wait!")) { case 1: mes "[Alice]"; mes "What an enthusiastic Novice you are! Okay, I'll send you to the folks in charge of Field Combat Training. Make sure that you listen carefully to the trainers."; @@ -1175,7 +1175,7 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "I help you?"; mes "Hmm, it seems that you haven't attended the Basic Interfaces class yet. Would you like to attend that class first?"; next; - switch(select("I am going to attend that class.:Send me to Field Combat Training.:Cancel")) { + switch(select("I am going to attend that class.", "Send me to Field Combat Training.", "Cancel")) { case 1: mes "[Cecil]"; mes "Excellent~"; @@ -1185,7 +1185,7 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "[Alice]"; mes "Are you sure you really want to go into Field Combat Training? Have you spoken to every tutor? You better do that beforehand."; next; - switch(select("I want Field Combat Training~!:Oh, wait!")) { + switch(select("I want Field Combat Training~!", "Oh, wait!")) { case 1: mes "[Alice]"; mes "What an enthusiastic Novice you are! Okay, I'll send you to the folks in charge of Field Combat Training. Make sure that you listen carefully to the trainers."; @@ -1213,7 +1213,7 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "I help you?"; mes "It looks like you still haven't attended the ^4d4dffthe Skill information class^000000 yet. Would you like to attend that class first?"; next; - switch(select("I'll attend that class.:Send me to Field Combat Training.:Cancel")) { + switch(select("I'll attend that class.", "Send me to Field Combat Training.", "Cancel")) { case 1: mes "[Alice]"; mes "Now, that's a good idea. Please talk to Cecil, the tutor at the far left side of this room, okay?"; @@ -1224,7 +1224,7 @@ new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{ mes "[Alice]"; mes "Are you sure you really want to go into Field Combat Training? Have you spoken to every tutor? You better do that beforehand."; next; - switch(select("I want Field Combat Training~!:Oh, wait!")) { + switch(select("I want Field Combat Training~!", "Oh, wait!")) { case 1: mes "[Alice]"; mes "What an enthusiastic Novice you are! Okay, I'll send you to the folks in charge of Field Combat Training. Make sure that you listen carefully to the trainers."; @@ -1298,7 +1298,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 4_F_KAFRA1,{ mes "Please choose"; mes "your destination."; next; - switch(select("Prontera:Morroc:Payon:Alberta:Geffen")) { + switch(select("Prontera", "Morroc", "Payon", "Alberta", "Geffen")) { case 1: .@dest$ = "Prontera"; .@mapn$ = "prontera"; @@ -1361,7 +1361,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 4_F_KAFRA1,{ end; } else { - switch(select("Field Combat Course:Prontera:Morroc:Payon:Alberta:Geffen")) { + switch(select("Field Combat Course", "Prontera", "Morroc", "Payon", "Alberta", "Geffen")) { case 1: mes "[Kafra Employee]"; mes "Thank you, let"; @@ -1433,7 +1433,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 4_F_KAFRA1,{ mes "learn more about."; next; while(1) { - switch(select("Save service:Storage service:Teleport service:Cart rental service:Cancel")) { + switch(select("Save service", "Storage service", "Teleport service", "Cart rental service", "Cancel")) { case 1: mes "[Kafra Employee]"; mes "When you talk to a Kafra Employee and ask for the Save Service, the location of where you will revive, after being defeated in battle, will be changed."; @@ -1555,7 +1555,7 @@ new_1-2,161,182,5 script Instructor#nv 4_F_03,{ mes ""; next; while(1) { - switch(select("Basic Info Window:Party Window:Item Window:Option Window:Equipment Window:Cancel")) { + switch(select("Basic Info Window", "Party Window", "Item Window", "Option Window", "Equipment Window", "Cancel")) { case 1: mes "[Edwin]"; mes "Let's take a look at"; @@ -1739,7 +1739,7 @@ new_1-2,182,182,3 script Somatology Instructor 4_M_SAGE_A,{ mes "according to your personal needs, so ask about the Status you wish to better understand. First, open your Status Window by using the '^3355FFAlt^000000 + ^3355FFA^000000' keys."; next; while(1) { - switch(select("Strength and Agility:Vitality and Intelligence:Dexterity and Luck:I do not wish to continue.")) { + switch(select("Strength and Agility", "Vitality and Intelligence", "Dexterity and Luck", "I do not wish to continue.")) { case 1: mes "[Jare Riotte]"; mes "Let me explain Strength first."; @@ -1919,7 +1919,7 @@ new_1-2,184,172,1 script Understandings of Skills 1_M_01,{ emotion e_kis; next; while(1) { - switch(select("Passive and Active skills:Basic Skills:Use of Emoticons:Cancel.")) { + switch(select("Passive and Active skills", "Basic Skills", "Use of Emoticons", "Cancel.")) { case 1: mes "[Leo Handerson]"; mes "First, let me explain"; @@ -1982,7 +1982,7 @@ new_1-2,184,172,1 script Understandings of Skills 1_M_01,{ mes "your better understanding."; next; while(1) { - switch(select("Trade and Exchange:Organizing & Joining party:Opening Chat Room:Storage Use:No thanks, I know this already.")) { + switch(select("Trade and Exchange", "Organizing & Joining party", "Opening Chat Room", "Storage Use", "No thanks, I know this already.")) { case 1: mes "[Leo Handerson]"; mes "When you go visit our official website at ^0000FFiro.ragnarokonline.com^000000, you can find a full explanation about trading, illustrated with pictures."; @@ -2193,7 +2193,7 @@ new_1-2,17,182,5 script Helper#nv 4_M_02,{ mes "Please check your"; mes "equipment before you engaging in battle. Are you sure you've equipped all of your equipment, your weapons and armor?"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Elmeen]"; mes "First, you place the cursor on a monster. When you left click, you will hit the monster once."; @@ -2266,7 +2266,7 @@ new_1-2,17,182,5 script Helper#nv 4_M_02,{ mes "first for you?"; next; while(1) { - switch(select("Monsters:Experience:Items:Quit.")) { + switch(select("Monsters", "Experience", "Items", "Quit.")) { case 1: mes "[Elmeen]"; mes "There are many aggressive monsters that will attack you first before you even approach them. "; @@ -2371,7 +2371,7 @@ new_1-2,17,182,5 script Helper#nv 4_M_02,{ mes "shall I expain?"; next; while(1) { - switch(select("Monsters:Experience:Items:Quit.")) { + switch(select("Monsters", "Experience", "Items", "Quit.")) { case 1: mes "[Elmeen]"; mes "There are many aggressive monsters that will attack you first before you even approach them. "; @@ -2490,7 +2490,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 4_F_03,{ mes "to take the test"; mes "right away?"; next; - switch(select("Yes:I need more time.")) { + switch(select("Yes", "I need more time.")) { case 1: mes "[Muriel]"; mes "Please make sure you"; @@ -2553,7 +2553,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 4_F_03,{ mes "Do you wish"; mes "to try again?"; next; - switch(select("Yes.:Can I have more time?")) { + switch(select("Yes.", "Can I have more time?")) { case 1: mes "[Muriel]"; mes "I will give you"; @@ -2614,7 +2614,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 4_F_03,{ mes "[Muriel]"; mes "Do you wish to try again?"; next; - switch(select("Yes:Can I have more time?")) { + switch(select("Yes", "Can I have more time?")) { case 1: mes "[Muriel]"; mes "I will restore"; @@ -2655,7 +2655,7 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 4_M_02,{ mes "Novices. So would you"; mes "like to try?"; next; - switch(select("I do want more of a challenge~:I wanna fight tough monsters!:Cancel")) { + switch(select("I do want more of a challenge~", "I wanna fight tough monsters!", "Cancel")) { case 1: mes "[Hoffman]"; mes "I see, then let me guide"; @@ -2720,7 +2720,7 @@ new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 4_M_03,{ mes "Would you like to move"; mes "to the next course?"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Keyman]"; mes "I hope you will be"; @@ -2778,7 +2778,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "Do you wish to start Ragnarok Online immediately, or take this personality test course first?"; next; - switch(select("I'll take the course.:Let me start Ragnarok Online please.")) { + switch(select("I'll take the course.", "Let me start Ragnarok Online please.")) { case 1: mes "[Hanson]"; mes "Excellent choice!"; @@ -2796,7 +2796,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "that best matches you from"; mes "among the following."; next; - switch(select("Study:Exercise:Public service:Violence")) { + switch(select("Study", "Exercise", "Public service", "Violence")) { case 1: ++.@magician_p; break; @@ -2811,7 +2811,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ ++.@thief_p; break; } - switch(select("Change:Conserve")) { + switch(select("Change", "Conserve")) { case 1: ++.@magician_p; break; @@ -2819,7 +2819,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ ++.@acolyte_p; break; } - switch(select("Consumer:Seller:Producer")) { + switch(select("Consumer", "Seller", "Producer")) { case 1: ++.@swordman_p; ++.@thief_p; @@ -2832,7 +2832,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ ++.@magician_p; break; } - switch(select("Celebrity:Prudence")) { + switch(select("Celebrity", "Prudence")) { case 1: ++.@thief_p; break; @@ -2840,7 +2840,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ ++.@archer_p; break; } - switch(select("Theory:Experience")) { + switch(select("Theory", "Experience")) { case 1: ++.@magician_p; break; @@ -2848,7 +2848,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ ++.@swordman_p; break; } - switch(select("The Past:Reality:The Future")) { + switch(select("The Past", "Reality", "The Future")) { case 1: ++.@archer_p; break; @@ -2869,7 +2869,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "I'd rather die"; mes "than live submissively."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@swordman_p; break; @@ -2883,7 +2883,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "to see someone better"; mes "than you."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@merchant_p; break; @@ -2896,7 +2896,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "exploring dangerous"; mes "places."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@swordman_p; break; @@ -2909,7 +2909,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "a leader-type"; mes "person."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@swordman_p; break; @@ -2930,7 +2930,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "to the urge to push"; mes "this button?"; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@thief_p; break; @@ -2942,7 +2942,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "You often see"; mes "things that don't exist."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@acolyte_p; break; @@ -2955,7 +2955,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "a cliff, you'd feel"; mes "like you were flying."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@acolyte_p; break; @@ -2966,7 +2966,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "Money talks."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: ++.@merchant_p; break; @@ -2981,7 +2981,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "As you check"; mes "your tight schedule...."; next; - switch(select("You feel like a robot.:You are proud and satisfied.:Schedule? What schedule?")) { + switch(select("You feel like a robot.", "You are proud and satisfied.", "Schedule? What schedule?")) { case 1: ++.@swordman_p; ++.@thief_p; @@ -3001,7 +3001,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "a purchase, the first thing"; mes "you do is..."; next; - switch(select("Consider if you need it.:Check the price.:Don't think twice, just buy it!")) { + switch(select("Consider if you need it.", "Check the price.", "Don't think twice, just buy it!")) { case 1: ++.@archer_p; break; @@ -3018,7 +3018,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "competing with other people..."; mes ""; next; - switch(select("don't mind...:don't like...:don't care about...")) { + switch(select("don't mind...", "don't like...", "don't care about...")) { case 1: ++.@merchant_p; break; @@ -3036,7 +3036,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "But if you cooperate with others, it will be simple and an enjoyable task. You would... "; next; - switch(select("Handle it myself, even if it's hard.:Ask friends to help.")) { + switch(select("Handle it myself, even if it's hard.", "Ask friends to help.")) { case 1: ++.@magician_p; break; @@ -3050,7 +3050,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "fainted on the street."; mes "What would you do?"; next; - switch(select("Carry her to a hospital.:Assess the situation before taking action.:Just ignore it.")) { + switch(select("Carry her to a hospital.", "Assess the situation before taking action.", "Just ignore it.")) { case 1: ++.@acolyte_p; break; @@ -3069,7 +3069,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "pick up 'Clothing.'"; mes "What would you do?"; next; - switch(select("Check the brand.:Wonder who lost it.:Finder's keepers!:Leave it where it was.")) { + switch(select("Check the brand.", "Wonder who lost it.", "Finder's keepers!", "Leave it where it was.")) { case 1: ++.@merchant_p; break; @@ -3087,7 +3087,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "You happened to accidentally slip your tongue in the middle of a conversation. How do you cope with this situation?"; next; - switch(select("Pretend it's a joke.:Change the subject.:Analyze it.:Apologize honestly.")) { + switch(select("Pretend it's a joke.", "Change the subject.", "Analyze it.", "Apologize honestly.")) { case 1: ++.@thief_p; break; @@ -3104,7 +3104,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "You're on a trip with your beloved. Your significant other then asks you to buy a souvenir that's not particularly good. What do you do?"; next; - switch(select("Buy the item for her/him.:Say 'no.':Promise it for next time.")) { + switch(select("Buy the item for her/him.", "Say 'no.'", "Promise it for next time.")) { case 1: ++.@swordman_p; break; @@ -3253,7 +3253,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "So would you like to accept our recommendation, or would you like to choose a job on your own?"; next; - switch(select("Swordman!:My own choice!")) { + switch(select("Swordman!", "My own choice!")) { case 1: mes "[Hanson]"; mes "That's a great choice!"; @@ -3320,7 +3320,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "So, would you like to accept our recommendation or would you like to choose a job on your own?"; next; - switch(select("Mage!:My own choice!")) { + switch(select("Mage!", "My own choice!")) { case 1: mes "[Hanson]"; mes "That's a great choice!"; @@ -3393,7 +3393,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "So, would you like to accept our recommendation or would you like to choose a job on your own?"; next; - switch(select("Merchant!:My own choice!")) { + switch(select("Merchant!", "My own choice!")) { case 1: mes "[Hanson]"; mes "That's a great choice!"; @@ -3471,7 +3471,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "So, would you like to accept our recommendation or would you like to choose a job on your own?"; next; - switch(select("Thief!:My own choice!")) { + switch(select("Thief!", "My own choice!")) { case 1: mes "[Hanson]"; mes "That's a great choice!"; @@ -3532,7 +3532,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "So, would you like to accept our recommendation or would you like to choose a job on your own?"; next; - switch(select("Archer!:My own choice!")) { + switch(select("Archer!", "My own choice!")) { case 1: mes "[Hanson]"; mes "That's a great choice!"; @@ -3604,7 +3604,7 @@ new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{ mes "[Hanson]"; mes "So, would you like to accept our recommendation or would you like to choose a job on your own?"; next; - switch(select("Acolyte!:My own choice!")) { + switch(select("Acolyte!", "My own choice!")) { case 1: mes "[Hanson]"; mes "That's a great choice!"; @@ -3793,7 +3793,7 @@ S_UserJobchoice: mes "I see. It's your choice."; mes "There is no obligation to change to the job we recommend. Please choose the job you wish to become."; next; - select( "Swordsman:Mage:Merchant:Thief:Archer:Acolyte" ); + select( "Swordsman", "Mage", "Merchant", "Thief", "Archer", "Acolyte" ); // @menu is already set by Core. setarray .@Jobs$[1],"Swordsman","Mage","Merchant","Thief","Archer","Acolyte"; @@ -3928,7 +3928,7 @@ new_1-4,91,22,4 script Bruce#nv 1_M_LIBRARYMASTER,{ mes "have in mind?"; next; while(1) { - switch(select("Swordman:Mage:Archer:Merchant:Thief:Acolyte:End conversation.")) { + switch(select("Swordman", "Mage", "Archer", "Merchant", "Thief", "Acolyte", "End conversation.")) { case 1: mes "[Bruce]"; mes "As the name implies, the"; @@ -4085,7 +4085,7 @@ new_1-4,91,22,4 script Bruce#nv 1_M_LIBRARYMASTER,{ mes "you have in mind?"; next; while(1) { - switch(select("Swordman:Mage:Archer:Merchant:Thief:Acolyte:End conversation.")) { + switch(select("Swordman", "Mage", "Archer", "Merchant", "Thief", "Acolyte", "End conversation.")) { case 1: mes "[Bruce]"; mes "As the name implies, the"; diff --git a/npc/pre-re/merchants/shops.txt b/npc/pre-re/merchants/shops.txt index 4abe887a6..f5dd954f8 100644 --- a/npc/pre-re/merchants/shops.txt +++ b/npc/pre-re/merchants/shops.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) 2012-2016 Hercules Dev Team //= Copyright (C) Frost //= Copyright (C) Streusel //= Copyright (C) Daegaladh @@ -31,7 +31,7 @@ //================= Description =========================================== //= Pre-renewal-specific town shop NPCs. //================= Current Version ======================================= -//= 1.4 +//= 1.7 //========================================================================= //== Prontera ============================================== @@ -195,6 +195,154 @@ OnInit: sellitem Bun_; } +//== Geffen ================================================ +geffen_in,77,167,0 trader Tool Dealer#gef 1_F_03,{ +OnInit: + sellitem Arrow; + sellitem Spectacles; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Yellow_Potion; + sellitem White_Potion; + sellitem Green_Potion; + sellitem Center_Potion; + sellitem Awakening_Potion; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; + sellitem Granpa_Beard; +} + +geffen,193,152,4 trader Pet Groomer#gef 4_F_TELEPORTER,{ +OnInit: + sellitem Pet_Food; + sellitem Pet_Incubator; + sellitem Backpack; + sellitem Rocker_Glasses; + sellitem Mojji; + sellitem Vital_Flower_; + sellitem Flame_Gemstone; + sellitem Bun_; +} + +geffen_in,171,123,4 trader Tool Dealer#gef2 1_M_WIZARD,{ +OnInit: + sellitem Empty_Cylinder; + sellitem Empty_Potion; +} + +//== Payon ================================================= +payon_in01,5,49,7 trader Tool Dealer#pay 4_M_ORIENT01,{ +OnInit: + sellitem Arrow; + sellitem Spectacles; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Yellow_Potion; + sellitem White_Potion; + sellitem Green_Potion; + sellitem Center_Potion; + sellitem Awakening_Potion; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; + sellitem Booby_Trap; +} + +payon_in02,87,34,0 trader Tool Dealer#pay2 1_F_ORIENT_01,{ +OnInit: + sellitem Arrow; + sellitem Silver_Arrow; + sellitem Spectacles; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Yellow_Potion; + sellitem White_Potion; + sellitem Green_Potion; + sellitem Center_Potion; + sellitem Awakening_Potion; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; + sellitem Booby_Trap; +} + +payon,159,96,4 trader Tool Dealer#pay3 4_M_ORIENT01,{ +OnInit: + sellitem Arrow; + sellitem Red_Potion; + sellitem Center_Potion; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; +} + +payon,177,131,4 trader Pet Groomer#pay 4_F_TELEPORTER,{ +OnInit: + sellitem Pet_Food; + sellitem Pet_Incubator; + sellitem Backpack; + sellitem Rocker_Glasses; + sellitem Mojji; + sellitem Flame_Gemstone; + sellitem Vital_Flower_; + sellitem Vital_Flower; + sellitem Bun_; + sellitem Damp_Darkness; + sellitem Small_Snow_Flower; + sellitem Fresh_Plant; + sellitem Big_Cell; + sellitem Apple_Pudding; + sellitem Mystic_Stone; + sellitem Flavored_Alcohol; + sellitem Grilled_Rice_Cake; + sellitem Fish_With_Blue_Back; + sellitem Pumpkin_Pie_; + sellitem Traditional_Cookie; +} + +//== Alberta =============================================== +alb2trea,87,65,5 trader Tool Dealer#alb 4_M_01,{ +OnInit: + sellitem Arrow; + sellitem Silver_Arrow; + sellitem Fire_Arrow; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Yellow_Potion; + sellitem White_Potion; + sellitem Green_Potion; + sellitem Center_Potion; + sellitem Awakening_Potion; +} + +alberta_in,182,97,0 trader Tool Dealer#alb2 1_F_MERCHANT_01,{ +OnInit: + sellitem Arrow; + sellitem Spectacles; + sellitem Red_Potion; + sellitem Orange_Potion; + sellitem Yellow_Potion; + sellitem White_Potion; + sellitem Green_Potion; + sellitem Center_Potion; + sellitem Awakening_Potion; + sellitem Wing_Of_Fly; + sellitem Wing_Of_Butterfly; + sellitem Spinning_Eyes; +} + +alberta_in,176,81,3 trader Trading Merchant#alb 4_M_HUMERCHANT,{ +OnInit: + sellitem Bullet; + sellitem Silver_Bullet; + sellitem Shell_Of_Blood; + sellitem Branch; + sellitem Crimson_Bolt; + sellitem The_Cyclone; + sellitem Rolling_Stone; + sellitem Black_Rose; + sellitem Long_Barrel; + sellitem Jungle_Carbine; + sellitem Thunder_P; +} + //== Cooking Addition ====================================== prontera,156,212,1 trader Chef Assistant#prt 8_F_GIRL,{ OnInit: @@ -212,3 +360,18 @@ OnInit: sellitem Red_Spice; sellitem Yellow_Spice; } + +geffen,196,111,3 trader Chef Assistant#gef 4_M_03,{ +OnInit: + sellitem Pot; +} + +alberta,167,135,5 trader Chef Assistant#alb 4_M_05,{ +OnInit: + sellitem Delicious_Fish; +} + +payon,206,119,5 trader Chef Assistant#pay 4_M_ORIENT02,{ +OnInit: + sellitem Hot_Sauce; +} diff --git a/npc/pre-re/mobs/dungeons/gefenia.txt b/npc/pre-re/mobs/dungeons/gefenia.txt index c3ce88a09..c6ec26d13 100644 --- a/npc/pre-re/mobs/dungeons/gefenia.txt +++ b/npc/pre-re/mobs/dungeons/gefenia.txt @@ -88,7 +88,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0 //- gefenia01 - Geffenia (Old) - //gefenia01,0,0,0,0 monster Mini Demon 1292,6,300000,0,0 -//gefenia01,0,0,0,0 monster Apolcalips 1365,4,300000,0,0 +//gefenia01,0,0,0,0 monster Apocalypse 1365,4,300000,0,0 //gefenia01,0,0,0,0 monster Elder 1377,10,300000,0,1 //gefenia01,0,0,0,0 monster Abyssmal Knight 1219,3,1800000,900000,1 //gefenia01,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0 @@ -101,7 +101,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0 //gefenia02,0,0,0,0 monster Succubus 1370,6,0,0,0 //gefenia02,0,0,0,0 monster Incubus 1374,6,0,0,0 //gefenia02,0,0,0,0 monster Mini Demon 1292,10,300000,0,0 -//gefenia02,0,0,0,0 monster Apolcalips 1365,8,300000,0,0 +//gefenia02,0,0,0,0 monster Apocalypse 1365,8,300000,0,0 //gefenia02,0,0,0,0 monster Abyssmal Knight 1219,2,1800000,900000,1 //gefenia02,0,0,0,0 monster Bloody Knight 1268,5,300000,0,0 //gefenia02,0,0,0,0 monster Poring 1502,1,0,0,0 @@ -113,7 +113,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0 //gefenia03,0,0,0,0 monster Succubus 1370,5,0,0,0 //gefenia03,0,0,0,0 monster Incubus 1374,5,0,0,0 //gefenia03,0,0,0,0 monster Mini Demon 1292,10,300000,0,0 -//gefenia03,0,0,0,0 monster Apolcalips 1365,6,300000,0,0 +//gefenia03,0,0,0,0 monster Apocalypse 1365,6,300000,0,0 //gefenia03,0,0,0,0 monster Elder 1377,10,300000,0,1 //gefenia03,0,0,0,0 monster Abyssmal Knight 1219,3,1800000,900000,1 //gefenia03,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0 @@ -125,7 +125,7 @@ gefenia04,0,0,0,0 monster Ogretooth 1204,1,18000000,14400000,0 //gefenia04,0,0,0,0 monster Fake Angel 1371,10,0,0,0 //gefenia04,0,0,0,0 monster Succubus 1370,5,0,0,0 //gefenia04,0,0,0,0 monster Incubus 1374,3,0,0,0 -//gefenia04,0,0,0,0 monster Apolcalips 1365,4,300000,0,0 +//gefenia04,0,0,0,0 monster Apocalypse 1365,4,300000,0,0 //gefenia04,0,0,0,0 monster Abyssmal Knight 1219,5,1800000,900000,1 //gefenia04,0,0,0,0 monster Bloody Knight 1268,2,300000,0,0 //gefenia04,0,0,0,0 monster Poring 1502,1,0,0,0 diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt index 591eb3377..46e35e541 100644 --- a/npc/pre-re/other/resetskill.txt +++ b/npc/pre-re/other/resetskill.txt @@ -57,7 +57,7 @@ prontera,146,232,4 script Hypnotist#2 4_F_TELEPORTER,{ mes "Job character to qualify."; mes "Now, do you have any questions?"; next; - switch(select("Skill Reset?:I want a Skill Reset:Nothing")) { + switch(select("Skill Reset?", "I want a Skill Reset", "Nothing")) { case 1: mes "[Hypnotist]"; @@ -88,7 +88,7 @@ prontera,146,232,4 script Hypnotist#2 4_F_TELEPORTER,{ mes "want to proceed with"; mes "my ^FF0000Skill Reset^000000 service?"; next; - if (select("Yes:Cancel") == 1) { + if (select("Yes", "Cancel") == 1) { if (BaseLevel > 40) { mes "[Hypnotist]"; mes "I'm sorry, but characters"; diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt index 84f1d4730..428eb21ad 100644 --- a/npc/pre-re/quests/collection/quest_alligator.txt +++ b/npc/pre-re/quests/collection/quest_alligator.txt @@ -38,7 +38,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "[Cuir]"; mes "Have you finished hunting the 50 Alligators?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Cuir]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Cuir]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "[Cuir]"; mes "Have you finished hunting the 50 Alligators?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Cuir]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Cuir]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "[Cuir]"; mes "Have you finished hunting the 150 Alligators?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Cuir]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Cuir]"; mes "Ok then, well come back here if you change your mind."; @@ -167,19 +167,19 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "I was sent here to minimize the Alligator population but the task is proving to be quite difficult for just me to complete."; mes "How'd you like to help me out?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Cuir]"; mes "You can help me out by either hunting Alligators or by gathering items for me."; mes "Which would you like to do?"; next; - switch(select("Gather Items:Hunt Alligators:Cancel")) { + switch(select("Gather Items", "Hunt Alligators", "Cancel")) { case 1: // Item turn in mes "[Cuir]"; mes "If you can bring me ^00CC0020 Anolian Skins^000000. I'll help you get stronger."; next; - switch(select("I have the Anolian Skins:Gators bite!")) { + switch(select("I have the Anolian Skins", "Gators bite!")) { case 1: /* if (checkweight(Yellow_Potion,10) == 0) { @@ -216,7 +216,7 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ mes "Ah, ok I think you can help me out by hunting some Alligators."; mes "How many would you like to hunt?"; next; - switch(select("50 Alligators:100 Alligators:150 Alligators")) { + switch(select("50 Alligators", "100 Alligators", "150 Alligators")) { case 1: mes "[Cuir]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt index 97d5b50ec..675b6afc1 100644 --- a/npc/pre-re/quests/collection/quest_caramel.txt +++ b/npc/pre-re/quests/collection/quest_caramel.txt @@ -38,7 +38,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "[Yullo]"; mes "Have you finished hunting the 50 Caramels?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Yullo]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Yullo]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "[Yullo]"; mes "Have you finished hunting the 50 Caramels?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Yullo]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Yullo]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "[Yullo]"; mes "Have you finished hunting the 150 Caramels?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Yullo]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Yullo]"; mes "Ok then, well come back here if you change your mind."; @@ -164,13 +164,13 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "I can't, no more and I mean it."; mes "Look at me I am serious I can't kill any more of these things."; next; - switch(select("What things?:Ignore.")) { + switch(select("What things?", "Ignore.")) { case 1: mes "[Yullo]"; mes "You know what, here is an idea."; mes "You can gather them and I can give you a reward for your efforts!"; next; - switch(select("Gather Items:Hunt Caramels:Cancel")) { + switch(select("Gather Items", "Hunt Caramels", "Cancel")) { case 1: // Item turn in mes "[Yullo]"; @@ -179,7 +179,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "Please tell me you have some or can"; mes "help me"; next; - switch(select("I have Porcupine Quills:Well I don't think I can help.")) { + switch(select("I have Porcupine Quills", "Well I don't think I can help.")) { case 1: /* if (checkweight(Red_Potion,10) == 0) { @@ -216,7 +216,7 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ mes "Ah, ok I think you can help me out by hunting some Caramels."; mes "How many would you like to hunt?"; next; - switch(select("50 Caramels:100 Caramels:150 Caramels")) { + switch(select("50 Caramels", "100 Caramels", "150 Caramels")) { case 1: mes "[Yullo]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt index 358726e1a..2ed6f7087 100644 --- a/npc/pre-re/quests/collection/quest_coco.txt +++ b/npc/pre-re/quests/collection/quest_coco.txt @@ -38,7 +38,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "[Nutters]"; mes "Have you finished hunting the 50 Cocos?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Nutters]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Nutters]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "[Nutters]"; mes "Have you finished hunting the 50 Cocos?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Nutters]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Nutters]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "[Nutters]"; mes "Have you finished hunting the 150 Cocos?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Nutters]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Nutters]"; mes "Ok then, well come back here if you change your mind."; @@ -165,19 +165,19 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "Pesky Coco's have hidden all the Acorns."; mes "Do you think you could help me?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Nutters]"; mes "Oh, that's great! I knew I could count on you, just from looking at you!"; next; - switch(select("Gather Items:Hunt Cocos:Cancel")) { + switch(select("Gather Items", "Hunt Cocos", "Cancel")) { case 1: // Item turn in mes "[Nutters]"; mes "Can you help me find ^00CE0025 Acorns^000000."; mes "I will reward you with much if you can."; next; - switch(select("I have 25 Acorns:Please come again?")) { + switch(select("I have 25 Acorns", "Please come again?")) { case 1: /* if (checkweight(Orange_Potion,5) == 0) { @@ -218,7 +218,7 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ mes "Ah, ok I think you can help me out by hunting some Cocos."; mes "How many would you like to hunt?"; next; - switch(select("50 Cocos:100 Cocos:150 Cocos")) { + switch(select("50 Cocos", "100 Cocos", "150 Cocos")) { case 1: mes "[Nutters]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt index e768e1c2c..41c9f26ca 100644 --- a/npc/pre-re/quests/collection/quest_creamy.txt +++ b/npc/pre-re/quests/collection/quest_creamy.txt @@ -38,7 +38,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "[Laertes]"; mes "Have you finished hunting the 50 Creamys?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Laertes]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Laertes]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "[Laertes]"; mes "Have you finished hunting the 50 Creamys?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Laertes]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Laertes]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "[Laertes]"; mes "Have you finished hunting the 150 Creamys?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Laertes]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Laertes]"; mes "Ok then, well come back here if you change your mind."; @@ -164,19 +164,19 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "Good Morning!"; mes "Perhaps you could help me?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Laertes]"; mes "I work for an apothecary in Prontera."; mes "I come here to collect materials for medicine."; next; - switch(select("Gather Items:Hunt Creamys:Cancel")) { + switch(select("Gather Items", "Hunt Creamys", "Cancel")) { case 1: // Item turn in mes "[Laertes]"; mes "I need to have a good supply of ^FF0000Powder of Butterfly^000000"; next; - switch(select("I have Powder of Butterfly:What did you need?")) { + switch(select("I have Powder of Butterfly", "What did you need?")) { case 1: /* if (checkweight(Orange_Potion,5) == 0) { @@ -217,7 +217,7 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ mes "Ah, ok I think you can help me out by hunting some Creamys."; mes "How many would you like to hunt?"; next; - switch(select("50 Creamys:100 Creamys:150 Creamys")) { + switch(select("50 Creamys", "100 Creamys", "150 Creamys")) { case 1: mes "[Laertes]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt index f3785b932..f3218c317 100644 --- a/npc/pre-re/quests/collection/quest_demonpungus.txt +++ b/npc/pre-re/quests/collection/quest_demonpungus.txt @@ -38,7 +38,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "[Local Villager]"; mes "Have you finished hunting the 50 Demon Pungus?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Local Villager]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Local Villager]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "[Local Villager]"; mes "Have you finished hunting the 50 Demon Pungus?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Local Villager]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Local Villager]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "[Local Villager]"; mes "Have you finished hunting the 150 Demon Pungus?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Local Villager]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Local Villager]"; mes "Ok then, well come back here if you change your mind."; @@ -164,19 +164,19 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "Hey, you there. Yeah you!"; mes "Do you think you can help me with something?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Local Villager]"; mes "I am trying to make my way through but I can't seem to get past these Demon Pungus."; next; - switch(select("Gather Items:Hunt Demon Pungus:Cancel")) { + switch(select("Gather Items", "Hunt Demon Pungus", "Cancel")) { case 1: // Item turn in mes "[Local Villager]"; mes "Can you help by collecting ^FF0000Bacillus^000000?"; mes "I will reward you for helping clear this out for me."; next; - switch(select("I have Bacillus:What did you need?")) { + switch(select("I have Bacillus", "What did you need?")) { case 1: /* if (checkweight(White_Potion,10) == 0) { @@ -214,7 +214,7 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ mes "Ah, ok I think you can help me out by hunting some Demon Pungus."; mes "How many would you like to hunt?"; next; - switch(select("50 Demon Pungus:100 Demon Pungus:150 Demon Pungus")) { + switch(select("50 Demon Pungus", "100 Demon Pungus", "150 Demon Pungus")) { case 1: mes "[Local Villager]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt index 0630ac5e7..7a09ee06c 100644 --- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt +++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt @@ -39,7 +39,7 @@ nif_fild01,332,327,4 script Deadman 4_M_NFDEADMAN,{ mes "[Deadman]"; mes "Have you finished hunting the 50 Disguise?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Deadman]"; mes "Hmm, I don't think you've hunted 50 yet."; @@ -53,7 +53,7 @@ nif_fild01,332,327,4 script Deadman 4_M_NFDEADMAN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Deadman]"; mes "Ok then, well come back here if you change your mind."; @@ -77,7 +77,7 @@ nif_fild01,332,327,4 script Deadman 4_M_NFDEADMAN,{ mes "[Deadman]"; mes "Have you finished hunting the 50 Loli Ruri?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Deadman]"; mes "Hmm, I don't think you've hunted 50 yet."; @@ -91,7 +91,7 @@ nif_fild01,332,327,4 script Deadman 4_M_NFDEADMAN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Deadman]"; mes "Ok then, well come back here if you change your mind."; @@ -116,7 +116,7 @@ nif_fild01,332,327,4 script Deadman 4_M_NFDEADMAN,{ mes "You are here to help me right?"; mes "If not, i don't know what to do with the Monsters in this Place!"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Deadman]"; mes "Great! I knew the moment i saw you that i can count on you!"; @@ -126,7 +126,7 @@ nif_fild01,332,327,4 script Deadman 4_M_NFDEADMAN,{ mes "[Deadman]"; mes "So, which of those Monsters would you like to hunt for me?"; next; - switch(select("Disguise:Loli Ruri:Cancel")) { + switch(select("Disguise", "Loli Ruri", "Cancel")) { case 1: if (BaseLevel > 90) { mes "[Deadman]"; diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt index 5226cca51..ebfb9b2eb 100644 --- a/npc/pre-re/quests/collection/quest_dokebi.txt +++ b/npc/pre-re/quests/collection/quest_dokebi.txt @@ -38,7 +38,7 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "[Li]"; mes "Have you finished hunting the 50 Dokebis?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Li]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Li]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "[Li]"; mes "Have you finished hunting the 50 Dokebis?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Li]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Li]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "[Li]"; mes "Have you finished hunting the 150 Dokebis?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Li]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Li]"; mes "Ok then, well come back here if you change your mind."; @@ -163,18 +163,18 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "[Li]"; mes "Hello. DO you think you could help me?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Li]"; mes "There are so many Dokebis here...I just don't feel safe."; next; - switch(select("Gather Items:Hunt Dokebis:Cancel")) { + switch(select("Gather Items", "Hunt Dokebis", "Cancel")) { case 1: // Item turn in mes "[Li]"; mes "My fortune teller business needs a good supply of ^FF0000Dokebi Horns^000000 to give my customers good luck."; next; - switch(select("I have some Dokebi Horns:What did you need?")) { + switch(select("I have some Dokebi Horns", "What did you need?")) { case 1: if (countitem(Dokkaebi_Horn) > 49) { mes "[Li]"; @@ -204,7 +204,7 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ mes "Ah, ok I think you can help me out by hunting some Dokebis."; mes "How many would you like to hunt?"; next; - switch(select("50 Dokebis:100 Dokebis:150 Dokebis")) { + switch(select("50 Dokebis", "100 Dokebis", "150 Dokebis")) { case 1: mes "[Li]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt index 339f49761..0466c9693 100644 --- a/npc/pre-re/quests/collection/quest_dryad.txt +++ b/npc/pre-re/quests/collection/quest_dryad.txt @@ -38,7 +38,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "[Lilla]"; mes "Have you finished hunting the 50 Dryads?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lilla]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lilla]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "[Lilla]"; mes "Have you finished hunting the 50 Dryads?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lilla]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lilla]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "[Lilla]"; mes "Have you finished hunting the 150 Dryads?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lilla]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lilla]"; mes "Ok then, well come back here if you change your mind."; @@ -164,20 +164,20 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "Why hello!"; mes "You look like someone who is willing to help a lil thing like myself out."; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Lilla]"; mes "Really?!"; mes "That's great!"; next; - switch(select("Gather Items:Hunt Dryads:Cancel")) { + switch(select("Gather Items", "Hunt Dryads", "Cancel")) { case 1: // Item turn in mes "[Lilla]"; mes "I really need to gather ^00CE0050 Sharp Leafs^000000 for my garden tea party."; mes "Do you have any?"; next; - switch(select("I have some Sharp Leafs:What did you need?")) { + switch(select("I have some Sharp Leafs", "What did you need?")) { case 1: /* if (checkweight(White_Potion,10) == 0) { @@ -217,7 +217,7 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ mes "Ah, ok I think you can help me out by hunting some Dryads."; mes "How many would you like to hunt?"; next; - switch(select("50 Dryads:100 Dryads:150 Dryads")) { + switch(select("50 Dryads", "100 Dryads", "150 Dryads")) { case 1: mes "[Lilla]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt index ec36e1510..0a6f614ea 100644 --- a/npc/pre-re/quests/collection/quest_fabre.txt +++ b/npc/pre-re/quests/collection/quest_fabre.txt @@ -38,7 +38,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "[Langry]"; mes "Have you finished hunting the 50 Fabres?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Langry]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Langry]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "[Langry]"; mes "Have you finished hunting the 50 Fabres?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Langry]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Langry]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "[Langry]"; mes "Have you finished hunting the 150 Fabres?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Langry]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Langry]"; mes "Ok then, well come back here if you change your mind."; @@ -164,13 +164,13 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "Do you think you can help me?"; mes "Please?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Langry]"; mes "Really?!"; mes "That's great!"; next; - switch(select("Gather Items:Hunt Fabres:Cancel")) { + switch(select("Gather Items", "Hunt Fabres", "Cancel")) { case 1: // Item turn in mes "[Langry]"; @@ -178,7 +178,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "complete this community service project."; mes "You know what? I can even reward you a little for helping me."; next; - switch(select("I have some Fluff:What was that again?")) { + switch(select("I have some Fluff", "What was that again?")) { case 1: if (countitem(Fluff) > 24) { mes "[Langry]"; @@ -204,7 +204,7 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ mes "Ah, ok I think you can help me out by hunting some Fabres."; mes "How many would you like to hunt?"; next; - switch(select("50 Fabres:100 Fabres:150 Fabres")) { + switch(select("50 Fabres", "100 Fabres", "150 Fabres")) { case 1: mes "[Langry]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt index 876101cca..77958ee96 100644 --- a/npc/pre-re/quests/collection/quest_frilldora.txt +++ b/npc/pre-re/quests/collection/quest_frilldora.txt @@ -38,7 +38,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "[Lemly]"; mes "Have you finished hunting the 50 Frilldora?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lemly]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lemly]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "[Lemly]"; mes "Have you finished hunting the 50 Frilldora?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lemly]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lemly]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "[Lemly]"; mes "Have you finished hunting the 150 Frilldora?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lemly]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lemly]"; mes "Ok then, well come back here if you change your mind."; @@ -166,7 +166,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "[Lemly]"; mes "Think you could take some time to give me a hand?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Lemly]"; mes "I am looking for lizard ^FF0000Frills^000000."; @@ -174,10 +174,10 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "[Lemly]"; mes "The lizards around here have a natural stealth, a property that the Assassin's Guild wants to study."; next; - switch(select("Gather Items:Hunt Frilldora:Cancel")) { + switch(select("Gather Items", "Hunt Frilldora", "Cancel")) { case 1: // Item turn in - switch(select("I have some Frills:What did you need?")) { + switch(select("I have some Frills", "What did you need?")) { case 1: if (countitem(Lizard_Scruff) > 24) { mes "[Lemly]"; @@ -207,7 +207,7 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ mes "Ah, ok I think you can help me out by hunting some Frilldora."; mes "How many would you like to hunt?"; next; - switch(select("50 Frilldora:100 Frilldora:150 Frilldora")) { + switch(select("50 Frilldora", "100 Frilldora", "150 Frilldora")) { case 1: mes "[Lemly]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt index 6c7a9ea88..9f2b7525e 100644 --- a/npc/pre-re/quests/collection/quest_goat.txt +++ b/npc/pre-re/quests/collection/quest_goat.txt @@ -38,7 +38,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "[Vegetable Farmer]"; mes "Have you finished hunting the 50 Goats?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Vegetable Farmer]"; mes "Hmm, I don't think you've hunted 50 yet."; @@ -52,7 +52,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Vegetable Farmer]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "[Vegetable Farmer]"; mes "Have you finished hunting the 100 Goats?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Vegetable Farmer]"; mes "Hmm, I don't think you've hunted 100 yet."; @@ -92,7 +92,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Vegetable Farmer]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "[Vegetable Farmer]"; mes "Have you finished hunting the 150 Goats?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Vegetable Farmer]"; mes "Hmm, I don't think you've hunted 150 yet."; @@ -133,7 +133,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Vegetable Farmer]"; mes "Ok then, well come back here if you change your mind."; @@ -165,19 +165,19 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "You are here to help me right?"; mes "If not, then I am in a world of hurt."; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Vegetable Farmer]"; mes "These Goats keep eating my vegetables."; mes "Can you do what you can to help me?"; next; - switch(select("Gather Items:Hunt Goats:Cancel")) { + switch(select("Gather Items", "Hunt Goats", "Cancel")) { case 1: // Item turn in mes "[Vegetable Farmer]"; mes "I need ^FF0000Antelope Horns^000000 to show for your hard work, and I will reward you."; next; - switch(select("I have Antelope Horns:What did you need?")) { + switch(select("I have Antelope Horns", "What did you need?")) { case 1: /* if (checkweight(White_Potion,10) == 0) { @@ -216,7 +216,7 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ mes "Thank you."; mes "How many Goats would you like to hunt?"; next; - switch(select("50 Goats:100 Goats:150 Goats")) { + switch(select("50 Goats", "100 Goats", "150 Goats")) { case 1: mes "[Vegetable Farmer]"; mes "Kill 50 of those Goats and let me know when you're done. I will reward you for your efforts."; diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt index 2ab40efc2..461a26a8a 100644 --- a/npc/pre-re/quests/collection/quest_golem.txt +++ b/npc/pre-re/quests/collection/quest_golem.txt @@ -38,7 +38,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "[Private Jeremy]"; mes "Have you finished hunting the 50 Golems?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Private Jeremy]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Private Jeremy]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "[Private Jeremy]"; mes "Have you finished hunting the 50 Golems?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Private Jeremy]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Private Jeremy]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "[Private Jeremy]"; mes "Have you finished hunting the 150 Golems?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Private Jeremy]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Private Jeremy]"; mes "Ok then, well come back here if you change your mind."; @@ -164,18 +164,18 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "Greetings citizen!"; mes "Say, how would you like to help me?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Private Jeremy]"; mes "Thanks! I really appreciate it."; next; - switch(select("Gather Items:Hunt Golems:Cancel")) { + switch(select("Gather Items", "Hunt Golems", "Cancel")) { case 1: // Item turn in mes "[Private Jeremy]"; mes "The Morroc Guard needs ^FF0000Stone Hearts^000000 for our training regimen."; next; - switch(select("I have Stone Hearts:What did you need?")) { + switch(select("I have Stone Hearts", "What did you need?")) { case 1: if (countitem(Stone_Heart) > 24) { mes "[Private Jeremy]"; @@ -203,7 +203,7 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ mes "Ah, ok I think you can help me out by hunting some Golems."; mes "How many would you like to hunt?"; next; - switch(select("50 Golems:100 Golems:150 Golems")) { + switch(select("50 Golems", "100 Golems", "150 Golems")) { case 1: mes "[Private Jeremy]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt index 16cbf69aa..1e62fb4a5 100644 --- a/npc/pre-re/quests/collection/quest_hode.txt +++ b/npc/pre-re/quests/collection/quest_hode.txt @@ -38,7 +38,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "[Shone]"; mes "Have you finished hunting the 50 Hodes?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Shone]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Shone]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "[Shone]"; mes "Have you finished hunting the 50 Hodes?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Shone]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Shone]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "[Shone]"; mes "Have you finished hunting the 150 Hodes?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Shone]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Shone]"; mes "Ok then, well come back here if you change your mind."; @@ -167,19 +167,19 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "[Shone]"; mes "Hey do you think you can help me?"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Shone]"; mes "Thanks a lot, pal!"; next; - switch(select("Gather Items:Hunt Hodes:Cancel")) { + switch(select("Gather Items", "Hunt Hodes", "Cancel")) { case 1: // Item turn in mes "[Shone]"; mes "I am trying to collect ^00CE0025 Earthworm Peelings^000000."; mes "I will reward you if you help."; next; - switch(select("I have 25 Earthworm Peelings:What was it again?")) { + switch(select("I have 25 Earthworm Peelings", "What was it again?")) { case 1: /* if (checkweight(Orange_Potion,10) == 0) { @@ -216,7 +216,7 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ mes "Ah, ok I think you can help me out by hunting some Hodes."; mes "How many would you like to hunt?"; next; - switch(select("50 Hodes:100 Hodes:150 Hodes")) { + switch(select("50 Hodes", "100 Hodes", "150 Hodes")) { case 1: mes "[Shone]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt index c980926e5..bcea61337 100644 --- a/npc/pre-re/quests/collection/quest_leafcat.txt +++ b/npc/pre-re/quests/collection/quest_leafcat.txt @@ -38,7 +38,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "[Lella]"; mes "Have you finished hunting the 50 Leaf Cats?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lella]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lella]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "[Lella]"; mes "Have you finished hunting the 50 Leaf Cats?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lella]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -92,7 +92,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lella]"; mes "Ok then, well come back here if you change your mind."; @@ -119,7 +119,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "[Lella]"; mes "Have you finished hunting the 150 Leaf Cats?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Lella]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -133,7 +133,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Lella]"; mes "Ok then, well come back here if you change your mind."; @@ -165,18 +165,18 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "You look like someone who is willing to help someone who is slowly going mad."; next; mes "[Lella]"; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Lella]"; mes "Thanks! You're a life saver!"; next; - switch(select("Gather Items:Hunt Leaf Cats:Cancel")) { + switch(select("Gather Items", "Hunt Leaf Cats", "Cancel")) { case 1: // Item turn in mes "I really need to gather ^00CE0050 Huge Leafs^000000 for my sanity."; mes "Do you have any?"; next; - switch(select("I have 50 Huge Leafs:What, sorry I was day dreaming")) { + switch(select("I have 50 Huge Leafs", "What, sorry I was day dreaming")) { case 1: /* if (checkweight(Yellow_Potion,10) == 0) { @@ -215,7 +215,7 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ mes "Ah, ok I think you can help me out by hunting some Leaf Cats."; mes "How many would you like to hunt?"; next; - switch(select("50 Leaf Cats:100 Leaf Cats:150 Leaf Cats")) { + switch(select("50 Leaf Cats", "100 Leaf Cats", "150 Leaf Cats")) { case 1: mes "[Lella]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt index 07f16c874..f1a27a10a 100644 --- a/npc/pre-re/quests/collection/quest_mantis.txt +++ b/npc/pre-re/quests/collection/quest_mantis.txt @@ -39,7 +39,7 @@ lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{ mes "[Mantis Researcher]"; mes "Have you finished hunting the 50 Mantis?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Mantis Researcher]"; mes "Hmm, I don't think you've hunted 50 yet."; @@ -53,7 +53,7 @@ lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Mantis Researcher]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{ mes "You are here to help me right?"; mes "If not, i don't know what to do with the Monsters in this Place!"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Mantis Researcher]"; mes "Great! I knew the moment i saw you that i can count on you!"; @@ -88,7 +88,7 @@ lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{ mes "[Mantis Researcher]"; mes "So, would you still like to help me?"; next; - switch(select("Sure:Cancel")) { + switch(select("Sure", "Cancel")) { case 1: if (BaseLevel > 70) { mes "[Mantis Researcher]"; diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt index 32c595c92..feebff009 100644 --- a/npc/pre-re/quests/collection/quest_pecopeco.txt +++ b/npc/pre-re/quests/collection/quest_pecopeco.txt @@ -38,7 +38,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "[Gregor]"; mes "Have you finished hunting the 50 Peco Pecos?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Gregor]"; mes "Hmm, I don't think you've hunted 50 yet..."; @@ -52,7 +52,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Gregor]"; mes "Ok then, well come back here if you change your mind."; @@ -79,7 +79,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "[Gregor]"; mes "Have you finished hunting the 50 Peco Pecos?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Gregor]"; mes "Hmm, I don't think you've hunted 100 yet..."; @@ -93,7 +93,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Gregor]"; mes "Ok then, well come back here if you change your mind."; @@ -121,7 +121,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "[Gregor]"; mes "Have you finished hunting the 150 Peco Pecos?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Gregor]"; mes "Hmm, I don't think you've hunted 150 yet..."; @@ -135,7 +135,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Gregor]"; mes "Ok then, well come back here if you change your mind."; @@ -177,7 +177,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "[Gregor]"; mes "Can you do me a favor please?"; next; - switch(select("What kind of favor?:No")) { + switch(select("What kind of favor?", "No")) { case 1: mes "[Gregor]"; mes "I am so afraid that these Peco Pecos will hurt me for my, uh, researching activities."; @@ -187,13 +187,13 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "I think I'll feel safer..."; mes "Please..."; next; - switch(select("Gather Items:Hunt Peco Pecos:Cancel")) { + switch(select("Gather Items", "Hunt Peco Pecos", "Cancel")) { case 1: // Item turn in mes "[Gregor]"; mes "I need some ^FF0000Bill of Birds^000000 for my, uh, research..."; next; - switch(select("I have some Bill of Birds:What did you need?")) { + switch(select("I have some Bill of Birds", "What did you need?")) { case 1: if (countitem(Bill_Of_Birds) > 24) { mes "[Gregor]"; @@ -224,7 +224,7 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ mes "Ah, ok I think you can help me out by hunting some Peco Pecos."; mes "How many would you like to hunt?"; next; - switch(select("50 Peco Pecos:100 Peco Pecos:150 Peco Pecos")) { + switch(select("50 Peco Pecos", "100 Peco Pecos", "150 Peco Pecos")) { case 1: mes "[Gregor]"; mes "Come back when you've finished your task and I will give you a small reward."; diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt index 5868fae84..28b4ff67a 100644 --- a/npc/pre-re/quests/collection/quest_pupa.txt +++ b/npc/pre-re/quests/collection/quest_pupa.txt @@ -38,7 +38,7 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Halgus]"; mes "Hmm, I don't think you've gotten rid of 50 Pupa yet..."; @@ -52,7 +52,7 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Halgus]"; mes "Ok then, well come back here if you change your mind."; @@ -79,7 +79,7 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Halgus]"; mes "Hmm, I don't think you've gotten rid of 100 Pupa yet..."; @@ -93,7 +93,7 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Halgus]"; mes "Ok then, well come back here if you change your mind."; @@ -121,7 +121,7 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Halgus]"; mes "Hmm, I don't think you've gotten rid of 150 Pupa yet..."; @@ -135,7 +135,7 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Halgus]"; mes "Ok then, well come back here if you change your mind."; @@ -172,18 +172,18 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "None-the-less my daughter thought it would be fun to gather pupa around this field and it's becoming unsightly."; mes "Do you mind helping me get rid of some Pupa to clear out this field?"; next; - switch(select("Sure, I don't mind:No")) { + switch(select("Sure, I don't mind", "No")) { case 1: mes "[Halgus]"; mes "Really? What would you like to do to help?"; next; - switch(select("Gather Items:Get rid of Pupa:Cancel")) { + switch(select("Gather Items", "Get rid of Pupa", "Cancel")) { case 1: // Item turn in mes "[Halgus]"; mes "Can you collect ^00CE0025 Chrysalis^000000 and return them to me, I promise to reward you well."; next; - switch(select("I have Chrysalis:What did you need?")) { + switch(select("I have Chrysalis", "What did you need?")) { case 1: if (countitem(Chrysalis) > 24) { mes "[Halgus]"; @@ -209,7 +209,7 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ mes "Thank you so much!"; mes "How many would you like to get rid of?"; next; - switch(select("50 Pupa:100 Pupa:150 Pupa")) { + switch(select("50 Pupa", "100 Pupa", "150 Pupa")) { case 1: mes "[Halgus]"; mes "If you can get rid of 50 of those Pupa from the field I will be grateful."; diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt index 02a2366aa..87c1fc337 100644 --- a/npc/pre-re/quests/collection/quest_zhupolong.txt +++ b/npc/pre-re/quests/collection/quest_zhupolong.txt @@ -39,7 +39,7 @@ lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{ mes "[Dragon Hunter]"; mes "Have you finished hunting the 50 Zhu Po Long?"; next; - switch(select("Yes:No:I want to quit")) { + switch(select("Yes", "No", "I want to quit")) { case 1: mes "[Dragon Hunter]"; mes "Hmm, I don't think you've hunted 50 yet."; @@ -53,7 +53,7 @@ lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{ mes "Are you sure that you want to stop hunting?"; mes "Any progress that you've made will be erased"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Dragon Hunter]"; mes "Ok then, well come back here if you change your mind."; @@ -78,7 +78,7 @@ lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{ mes "You are here to help me right?"; mes "If not, i don't know what to do with the Monsters in this Place!"; next; - switch(select("Sure:No")) { + switch(select("Sure", "No")) { case 1: mes "[Dragon Hunter]"; mes "Great! I knew the moment i saw you that i can count on you!"; @@ -88,7 +88,7 @@ lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{ mes "[Dragon Hunter]"; mes "So, would you still like to help me?"; next; - switch(select("Sure:Cancel")) { + switch(select("Sure", "Cancel")) { case 1: if (BaseLevel > 90) { mes "[Dragon Hunter]"; diff --git a/npc/pre-re/quests/quests_13_1.txt b/npc/pre-re/quests/quests_13_1.txt index bf94ab760..d1b90d0d6 100644 --- a/npc/pre-re/quests/quests_13_1.txt +++ b/npc/pre-re/quests/quests_13_1.txt @@ -32,4 +32,4 @@ //= 1.0 //========================================================================= -izlude,101,173,6 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 4W_SAILOR +izlude,99,136,5 duplicate(PromotionalStaff_izlude) Promotional Staff#iz 4W_SAILOR diff --git a/npc/pre-re/quests/skills/novice_skills.txt b/npc/pre-re/quests/skills/novice_skills.txt index a22a8c5e5..7a4f85396 100644 --- a/npc/pre-re/quests/skills/novice_skills.txt +++ b/npc/pre-re/quests/skills/novice_skills.txt @@ -46,7 +46,7 @@ prt_in,234,133,4 script Nami 1_F_01,{ mes "Actually, I'm really good."; mes "Do you want me to try on you? ? ? . ."; next; - switch (select("Continue conversation:Slowly slink away. . . .")) { + switch (select("Continue conversation", "Slowly slink away. . . .")) { case 1: if ((skill_nov >= 0) && (skill_nov <= 2)) { switch (skill_nov) { |