diff options
author | Haru <haru@dotalux.com> | 2016-02-07 01:23:46 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2016-02-07 01:23:46 +0100 |
commit | 1fd628e7be9e6de4ea48394be09ae10e912d8f3d (patch) | |
tree | 4e5b42a444f83976c33f22540d3aa46a8ceb7001 /npc/merchants | |
parent | e68aa1f74d315f7bf24d7c8829002d0031b23539 (diff) | |
parent | 0462bc828e59ce99a48303a2f6190d3a01ce9465 (diff) | |
download | hercules-1fd628e7be9e6de4ea48394be09ae10e912d8f3d.tar.gz hercules-1fd628e7be9e6de4ea48394be09ae10e912d8f3d.tar.bz2 hercules-1fd628e7be9e6de4ea48394be09ae10e912d8f3d.tar.xz hercules-1fd628e7be9e6de4ea48394be09ae10e912d8f3d.zip |
Merge pull request #1110 from dastgir/22-ScriptClean-Phase2
Script CleanUp Phase 2
Diffstat (limited to 'npc/merchants')
27 files changed, 126 insertions, 126 deletions
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index fe69a8a3a..e75912f4c 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -122,7 +122,7 @@ S_RefineValidate: mes "To refine that, you'll need to have one ^ff9999" + getitemname(getarg(1)) + "^000000 and " + getarg(2) + " zeny."; mes "Would you like to continue?"; next; - if(select("Yes:No") == 1) { + if(select("Yes", "No") == 1) { if (getequippercentrefinery(getarg(3)) < 100) { if (getarg(0)) { mes "[Suhnbi]"; @@ -139,7 +139,7 @@ S_RefineValidate: mes "^ff0000Besides, the equipment will break!^000000"; mes "Are you sure you still want to continue?"; next; - if(select("Yes:No") == 2) { + if(select("Yes", "No") == 2) { mes "[Suhnbi]"; mes "Good."; mes "Because if the weapon breaks from unreasonable refining, then I get a bad mood, too."; @@ -155,7 +155,7 @@ S_RefineValidate: //mes "Everything will disappear. As in... GONE!"; mes "Do you really wish to continue?"; next; - if(select("Yes:No") == 2) { + if(select("Yes", "No") == 2) { mes "[Suhnbi]"; mes "What nonsense. You waste my precious time."; mes "Get lost, punk."; diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index 16ccccd65..ea926ae6b 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -53,12 +53,12 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{ mes "Alchemist Union."; mes "How can I assist you today?"; next; - switch (select("Purchase materials.:Purchase a production manual.:Quit.")) { + switch (select("Purchase materials.", "Purchase a production manual.", "Quit.")) { case 1: mes "[Gever Al Sharp]"; mes "What would you like?"; next; - if (select("Medicine Bowl - " + (RENEWAL ? "250z" : "8 Zeny") +":Cancel.") == 1) { + if (select("Medicine Bowl - " + (RENEWAL ? "250z" : "8 Zeny"), "Cancel.") == 1) { mes "[Gever Al Sharp]"; mes "How many do you want?"; mes "Enter '0' if you want to quit."; @@ -122,7 +122,7 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{ mes "What do you need?"; mes "Manuals are generally 100,000 zeny. But there are a couple of special manuals that will cost more."; next; - switch (select("Potion Creation Guide:Alcohol Creation Guide:Bottle Grenade Creation Guide:Acid Bottle Creation Guide:Plant Bottle Creation Guide:Marine Sphere Bottle Creation Guide:Glistening Coat Creation Guide:Condensed Potion Creation Guide:Cancel Deal.")) { + switch (select("Potion Creation Guide", "Alcohol Creation Guide", "Bottle Grenade Creation Guide", "Acid Bottle Creation Guide", "Plant Bottle Creation Guide", "Marine Sphere Bottle Creation Guide", "Glistening Coat Creation Guide", "Condensed Potion Creation Guide", "Cancel Deal.")) { case 1: callsub S_SellManual, Normal_Potion_Book, 100000; break; @@ -175,7 +175,7 @@ S_SellManual: mes ""+ getitemname(getarg(0)) +"?"; mes "That'll be "+ getarg(1) +" zeny."; next; - if (select("Purchase.:Quit.") == 1) { + if (select("Purchase.", "Quit.") == 1) { Zeny -= getarg(1); getitem getarg(0),1; mes "[Gever Al Sharp]"; diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index 392c8be1f..69310388f 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -48,7 +48,7 @@ alberta,118,157,3 script Magazine Dealer Kenny::mdk 4_M_01,{ mes "easily when they're in Magazines. Now, can I interest you in"; mes "anything in particular?"; next; - switch(select("Wind Sphere Pack:Shadow Sphere Pack:Poison Sphere Pack:Water Sphere Pack:Fire Sphere Pack:Cartridge:Blood Cartridge:Silver Cartridge:Cancel")) { + switch(select("Wind Sphere Pack", "Shadow Sphere Pack", "Poison Sphere Pack", "Water Sphere Pack", "Fire Sphere Pack", "Cartridge", "Blood Cartridge", "Silver Cartridge", "Cancel")) { case 1: callfunc "Func_Casing",13204,12144; break; case 2: callfunc "Func_Casing",13206,12145; break; case 3: callfunc "Func_Casing",13205,12146; break; diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 0c85a19bb..490be66ba 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -47,7 +47,7 @@ alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 4_M_04,{ mes "the materials, and I'll make"; mes "you the bullets you need."; next; - switch(select("Poison Sphere:Flare Sphere:Lighting Sphere:Blind Sphere:Freezing Sphere:Cancel")) { + switch(select("Poison Sphere", "Flare Sphere", "Lighting Sphere", "Blind Sphere", "Freezing Sphere", "Cancel")) { case 1: callfunc "Bullet_Trade",937,10,13205; break; case 2: callfunc "Bullet_Trade",7097,2,13203; break; case 3: callfunc "Bullet_Trade",7053,3,13204; break; diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index ca32bb287..31202445e 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -51,7 +51,7 @@ que_job01,68,84,1 script Black Marketeer#Buying 4_M_SITDOWN,{ mes "You must need something badly to come to find me."; mes "What do you want?"; next; - switch(select("Bulk Buyer Shop License:Who are you?:Nothing, nothing!")) { + switch(select("Bulk Buyer Shop License", "Who are you?", "Nothing, nothing!")) { case 1: mes "[Mr. Jass]"; mes "I knew it!"; @@ -128,7 +128,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ mes "I'm Hugh from the Purchasing Team."; mes "How may I help you today?"; next; - if(select("Purchase Bulk Buyer Shop License:Quit") == 2) { + if(select("Purchase Bulk Buyer Shop License", "Quit") == 2) { mes "[Mr. Hugh]"; mes "Please feel free to ask me if you need any Bulk Buyer Shop Licenses."; mes "Come again~"; @@ -218,7 +218,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ mes "Say, would you like to register now?"; mes "If you do, I'll teach you how to open the Bulk Buyer Shop."; next; - if(select("Learn how to open Bulk Buyer Shop:Cancel") == 2) { + if(select("Learn how to open Bulk Buyer Shop", "Cancel") == 2) { mes "[Mr. Hugh]"; mes "Man, that's disappointing!"; mes "Using this bulk buyer option can benefit your business in many ways, but it's your call."; diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt index 4f92a4135..6d0d1f3d5 100644 --- a/npc/merchants/cash_hair.txt +++ b/npc/merchants/cash_hair.txt @@ -93,7 +93,7 @@ itemmall,19,74,5 script Stylist#cash 4_F_02,{ mes "if you'd like me to"; mes "change your hairstyle?"; next; - if(select("Change Hairstyle:Don't Change") == 1) { + if(select("Change Hairstyle", "Don't Change") == 1) { if (countitem(New_Style_Coupon) > 0) { mes "[Kaniki]"; mes "Great, you brought"; @@ -102,7 +102,7 @@ itemmall,19,74,5 script Stylist#cash 4_F_02,{ mes "did you want to have?"; next; if (Sex == 1) { - if(select("Emergency Heal Perm:Aura Blade Cut") == 1) { + if(select("Emergency Heal Perm", "Aura Blade Cut") == 1) { delitem New_Style_Coupon,1; // New_Style_Coupon setlook 1,24; }else{ @@ -110,7 +110,7 @@ itemmall,19,74,5 script Stylist#cash 4_F_02,{ setlook 1,25; } }else{ - if(select("Assumptio Perm:Soul Changer Cut") == 1) { + if(select("Assumptio Perm", "Soul Changer Cut") == 1) { delitem New_Style_Coupon,1; // New_Style_Coupon setlook 1,24; }else{ diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 34c7fb7b2..f0b20256f 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -50,7 +50,7 @@ function Dyes; mes .n$; mes "How may I assist you?"; next; - switch(select("- Talk:- Dye Clothing:- Price List:- ^777777Cancel^000000")) { + switch(select("- Talk", "- Dye Clothing", "- Price List", "- ^777777Cancel^000000")) { case 1: mes .n$; mes "Life may have gotten a bit better, but when I look at all of the orders I've received... Whew!"; @@ -165,7 +165,7 @@ function Dyes { mes "the default for free."; mes "Are you sure?"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes .n$; setlook 7,0; diff --git a/npc/merchants/coin_exchange.txt b/npc/merchants/coin_exchange.txt index 392a18c0b..8ce94830d 100644 --- a/npc/merchants/coin_exchange.txt +++ b/npc/merchants/coin_exchange.txt @@ -52,13 +52,13 @@ setarray .@items[2],12342,12343,12348; .@Book = 11019; //Manuk_Selling_Item .@coin = 6080; //Manuk_Coin - .@i = select("View item description:Manuk's Opportunity:Manuk's Courage:Manuk's Faith:Cancel"); + .@i = select("View item description", "Manuk's Opportunity", "Manuk's Courage", "Manuk's Faith", "Cancel"); } else { setarray .@items[2],12344,12345,12349; .@Book = 11018; //Splendide_Selling_Item .@coin = 6081; //Splendide_Coin - .@i = select("View item description:Buy Pinguicula's Fruit Jam:Buy Luciola's Honey Jam:Buy Cornus' Tears:Do nothing"); + .@i = select("View item description", "Buy Pinguicula's Fruit Jam", "Buy Luciola's Honey Jam", "Buy Cornus' Tears", "Do nothing"); } mes .@n$; if (.@i == 1) { @@ -70,7 +70,7 @@ else if (.@i < 5) { mes "I can sell you 3 "+getitemname(.@items[.@i])+" for ^3131FF1 coin^000000."; next; - switch(select("Purchase:Do not purchase")) { + switch(select("Purchase", "Do not purchase")) { case 1: if (countitem(.@coin)) { mes .@n$; diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt index a99fbd9e0..260a7c852 100644 --- a/npc/merchants/dye_maker.txt +++ b/npc/merchants/dye_maker.txt @@ -50,12 +50,12 @@ morocc_in,146,99,3 script Java Dullihan 1_M_MERCHANT,{ mes "Wow..."; mes "Such a nice day. Days like this are perfect to make dyes."; next; - switch(select("Talk:Make Dyestuffs:Cancel")) { + switch(select("Talk", "Make Dyestuffs", "Cancel")) { case 1: mes "[Dye Maker Java Dullihan]"; mes "Erm, I don't really have much to say to you. But, if you would like me to tell you about my life, I can do that. It's a little long and boring, but would you like to listen?"; next; - if (select("Listen:Don't Listen") == 1) { + if (select("Listen", "Don't Listen") == 1) { mes "[Dye Maker Java Dullihan]"; mes "As long as I can remember, my father has been making dyes. He used to spend countless hours making dyes of different colors. Even when my mother passed away, he never stopped."; next; @@ -97,7 +97,7 @@ morocc_in,146,99,3 script Java Dullihan 1_M_MERCHANT,{ mes "[Dye Maker Java Dullihan]"; mes "The color of the dye is special, made with all my heart and soul."; next; - switch(select("Scarlet Dyestuffs:Lemon Dyestuffs:Cobaltblue Dyestuffs:Darkgreen Dyestuffs:Orange Dyestuffs:Violet Dyestuffs:White Dyestuffs:Black Dyestuffs:Cancel")) { + switch(select("Scarlet Dyestuffs", "Lemon Dyestuffs", "Cobaltblue Dyestuffs", "Darkgreen Dyestuffs", "Orange Dyestuffs", "Violet Dyestuffs", "White Dyestuffs", "Black Dyestuffs", "Cancel")) { case 1: callsub S_MakeDye,1,1; break; case 2: callsub S_MakeDye,2,1; break; case 3: callsub S_MakeDye,3,2; break; @@ -187,7 +187,7 @@ S_MakeDye: case 4: mes "Okay! I believe you would have everything prepared. Would you like to start the process?"; break; } next; - if (select("Make Dyestuffs:Cancel") == 1) { + if (select("Make Dyestuffs", "Cancel") == 1) { .@size = getarraysize(.@item); // check requirements for (.@i = 0; .@i < .@size; ++.@i) diff --git a/npc/merchants/elemental_trader.txt b/npc/merchants/elemental_trader.txt index 928782255..bad49b4b2 100644 --- a/npc/merchants/elemental_trader.txt +++ b/npc/merchants/elemental_trader.txt @@ -61,7 +61,7 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ mes "Keekeekee... Or else,"; mes "I will let you taste my acid bottle...!"; next; - if (select("Please, excuse me:Do you need help?") == 1) { + if (select("Please, excuse me", "Do you need help?") == 1) { mes "[Laspuchin Gregory]"; mes "Keheheh... Did you hear"; mes "what I said? It would be"; @@ -81,7 +81,7 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ mes "I will use it efficiently..."; mes "Do you have them now?"; next; - if (select("Nope:I got some") == 1) { + if (select("Nope", "I got some") == 1) { mes "[Laspuchin Gregory]"; mes "Then, find 8 stones of one kind."; mes "If you bring 8 of one kind of"; @@ -104,7 +104,7 @@ ama_in02,61,27,7 script Alchemist#ama 4_M_ALCHE_B,{ mes "Uh-huh, what did you bring?"; next; setarray .@items[1],995,997,994,996; - .@i = .@items[select("Mystic Frozen:Great Nature:Flame Heart:Rough Wind")]; + .@i = .@items[select("Mystic Frozen", "Great Nature", "Flame Heart", "Rough Wind")]; mes "[Laspuchin Gregory]"; if (countitem(.@i) > 7) { mes "I will take 8 of them and"; diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt index 3e7a723b6..5b4cac2dc 100644 --- a/npc/merchants/enchan_arm.txt +++ b/npc/merchants/enchan_arm.txt @@ -52,7 +52,7 @@ prontera,165,60,2 script Apprentice Craftsman 1_F_MERCHANT_01,{ mes "[Apprentice Craftsman]"; mes "I'm not responsible for what would happen if you have more than one of the same kind in your inventory."; next; - switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) { + switch(select("Non Slotted Armor.", "Slotted Armor.", "High Grade Armor.", "Maybe next time.")) { case 1: setarray .@items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396; .@j = 50; @@ -96,7 +96,7 @@ S_EnchantArmor: mes "and Cards will be GONE.^000000"; mes "Do you still want to try an Enchant?"; next; - if(select("Hmm... Let me think it over.:Go ahead.") == 1) { + if(select("Hmm... Let me think it over.", "Go ahead.") == 1) { mes "[Apprentice Craftsman]"; mes "Well, I can't blame you. Safety first, eh?"; mes "Now you have a nice day."; diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index b114344a1..6028d9ddb 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -45,7 +45,7 @@ payon,173,238,5 script Jade#pay 4_M_SAGE_A,{ mes "change them to Gemstones"; mes "of a different color."; next; - switch(select("Blue Gemstones into Red ones!:Red Gemstones into Yellow ones!:Yellow Gemstones into Blue ones!")) { + switch(select("Blue Gemstones into Red ones!", "Red Gemstones into Yellow ones!", "Yellow Gemstones into Blue ones!")) { case 1: callsub S_TradeGems,717,716; case 2: callsub S_TradeGems,716,715; case 3: callsub S_TradeGems,715,717; @@ -71,7 +71,7 @@ S_TradeGems: mes "that you currently have."; mes "What do you want to do?"; next; - switch(select("Give me as many as you can.:I want to set the amount.:I quit.")) { + switch(select("Give me as many as you can.", "I want to set the amount.", "I quit.")) { case 1: delitem getarg(0),.@gems * 2; getitem getarg(1),.@gems; diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt index 1a786b415..62916ac28 100644 --- a/npc/merchants/hair_dyer.txt +++ b/npc/merchants/hair_dyer.txt @@ -53,7 +53,7 @@ prt_in,243,168,4 script Jovovich 4_F_02,{ } next; while(1) { - switch(select("Dye Hair:Tips and Information:Cancel")) { + switch(select("Dye Hair", "Tips and Information", "Cancel")) { case 1: mes "[Hairdresser Jovovich]"; mes "Yes yes, good choice~"; @@ -64,7 +64,7 @@ prt_in,243,168,4 script Jovovich 4_F_02,{ mes "[Hairdresser Jovovich]"; mes "What do you think? Did you want a different color?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { mes "[Hairdresser Jovovich]"; mes "Okay! Choose the color that you would like."; next; @@ -77,7 +77,7 @@ prt_in,243,168,4 script Jovovich 4_F_02,{ } while(1) { - switch(select("Red, please.:Yellow, please.:Violet, please.:Orange, please.:Green, please.:Blue, please.:White, please.:Black, please.:Actually, I like my hair as it is.")) { + switch(select("Red, please.", "Yellow, please.", "Violet, please.", "Orange, please.", "Green, please.", "Blue, please.", "White, please.", "Black, please.", "Actually, I like my hair as it is.")) { case 1: .@headpalette = 8; break; case 2: .@headpalette = 1; break; case 3: .@headpalette = 2; break; @@ -194,7 +194,7 @@ lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{ } while (.@choose_success != 2) { next; - switch(select("Dye Hair:Coloring Information:Cancel")) { + switch(select("Dye Hair", "Coloring Information", "Cancel")) { case 1: mes "[Rossa]"; mes "Ho ho ho ho~"; @@ -209,7 +209,7 @@ lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{ mes "But would you like to"; mes "try a different one?"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes "[Rossa]"; mes "Please select"; @@ -228,7 +228,7 @@ lhz_in02,100,134,3 script Hair Dyer#lich 4_F_EINWOMAN,{ } } while (.@choose_success != 2) { - switch(select("Red, please.:Yellow, please.:Purple, please.:Orange, please.:Green, please.:Blue, please.:White, please.:Dark Brown, please.:I like my hair color.")) { + switch(select("Red, please.", "Yellow, please.", "Purple, please.", "Orange, please.", "Green, please.", "Blue, please.", "White, please.", "Dark Brown, please.", "I like my hair color.")) { case 1: .@headpalette = 8; break; diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index 2d61d02db..83db489ae 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -43,7 +43,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "Welcome to Veronica's hair salon."; mes "How can I help you?"; next; - switch(select("See available hair styles.:Change hair style.:End conversation.")) { + switch(select("See available hair styles.", "Change hair style.", "End conversation.")) { case 1: mes "[Veronica]"; mes "We have a total of 19 styles, available from no.1 to no.19."; @@ -437,7 +437,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "I shall proceed with your request."; mes "Would you mind?"; next; - if(select("No, I don't mind.:Yes, let me choose another one.") == 1) { + if(select("No, I don't mind.", "Yes, let me choose another one.") == 1) { if(getlook(6) == 0) { mes "[Veronica]"; mes "Oh, my, you haven't dyed your hair"; @@ -446,7 +446,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "Oh well, I will do it for free."; mes "So what kind of color would you like?"; next; - switch(select("Red.:Yellow.:Purple.:Orange.:Green.:Blue.:White.:Dark Brown.:Cancel.")) { + switch(select("Red.", "Yellow.", "Purple.", "Orange.", "Green.", "Blue.", "White.", "Dark Brown.", "Cancel.")) { case 1: .@pallete = 8; break; @@ -558,7 +558,7 @@ alberta,33,141,7 script Roving Hair Dresser 4_M_BARBER,{ mes "waiting to be transformed into"; mes "works of magnificent art~!"; next; - switch(select("What are you?:Do my hair, please!:.....")) { + switch(select("What are you?", "Do my hair, please!", ".....")) { case 1: mes "[Rui Vishop]"; mes "Do you not know that I, Rui"; @@ -658,7 +658,7 @@ alberta,33,141,7 script Roving Hair Dresser 4_M_BARBER,{ mes "stupid hair dresser to"; mes "do her clumsy work on you..."; next; - if(select("No, please do my hair.:Umm, I changed my mind.") ==1 ) { + if(select("No, please do my hair.", "Umm, I changed my mind.") ==1 ) { mes "[Rui Vishop]"; mes "O~k~a~y!"; mes "Now, let us begin~!"; @@ -713,7 +713,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "shy, tell me exactly how you"; mes "want me to make you glamorous~"; next; - switch(select("Check all hairstyles:Change hairstyle:Cancel")) { + switch(select("Check all hairstyles", "Change hairstyle", "Cancel")) { case 1: mes "[Prince Shammi]"; mes "Oh, would you like to"; @@ -723,10 +723,10 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "[Prince Shammi]"; mes "Please, oh please, choose from the following styles and I will show you a preview."; next; - switch(select("Old Hairstyles:New Hairstyles")) { + switch(select("Old Hairstyles", "New Hairstyles")) { case 1: if (Sex == 1) { - switch(select("Petite Style:Executioner Style:Prince Style:Deviace Style:Cancel")) { + switch(select("Petite Style", "Executioner Style", "Prince Style", "Deviace Style", "Cancel")) { case 1: cutin "hair_m_20",4; mes "[Prince Shammi]"; @@ -777,7 +777,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ } } else { - switch(select("Spring Rabbit Style:Harpy Style:Medusa Style:Isis Style:Cancel")) { + switch(select("Spring Rabbit Style", "Harpy Style", "Medusa Style", "Isis Style", "Cancel")) { case 1: cutin "hair_f_20",4; mes "[Prince Shammi]"; @@ -831,7 +831,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ break; case 2: if (Sex == 1) { - switch(select("Emergency Heal Perm:Aura Blade Cut:Power Swing:Renovatio Cut:Cancel")) { + switch(select("Emergency Heal Perm", "Aura Blade Cut", "Power Swing", "Renovatio Cut", "Cancel")) { case 1: cutin "hair_m_24",4; mes "[Prince Shammi]"; @@ -870,7 +870,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ } } else { - switch(select("Assumptio Perm:Soul Changer Cut:X Tornado Cut:Oratio Cut:Cancel")) { + switch(select("Assumptio Perm", "Soul Changer Cut", "X Tornado Cut", "Oratio Cut", "Cancel")) { case 1: cutin "hair_f_24",4; mes "[Prince Shammi]"; @@ -1015,7 +1015,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "hairstyle that you wanted?"; mes "This is No. "+.@input+", by the way."; next; - switch(select("Yes.:No.")) { + switch(select("Yes.", "No.")) { case 1: if (getlook(LOOK_HAIR_COLOR) == 0) { mes "[Prince Shammi]"; @@ -1026,7 +1026,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "a part of my service, so"; mes "please choose a color~"; next; - switch(select("Red:Yellow:Purple:Orange:Green:Blue:White:Dark Brown")) { + switch(select("Red", "Yellow", "Purple", "Orange", "Green", "Blue", "White", "Dark Brown")) { case 1: .@headpalette = 8; break; @@ -1130,7 +1130,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "H-h-h-h-h-hello! Can"; mes "I help you with anything?"; next; - switch(select("What do you do?:Please change my hairstyle.:Who is Prince Shammi?")) { + switch(select("What do you do?", "Please change my hairstyle.", "Who is Prince Shammi?")) { case 1: mes "[Assistant Beautician]"; mes "Oh! Me...? I'm"; @@ -1191,7 +1191,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "up for the material expenses."; mes "Is that okay with you?"; next; - switch(select("Of course~:On second thought...")) { + switch(select("Of course~", "On second thought...")) { case 1: mes "[Assistant Beautician]"; mes "Great! Now, please"; @@ -1234,7 +1234,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ cutin "hair_f_"+.@input+".BMP",4; } next; - switch(select("Yes, let's try it~:Cancel.")) { + switch(select("Yes, let's try it~", "Cancel.")) { case 1: break; case 2: diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt index e1a9bae7e..a7fc5e922 100644 --- a/npc/merchants/hd_refine.txt +++ b/npc/merchants/hd_refine.txt @@ -120,7 +120,7 @@ mes "In order to refine the gear you selected you need ^ff9999"+getitemname(.@material)+"^000000 and 20,000 zeny as a fee."; mes "Do you have them ready?"; next; - if(select("Yes:No") == 2) { + if(select("Yes", "No") == 2) { mes "[Blacksmith Mighty Hammer]"; mes "I will wait until you are ready."; close; @@ -131,7 +131,7 @@ mes "Well, even if it fails, it only decreases by 1 refine level."; mes "Would you like to continue refining?"; next; - if(select("Yes:No") == 2) { + if(select("Yes", "No") == 2) { mes "[Blacksmith Mighty Hammer]"; mes "Only those who overcome fear of failure will obtain a masterpiece."; close; @@ -266,7 +266,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF mes "To refine this equipment, I need 1 ^ff9999"+getitemname(.@material)+"^000000 and 100,000 zeny as a fee."; mes "Do you really want to refine this?"; next; - if(select("Yes:No") == 2) { + if(select("Yes", "No") == 2) { mes "[Basta]"; mes "Okay. If that's what you want..."; close; @@ -285,7 +285,7 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF mes "Compared to other blacksmiths, the risk is smaller."; mes "I've given all precautions. Do you want to try it?"; next; - if(select("Yes:No") == 2) { + if(select("Yes", "No") == 2) { mes "[Basta]"; mes "Well~"; mes "Not challenging at all could also be a kind of wisdom in life."; diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index f1ad519d9..14f83b2a0 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -42,7 +42,7 @@ mes "^3355FF100 Zeny^000000 Ice Cream,"; mes "Ice Cream!"; next; - if(select("Gimme Ice Cream!:Cancel Trade") == 2) { + if(select("Gimme Ice Cream!", "Cancel Trade") == 2) { mes "Are you sure you don't want any?"; mes "I won't be selling it for long,"; mes "and once I run out,"; diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt index a3da896cf..07ccf5358 100644 --- a/npc/merchants/inn.txt +++ b/npc/merchants/inn.txt @@ -115,7 +115,7 @@ lhz_in02,230,284,4 script Hotel Employee#01 4_M_04,{ mes "finest accomodations"; mes "and the best service."; next; - switch(select("Save Point:Rest - 5,000 zeny:Cancel")) { + switch(select("Save Point", "Rest - 5,000 zeny", "Cancel")) { case 1: savepoint "lhz_in02",209,275; mes "[Hotel Employee]"; @@ -166,7 +166,7 @@ ve_in,157,219,5 script Inn Master#Receptionist 4_M_SEAMAN,{ mes "most comfortable"; mes "inn here in Veins~"; next; - switch(select("Save:Take a Rest -> 5000 zeny:Quit")) { + switch(select("Save", "Take a Rest -> 5000 zeny", "Quit")) { case 1: mes "[Inn Master]"; mes "Your Respawn Point"; @@ -209,7 +209,7 @@ function script F_InnMaid { mes getarg(1) + "."; mes "How may I help you?"; next; - switch(select("Save:Take a Rest -> 5000 zeny:Cancel")) { + switch(select("Save", "Take a Rest -> 5000 zeny", "Cancel")) { case 1: mes getarg(0); mes "Your respawn point"; diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 5be824f85..06a2f8bdb 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -47,7 +47,7 @@ que_ng,72,29,3 script Kunai Merchant Kashin 4_M_01,{ mes "know if you're interested"; mes "in any of my wares."; next; - switch(select("10 Fell Poison Kunai:10 Icicle Kunai:10 High Wind Kunai:10 Black Earth Kunai:10 Heat Wave Kunai:Cancel")) { + switch(select("10 Fell Poison Kunai", "10 Icicle Kunai", "10 High Wind Kunai", "10 Black Earth Kunai", "10 Heat Wave Kunai", "Cancel")) { case 1: callfunc "Kunai_Trade",13250,20,7524,1,13259; break; case 2: callfunc "Kunai_Trade",13251,8,7522,2,13255; break; case 3: callfunc "Kunai_Trade",13252,4,7523,2,13257; break; diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt index d4f48fe4d..ff87c68d5 100644 --- a/npc/merchants/milk_trader.txt +++ b/npc/merchants/milk_trader.txt @@ -52,7 +52,7 @@ prontera,73,140,0 script Milk Vendor 4_M_04,{ mes "them for 1 Milk. How"; mes "does that sound?"; next; - if (select("Exchange all empty bottles.:Cancel") == 1) { + if (select("Exchange all empty bottles.", "Cancel") == 1) { if (countitem(Empty_Bottle) <= 0) { mes "[Milk Vendor]"; mes "Hey..."; diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index d23961554..c27fc6570 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -58,14 +58,14 @@ prontera,123,102,5 script Merchant#pron 4_M_03,{ mes "to give me that stuff for free. What about if I trade a Red Potion for 5 Shells, 10 Fluff,"; mes "or 10 Jellopies?"; next; - switch(select("Sure!:I think it's a rip-off!:No, thanks.")) { + switch(select("Sure!", "I think it's a rip-off!", "No, thanks.")) { case 1: mes "[Merchant]"; mes "So which item do"; mes "you want to bring me?"; mes "Shells, Fluffs, or Jellopies?"; next; - switch(select("Shells:Jellopies:Fluff:Cancel")) { + switch(select("Shells", "Jellopies", "Fluff", "Cancel")) { case 1: callfunc "F_PotExchange",935,5; case 2: callfunc "F_PotExchange",909,10; case 3: callfunc "F_PotExchange",914,10; @@ -114,7 +114,7 @@ morocc,180,259,3 script Merchant#morroc 4_M_03,{ mes "to give me that stuff for free. What about if I trade a Red Potion for 5 Shells, 7 Feathers of Bird"; mes "or 10 Jellopies?"; next; - switch(select("Sure!:I think it's a rip-off!:No, thanks.")) { + switch(select("Sure!", "I think it's a rip-off!", "No, thanks.")) { case 1: mes "[Merchant]"; mes "So which item do"; @@ -122,7 +122,7 @@ morocc,180,259,3 script Merchant#morroc 4_M_03,{ mes "Shells, Feathers of Birds,"; mes "or Jellopies?"; next; - switch(select("Shells:Feathers of Birds:Jellopies:Cancel")) { + switch(select("Shells", "Feathers of Birds", "Jellopies", "Cancel")) { case 1: callfunc "F_PotExchange",935,5; case 2: callfunc "F_PotExchange",916,7; case 3: callfunc "F_PotExchange",909,10; @@ -170,14 +170,14 @@ payon,200,134,5 script Merchant#pay 4_M_03,{ mes "Of course, I won't ask you"; mes "to give me that stuff for free. What about if I trade a Red Potion for 6 Tree Roots or 10 Jellopies?"; next; - switch(select("Sure!:I think it's a rip-off!:No, thanks.")) { + switch(select("Sure!", "I think it's a rip-off!", "No, thanks.")) { case 1: mes "[Merchant]"; mes "So which item do"; mes "you want to bring me?"; mes "Tree Roots, or Jellopies?"; next; - switch(select("Tree Roots:Jellopies:Cancel")) { + switch(select("Tree Roots", "Jellopies", "Cancel")) { case 1: callfunc "F_PotExchange",902,6; case 2: callfunc "F_PotExchange",909,10; case 3: @@ -224,7 +224,7 @@ aldebaran,152,63,5 script Merchant#alde 4_M_03,{ mes "Of course, I won't ask you"; mes "to give me that stuff for free. What about if I trade a Red Potion for 1 Worm Peeling, 7 Feather of Birds, or 10 Jellopies?"; next; - switch(select("Sure!:I think it's a rip-off!:No, thanks.")) { + switch(select("Sure!", "I think it's a rip-off!", "No, thanks.")) { case 1: mes "[Merchant]"; mes "So which item do"; @@ -233,7 +233,7 @@ aldebaran,152,63,5 script Merchant#alde 4_M_03,{ mes "Worm Peelings?"; mes "Or Jellopies?"; next; - switch(select("Worm Peelings:Feathers of Birds:Jellopies:Cancel")) { + switch(select("Worm Peelings", "Feathers of Birds", "Jellopies", "Cancel")) { case 1: callfunc "F_PotExchange",955,1; case 2: callfunc "F_PotExchange",916,7; case 3: callfunc "F_PotExchange",909,10; @@ -281,14 +281,14 @@ geffen,173,88,5 script Merchant#geff 4_M_03,{ mes "Of course, I won't ask you"; mes "to give me that stuff for free. What about if I trade a Red Potion for 5 Shells or 6 Chrysalises, or 10 Jellopies?"; next; - switch(select("Sure!:I think it's a rip-off!:No, thanks.")) { + switch(select("Sure!", "I think it's a rip-off!", "No, thanks.")) { case 1: mes "[Merchant]"; mes "So which item do"; mes "you want to bring me?"; mes "Shells, Chrysalises, or Jellopies?"; next; - switch(select("Shells:Chrysalises:Jellopies:Cancel")) { + switch(select("Shells", "Chrysalises", "Jellopies", "Cancel")) { case 1: callfunc "F_PotExchange",935,5; case 2: callfunc "F_PotExchange",915,6; case 3: callfunc "F_PotExchange",909,10; @@ -340,7 +340,7 @@ function script F_PotExchange { mes "What do you say?"; mes "Do we have a deal?"; next; - if (select("Deal.:No deal.") == 1) { + if (select("Deal.", "No deal.") == 1) { mes "[Merchant]"; mes "You know the exact"; mes "number of Red Potions"; diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index 37069f166..0cbbeda6d 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -47,7 +47,7 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ mes "[Old Pharmacist]"; mes "Ummmm..."; mes "What brings you here...?"; - switch(select("Make Potion:Talk.:Mixing Information:Cancel")) { + switch(select("Make Potion", "Talk.", "Mixing Information", "Cancel")) { case 1: next; if (MaxWeight - Weight < 5000) { @@ -62,7 +62,7 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ } else { mes "[Old Pharmacist]"; mes "You have all the stuff ready, right? Which one would you like?"; - switch(select("Red Potion.:Orange Potion.:Yellow Potion.:White Potion.:Blue Potion.:Green Potion.:Actually, I don't want anything.")) { + switch(select("Red Potion.", "Orange Potion.", "Yellow Potion.", "White Potion.", "Blue Potion.", "Green Potion.", "Actually, I don't want anything.")) { case 1: callsub L_Making,507,3,501; case 2: @@ -88,7 +88,7 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ close; } mes "How many?"; - switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) { + switch(select("Make as many as I can.", "I want to choose an amount.", "Actually, I don't want anything.")) { case 1: next; if ((countitem(Red_Herb) < .@max) || (countitem(Yellow_Herb) < .@max) || (countitem(Empty_Bottle) < .@max) || (Zeny < .@max*3)) { @@ -218,7 +218,7 @@ L_Making: close; } mes "How many?"; - switch(select("Make as many as I can.:I want to choose an amount.:Actually, I don't want anything.")) { + switch(select("Make as many as I can.", "I want to choose an amount.", "Actually, I don't want anything.")) { case 1: next; if ((countitem(getarg(0)) < .@max*2) || (countitem(Empty_Bottle) < .@max) || (Zeny < .@max*getarg(1))) { diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt index 98b35b08f..bf9de37a6 100644 --- a/npc/merchants/quivers.txt +++ b/npc/merchants/quivers.txt @@ -61,7 +61,7 @@ payon_in01,5,134,5 script Inventor Jaax 4_M_ORIENT02,{ mes "[Inventor Jaax]"; mes "Would you like to try using one of my arrow quivers? I have no doubt that someone like you can appreciate my genius!"; next; - switch(select("Quiver:Iron Arrow Quiver:Steel Arrow Quiver:Oridecon Arrow Quiver:Fire Arrow Quiver:Silver Arrow Quiver:Wind Arrow Quiver:Stone Arrow Quiver:Crystal Arrow Quiver:Shadow Arrow Quiver:Immaterial Arrow Quiver:Rusty Arrow Quiver")) { + switch(select("Quiver", "Iron Arrow Quiver", "Steel Arrow Quiver", "Oridecon Arrow Quiver", "Fire Arrow Quiver", "Silver Arrow Quiver", "Wind Arrow Quiver", "Stone Arrow Quiver", "Crystal Arrow Quiver", "Shadow Arrow Quiver", "Immaterial Arrow Quiver", "Rusty Arrow Quiver")) { case 1: callsub S_BuyQuiver,1750,500,500,12004; case 2: callsub S_BuyQuiver,1770,500,500,12005; case 3: callsub S_BuyQuiver,1753,500,500,12006; @@ -92,7 +92,7 @@ S_BuyQuiver: mes "Excellent!"; mes "Are you carrying any Arrows with you? I'll provide you with a quiver that can carry "+getarg(1)+" of your "+getitemname(getarg(0))+"s for only ^FF3131"+getarg(2)+" Zeny^000000."; next; - switch(select("Store as many Arrows in quivers as possible:Purchase 1 quiver:Cancel")) { + switch(select("Store as many Arrows in quivers as possible", "Purchase 1 quiver", "Cancel")) { case 1: .@arrows = countitem(getarg(0)); .@quiver = .@arrows / getarg(1); @@ -111,7 +111,7 @@ S_BuyQuiver: mes "as you can for the Arrows"; mes "you are currently carrying?"; next; - if (select("Yes:Cancel") == 1) { + if (select("Yes", "Cancel") == 1) { if (.@arrow_zeny01 < Zeny) { mes "[Inventor Jaax]"; mes "There you go!"; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 36574b2b5..9fb1d70c3 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -59,12 +59,12 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ mes "Welcome to Christopher's Workshop. Ye can get all yer stuff for forging here. What business"; mes "brings ye to me?"; next; - switch(select("Purchase Anvil:Purchase Forging Item:Purchase Metal:Purify Rough Ores:Cancel")) { + switch(select("Purchase Anvil", "Purchase Forging Item", "Purchase Metal", "Purify Rough Ores", "Cancel")) { case 1: mes "[Christopher Guillenrow]"; mes "A better Anvil gives ye a greeeater chance to make better weapons, ye know? But they'll cost ye more zeny. Just get it off yer chest and buy what fits your purposes best, laddy."; next; - switch(select("Anvil - 30,000 zeny:Oridecon Anvil - 120,000 zeny:Golden Anvil - 300,000 zeny:Better Anvil than the others.:Cancel.")) { + switch(select("Anvil - 30,000 zeny", "Oridecon Anvil - 120,000 zeny", "Golden Anvil - 300,000 zeny", "Better Anvil than the others.", "Cancel.")) { case 1: if (Zeny < 30000) { mes "[Christopher Guillenrow]"; @@ -114,7 +114,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ mes "[Christopher Guillenrow]"; mes "A respectable blacksmith uses fine tools. Ye can become one o'those with me Stuff. Choose anything ye want."; next; - switch(select("Mini-Furnace - 150 zeny:Iron Hammer - 1000 zeny:Golden Hammer - 3000 zeny:Oridecon Hammer - 5000 zeny:Cancel.")) { + switch(select("Mini-Furnace - 150 zeny", "Iron Hammer - 1000 zeny", "Golden Hammer - 3000 zeny", "Oridecon Hammer - 5000 zeny", "Cancel.")) { case 1: mes "[Christopher Guillenrow]"; mes "It's a much needed tool fer refining metal! So, How many do ye wish to buy? If ye want to quit, just type the number '0.'"; @@ -193,7 +193,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ mes "[Christopher Guillenrow]"; mes "I prepare every Metal, and only the high quality ones o'course. Now then, which one do ye need?"; next; - switch(select("Phracon - 200z.:Emveretarcon - 1000z.:Cancel.")) { + switch(select("Phracon - 200z.", "Emveretarcon - 1000z.", "Cancel.")) { case 1: mes "[Christopher Guillenrow]"; mes "So, How many do ye wish to buy? If ye dont want anything, just type the number as '0.'"; @@ -279,7 +279,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ mes "[Christopher Guillenrow]"; mes "I can purify yer Oridecon and Elunium. I make a refined Ore out of 5 o'each rough ones. Well... Which one do ye want to make?"; next; - switch(select("Make Oridecon:Make Elunium:Cancel.")) { + switch(select("Make Oridecon", "Make Elunium", "Cancel.")) { case 1: if (countitem(Oridecon_Stone) < 5) { mes "[Christopher Guillenrow]"; @@ -333,13 +333,13 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ mes "In my shop, you will find everything that you need in forging."; mes "Tell me what you need."; next; - switch(select("Purchase Anvil.:Purchase Forging Items.:Purchase Metal.:Process Ores.:Quit.")) { + switch(select("Purchase Anvil.", "Purchase Forging Items.", "Purchase Metal.", "Process Ores.", "Quit.")) { case 1: mes "[Paul Spanner]"; mes "Anvil is the most necessary item for Blacksmiths."; mes "Since you will use an Anvil more than once, you'd better buy a nice one."; next; - switch(select("Anvil - 30,000z.:Oridecon Anvil - 120,000z.:Golden Anvil - 300,000z.:I need a better anvil.:Cancel.")) { + switch(select("Anvil - 30,000z.", "Oridecon Anvil - 120,000z.", "Golden Anvil - 300,000z.", "I need a better anvil.", "Cancel.")) { case 1: if (Zeny < 30000) { mes "[Paul Spanner]"; @@ -391,7 +391,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ mes "You need various materials to process ores and to forge weapons."; mes "I have everything that you need. Take a look."; next; - switch(select("Mini Furnace - 150z.:Iron Hammer - 1,000z.:Golden Hammer - 3,000z.:Oridecon Hammer - 5,000z.:Cancel.")) { + switch(select("Mini Furnace - 150z.", "Iron Hammer - 1,000z.", "Golden Hammer - 3,000z.", "Oridecon Hammer - 5,000z.", "Cancel.")) { case 1: .@item = 612; .@item_cost = 150; @@ -460,7 +460,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ mes "I have high quality metal."; mes "So, which metal would you like to buy?"; next; - switch(select("Phracon - 200z.:Emveretarcon - 1,000z.:Quit.")) { + switch(select("Phracon - 200z.", "Emveretarcon - 1,000z.", "Quit.")) { case 1: .@item = 1010; .@item_price = 200; @@ -514,7 +514,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ mes "I can process Oridecon and Elunium for you."; mes "You need 5 ores to process them into one Oridecon or Elunium."; mes "So, which one do you want to process?"; - switch(select("Oridecon:Elunium:Quit.")) { + switch(select("Oridecon", "Elunium", "Quit.")) { case 1: if (countitem(Oridecon_Stone) < 5) { mes "[Paul Spanner]"; @@ -677,7 +677,7 @@ function script refinemain { mes "a service fee of " + .@price + " Zeny."; mes "Do you really wish to continue?"; next; - if(select("Yes:No") == 2){ + if(select("Yes", "No") == 2){ mes "[" + getarg(0) + "]"; mes "Yeah..."; mes "There's no need to"; @@ -706,7 +706,7 @@ function script refinemain { mes "^FF0000lose this weapon^000000 forever."; mes "Do you still want to refine?"; next; - if(select("Yes:No") == 2){ + if(select("Yes", "No") == 2){ mes "[" + getarg(0) + "]"; mes "I completely agree..."; mes "I might be a great refiner, but sometimes even I make mistakes."; @@ -928,7 +928,7 @@ function script phramain { mes "Weapons, and ^007777Emveretarcon^000000"; mes "for Level 2 Weapons."; next; - switch(select("Phracon - 200 Zeny:Emveretarcon - 1000 Zeny:Ask about other Metals")) { + switch(select("Phracon - 200 Zeny", "Emveretarcon - 1000 Zeny", "Ask about other Metals")) { case 1: .@material = 1010; .@price = 200; @@ -1039,7 +1039,7 @@ function script orimain { mes "5 Rough Stones to make"; mes "1 pure one for you."; next; - switch(select("Make Oridecon:Make Elunium:Ask about Enchanted Stones")) { + switch(select("Make Oridecon", "Make Elunium", "Ask about Enchanted Stones")) { case 1: if (countitem(Oridecon_Stone) > 4) { delitem Oridecon_Stone,5; @@ -1171,7 +1171,7 @@ function script repairmain { mes "You can count on me"; mes "for item repairs!"; next; - switch(select("Actually, I do have some items...:None at the moment.")) { + switch(select("Actually, I do have some items...", "None at the moment.")) { case 1: .@checkitem = 1; while (1) { @@ -1201,7 +1201,7 @@ function script repairmain { mes "["+getarg(0)+"]"; mes "Each repair costs " + .@repairprice + " Zeny. So to repair all your damaged items would cost " + .@totalcost + " Zeny! Would you like to repair the items?"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: if (Zeny < .@totalcost) { mes "["+getarg(0)+"]"; diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index d3447b2b1..93e8b2661 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -54,7 +54,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ mes "a Peco Peco? The rental"; mes "fee is "+.@price+" zeny."; next; - switch(select("Rent Peco Peco:Cancel")) { + switch(select("Rent Peco Peco", "Cancel")) { case 1: if (Zeny < .@price) { mes "[Peco Peco Breeder]"; @@ -117,7 +117,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ mes "for you. To rent one"; mes "will cost "+.@price+" zeny."; next; - switch(select("Rent a PecoPeco:Quit")) { + switch(select("Rent a PecoPeco", "Quit")) { case 1: if (Zeny < .@price) { mes "[Peco Peco Breeder]"; @@ -182,7 +182,7 @@ hu_in01,381,304,5 script Falcon Breeder#hnt 8W_SOLDIER,{ mes "trusty bird of prey for a"; mes "fee of just "+.@price+" zeny~"; next; - switch(select("Rent Falcon:Cancel")) { + switch(select("Rent Falcon", "Cancel")) { case 1: if (checkoption(Option_Wug) || checkoption(Option_Wugrider)) { mes "[Falcon Breeder]"; diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 8b2a3275b..db8b69feb 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -61,7 +61,7 @@ mes "Adding Slots may seem simple, but it's far more complicated than it looks."; mes "If you're interested in my service, let me know."; next; - switch(select("Add Slot to Weapon:Add Slot to Armor:Slot Attempt Info:Cancel")) + switch(select("Add Slot to Weapon", "Add Slot to Armor", "Slot Attempt Info", "Cancel")) { case 1: mes "[Seiyablem]"; @@ -69,14 +69,14 @@ mes "I categorize weapons by their difficulty in adding a Slot, C Class being easiest and S Class the most difficult."; mes "Which class would you like to try?"; next; - switch(select("C Class:B Class:A Class:S Class")) + switch(select("C Class", "B Class", "A Class", "S Class")) { case 1: mes "[Seiyablem]"; mes "C Class, eh?"; mes "Now, I can only upgrade certain equipment in that class, so please choose one of the following items, so we can try to add a Slot to it."; next; - switch(select("Trident:Rope:Violin")) + switch(select("Trident", "Rope", "Violin")) { case 1: callfunc "Func_Socket",1460,1461,40,66,200,1010,10; case 2: callfunc "Func_Socket",1950,1951,40,66,200,1010,10; @@ -88,7 +88,7 @@ mes "Alright, this is the average equipment category."; mes "Please choose the weapon to which you'd like me to try to add a Slot."; next; - switch(select("Chain:Gladius:Gakkung Bow:Pike:Haedonggum:Lute:Wire:Waghnakh:Arbalest Bow")) + switch(select("Chain", "Gladius", "Gakkung Bow", "Pike", "Haedonggum", "Lute", "Wire", "Waghnakh", "Arbalest Bow")) { case 1: callfunc "Func_Socket",1519,1520,40,61,300,1010,10; case 2: callfunc "Func_Socket",1219,1220,40,61,300, 984, 1,999,5; @@ -106,7 +106,7 @@ mes "This is some high risk territory!"; mes "Alright, which weapon would you like me to try adding a Slot?"; next; - switch(select("Hunter Bow:Survivor's Rod(INT):Zweihander:Flamberge:Infiltrator:Ballista:Stunner:Berserk:Claymore")) + switch(select("Hunter Bow", "Survivor's Rod(INT)", "Zweihander", "Flamberge", "Infiltrator", "Ballista", "Stunner", "Berserk", "Claymore")) { case 1: callfunc "Func_Socket",1718,1726,40,61,500,984,2,999,10; case 2: callfunc "Func_Socket",1619,1620,40,61,500,984,5,999,10; @@ -125,7 +125,7 @@ mes "It'd be a near miracle if I can actually pull this off."; mes "Okay... Which weapon shall we try adding a Slot to?"; next; - switch(select("Gungnir:Poison Knife:Ice Pick:Sucsamad:Ginnungagap:Cutlas:Crescent Scythe:Survivor's Rod(DEX)")) + switch(select("Gungnir", "Poison Knife", "Ice Pick", "Sucsamad", "Ginnungagap", "Cutlas", "Crescent Scythe", "Survivor's Rod(DEX)")) { case 1: callfunc "Func_Socket", 1413, 1418,40,51,1000,984,5,999,10; case 2: callfunc "Func_Socket", 1239,13016,40,51,1000,984,5,999,10; @@ -145,7 +145,7 @@ mes "C Class is the easiest one, and S Class he hardest one."; mes "Which class would you like to try?"; next; - switch(select("C Class:B Class:A Class:S Class")) + switch(select("C Class", "B Class", "A Class", "S Class")) { case 1: mes "[Seiyablem]"; @@ -153,7 +153,7 @@ mes "Sounds reasonable."; mes "Which armor would you like to try adding a Slot?"; next; - switch(select("Mantle:Coat:Circlet:Biretta")) + switch(select("Mantle", "Coat", "Circlet", "Biretta")) { case 1: callfunc "Func_Socket",2307,2308,40,66,200,999,3; case 2: callfunc "Func_Socket",2309,2310,40,66,200,999,3; @@ -165,7 +165,7 @@ mes "You have chosen average B Class."; mes "So, what kind of armor do you have?"; next; - switch(select("Mirror Shield:Chain Mail:Saint Robe:Silk Robe:Boots:Shoes:Muffler:Guard:Buckler:Shield:Bongun Hat")) + switch(select("Mirror Shield", "Chain Mail", "Saint Robe", "Silk Robe", "Boots", "Shoes", "Muffler", "Guard", "Buckler", "Shield", "Bongun Hat")) { case 1: callfunc "Func_Socket",2107,2108,40,61,250,999,5; case 2: callfunc "Func_Socket",2314,2315,40,61,250,999,5; @@ -185,7 +185,7 @@ mes "This is some high risk territory!"; mes "Alright, which armor would you like me to try adding a Slot?"; next; - switch(select("Gemmed Sallet:Bucket Hat:Memory Book:Tights:Legion Plate Armor:Full Plate:Thief Clothes:Greaves:Coif:Manteau:Helm:Ninja Suit:Orc Helm:Ancient Cape:Monk Hat:Golden Gear:Brooch:Munak Hat")) + switch(select("Gemmed Sallet", "Bucket Hat", "Memory Book", "Tights", "Legion Plate Armor", "Full Plate", "Thief Clothes", "Greaves", "Coif", "Manteau", "Helm", "Ninja Suit", "Orc Helm", "Ancient Cape", "Monk Hat", "Golden Gear", "Brooch", "Munak Hat")) { case 1: callfunc "Func_Socket",2230,2231,40,61,400,985,1; case 2: callfunc "Func_Socket",5114,5120,40,61,400,985,1; @@ -212,7 +212,7 @@ mes "You sure about this?"; mes "Alright... Let me know the Armor to which you'd like to add a Slot, and I'll tell what I need to try it."; next; - switch(select("Majestic Goat:Spiky Band:Bone Helm:Corsair:Crown:Tiara:Sphinx Hat:Robe of Cast:Earring:Ring:Bow Thimble")) + switch(select("Majestic Goat", "Spiky Band", "Bone Helm", "Corsair", "Crown", "Tiara", "Sphinx Hat", "Robe of Cast", "Earring", "Ring", "Bow Thimble")) { case 1: callfunc "Func_Socket",2256,5160,40,51,2000,985,2; case 2: callfunc "Func_Socket",2258,5161,40,51,2000,985,2; @@ -287,7 +287,7 @@ function script Func_Socket { } mes "Do you still want to try to add a Slot?"; next; - switch(select("Attempt Slot Addition:Cancel")) + switch(select("Attempt Slot Addition", "Cancel")) { case 1: if ((Zeny >= getarg(4)*1000) && (countitem(getarg(5)) >= getarg(6)) && (countitem(getarg(7,512)) >= getarg(8,0)) && (countitem(getarg(0)) > 0)) // if there's no getarg(7) and getarg(8) provided, check itemcount against 0 (we still need a valid item ID though) diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index fc2c2d636..98d33b01c 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -83,7 +83,7 @@ mes "and the success chance all depend on"; mes "the specific item I'm working on."; next; - switch(select("Weapon:Armor:About that thing you skipped:More information:Quit")) + switch(select("Weapon", "Armor", "About that thing you skipped", "More information", "Quit")) { case 1: mes "[Leablem]"; @@ -93,14 +93,14 @@ mes "C class is the easiest one, and S class is the hardest one."; mes "Which class would you like to try?"; next; - switch(select("C:B:A:S")) + switch(select("C", "B", "A", "S")) { case 1: mes "[Leablem]"; mes "C class, I see."; mes "So, what kind of weapon do you have?"; next; - switch(select("Book of Mother Earth:Book of Billows:Book of Gust of Wind:Book of the Blazing Sun")) + switch(select("Book of Mother Earth", "Book of Billows", "Book of Gust of Wind", "Book of the Blazing Sun")) { case 1: callfunc "Func_Socket2",1554,1569,40,66,200,1010,10; case 2: callfunc "Func_Socket2",1553,1568,40,66,200,1010,10; @@ -112,7 +112,7 @@ mes "You have chosen average B class."; mes "So, what kind of weapon do you have?"; next; - switch(select("Orcish Axe:Scimiter:Spike")) + switch(select("Orcish Axe", "Scimiter", "Spike")) { case 1: callfunc "Func_Socket2",1304,1309,40,66,200,984,1; case 2: callfunc "Func_Socket2",1113,1114,40,66,200,984,1; @@ -123,7 +123,7 @@ mes "A class? You seem to want little too much. But, no problem."; mes "So, what kind of weapon do you have?"; next; - switch(select("Dragon Killer:Katar of Quaking:Katar of Raging Blaze:Katar of Frozen Icicle:Katar of Piercing Wind:Golden Mace:Oriental Lute:Queen's Whip:Spectral Spear:Gae Bolg:Schweizersabel")) + switch(select("Dragon Killer", "Katar of Quaking", "Katar of Raging Blaze", "Katar of Frozen Icicle", "Katar of Piercing Wind", "Golden Mace", "Oriental Lute", "Queen's Whip", "Spectral Spear", "Gae Bolg", "Schweizersabel")) { case 1: callfunc "Func_Socket2",13001,13030,40,61,500,984,2; case 2: callfunc "Func_Socket2", 1257, 1276,40,66,500,984,2; @@ -142,7 +142,7 @@ mes "Huh, S Class?! Oh my god, are you serious?*Tremble*"; mes "So...which S class weapon would you like to make a slot?!"; next; - switch(select("Zephyrus:Mailbreaker:Dragon Slayer:Swordbreaker:Assasin Dagger:Grand Cross:Executioner")) + switch(select("Zephyrus", "Mailbreaker", "Dragon Slayer", "Swordbreaker", "Assasin Dagger", "Grand Cross", "Executioner")) { case 1: callfunc "Func_Socket2",1468, 1481,40,51,1000,984,5,999,10; case 2: callfunc "Func_Socket2",1225,13032,40,51,1000,984,5,999,10; @@ -161,14 +161,14 @@ mes "C class is the easiest one, and S class is the hardest one."; mes "Which class would you like to try?"; next; - switch(select("C:B:A:S")) + switch(select("C", "B", "A", "S")) { case 1: mes "[Leablem]"; mes "C class, I see."; mes "So, what kind of armor do you have?"; next; - switch(select("Sunflower:Ph.D Hat:Big Ribbon:Boys Cap")) + switch(select("Sunflower", "Ph.D Hat", "Big Ribbon", "Boys Cap")) { case 1: callfunc "Func_Socket2",2253,5351,40,66,100,999,3; case 2: callfunc "Func_Socket2",5012,5347,40,66,100,999,3; @@ -180,7 +180,7 @@ mes "You have chosen average B class."; mes "So, what kind of armor do you have?"; next; - switch(select("Skull Ring:High Heels")) + switch(select("Skull Ring", "High Heels")) { case 1: callfunc "Func_Socket2",2609,2715,40,61,300,999,5; case 2: callfunc "Func_Socket2",2409,2432,40,61,300,999,5; @@ -190,7 +190,7 @@ mes "A class? You seem to want little too much. But, no problem."; mes "So, what kind of armor do you have?"; next; - switch (select("Pirate Bandana:Black Leather Boots"+(RENEWAL?":Special Ninja Suit":""))) { + switch (select("Pirate Bandana", "Black Leather Boots", (RENEWAL?"Special Ninja Suit": ""))) { case 1: callfunc "Func_Socket2",2287,5350,50,61,500,985,1; // 50,61 - it's not a typo case 2: callfunc "Func_Socket2",2425,2434,40,51,500,985,1; case 3: callfunc "Func_Socket2",15053,15056,50,61,500,985,1; @@ -200,7 +200,7 @@ mes "Huh, S Class?! Oh my god, are you serious?*Tremble*"; mes "So...which S class armor would you like to make a slot?!"; next; - switch(select("Mage Coat:Holy Robe:Sacred Mission:Undershirt:Pantie")) + switch(select("Mage Coat", "Holy Robe", "Sacred Mission", "Undershirt", "Pantie")) { case 1: callfunc "Func_Socket2",2334,2372,40,51,1000,985,1; // Mage Coat has 10% success chance case 2: callfunc "Func_Socket2",2327,2373,45,51,1000,985,1; // the rest has 5% @@ -429,7 +429,7 @@ function script Func_Socket2 { mes "Also remember, if the " + (getiteminfo(getarg(0),5)&2 ? "weapon" : "armor") + " has been upgraded, and has been inserted with a card,"; mes "you will lose them even if you succeed in creating a slot."; next; - switch(select("Ask for slot creation.:Try next time.")) + switch(select("Ask for slot creation.", "Try next time.")) { case 1: if ((Zeny >= getarg(4)*1000) && (countitem(getarg(5)) >= getarg(6)) && (countitem(getarg(7,512)) >= getarg(8,0)) && (countitem(getarg(0)) > 0)) // if there's no getarg(7) and getarg(8) provided, check itemcount against 0 (we still need a valid item ID though) diff --git a/npc/merchants/wander_pet_food.txt b/npc/merchants/wander_pet_food.txt index 7db9f285a..598430932 100644 --- a/npc/merchants/wander_pet_food.txt +++ b/npc/merchants/wander_pet_food.txt @@ -49,7 +49,7 @@ prontera,218,218,3 script Pet Enthusiast 4W_KID,{ mes "[Pet Enthusiast Jenny]"; mes "Do you have any food that you are looking for?"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: if ((countitem(Broken_Wine_Vessel) > 19) && (countitem(Alchol) > 0)) { mes "[Pet Enthusiast Jenny]"; @@ -57,7 +57,7 @@ prontera,218,218,3 script Pet Enthusiast 4W_KID,{ mes "Do you want to exchange them for"; mes "^ff000020 Spirit Liquor^000000 for your Wanderer pet?"; next; - switch(select("Yes, please!:No thank you.")) { + switch(select("Yes, please!", "No thank you.")) { case 1: mes "[Pet Enthusiast Jenny]"; mes "Ok here you go then."; |