diff options
26 files changed, 79 insertions, 79 deletions
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt index 3ece8d512..b6404d57d 100644 --- a/npc/custom/battleground/bg_common.txt +++ b/npc/custom/battleground/bg_common.txt @@ -13,7 +13,7 @@ mes "[Maroll Battle Recruiter]"; mes "The two princes of the kingdom are now battling for the throne of Maroll, and are in need of experienced soldiers like you. How would you like to lend your power to one of the princes in the Maroll Kingdom?"; next; - if( select("Join:Don't Join") == 2 ) + if( select("Join", "Don't Join") == 2 ) { mes "[Maroll Battle Recruiter]"; mes "I'll always be stationed here for more soldiers. Feel free to come back whenever you're interested."; @@ -40,7 +40,7 @@ bat_room,148,150,4 script Teleporter#bat 4_F_TELEPORTER,{ mes "[Teleporter]"; mes "Do you wish to leave the battlefield? Use my service to return to town."; next; - if( select("Leave:Don't Leave") == 2 ) + if( select("Leave", "Don't Leave") == 2 ) { mes "[Teleporter]"; mes "I'll be here whenever you're in need of my service."; @@ -82,7 +82,7 @@ bat_room,160,159,3 script General Guillaume 4_M_KY_KIYOM,{ mes "[General Guillaume]"; mes "This is however, not just a battle between us. This battle will determine the future of this country. I pledge on my honor to prove that I'm the one who can protect this Maroll from outside threats."; next; - if( select("Yes, I want to join you.:End Conversation") == 2 ) + if( select("Yes, I want to join you.", "End Conversation") == 2 ) { mes "[General Guillaume]"; mes "I'll be the one who will capture the flag!"; @@ -117,7 +117,7 @@ bat_room,160,140,3 script Prince Croix 4_M_CRU_CRUA,{ mes "[Prince Croix]"; mes "General Guillaume may have an advantage in this battle as he is the great general of Maroll, but that doesn't automatically mean he'll win. I want to win this battle so that I can grant a better future for my people."; next; - if( select("Yes, I want to join you!:End Conversation") == 2 ) + if( select("Yes, I want to join you!", "End Conversation") == 2 ) { mes "[Prince Croix]"; mes "For Maroll!"; @@ -206,7 +206,7 @@ bat_room,156,178,5 script Tierra Valley Officer#1 4_M_KY_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Tierra Officer]"; @@ -276,7 +276,7 @@ bat_room,156,121,1 script Tierra Valley Officer#2 4_M_CRU_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Tierra Officer]"; @@ -346,7 +346,7 @@ bat_room,164,178,5 script Tierra Valley Officer#3 4_M_KY_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Tierra Officer]"; @@ -416,7 +416,7 @@ bat_room,164,121,1 script Tierra Valley Officer#4 4_M_CRU_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Tierra Officer]"; @@ -487,7 +487,7 @@ bat_room,172,178,5 script Flavius Officer#1 4_M_KY_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Flavius Officer]"; @@ -558,7 +558,7 @@ bat_room,172,121,1 script Flavius Officer#2 4_M_CRU_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Flavius Officer]"; @@ -629,7 +629,7 @@ bat_room,148,178,5 script Flavius Officer#3 4_M_KY_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Flavius Officer]"; @@ -700,7 +700,7 @@ bat_room,148,121,1 script Flavius Officer#4 4_M_CRU_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[Flavius Officer]"; @@ -768,7 +768,7 @@ bat_room,140,178,5 script KVM [80-99] Officer#1 4_M_KY_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[KVM Officer]"; @@ -836,7 +836,7 @@ bat_room,140,121,1 script KVM [80-99] Officer#2 4_M_CRU_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[KVM Officer]"; @@ -904,7 +904,7 @@ bat_room,132,178,5 script KVM [60-79] Officer#1 4_M_KY_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[KVM Officer]"; @@ -972,7 +972,7 @@ bat_room,132,121,1 script KVM [60-79] Officer#2 4_M_CRU_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[KVM Officer]"; @@ -1040,7 +1040,7 @@ bat_room,124,178,5 script KVM [1-59] Officer#1 4_M_KY_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[KVM Officer]"; @@ -1108,7 +1108,7 @@ bat_room,124,121,1 script KVM [1-59] Officer#2 4_M_CRU_KNT,{ mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; - if( select("I want to join your army!:End Conversation") == 2 ) + if( select("I want to join your army!", "End Conversation") == 2 ) close; mes "[KVM Officer]"; @@ -1252,7 +1252,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ deletearray .@Item_DB[0],127; set .@Badge, 7828; - switch( select("Weapons:Garment:Footgear:Armor:Accessory") ) + switch( select("Weapons", "Garment", "Footgear", "Armor", "Accessory") ) { case 1: setarray .@Item_DB[0],13036,13411,1425,1632,1634,1543,1924,1978,1574,1824,1183,1380,13305,1279,1739,13108,13172; set .@Value, 100; break; case 2: setarray .@Item_DB[0],2538,2539,2540; set .@Value, 50; break; @@ -1270,7 +1270,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ deletearray .@Item_DB[0],127; set .@Badge, 7829; - switch( select("Weapons:Garment:Footgear:Armor:Accessory") ) + switch( select("Weapons", "Garment", "Footgear", "Armor", "Accessory") ) { case 1: setarray .@Item_DB[0],13037,13410,1633,1635,1542,1923,1977,1575,1823,1184,1482,1379,13306,1280,1738,13171,13173,13174; set .@Value, 100; break; case 2: setarray .@Item_DB[0],2538,2539,2540; set .@Value, 50; break; @@ -1306,7 +1306,7 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ mes "Are you sure you want this item?"; next; - if( select("Yes:No") == 2 ) + if( select("Yes", "No") == 2 ) { mes "[Erundek]"; mes "Do you need more time to check the items?"; diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index db57510f7..35cd63dc2 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -18,7 +18,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ end; } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) { if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) { - if (select(" ~ Falcon: ~ Warg") == 1) + if (select(" ~ Falcon", " ~ Warg") == 1) setfalcon; else getitem Wolf's_Flute, 1; @@ -29,7 +29,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ } } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) { if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { - if (select(" ~ Cart: ~ Mado") == 1) { + if (select(" ~ Cart", " ~ Mado") == 1) { setcart; } else { setmount(MOUNT_MADO); diff --git a/npc/custom/card_remover.txt b/npc/custom/card_remover.txt index 902f09f91..077296ac6 100644 --- a/npc/custom/card_remover.txt +++ b/npc/custom/card_remover.txt @@ -22,7 +22,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{ mes "[Wise Old Woman]"; mes "Good day, young one. I have the power to remove cards that you have compounded onto your equipment. Does this idea please you?"; next; - switch(select("Yes, it does.:What do you charge?:No thanks.")) { + switch(select("Yes, it does.", "What do you charge?", "No thanks.")) { case 1: mes "[Wise Old Woman]"; mes "Very well. Which item shall I examine for you?"; @@ -62,7 +62,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{ mes "[Wise Old Woman]"; mes "This item has " + .@cardcount + " cards compounded on it. To perform my magic, I will need " + (.zenycost+(.@cardcount * .percardcost)) + " zeny, a ^0000FFStar Crumb^000000, and a ^0000FFYellow Gemstone^000000."; next; - if(select("Very well. Do it.:Nevermind.") == 2) { + if(select("Very well. Do it.", "Nevermind.") == 2) { mes "[Wise Old Woman]"; mes "Very well. Return at once if you seek my services."; close; @@ -75,7 +75,7 @@ prt_in,28,73,4 script Wise Old Woman#eAcustom 1_F_ORIENT_04,{ mes "[Wise Old Woman]"; mes "Before I begin, I must warn you--I may fail. If I do, I may destroy the cards, the item, or both. I do not give refunds. That being said, which is more important to you: The cards, or the item?"; next; - switch(select("I changed my mind about this.:The item.:The cards.")) { + switch(select("I changed my mind about this.", "The item.", "The cards.")) { case 1: mes "[Wise Old Woman]"; mes "Very well. Return at once if you seek my services."; diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt index e6e75c9f3..c5bed187b 100644 --- a/npc/custom/etc/bank.txt +++ b/npc/custom/etc/bank.txt @@ -18,7 +18,7 @@ set @cost,500; mes "[Banker]"; mes "Welcome to the First Bank of Prontera. How can I help you today?"; next; -switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's my current balance?:Cancel")) { +switch(select("I'd like to make a deposit.", "I'd like to make a withdrawl.", "What's my current balance?", "Cancel")) { case 1: mes "[Banker]"; mes "Very well... How much would you like to deposit? The maximum you can deposit at once is 999,999 Zeny."; @@ -72,7 +72,7 @@ switch(select("I'd like to make a deposit.:I'd like to make a withdrawl.:What's mes "[Banker]"; mes "You don't have the Zeny for the transaction fee right now. Would you like me to take the fee directly from your withdrawl?"; next; - switch(select("Yes please.:No, Thanks")){ + switch(select("Yes please.", "No, Thanks")){ case 1: mes "[Banker]"; mes "Removing " + @cost + " from your withdrawl to cover the deposit fee..."; diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt index 3a1249274..b8e1af564 100644 --- a/npc/custom/etc/mvp_arena.txt +++ b/npc/custom/etc/mvp_arena.txt @@ -72,7 +72,7 @@ quiz_00,62,31,4 script Epsilon MVP 4_M_TWMIDMAN,{ callfunc "Keeper",5; } // Protectors function script Protector { mes "[ ^0065DFMVP-Protector^000000 ]"; - switch(select(""+((getarg(0)=="")?"":"Harder Monsters")+":Heal:Exit")) { + switch(select( ((getarg(0)=="")?"":"Harder Monsters"), "Heal", "Exit")) { case 1: warp getarg(0),102,102; end; diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index 1f32f9f25..2388d239d 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -57,7 +57,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ mes "Cluck cluck! Cluuuuuck? ^FF0000~Hi GM " + strcharinfo(0) + ", Wanna play today?~^000000"; mes "Cluck cluck... CLUCK! ^FF0000~Just tell me what to do!~^000000"; next; - while(1) switch(select("Start Event:Check Prize:Set Prize:Not today Cluckers")) { + while(1) switch(select("Start Event", "Check Prize", "Set Prize", "Not today Cluckers")) { case 1: mes "[Cluckers]"; mes "CLUCK! ^FF0000~Sure thing!~^000000"; diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index ac218a2c2..476a21f27 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -22,7 +22,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ mes .@n$; mes "Select an option."; next; - switch(select("Turn ON/OFF Event:Event Settings")) { + switch(select("Turn ON/OFF Event", "Event Settings")) { case 1: mes .@n$; if (.EventON) { @@ -32,7 +32,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ mes "The Event is currently: [^FF0000OFF^000000]"; mes "Would you like to turn it ON?"; } - if(select("Yes:No")==2) close; + if(select("Yes", "No")==2) close; if (.EventON) { set .EventON,0; set .Timer,0; setnpctimer 0; stopnpctimer; @@ -50,7 +50,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ mes .@n$; mes "Pick a setting to modify."; next; - switch(select("Monster Display:Number of Rounds:Prize Settings")) { + switch(select("Monster Display", "Number of Rounds", "Prize Settings")) { case 1: setarray .@r$[0],"Disguise as all monsters.","Disguise as MVPs only."; mes .@n$; @@ -104,7 +104,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ mes .@n$; mes "Welcome."; mes "How may I be of assistance?"; - if(select("Information:Nothing, just passing through.")==2) close; + if(select("Information", "Nothing, just passing through.")==2) close; next; mes .@n$; mes "This event is quite simple."; diff --git a/npc/custom/events/mushroom_event.txt b/npc/custom/events/mushroom_event.txt index 29faaf979..ef25a9294 100644 --- a/npc/custom/events/mushroom_event.txt +++ b/npc/custom/events/mushroom_event.txt @@ -23,7 +23,7 @@ prontera,142,228,6 script Find the Mushroom BLACK_MUSHROOM,{ if (.status || getgmlevel() < .GM) close; mes "Start the event?"; next; - if(select("- No:- Yes") == 1) close; + if(select("- No", "- Yes") == 1) close; donpcevent strnpcinfo(0)+"::OnMinute10"; mes "[ Find The Mushroom ]"; mes "Event started!"; diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt index b05a24487..22b505741 100644 --- a/npc/custom/healer.txt +++ b/npc/custom/healer.txt @@ -22,7 +22,7 @@ if (.@price) { message strcharinfo(0),"Healing costs "+.@price+" Zeny."; if (Zeny < .@price) end; - if(select("^0055FFHeal^000000:^777777Cancel^000000") == 2) close; + if(select("^0055FFHeal^000000", "^777777Cancel^000000") == 2) close; Zeny -= .@price; } specialeffect2 EF_HEAL2; percentheal 100,100; diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt index ee03c16eb..7e90542b1 100644 --- a/npc/custom/item_signer.txt +++ b/npc/custom/item_signer.txt @@ -19,7 +19,7 @@ prt_in,24,61,7 script Perchik 1_M_01,{ mes "[Perchik]"; mes "I can ^0055FFsign your name^000000 on almost any rare item you hold."; next; - if(select("Tell me more...:Sign my items, please!") == 1) { + if(select("Tell me more...", "Sign my items, please!") == 1) { mes "[Perchik]"; mes "I can put your name on any slotless equipment or weapon."; emotion e_ic; @@ -101,7 +101,7 @@ prt_in,24,61,7 script Perchik 1_M_01,{ } mes "Shall I sign your ^0055FF"+getitemname(.@id)+"^000000?"; next; - if(select("Ok!:Leave")==2) { + if(select("Ok!", "Leave")==2) { mes "[Perchik]"; mes "See you..."; emotion e_yawn; diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index d1f2b59c9..f64225800 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -18,13 +18,13 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ mes "With this, you can rest assured your items are safe."; next; mes "What would you like to do?"; - if(select("Bind:Unbind") == 1) { + if(select("Bind", "Unbind") == 1) { if(Zeny < .bindprice) { mes "You don't have enough zeny to bind an item."; close; } mes "What kind of bind?"; - .@boundtype = 1 << (select("Account:Guild:Character")-1); + .@boundtype = 1 << (select("Account", "Guild", "Character")-1); if(.@boundtype == 2 && (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(0))) { mes "In order for me to bind an item to a guild you must be the master of one."; close; @@ -47,14 +47,14 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ .@item = .@bindlist[select(.@bindlist$)-2]; next; mes "Before I continue, I want you to know I can't tell the difference between multiple items. If you have a specific item you want bounded, please remove any duplicates from inventory."; - if(select("I understand, continue:Wait a minute") == 2) { + if(select("I understand, continue", "Wait a minute") == 2) { next; mes "I'll be here when you're ready."; close; } next; mes "Are you sure you'd like to bind your "+ getitemname(@inventorylist_id[.@item]) +" to your "+.boundtypes$[.@boundtype]+"?"; - if(select("Yes:No") == 1) { + if(select("Yes", "No") == 1) { Zeny -= .bindprice; delitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item]; getitembound2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item],.@boundtype; @@ -94,14 +94,14 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ } } mes "Before I continue, I want you to know I can't tell the difference between multiple items. If you have a specific item you want unbounded, please remove any duplicates from inventory."; - if(select("I understand, continue:Wait a minute") == 2) { + if(select("I understand, continue", "Wait a minute") == 2) { next; mes "I'll be here when you're ready."; close; } next; mes "Are you sure you'd like to unbind your "+ getitemname(@inventorylist_id[.@item]) +"?"; - if(select("Yes:No") == 1) { + if(select("Yes", "No") == 1) { Zeny -= .unbindprice; delitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item]; getitem2 @inventorylist_id[.@item],@inventorylist_amount[.@item],@inventorylist_identify[.@item],@inventorylist_refine[.@item],@inventorylist_attribute[.@item],@inventorylist_card1[.@item],@inventorylist_card2[.@item],@inventorylist_card3[.@item],@inventorylist_card4[.@item]; diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt index c497ceef3..cc09055a4 100644 --- a/npc/custom/jobmaster.txt +++ b/npc/custom/jobmaster.txt @@ -55,7 +55,7 @@ prontera,153,193,6 script Job Master 2_F_MAGICMASTER,{ while (true) { mes "Select an option."; next; - .@choice = select(" ~ ^0055FFRebirth^000000:"+(.third_classes ? " ~ ^FF0000Third Class^000000" : "")+": ~ ^777777Cancel^000000"); + .@choice = select(" ~ ^0055FFRebirth^000000", (.third_classes ? " ~ ^FF0000Third Class^000000":""), " ~ ^777777Cancel^000000"); if (.@choice == 3) close; mes "[Job Master]"; @@ -150,7 +150,7 @@ function Job_Menu { } else { .@newjob = getarg(0); } - if (select(" ~ Change into ^0055FF"+jobname(.@newjob)+"^000000 class: ~ ^777777"+(getargcount() > 1 ? "Go back" : "Cancel")+"^000000") == 1) { + if (select(" ~ Change into ^0055FF"+ jobname(.@newjob) +"^000000 class", " ~ ^777777"+(getargcount() > 1 ? "Go back": "Cancel")+"^000000") == 1) { mes "[Job Master]"; mes "You are now "+A_An(jobname(.@newjob))+"!"; if (.@newjob == Job_Novice_High && .linear_jobchange) diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt index da35da389..3cd85f873 100644 --- a/npc/custom/platinum_skills.txt +++ b/npc/custom/platinum_skills.txt @@ -23,7 +23,7 @@ prontera,128,200,6 script Platinum Skill NPC 4_F_MAID,{ mes "I can give you the special skills available to your job."; mes "Would you like these skills now?"; next; - if (select("Yes Please:No") == 2) { + if (select("Yes Please", "No") == 2) { mes "[Platinum Skill NPC]"; mes "Have a nice day... >.>"; close; diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt index 8a57d4f3e..7dec41f79 100644 --- a/npc/custom/quests/berzebub.txt +++ b/npc/custom/quests/berzebub.txt @@ -22,7 +22,7 @@ prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{ close; } mes "Greeting, lad. I found a really nifty item while I was picking mushrooms near Glast Heim."; next; - if(select("Keep Talking:Leave")==2) goto M_Leave; + if(select("Keep Talking", "Leave")==2) goto M_Leave; mes .@n$; mes "I have never seen an item like this before. I am told it can be placed inside any accessory with a slot available."; @@ -30,7 +30,7 @@ prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{ mes .@n$; mes "If you're interested in this item, I'll tell you what you need for me to make you one of your own. I can only give one of these to each player, so once you finish this quest, you may not do it again."; next; - if(select("Tell me more about it:Nah, I don't care about it")==2) goto M_Leave; + if(select("Tell me more about it", "Nah, I don't care about it")==2) goto M_Leave; mes .@n$; mes "I believe the item is called a ^FF0000Berzebub Card^000000. It makes you cast spells really fast!"; @@ -41,7 +41,7 @@ prontera,165,178,8 script Old Woman 8_F_GRANDMOTHER,{ mes " ~ "+.@items[.@i+1]+"x "+getitemname(.@items[.@i]); if (countitem(.@items[.@i]) < .@items[.@i+1]) set .@nr,1; } next; - if(select("I have all of that!:I'll get those ASAP")==2) goto M_Leave; + if(select("I have all of that!", "I'll get those ASAP")==2) goto M_Leave; mes .@n$; if (.@nr) { diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index 372c6bffe..ad18a73f5 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/npc/custom/quests/hunting_missions.txt @@ -99,7 +99,7 @@ function Chk; function Cm; else if (.Reset > 0) mes "It will cost "+Cm(.Reset)+" Zeny."; next; - switch(select(" ~ Abandon...: ~ ^777777Cancel^000000")) { + switch(select(" ~ Abandon...", " ~ ^777777Cancel^000000")) { case 1: if (.Reset > 0) { if (Zeny < .Reset) { diff --git a/npc/custom/quests/kaho_balmung.txt b/npc/custom/quests/kaho_balmung.txt index ff581825b..f08ece027 100644 --- a/npc/custom/quests/kaho_balmung.txt +++ b/npc/custom/quests/kaho_balmung.txt @@ -19,12 +19,12 @@ prontera,158,356,4 script Royal Messenger 8W_SOLDIER,{ mes "Welcome to Prontera."; mes "I am the messenger in charge of the Royal Quests."; next; - if(select("Listen...:Walk away")==2) close; + if(select("Listen...", "Walk away")==2) close; mes "[Royal Messenger]"; mes "There are two quests."; mes "Choose the one you like."; next; - set .@i, select("Balmung:Lord Kaho's Horns:^777777Never mind.^000000"); + set .@i, select("Balmung", "Lord Kaho's Horns", "^777777Never mind.^000000"); mes "[Royal Messenger]"; if (.@i==3) { mes "Have a nice day."; diff --git a/npc/custom/quests/kahohorn.txt b/npc/custom/quests/kahohorn.txt index 880e2aff9..4d37c9530 100644 --- a/npc/custom/quests/kahohorn.txt +++ b/npc/custom/quests/kahohorn.txt @@ -45,7 +45,7 @@ geffen,115,107,5 script Lord Kaho's Servant 1_M_PUBMASTER,{ mes .@n$; mes "Are you ready for me to make this special item?"; next; - if(select("Sure am!:These requirements are unfathomable!")==2) { + if(select("Sure am!", "These requirements are unfathomable!")==2) { mes .@n$; mes "What I had to go through was more unfathomable..."; mes "If you succeed in getting these items, you will have incredible strength!"; diff --git a/npc/custom/quests/kings_items.txt b/npc/custom/quests/kings_items.txt index 055315810..991112286 100644 --- a/npc/custom/quests/kings_items.txt +++ b/npc/custom/quests/kings_items.txt @@ -15,7 +15,7 @@ prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{ mes "[King of Prontera]"; mes "Hello, can you help me?"; next; - if(select("Sure, what can I do?:Sorry, I'm busy.")==2) { + if(select("Sure, what can I do?", "Sorry, I'm busy.")==2) { mes "[King of Prontera]"; mes "Ok, that's fine, I'm sure someone else will help."; close; } @@ -26,7 +26,7 @@ prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{ next; setarray .@items1[0],5007,742,30,741,50,753,20,732,1,710,20,629,20; setarray .@items2[0],1137,2254,1,2282,1,714,1; - switch(select("What do you need?:I have the items!:Forget it.")) { + switch(select("What do you need?", "I have the items!", "Forget it.")) { case 1: for(set .@i,1; .@i<3; set .@i,.@i+1) { mes "[King of Prontera]"; @@ -40,7 +40,7 @@ prt_castle,80,170,4 script King of Prontera 1_M_PRON_KING,{ mes "[King of Prontera]"; mes "What item do you want?"; next; - set .@i, select("Crown:Sword"); + set .@i, select("Crown", "Sword"); for(set .@j,1; .@j<getarraysize(getd(".@items"+.@i)); set .@j,.@j+2) if (countitem(getd(".@items"+.@i+"["+.@j+"]")) < getd(".@items"+.@i+"["+(.@j+1)+"]")) set .@nr,1; mes "[King of Prontera]"; @@ -66,7 +66,7 @@ prt_castle,84,170,4 script King's Daughter 1_M_SIZ,{ mes "[King's Daughter]"; mes "Hmph, I hate my dad right now!!"; next; - if(select("Why?:Whatever...")==2) { + if(select("Why?", "Whatever...")==2) { mes "[King's Daughter]"; mes "FINE THEN! Hmph!!"; close; } diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt index 2d1ab33a4..dd7fad138 100644 --- a/npc/custom/quests/quest_shop.txt +++ b/npc/custom/quests/quest_shop.txt @@ -126,7 +126,7 @@ OnBuyItem: set .@preview,1; addtimer 1000, strnpcinfo(0)+"::OnEnd"; while(1) { - switch(select(" ~ Purchase ^0055FF"+getitemname(.@q[0])+"^000000:"+((.@preview && !@qe[7])?" ~ Preview...":"")+": ~ ^777777Cancel^000000")) { + switch(select(" ~ Purchase ^0055FF"+ getitemname(.@q[0]) +"^000000", ((.@preview && !@qe[7])?" ~ Preview...": ""), " ~ ^777777Cancel^000000")) { case 1: if (@qe[0]) { mes "[Quest Shop]"; diff --git a/npc/custom/quests/questboard.txt b/npc/custom/quests/questboard.txt index e4336a67a..ba335d2d4 100644 --- a/npc/custom/quests/questboard.txt +++ b/npc/custom/quests/questboard.txt @@ -30,7 +30,7 @@ prontera,129,215,5 script Questboard 4_BOARD3,{ mes "Base EXP: ^0000FF"+getd("." +currentquest$+"_collectionexp["+0+"]")+"^000000"; mes "Job EXP: ^0000FF"+getd("." +currentquest$+"_collectionexp["+1+"]")+"^000000"; next; - if(select("Finish:Abort") == 2){ + if(select("Finish", "Abort") == 2){ mes "[^FF7700Questboard^000000]"; mes "Quest aborted."; set currentquest$, ""; @@ -55,7 +55,7 @@ prontera,129,215,5 script Questboard 4_BOARD3,{ mes "Base EXP: ^0000FF"+getd("." +currentquest$+"_huntingexp["+0+"]")+"^000000"; mes "Job EXP: ^0000FF"+getd("." +currentquest$+"_huntingexp["+1+"]")+"^000000"; next; - if(select("Finish:Abort") == 2){ + if(select("Finish", "Abort") == 2){ mes "[^FF7700Questboard^000000]"; mes "Quest aborted."; for(set .@x, 1; .@x < getarraysize(getd("."+currentquest$+"_huntingmob")); set .@x,.@x+2){ @@ -105,7 +105,7 @@ L_questmenu: mes "Base EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+0+"]")+"^000000"; mes "Job EXP: ^0000FF"+getd("." +.@selection+"_collectionexp["+1+"]")+"^000000"; next; - if(select("Accept:Decline") == 2){ + if(select("Accept", "Decline") == 2){ close; } if(BaseLevel >= getd("." +.@selection+"_collectionmin") && BaseLevel <= getd("." +.@selection+"_collectionmax")) @@ -152,7 +152,7 @@ L_questmenu: mes "Base EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+0+"]")+"^000000"; mes "Job EXP: ^0000FF"+getd("." +.@selection+"_huntingexp["+1+"]")+"^000000"; next; - if(select("Accept:Decline") == 2){ + if(select("Accept", "Decline") == 2){ close; } if(BaseLevel >= getd("." +.@selection+"_huntingmin") && BaseLevel <= getd("." +.@selection+"_huntingmax")) diff --git a/npc/custom/quests/sphinx_mask.txt b/npc/custom/quests/sphinx_mask.txt index a32828b8b..f7e1023c4 100644 --- a/npc/custom/quests/sphinx_mask.txt +++ b/npc/custom/quests/sphinx_mask.txt @@ -37,7 +37,7 @@ L_Menu: case 2: mes "Ahh a business man are you no? Fine, how about..."; break; case 3: mes "Hmmm... you drive a hard bargain, ok... my final offer..."; break; } next; - if(select("Pay "+getarg(1)+"z:No deal")==2) return; + if(select("Pay "+getarg(1)+"z", "No deal")==2) return; mes "[Turban Thief]"; if (Zeny < getarg(2)) { mes "Are youz playin wit me? You don't have ze money!"; diff --git a/npc/custom/quests/sunglasses.txt b/npc/custom/quests/sunglasses.txt index 1b45c9036..416dcb571 100644 --- a/npc/custom/quests/sunglasses.txt +++ b/npc/custom/quests/sunglasses.txt @@ -25,14 +25,14 @@ alberta,88,193,5 script Sunglasses Trader 1_F_MERCHANT_01,{ close; } mes "Hello. What can I do for you?"; next; - if(select("I heard that you can make ^0000FFSlotted Sunglasses^000000.:Nothing, sorry to bother you.")==2) { + if(select("I heard that you can make ^0000FFSlotted Sunglasses^000000.", "Nothing, sorry to bother you.")==2) { mes "[Sunglasses Trader]"; mes "Come back to me than you are ready."; close; } mes "[Sunglasses Trader]"; mes "I do not make them, but I can tell you where to find the person who does. For a small fee..."; next; - if(select("How much?:No way, I will find her myself!")==2) { + if(select("How much?", "No way, I will find her myself!")==2) { mes "[Sunglasses Trader]"; mes "Suit yourself, the Maker will not make you ^0000FFSlotted Sunglasses^000000 unless she knows that you are coming."; mes "Only I can tell her you are coming."; @@ -46,7 +46,7 @@ alberta,88,193,5 script Sunglasses Trader 1_F_MERCHANT_01,{ mes " - ^00008850 Feathers^000000"; mes " - ^000088100000z^000000"; next; - if(select("Alright, here.:That's too much!")==2) { + if(select("Alright, here.", "That's too much!")==2) { mes "[Sunglasses Trader]"; mes "Suit yourself."; close; } @@ -75,14 +75,14 @@ moc_fild07,334,186,5 script Maseph 4_F_GON,{ mes "Hello there."; mes "You came for the ^000088Slotted Sunglasses^000000, right?"; next; - if(select("Yes:No, sorry to bother you.")==2) { + if(select("Yes", "No, sorry to bother you.")==2) { mes "[Maseph]"; mes "Off you go, then."; close; } mes "[Maseph]"; mes "To make one, I will need one pair of ^000088Sunglasses^000000 and 400000z."; next; - if(select("Here you go.:No, thanks.")==2) { + if(select("Here you go.", "No, thanks.")==2) { mes "[Maseph]"; mes "As you wish."; close; } diff --git a/npc/custom/quests/valhallen.txt b/npc/custom/quests/valhallen.txt index c70de008b..1a2b45968 100644 --- a/npc/custom/quests/valhallen.txt +++ b/npc/custom/quests/valhallen.txt @@ -17,7 +17,7 @@ prontera,147,171,5 script Lenneth 4_F_VALKYRIE,{ mes "I can transmute for you many of the Valhallen items,"; mes "although they require many rare elements to make."; next; - switch(select("Mjolnir:Sleipnir:Brisingamen:Gleipnir:Megingjard")) { + switch(select("Mjolnir", "Sleipnir", "Brisingamen", "Gleipnir", "Megingjard")) { case 1: mes "[Lenneth]"; mes "^3355FFMjolnir^000000 is the mighty Hammer of Thor."; @@ -52,7 +52,7 @@ prontera,147,171,5 script Lenneth 4_F_VALKYRIE,{ mes "[Lenneth]"; mes "Do you desire ^3355FF"+getitemname(.@items[0])+"^000000?"; next; - if(select("Yes:No")==2) { + if(select("Yes", "No")==2) { mes "[Lenneth]"; mes "Please return if you change your mind."; close; } diff --git a/npc/custom/resetnpc.txt b/npc/custom/resetnpc.txt index 1f8448111..2f34435a0 100644 --- a/npc/custom/resetnpc.txt +++ b/npc/custom/resetnpc.txt @@ -26,7 +26,7 @@ prontera,150,193,4 script Reset Girl 4_F_TELEPORTER,{ mes "Reset Both: "+ .@ResetBoth +"z"; mes "Please select the service you want:"; next; - switch(select("^FF3355Reset Skills:Reset Stats:Reset Both^000000:Cancel")) { + switch(select("^FF3355Reset Skills", "Reset Stats", "Reset Both^000000", "Cancel")) { case 1: mes "[Reset Girl]"; if (Zeny < .@ResetSkill) { diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt index 4bbc8f8dd..37661ccb9 100644 --- a/npc/custom/stylist.txt +++ b/npc/custom/stylist.txt @@ -14,7 +14,7 @@ prontera,170,180,1 script Stylist#custom_stylist 2_M_DYEINGER,{ setarray .@styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color"); setarray .@Look[1],7,1,6; - set .@s, select(" ~ Cloth color: ~ Hairstyle: ~ Hair color"); + set .@s, select(" ~ Cloth color", " ~ Hairstyle", " ~ Hair color"); set .@Revert, getlook(.@Look[.@s]); set .@style,1; while(1) { diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index fee4dfac5..b0836820f 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -234,7 +234,7 @@ while(1) { } } next; - switch(select(""+((.CastleWarp || .Active[1])?" ~ Warp to castles...":"")+": ~ Check schedule...: ~ View castle owners...:"+((getgmlevel()<.GMAccess || !getgmlevel())?"":" ~ Manage sessions...")+": ~ ^777777Cancel^000000")) { + switch(select(((.CastleWarp || .Active[1])?" ~ Warp to castles...":""), "~ Check schedule...", " ~ View castle owners...", ((getgmlevel()<.GMAccess || !getgmlevel())?"":" ~ Manage sessions..."), " ~ ^777777Cancel^000000")) { case 1: if (.CastleWarp) set .@clr$,"^0055FF"; set .@menu$,""; @@ -287,7 +287,7 @@ while(1) { mes "There are ^0055FF"+(.Size/4)+" session(s)^000000 configured."; mes "What would you like to do?"; next; - switch(select(" ~ Add a session...: ~ Delete a session...: ~ Reload settings...:"+((agitcheck() || agitcheck2())?" ~ End WOE session...":"")+": ~ ^777777Go back^000000")) { + switch(select(" ~ Add a session...", " ~ Delete a session...", " ~ Reload settings...", ((agitcheck() || agitcheck2())?" ~ End WOE session...": ""), " ~ ^777777Go back^000000")) { case 1: mes "[New Session]"; if (.Size > 127) { @@ -344,7 +344,7 @@ while(1) { mes "[New Session]"; mes "Are you sure?"; next; - switch(select(" ~ ^0055FFAdd session...^000000: ~ Continue selecting castles...: ~ ^777777Cancel^000000")) { + switch(select(" ~ ^0055FFAdd session...^000000", " ~ Continue selecting castles...", " ~ ^777777Cancel^000000")) { case 1: for(set .@i,0; .@i<.Size; set .@i,.@i+4) if ((.@day == $WOE_CONTROL[.@i] && .@end <= $WOE_CONTROL[.@i+1]) || .@day < $WOE_CONTROL[.@i]) { @@ -386,7 +386,7 @@ while(1) { mes "Delete ^0055FF"+.Days$[$WOE_CONTROL[.@i*4]]+"'s^000000 session?"; mes "This action cannot be undone."; next; - set .@j, select(" ~ ^FF0000Delete session...^000000: ~ ^777777Cancel^000000"); + set .@j, select(" ~ ^FF0000Delete session...^000000", " ~ ^777777Cancel^000000"); mes "[Remove Session]"; if (.@j == 2) mes "Cancelled."; @@ -405,7 +405,7 @@ while(1) { mes "Be aware that this will disrupt the current WOE session."; } next; - set .@i, select(" ~ ^0055FFReload settings...^000000: ~ ^777777Cancel^000000"); + set .@i, select(" ~ ^0055FFReload settings...^000000", " ~ ^777777Cancel^000000"); mes "[Reload Settings]"; if (.@i == 2) mes "Cancelled."; else { @@ -426,7 +426,7 @@ while(1) { mes " "; mes "Kill the current WOE session?"; next; - set .@i, select(" ~ ^FF0000End session...^000000:"+((.Options&1)?" ~ ^FF0000End session without rewards...^000000":"")+": ~ ^777777Cancel^000000"); + set .@i, select(" ~ ^FF0000End session...^000000", ((.Options&1)?" ~ ^FF0000End session without rewards...^000000": ""), " ~ ^777777Cancel^000000"); mes "[Force Agit End]"; if (.@i == 3) mes "Cancelled."; |