From a867e8d2bc9133290fc882e2f5345f635ad020d7 Mon Sep 17 00:00:00 2001 From: Emistry Haoyan Date: Sun, 16 Jun 2019 18:44:45 +0800 Subject: [PATCH] Update min value of *input script command. - avoid potential hacks for old scripts that use `input()` script commands. --- npc/airports/airships.txt | 6 +-- npc/cities/alberta.txt | 4 +- npc/cities/aldebaran.txt | 2 +- npc/cities/geffen.txt | 6 +-- npc/cities/lighthalzen.txt | 2 +- npc/custom/etc/bank.txt | 4 +- npc/custom/etc/bank_kafra.txt | 4 +- npc/custom/etc/lottery.txt | 24 +++++----- npc/custom/etc/monster_arena.txt | 2 +- npc/custom/etc/quest_warper.txt | 34 +++++++------- npc/custom/etc/shifty_assassin.txt | 6 +-- npc/custom/etc/stock_market.txt | 6 +-- npc/custom/events/cluckers.txt | 4 +- npc/custom/events/disguise.txt | 6 +-- npc/custom/events/valentinesdayexp.txt | 4 +- npc/custom/stylist.txt | 2 +- npc/events/dumplingfestival.txt | 2 +- npc/events/easter_2008.txt | 4 +- npc/events/halloween_2006.txt | 2 +- npc/events/halloween_2009.txt | 2 +- npc/events/valentinesday.txt | 2 +- npc/events/valentinesday_2009.txt | 10 ++--- npc/events/whiteday.txt | 2 +- npc/instances/NydhoggsNest.txt | 2 +- npc/jobs/2-2/alchemist.txt | 62 +++++++++++++------------- npc/jobs/2-2/rogue.txt | 2 +- npc/kafras/dts_warper.txt | 16 +++---- npc/kafras/functions_kafras.txt | 4 +- npc/merchants/alchemist.txt | 2 +- npc/merchants/ammo_boxes.txt | 2 +- npc/merchants/ammo_dealer.txt | 2 +- npc/merchants/buying_shops.txt | 4 +- npc/merchants/gemstone.txt | 2 +- npc/merchants/hair_style.txt | 8 ++-- npc/merchants/icecream.txt | 2 +- npc/merchants/kunai_maker.txt | 2 +- npc/merchants/novice_exchange.txt | 2 +- npc/merchants/old_pharmacist.txt | 4 +- npc/merchants/refine.txt | 14 +++--- npc/other/arena/arena_point.txt | 2 +- npc/other/arena/arena_room.txt | 6 +-- npc/other/comodo_gambling.txt | 2 +- npc/other/fortune.txt | 2 +- npc/other/gm_npcs.txt | 2 +- npc/other/hugel_bingo.txt | 2 +- npc/other/mercenary_rent.txt | 2 +- npc/other/monster_race.txt | 4 +- npc/other/turbo_track.txt | 12 ++--- npc/pre-re/jobs/1-1/mage.txt | 8 ++-- npc/pre-re/jobs/1-1/merchant.txt | 2 +- npc/quests/cooking_quest.txt | 6 +-- npc/quests/juice_maker.txt | 2 +- npc/quests/quests_13_1.txt | 2 +- npc/quests/quests_airship.txt | 2 +- npc/quests/quests_geffen.txt | 2 +- npc/quests/quests_hugel.txt | 2 +- npc/quests/quests_lighthalzen.txt | 8 ++-- npc/quests/quests_louyang.txt | 2 +- npc/quests/quests_moscovia.txt | 10 ++--- npc/quests/quests_nameless.txt | 4 +- npc/quests/quests_umbala.txt | 6 +-- npc/quests/quests_veins.txt | 2 +- npc/quests/seals/god_global.txt | 4 +- npc/quests/thana_quest.txt | 2 +- npc/re/cities/brasilis.txt | 2 +- npc/re/cities/dewata.txt | 2 +- npc/re/cities/mora.txt | 2 +- npc/re/jobs/3-2/royal_guard.txt | 6 +-- npc/re/jobs/3-2/shadow_chaser.txt | 2 +- npc/re/jobs/novice/academy.txt | 6 +-- npc/re/merchants/3rd_trader.txt | 8 ++-- npc/re/merchants/alchemist.txt | 2 +- npc/re/merchants/catalog.txt | 2 +- npc/re/merchants/refine.txt | 2 +- npc/re/quests/eden/eden_iro.txt | 6 +-- npc/re/quests/eden/eden_quests.txt | 2 +- npc/re/quests/quests_brasilis.txt | 18 ++++---- npc/re/quests/quests_dicastes.txt | 2 +- npc/re/quests/quests_eclage.txt | 12 ++--- npc/re/quests/quests_malangdo.txt | 6 +-- npc/re/quests/quests_malaya.txt | 14 +++--- npc/re/woe-fe/invest_main.txt | 4 +- 82 files changed, 233 insertions(+), 233 deletions(-) diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 7bac19e21aa..693b02e0132 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -491,7 +491,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ " '0' to cancel your order."); next; while (1) { - input .@input; + input(.@input, 0); .@pay = .@input * 15; if (.@input == 0) { mes("[Fruitz]"); @@ -853,7 +853,7 @@ airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{ "'0' to cancel your order."); next; while (1) { - input .@input; + input(.@input, 0); .@pay = .@input * 15; if (.@input == 0) { mes("[Meltz]"); @@ -1329,7 +1329,7 @@ function script applegamble { "to cancel, please enter '0'."); next; while(1) { - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes(.@n$); mes("Changed your mind?"); diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index ed4be5438f1..2cf1554154c 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -347,7 +347,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "[Phelix]"; mes "I'm not giving you more then 100 at a time so don't bother, OK? If you don't want any, just say '0'."; mes "Right now, the most you can get is " + .@max + " but remember, 100 at most, you want to break my back?."; - input .@amount; + input(.@amount, 0); next; mes "[Phelix]"; if (.@amount <= 0) { @@ -396,7 +396,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ case 2: mes "[Phelix]"; mes "Right I'm not giving you more then 100 at a time so don't bother, okay? If you don't want any, just say '0'."; - input .@amount; + input(.@amount, 0); next; mes "[Phelix]"; if (.@amount == 0) { diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 57d4205df7e..41c0b4be25d 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -1200,7 +1200,7 @@ function script F_Lottery { mes "[Kafra]"; mes "How many times do you want the Lottery Machine to spin? You can choose up to 5 times."; next; - input @input; + input(@input, 0); if(@input < 1 || @input > 5) @input = rand(1,5); //Lupus's fix callsub sF_Spin; mes "[Kafra]"; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 7f299dfa242..383165a2320 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -274,7 +274,7 @@ OnTouch: mes "them at a time."; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Suspicious Guy]"; if (Sex == SEX_MALE) @@ -344,7 +344,7 @@ OnTouch: mes "There's no way you can pass this up! Now, how many do you want?"; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Suspicious Guy]"; mes "Man, how many chances of a lifetime have you passed up? Man, I hope you win the lottery..."; @@ -398,7 +398,7 @@ OnTouch: mes "Clearly, this is the deal of the century. So how many do you want?"; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Suspicious Guy]"; mes "Awww..."; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 3cbe900c38e..18a6e39a96c 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -561,7 +561,7 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{ mes "starving children. If you wish"; mes "to cancel, please enter ''0.''"; next; - input .@input; + input(.@input, 0); if (.@input > 30000 || .@input < 0) { mes "[Lucius]"; mes "Please enter a value"; diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt index c5bed187bb6..cfd9d2f71a6 100644 --- a/npc/custom/etc/bank.txt +++ b/npc/custom/etc/bank.txt @@ -28,7 +28,7 @@ switch(select("I'd like to make a deposit.", "I'd like to make a withdrawl.", "W mes "Oh, and do realize there is a " +@cost + " Zeny charge on all transactions!"; next; } - input @deposit; + input(@deposit, 0); if (@deposit < 1) { mes "Make sure you ask me to deposit a real amount."; close; @@ -59,7 +59,7 @@ switch(select("I'd like to make a deposit.", "I'd like to make a withdrawl.", "W mes "Oh, and do realize there is a " +@cost + " Zeny charge on all transactions!"; next; } - input @withdrawl; + input(@withdrawl, 0); if (@withdrawl < 1) { mes "Please don't play games. I need a real amount to withdraw."; close; diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt index 375a9f611a6..5ce1c74d746 100644 --- a/npc/custom/etc/bank_kafra.txt +++ b/npc/custom/etc/bank_kafra.txt @@ -44,7 +44,7 @@ L_NoIncomeToday: mes"[Maniss]"; mes "Please, tell me how much zeny you would like to deposit."; next; - if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT; + if(input(@kafrabank, 0) == 1) goto L_TOO_BIG_AMOUNT; if(@kafrabank<1000) goto L_LESS_1000; if(@kafrabank>Zeny) goto L_NOT_ENOUGH; @@ -62,7 +62,7 @@ M_WITHDRAW: mes "Your account: ^135445" + #kafrabank + "^000000 zeny."; mes "How much zeny would you like to withdraw?"; next; - if(input(@kafrabank) == 1) goto L_TOO_BIG_AMOUNT; + if(input(@kafrabank, 0) == 1) goto L_TOO_BIG_AMOUNT; if(@kafrabank<1) goto B_EXIT2; if(@kafrabank>#kafrabank) goto L_NOT_ENOUGH; diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt index 421fccc7801..22bc90aad36 100644 --- a/npc/custom/etc/lottery.txt +++ b/npc/custom/etc/lottery.txt @@ -171,29 +171,29 @@ L_HandPick: set @L5,0; set @L6,0; Input1: - input @L1; + input(@L1, 0); if (@L1 < 1 || @L1 > 40) goto Input1; mes @L1; Input2: - input @L2; + input(@L2, 0); if (@L2 < 1 || @L2 > 40) goto Input2; if (@L2 == @L1) goto Input2; mes @L2; Input3: - input @L3; + input(@L3, 0); if (@L3 < 1 || @L3 > 40) goto Input3; if (@L3 == @L1) goto Input3; if (@L3 == @L2) goto Input3; mes @L3; Input4: - input @L4; + input(@L4, 0); if (@L4 < 1 || @L4 > 40) goto Input4; if (@L4 == @L1) goto Input4; if (@L4 == @L2) goto Input4; if (@L4 == @L3) goto Input4; mes @L4; Input5: - input @L5; + input(@L5, 0); if (@L5 < 1 || @L5 > 40) goto Input5; if (@L5 == @L1) goto Input5; if (@L5 == @L2) goto Input5; @@ -201,7 +201,7 @@ Input5: if (@L5 == @L4) goto Input5; mes @L5; Input6: - input @L6; + input(@L6, 0); if (@L6 < 1 || @L6 > 40) goto Input6; if (@L6 == @L1) goto Input6; if (@L6 == @L2) goto Input6; @@ -406,29 +406,29 @@ L_GM_Rig: set $LR5,0; set $LR6,0; GMInput1: - input $LR1; + input($LR1, 0); if ($LR1 < 1 || $LR1 > 40) goto GMInput1; mes $LR1; GMInput2: - input $LR2; + input($LR2, 0); if ($LR2 < 1 || $LR2 > 40) goto GMInput2; if ($LR2 == $LR1) goto GMInput2; mes $LR2; GMInput3: - input $LR3; + input($LR3, 0); if ($LR3 < 1 || $LR3 > 40) goto GMInput3; if ($LR3 == $LR1) goto GMInput3; if ($LR3 == $LR2) goto GMInput3; mes $LR3; GMInput4: - input $LR4; + input($LR4, 0); if ($LR4 < 1 || $LR4 > 40) goto GMInput4; if ($LR4 == $LR1) goto GMInput4; if ($LR4 == $LR2) goto GMInput4; if ($LR4 == $LR3) goto GMInput4; mes $LR4; GMInput5: - input $LR5; + input($LR5, 0); if ($LR5 < 1 || $LR5 > 40) goto GMInput5; if ($LR5 == $LR1) goto GMInput5; if ($LR5 == $LR2) goto GMInput5; @@ -436,7 +436,7 @@ GMInput5: if ($LR5 == $LR4) goto GMInput5; mes $LR5; GMInput6: - input $LR6; + input($LR6, 0); if ($LR6 < 1 || $LR6 > 40) goto GMInput6; if ($LR6 == $LR1) goto GMInput6; if ($LR6 == $LR2) goto GMInput6; diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 8420cd544e6..c8853401b77 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -322,7 +322,7 @@ L_Sell: mes "You have: ^FF0000" + #monpoints + "^000000 experience points"; mes "How many would you like to sell?"; next; - input @sellexp; + input(@sellexp, 0); if (@sellexp > #monpoints) goto L_NoExp; set #monpoints,#monpoints-@sellexp; set @sellearn,100*@sellexp; // Price of exp diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index 2ae2e7f7f3a..fec9c6b142c 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -173,19 +173,19 @@ Setprice: next; mes "Basic - Warps are = "+(($QW_BW_PRICE)?"^00FF00"+$QW_BW_PRICE:"^FF0000Free")+"^000000"; mes "Basic - Warps are starter towns and related dungeons."; - input $QW_BW_PRICE; + input($QW_BW_PRICE, 0); goto Setprice; case 2: next; mes "Advanced - Warps are = "+(($QW_AW_PRICE)?"^00FF00"+$QW_AW_PRICE:"^FF0000Free")+"^000000"; mes "Advanced - Warps are towns and dungeons on the same island but not close to any starter town."; - input $QW_AW_PRICE; + input($QW_AW_PRICE, 0); goto Setprice; case 3: next; mes "Overseas - Warps are = "+(($QW_OW_PRICE)?"^00FF00"+$QW_OW_PRICE:"^FF0000Free")+"^000000"; mes "Overseas - Warps are towns and dungeons overseas reachable by boat from Alberta."; - input $QW_OW_PRICE; + input($QW_OW_PRICE, 0); goto Setprice; case 4: next; @@ -193,7 +193,7 @@ Setprice: mes "Basic - Warps are starter town related dungeons."; mes "Dungeon warp fees are calculated by maps away from entrance of the dungeon times Dungeon warp fee."; mes "These costs are on top of the regular Warp costs."; - input $QW_BW_FEE; + input($QW_BW_FEE, 0); goto Setprice; case 5: next; @@ -201,7 +201,7 @@ Setprice: mes "Advanced - Warps are dungeons not close to any starter town."; mes "Dungeon warp fees are calculated by maps away from entrance of the dungeon times Dungeon warp fee."; mes "These costs are on top of the regular Warp costs."; - input $QW_AW_FEE; + input($QW_AW_FEE, 0); goto Setprice; case 6: next; @@ -209,13 +209,13 @@ Setprice: mes "Overseas - Warps are dungeons related to towns overseas reachable by boat from Alberta."; mes "Dungeon warp fees are calculated by maps away from entrance of the dungeon times Dungeon warp fee."; mes "These costs are on top of the regular Warp costs."; - input $QW_OW_FEE; + input($QW_OW_FEE, 0); goto Setprice; case 7: next; mes "Full Healing = "+(($QW_HF_PRICE)?"^00FF00"+$QW_HF_PRICE:"^FF0000Free")+"^000000"; mes "Instant full healing 1 price."; - input $QW_HF_PRICE; + input($QW_HF_PRICE, 0); goto Setprice; case 8: next; @@ -224,8 +224,8 @@ Setprice: mes "Healing price per 1 HP."; mes "Healing price per 1 SP."; mes "2 inputs, first HP then SP."; - input $QW_HP_H_PRICE; - input $QW_HP_S_PRICE; + input($QW_HP_H_PRICE, 0); + input($QW_HP_S_PRICE, 0); goto Setprice; case 9: next; @@ -233,13 +233,13 @@ Setprice: if (!$QW_S_PRICE) mes "Storage = ^FF0000 Free ^000000"; if ($QW_S_PRICE == 60) mes "Storage = ^0000FF Kafra Mode ^000000"; mes "Storage cost, if set to 60 Kafra pricing will be handled."; - input $QW_S_PRICE; + input($QW_S_PRICE, 0); goto Setprice; case 10: next; mes "Guild Storage = "+(($QW_GS_PRICE)?"^00FF00"+$QW_GS_PRICE:"^FF0000Free")+"^000000"; mes "Guild Storage, free on Guild Kafras."; - input $QW_GS_PRICE; + input($QW_GS_PRICE, 0); goto Setprice; case 11: goto GM_Menu; @@ -264,21 +264,21 @@ SpecialWarpMenu: case 1: next; mes "Set the name to show in the menu as option."; - input $QW_SP_Warpname$; + input($QW_SP_Warpname$, 0); goto SpecialWarpMenu; case 2: next; mes "Set the map in the ^0000FFmapname^000000 format."; mes "When this warpmap is set the option for players will show once they meet the requirments."; mes "To disable Special Warp Menu option, clear this!"; - input $QW_SP_WarpMap$; + input($QW_SP_WarpMap$, 0); goto SpecialWarpMenu; case 3: next; mes "First input = Xcoord"; mes "Second input = Ycoord"; - input $QW_SP_WarpX; - input $QW_SP_WarpY; + input($QW_SP_WarpX, 0); + input($QW_SP_WarpY, 0); goto SpecialWarpMenu; case 4: goto GM_Menu; @@ -301,7 +301,7 @@ DungeonLevelLimit: mes "Set limit of Dungeon Depth 0 = entrance"; mes "Depth 1 is a map connected to 0 and so on"; mes "Shortest Route to map counts as depth"; - input $QW_DDL; + input($QW_DDL, 0); goto DungeonLevelLimit; case 3: goto GM_Menu; default: @@ -464,7 +464,7 @@ L_Storage: if(#kafra_code) { mes "Enter your storage password:"; set @code_,0; - input @code_; + input(@code_, 0); if(@code_ != #kafra_code) { dispbottom "Wrong storage password."; close; diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt index 4acf7c8ac91..9754eed41fa 100644 --- a/npc/custom/etc/shifty_assassin.txt +++ b/npc/custom/etc/shifty_assassin.txt @@ -27,7 +27,7 @@ morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{ mes "They cost ^0000FF" + $ninja_price + " zeny ^000000each."; set @buy,0; - input @buy; + input(@buy, 0); next; if ($ninja_avail < 1) { mes "[Shifty Assassin]"; @@ -84,7 +84,7 @@ morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{ mes "Resting Ninjas: "+#ninjasr; mes "How many do you want to send?"; set @number,0; - input @number; + input(@number, 0); if (@number < 1) { mes "[Shifty Assassin]"; mes "You can't kill anyone without ninjas."; @@ -144,7 +144,7 @@ morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{ mes "How many ninjas do you want to make available?"; next; set @add,0; - input @add; + input(@add, 0); set $ninja_avail,$ninja_avail+@add; mes @add + " ninjas added."; close; diff --git a/npc/custom/etc/stock_market.txt b/npc/custom/etc/stock_market.txt index 465840dfe74..ee4874bbf95 100644 --- a/npc/custom/etc/stock_market.txt +++ b/npc/custom/etc/stock_market.txt @@ -327,7 +327,7 @@ prontera,140,181,5 script Stock Market::stockmarket 4_M_MANAGER,{ input @buyname$; set @buyamount,0; - input @buyamount; + input(@buyamount, 0); // Checks valid number // if (@buyamount < $S_BuyMin) { mes "^FF0000Minimum of " + $S_BuyMin + " shares can be bought at a time.^000000"; @@ -479,7 +479,7 @@ prontera,140,181,5 script Stock Market::stockmarket 4_M_MANAGER,{ set @sellname$,"0"; input @sellname$; set @sellamount,0; - input @sellamount; + input(@sellamount, 0); if (@sellamount < 1) { mes "^FF0000Invalid integer.^000000"; next; @@ -756,7 +756,7 @@ OnGMOpen: if (select("Yes", "No") != 1) return; set @gmset,0; - input @gmset; + input(@gmset, 0); set $S1,@gmset; set $S2,@gmset; set $S3,@gmset; diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index 7047ca00e7b..2e617069343 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -74,11 +74,11 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ case 3: mes "[Cluckers]"; mes "Cluck cluck? Cluck??? ^FF0000~What should the prize for winning be? Please input the ID.~^000000"; - input $cluck_item_id; + input($cluck_item_id, 0); next; mes "[Cluckers]"; mes "Cluck? cluuuck? ^FF0000~How many if this item should I give away?~^000000"; - input $cluck_item_amount; + input($cluck_item_amount, 0); next; mes "[Cluckers]"; mes "Cluck cluck..? Cluck. ^FF0000~So, the prize is^000000 ^008000"+ $cluck_item_amount +" "+ getitemname($cluck_item_id) +"^000000? ^FF0000Great.~^000000"; diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index fde5e544afe..510e5e4247d 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -67,7 +67,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ mes "Input the number of rounds you want the event to last."; mes "Current number: [^0000FF"+.Rounds+"^000000]"; next; - input .@Rounds; + input(.@Rounds, 0); set .Rounds,.@Rounds; mes .@n$; mes "The number of rounds has been changed to "+.Rounds+"."; @@ -77,7 +77,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ mes "Input the Item ID of the prize given each round."; mes "Current item: [^0000FF"+getitemname(.Prize)+"^000000] (ID #"+.Prize+")"; next; - input .@Prize; + input(.@Prize, 0); mes .@n$; if (getitemname(.@Prize)=="" || getitemname(.@Prize)=="null") { mes "That item does not exist. Please try again."; @@ -86,7 +86,7 @@ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ set .Prize,.@Prize; mes "Input the amount to be given."; next; - input .@amount; + input(.@amount, 0); mes .@n$; if (.@amount<=0 || .@amount>=10000) { mes "That amount is invalid. Using default ammount of 1."; diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt index 33339dcd9f0..7f2a2dd0568 100644 --- a/npc/custom/events/valentinesdayexp.txt +++ b/npc/custom/events/valentinesdayexp.txt @@ -96,7 +96,7 @@ alberta,26,243,4 script Stephen#val1 1_M_MERCHANT,{ mes "So how many do you want?"; next; set @needmon,0; - input @flag_num; + input(@flag_num, 0); if (@flag_num <= 0) goto L_NONE; if (@flag_num > 5) goto L_ERR; set @needmon,@flag_num*5000; @@ -155,7 +155,7 @@ alberta,29,243,4 script Jainie#val1 1_M_INNKEEPER,{ mes "So how many do you want? 1 portion is 4500z + 1 Milk."; next; set @needmon,0; - input @flag_num; + input(@flag_num, 0); if (@flag_num == 0) goto L_NONE; if (@flag_num > 5) goto L_ERR; set @needmon,@flag_num*4500; diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt index 0ee7d8822a8..bbed38e7db5 100644 --- a/npc/custom/stylist.txt +++ b/npc/custom/stylist.txt @@ -25,7 +25,7 @@ prontera,170,180,1 script Stylist#custom_stylist 2_M_DYEINGER,{ case 1: set .@style, ((.@style!=.@styles[.@s])?.@style+1:1); break; case 2: set .@style, ((.@style!=1)?.@style-1:.@styles[.@s]); break; case 3: message strcharinfo(PC_NAME),"Choose a style between 1 - "+.@styles[.@s]+"."; - input .@style,0,.@styles[.@s]; + input(.@style, 0, .@styles[.@s]); if (!.@style) set .@style, rand(1,.@styles[.@s]); break; case 4: set .@style, .@Revert; setlook .@Look[.@s], .@Revert; break; diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index 641b8f2da71..ad5847525c5 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -67,7 +67,7 @@ payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{ mes "Each costs "+ .@price +"z."; mes "(Type in 0 to cancel)"; next; - input @input; + input(@input, 0); if (@input == 0) close; if (@input > 5) { diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index 4d914ebcb5f..91be6d64e72 100644 --- a/npc/events/easter_2008.txt +++ b/npc/events/easter_2008.txt @@ -91,7 +91,7 @@ prontera,111,99,5 script Egg Salesman#prt::EggVendor 4W_M_02,{ mes "Chicken Eggs so easily!"; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Egg Salesman]"; mes "Hey, if you're not"; @@ -263,7 +263,7 @@ prontera,230,312,3 script Nerlen#es07 1_F_PRIEST,{ mes "Enter ''0'' to cancel."; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Nerlen]"; mes "Oh, you changed your"; diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 940ffe30a85..6c49091d2f6 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -614,7 +614,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ mes "And maximum 3 is all you can get."; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Chicken Masta]"; mes "You don't have to buy it, if you don't need it."; diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt index e71abeaef2b..0efca0287ac 100644 --- a/npc/events/halloween_2009.txt +++ b/npc/events/halloween_2009.txt @@ -349,7 +349,7 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2 mes "[Halloween Wizard]"; mes "How many Fabrics or Jack o' Pumpkins do you want to use? Don't go over 100 because that is the max amount that I can use."; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Halloween Wizard]"; mes "You have no definite idea."; diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index bb64f41215f..d3c076da3df 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -58,7 +58,7 @@ alberta,26,243,4 script Stephen 1_M_MERCHANT,{ mes "you can come back again."; mes "So how many do you want?"; next; - input .@i; + input(.@i, 0); if (.@i <= 0) close; mes "[Stephen]"; if (.@i > 5) { diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 1151a08fb21..9d3ae22b509 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -66,7 +66,7 @@ prontera,164,174,4 script Trader#Val09 1_M_MERCHANT,{ mes "How many do you want anyway?"; next; while(.@input <= 0 || .@input > 5) { - input .@input; + input(.@input, 0); if (.@input < 1) { mes "[Marco Bassinio]"; mes "Oh, it's such a shame!"; @@ -195,7 +195,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "How many do you want?"; mes "You can't buy more than 10 items at once."; next; - input .@input; + input(.@input, 0); if (.@input <= 0) { mes "[Packs Trader]"; mes "Nothing to buy."; @@ -236,7 +236,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "How many do you want?"; mes "You can't buy more than 10 items at once."; next; - input .@input; + input(.@input, 0); if (.@input <= 0) { mes "[Packs Trader]"; mes "Nothing to buy."; @@ -277,7 +277,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "How many do you want?"; mes "You can't buy more than 10 items at once."; next; - input .@input; + input(.@input, 0); if (.@input <= 0) { mes "[Packs Trader]"; mes "Nothing to buy."; @@ -443,7 +443,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{ mes "When you write the number of the rings, the number shouldn't be larger than the number of rings you actually have."; mes "'0', cancels everything."; next; - input .@input; + input(.@input, 0); if (.@input <= 0) { mes "[Valentine Vote Manager]"; diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index 58655bf114c..d0626065438 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -118,7 +118,7 @@ S_Purchase: .@price = getarg(0); .@item_id = getarg(1); while (true) { - input .@amount; + input(.@amount, 0); if (.@amount <= 5) break; mes "[Sugar]"; diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index d39d90cd30d..ebaf70f9241 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -2234,7 +2234,7 @@ sec_in02,36,167,3 script Nidhoggur Manager 4_M_FAIRYSOLDIER,1,1,{ } mes("Input the variable number"); next(); - input(.@input); + input(.@input, 0); setd(.@var$, .@input); mesf("%s has been set to %d.", .@var$, .@input); close(); diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 634e0753b36..69b7b071ee1 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -567,32 +567,32 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ mes "[Raspuchin Gregory]"; mes "12 + 23 + 34 + 45 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 114) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "1000 - 36 - 227 - 348 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 389) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "14 * 17 * 3 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 714) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "9765 / 3 / 5 / 7 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 93) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(47 * 28) - (1376 / 4) = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 972) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2646 / 7) + (13 * 28) = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 742) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("How much do\r" @@ -604,7 +604,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Wing_Of_Butterfly), getitemname(Wing_Of_Fly)); next; - input .@input; + input(.@input, 0); if (.@input != 909) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -615,7 +615,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Helm), getitemname(Coat)); next; - input .@input; + input(.@input, 0); if (.@input != 450) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -632,7 +632,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Boots), getitemname(Ear_Mufs)); next; - input .@input; + input(.@input, 0); if (.@input != 20) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("If you buy 5 %s\r" @@ -642,44 +642,44 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ "do you earn?", getitemname(Helm)); next; - input .@input; + input(.@input, 0); if (.@input != 8800) .@w_point += 1; break; case 2: mes "[Raspuchin Gregory]"; mes "13 + 25 + 37 + 48 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 123) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "1000 - 58 - 214 - 416 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 312) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "12 * 24 * 3 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 864) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "10530 / 3 / 5 / 2 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 351) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(35 * 19) - (1792 / 7) = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 409) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2368 / 8) + (24 * 17) = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 704) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2646 / 7) + (13 * 28) = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 742) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -692,7 +692,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Spectacles), getitemname(Booby_Trap)); next; - input .@input; + input(.@input, 0); if (.@input != 934) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -703,7 +703,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Cap), getitemname(Boots)); next; - input .@input; + input(.@input, 0); if (.@input != 550) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -720,7 +720,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Sahkkat), getitemname(Glasses)); next; - input .@input; + input(.@input, 0); if (.@input != 16) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("How much profit do you\r" @@ -730,39 +730,39 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ "the normal price?", getitemname(Tights)); next; - input .@input; + input(.@input, 0); if (.@input != 8520) .@w_point += 1; break; case 3: mes "[Raspuchin Gregory]"; mes "12 + 23 + 34 + 45 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 114) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "1000 - 58 - 214 - 416 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 312) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "14 * 17 * 3 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 714) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "10530 / 3 / 5 / 2 = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 351) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(47 * 28) - (1376 / 4) = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 972) .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2646 / 7) + (13 * 28) = ?"; next; - input .@input; + input(.@input, 0); if (.@input != 742) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -775,7 +775,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Green_Potion), getitemname(Wing_Of_Fly)); next; - input .@input; + input(.@input, 0); if (.@input != 798) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -786,7 +786,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Cap), getitemname(Boots)); next; - input .@input; + input(.@input, 0); if (.@input != 480) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" @@ -800,7 +800,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Muffler), getitemname(Eye_Bandage)); next; - input .@input; + input(.@input, 0); if (.@input != 12) .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("If you buy 4 Padded Armors\r" @@ -810,7 +810,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ "you make from this sale?", getitemname(Padded_Armor)); next; - input .@input; + input(.@input, 0); if (.@input != 7680) .@w_point += 1; } if (.@w_point == 0) { diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 31191509770..57de9a71504 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -1292,7 +1292,7 @@ in_rogue,270,130,0 script he_to_rogue#rg WARPNPC,1,1,{ OnTouch: mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000"; next; - input .@input; + input(.@input, 0); if (.@input < 1 || .@input > 10000) { if (ROGUE_Q == 12) mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000"; diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index a482652ed0a..c9f7038881d 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -1209,7 +1209,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 1000."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 1000)) { mes "[Christy's Maid]"; mes "The value is incorrect."; @@ -1223,7 +1223,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 1000."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 1000)) { mes "[Christy's Maid]"; mes "The value is incorrect."; @@ -1237,7 +1237,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 1000."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 1000)) { mes "[Christy's Maid]"; mes "The value is incorrect."; @@ -1251,7 +1251,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 3."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 3)) { mes "[Christy's Maid]"; mes "The value is incorrect."; @@ -1265,7 +1265,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 1000."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 1000)) { mes "[Christy's Maid]"; mes "The value is incorrect."; @@ -1279,7 +1279,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 2."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 2)) { mes "[Christy's Maid]"; mes "The value is incorrect."; @@ -1293,7 +1293,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 2."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 2)) { mes "[Christy's Maid]"; mes "The value is incorrect."; @@ -1307,7 +1307,7 @@ sec_in02,17,160,4 script Vote Globalvar Girl#yuno 4_F_OPERATION,{ mes "[Christy's Maid]"; mes "Please enter a number among 0 and 10000."; next; - input .@input; + input(.@input, 0); if ((.@input < 0) || (.@input > 10000)) { mes "[Christy's Maid]"; mes "The value is incorrect."; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 90334cc6e74..d9253cd1364 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -490,7 +490,7 @@ function script F_CheckKafCode { return; mes "Enter your storage password:"; @code_ = 0; - input @code_; + input(@code_, 0); if (@code_ != #kafra_code) { dispbottom "Wrong storage password."; close2; @@ -601,7 +601,7 @@ function script F_EntKafCode { @kafcode_try = 0; logmes "Hack: Tried to fit storage password."; } - if (input(@code_) == 1) { + if (input(@code_, 0) == 1) { mes "You can't use such big password."; return 0; } diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index ea926ae6b24..890dfc2593b 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -64,7 +64,7 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{ mes "Enter '0' if you want to quit."; next; while(1) { - input .@input, 0, 2001; + input(.@input, 0, 2001); if (.@input == 0) { mes "[Gever Al Sharp]"; mes "The deal was cancelled."; diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index 69310388f11..4a60bf84b95 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -102,7 +102,7 @@ function script Func_Casing { mes "the number of Magazines you"; mes "want to receive. If you want to cancel, then just enter ''0.''"; next; - input .@amount; + input(.@amount, 0); if (.@amount > 50 || .@amount == 0) { mes "[Kenny]"; mes "Hey, I can't give you"; diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 490be66ba0e..86869d8006d 100644 --- a/npc/merchants/ammo_dealer.txt +++ b/npc/merchants/ammo_dealer.txt @@ -97,7 +97,7 @@ function script Bullet_Trade { mes "that you'd like. If you want to"; mes "cancel, then just enter ''0.''"; next; - input .@amount; + input(.@amount, 0); if (.@amount < 1 || .@amount > 500) { mes "[Tony]"; mes "Hey, I can't give you"; diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt index eaf62bbe119..d15dbdf53a7 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -67,7 +67,7 @@ que_job01,68,84,1 script Black Marketeer#Buying 4_M_SITDOWN,{ mes "It'll cost 500 zeny for each one."; next; while(1) { - input .@input; + input(.@input, 0); mes "[Mr. Jass]"; if (.@input == 0) { mes "Don't you need those licenses?"; @@ -139,7 +139,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ mes "How many licenses do you need?"; next; while(1) { - input .@input; + input(.@input, 0); mes "[Mr. Hugh]"; if (.@input == 0) { mes "You have cancelled the trade."; diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 6028d9ddb6e..7d67ef5b92e 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -84,7 +84,7 @@ S_TradeGems: mes "that you can enter is 100."; next; while(1) { - input .@input,0,101; + input(.@input, 0, 101); if (.@input == 0) { mes "[Jade]"; mes "None at all?"; diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index f940a5982d7..34e69b47a0b 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -51,7 +51,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "If you wish to cancel,"; mes "please enter 0."; next; - input .@style; + input(.@style, 0); if(.@style > 19) { mes "[Veronica]"; mes "Oops, I'm sorry, but that"; @@ -413,7 +413,7 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "no.19. I will do my best to"; mes "make you look your very best."; next; - input .@style; + input(.@style, 0); if(.@style > 19) { mes "[Veronica]"; mes "I am sorry, you chose an unavailable style."; @@ -976,7 +976,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "No. 27: Oratio Cut."; } next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Prince Shammi]"; mes "Oh...?"; @@ -1200,7 +1200,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "Um, if you need to"; mes "cancel, just enter ''0.''"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Assistant Beautician]"; mes "Awwww..."; diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 14f83b2a0e4..1803aeb473e 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -56,7 +56,7 @@ mes "so you can only purchase 5 at a time!!"; next; while(1) { - input .@input; + input(.@input, 0); if(.@input < 1) { mes "[Ice Cream Maker]"; mes "If you don't want to buy any,"; diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 06a2f8bdb17..bb948323270 100644 --- a/npc/merchants/kunai_maker.txt +++ b/npc/merchants/kunai_maker.txt @@ -84,7 +84,7 @@ function script Kunai_Trade { mes "If you want to cancel the trade, then please enter ''0.'' How many"; mes "Kunai sets would you like?"; next; - input .@amount; + input(.@amount, 0); if(.@amount < 1 || .@amount > 500) { mes "[Kashin]"; mes "Eh? I'm sorry, but"; diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt index c27fc65705f..1bc5dadbb37 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -355,7 +355,7 @@ function script F_PotExchange { mes "mind, just enter '0' to cancel."; next; while(1) { - input .@input,0,101; + input(.@input, 0, 101); if (.@input == 0) { mes "[Merchant]"; mes "What...?"; diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index 0cbbeda6dc0..9798e97000a 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -106,7 +106,7 @@ alberta_in,16,28,4 script Pharmacist 1_M_PUBMASTER,{ next; mes "[Old Pharmacist]"; mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions."; - input .@amount,0,101; + input(.@amount, 0, 101); if (.@amount == 0) { next; mes "[Old Pharmacist]"; @@ -235,7 +235,7 @@ L_Making: next; mes "[Old Pharmacist]"; mes "Then pick a number below 100. If you don't want any, just enter '0'. With the materials you have, you can make about "+.@max+" potions."; - input .@amount; + input(.@amount, 0); next; if (.@amount == 0) { mes "[Old Pharmacist]"; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 19ebf4a8ec9..9d25bd7f6b7 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -120,7 +120,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ 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.'"; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Christopher Guillenrow]"; mes "Aye, the deal is canceled. Fare ye well."; @@ -199,7 +199,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ mes "So, How many do ye wish to buy? If ye dont want anything, just type the number as '0.'"; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Christopher Guillenrow]"; mes "Deal has"; @@ -237,7 +237,7 @@ geffen_in,110,172,0 script Christopher#1 1_M_SMITH,{ mes "So, how many do ye wish to buy? If ye dont want anything at all, just type the number as '0.'"; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Christopher Guillenrow]"; mes "Deal has"; @@ -424,7 +424,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ mes "So, how many do you need? If you want to cancel the trade, enter '0'."; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Paul Spanner]"; mes "You have canceled the trade. If you need anything, just let me know."; @@ -478,7 +478,7 @@ ein_in01,38,29,0 script Paul Spanner 1_M_SMITH,{ mes "So, how many of them do you need? If you want to cancel the trade, enter '0'."; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Paul Spanner]"; mes "The trade has been canceled. If you need anything, just let me know."; @@ -808,7 +808,7 @@ function script refinemain { mes "[" + getarg(0) + "]"; mes "How many times would you like me to refine your item?"; next; - input .@refinecnt; + input(.@refinecnt, 0); .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part); if (.@refinecnt < 1 || .@refinecheck > 10) { mes "[" + getarg(0) + "]"; @@ -954,7 +954,7 @@ function script phramain { mes "If you don't want any, please enter the number, '0.'"; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[" + getarg(0) + "]"; mes "The deal has"; diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt index 5292ebab31b..d303a5c036d 100644 --- a/npc/other/arena/arena_point.txt +++ b/npc/other/arena/arena_point.txt @@ -80,7 +80,7 @@ prt_are_in,103,11,3 script Arena Point Manager 4_M_JOB_HUNTER,{ mes "value you may enter is 20."; mes "To cancel, enter ''^3355FF0^000000.''"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Arena Point Manager]"; mes "You have"; diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt index b8806e112ef..e240fec0c2f 100644 --- a/npc/other/arena/arena_room.txt +++ b/npc/other/arena/arena_room.txt @@ -520,9 +520,9 @@ sec_in02,72,180,3 script Arena Manager#arena 4_NFWISP,{ //mes "If not, please enter a value for minutes first and then seconds."; mes "Please enter a value for minutes first and then seconds."; next; - input .@arenamin; + input(.@arenamin, 0); setd .@min$,.@arenamin; - input .@arenasec; + input(.@arenasec, 0); setd .@sec$,.@arenasec; mes "[Arena Manager]"; mes "Current "+.@mode$+" ranker's play time has been rearranged to ^FF0000"+getd(.@min$)+"^000000 minutes and ^FF0000"+getd(.@sec$)+"^000000 seconds."; @@ -1011,7 +1011,7 @@ function script Func_Are_Rew { mes "You can exchange ^3131FF"+getarg(2)+" arena points with "+getarg(1)+" "+getitemname(getarg(0))+"^000000."; mes "If you wish to cancel, please enter 0. If you don't, please enter how many ^3131FFtimes^000000 of arena points you wish to spend."; next; - input .@reward; + input(.@reward, 0); if (.@reward == 0) { mes "[Givu]"; mes "You have canceled your request."; diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index bd2b0d6922e..61c5dee57b6 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -540,7 +540,7 @@ mjolnir_02,85,362,3 script Blacksmith Miner 4_F_JOB_BLACKSMITH,{ mes "If you change your mind,"; mes "please enter '0' to cancel."; next; - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes "[Dwayne]"; mes "Alright, you've"; diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt index 23d65e88f83..1e89474491d 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -57,7 +57,7 @@ payon_in03,117,128,5 script Fortune Teller 4_M_BIBI,{ mes "Then..."; mes "Please pay your fee with all of your sincerity."; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Lhimetorra]"; mes "Ah...?!"; diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt index d86535104d1..b4ee7028e73 100644 --- a/npc/other/gm_npcs.txt +++ b/npc/other/gm_npcs.txt @@ -63,7 +63,7 @@ function script F_GM_NPC { if (.@error) return -2; } else - input .@input; + input(.@input, 0); if (.@input == 0) return -1; else diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index 9c7b87ee40c..97ff31d746c 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -860,7 +860,7 @@ function script Func_Bingo { } } next; - input .@bingoinput; + input(.@bingoinput, 0); if(.@bingoinput < 1 || .@bingoinput > 25) { @bingo_case = .@i; return 0; } if(.@i > 1) { for(.@j = .@i; .@j > 0; --.@j) { diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index 4b0878e79be..2ca1c45d3d1 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -252,7 +252,7 @@ pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 4_M_J mes "each cost " + .@str_cost$ + " zeny."; mes "How many would you like?"; next; - input .@input; + input(.@input, 0); if (!.@input) { mes "[Mercenary Goods Merchant]"; mes "You changed your mind?"; diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 9e938c66328..cdc1157a0fb 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -359,7 +359,7 @@ p_track01,67,45,5 script Medal Distributor#single 4_F_RACING,{ mes "number now. Your ticket"; mes "exchange number is ^FF0000" + .@insa + "^000000."; next; - input .@input; //,0,1000; + input(.@input, 0, 1000); if (!.@input) { mes "[Medal Distributor]"; mes "Oh? You don't want"; @@ -2534,7 +2534,7 @@ S_Reward: mes "number greater than 100."; next; while (true) { - input .@input; + input(.@input, 0); if (!.@input) { mes "[Ei'felle]"; mes "Aw, so you've decided"; diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index f70c9742730..4724e106353 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -4126,7 +4126,7 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "you wish to have. To cancel,"; mes "please enter ''^3355FF0^000000.''"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Item Exchange Helper]"; mes "You have"; @@ -4214,7 +4214,7 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "you would like to receive."; mes "To cancel, enter ''^3355FF0^000000.''"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Item Exchange Helper]"; mes "You have"; @@ -4298,7 +4298,7 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "diamonds you would like to receive."; mes "To cancel, enter ''^3355FF0^000000.''"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Item Exchange Helper]"; mes "You have"; @@ -4345,7 +4345,7 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "that you'd like to receive."; mes "To cancel, enter ''^3355FF0^000000.''"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Item Exchange Helper]"; mes "You have"; @@ -4392,7 +4392,7 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "that you'd like to receive."; mes "To cancel, enter ''^3355FF0^000000.''"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Item Exchange Helper]"; mes "You have"; @@ -4506,7 +4506,7 @@ turbo_room,106,117,3 script Point Manager#tt 4_M_ZONDAOYAJI,{ mes "Please enter the number of times you wish to convert 10 Arena Points into Turbo Track Points. The largest value you may enter"; mes "is 20. To cancel, enter '^3355FF0^000000.'"; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Turbo Track Point Manager]"; mes "You have"; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 47ae792fefc..35ca2c96e5c 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -437,7 +437,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ switch(select("Jellopy.", "Fluff.", "Milk.", "Ready to Mix.")) { case 1: while(1) { - input .@input; + input(.@input, 0); if (.@input > 10000) { next; mes "[Mixing Machine]"; @@ -453,7 +453,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ break; case 2: while(1) { - input .@input; + input(.@input, 0); if (.@input > 10000) { next; mes "[Mixing Machine]"; @@ -469,7 +469,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ break; case 3: while(1) { - input .@input; + input(.@input, 0); if (.@input > 10000) { next; mes "[Mixing Machine]"; @@ -499,7 +499,7 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "the Magic Powder."; next; while(1) { - input .@input; + input(.@input, 0); if (.@input < 1000 || .@input > 9999) { mes "[Mixing Machine]"; if (.@input == 0) { diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 2d1cd9ba3b6..e71ed9d52cc 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -705,7 +705,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ next; while(1) { while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Union Staff Kay]"; mes "Are you sure that you wanna cancel?"; diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 505561f52d9..c1590d1e7a3 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -1102,7 +1102,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "but I'm not lending those out."; mes "Oh, and enter 0 to cancel."; next; - input .@new_book; + input(.@new_book, 0); if (.@new_book < 0 || .@new_book > 5) { cutin "orleans_5",0; mes "[Charles Orleans]"; @@ -1131,7 +1131,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "me the level of the cookbook"; mes "that you are returning to me?"; next; - input .@old_book; + input(.@old_book, 0); if (.@old_book < 0 || .@old_book > 5) { mes "[Charles Orleans]"; mes "There must be some"; @@ -2079,7 +2079,7 @@ S_SellSets: mes "enter the number 0."; next; while(1) { - input .@sell; + input(.@sell, 0); if (.@sell == 0) { mes "[Madeleine Chu]"; mes "You've changed your"; diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt index 4c5d34b3c8f..faf06f2c9c8 100644 --- a/npc/quests/juice_maker.txt +++ b/npc/quests/juice_maker.txt @@ -256,7 +256,7 @@ payon_in03,188,146,5 script Marx Hansen#juice 4_M_04,{ mes "Choose a number less than 100. If you don't want to, put '0'. You can make up to " + countitem(.@fruit) + " bottles of juice."; next; while(1) { - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Merchant Marx Hansen]"; mes "Well then..."; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index b1e4f90b3a6..1f23d690a3d 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -8478,7 +8478,7 @@ man_fild03,95,301,0 duplicate(manukrock) Mysterious Rock#18 CLEAR_NPC sec_in02,80,171,0 script Piece of crack#sec 2_MONEMUS,{ callfunc "F_GM_NPC"; mes "1~3000"; - input .@input; + input(.@input, 0); next; if (.@input < 1 || .@input > 3000) { mes "Cat trading Point adjust"; diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index bc6d73fad23..31719476ffc 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -3539,7 +3539,7 @@ OnTouch: while (true) { while (true) { next(); - input(@input); + input(@input, 0); if (@input < 100 || @input > 999) { mes("[Security System]"); mes("^FF0000Error."); diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt index a582bfa8e6e..522d96e30b3 100644 --- a/npc/quests/quests_geffen.txt +++ b/npc/quests/quests_geffen.txt @@ -306,7 +306,7 @@ geffen,122,77,4 script Nia#yagu 8_F_GIRL,{ // Guess a number that meets all conditions. while(1) { - if (input(.@input,100,999) != 0) { + if (input(.@input, 100, 999) != 0) { mes "[Nia]"; mes "You've canceled the"; mes "Number Match game."; diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index 9af2ab5fc5d..8a79d3ff74d 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -7566,7 +7566,7 @@ L_MilkCow: mes "you need to brush her a"; mes "certain number of times.^000000"; next; - input .@cowbrush; + input(.@cowbrush, 0); if (.@cowbrush != getarg(1)) { soundeffect "taming_fail.wav",0; mes "^3355FFAwwww..."; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 4795110d6d2..edf2f53ee1a 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -924,7 +924,7 @@ lhz_cube,237,183,0 script Barrel#cube HIDDEN_NPC,{ mes "digit numbers at one time...^000000"; next; for( $@i = 0; .@i < 9; ++.@i ) - input .@input; + input(.@input, 0); mes "^3355FFNothing happened...^000000"; close; } @@ -941,7 +941,7 @@ lhz_cube,237,183,0 script Barrel#cube HIDDEN_NPC,{ mes "you found inside the keg.^000000"; next; for( $@i = 0; .@i < 9; ++.@i ) { - input .@input; + input(.@input, 0); if (.@input == .@numbers[.@i]) .@number_line += 1; } if (.@number_line == 9) { @@ -9689,7 +9689,7 @@ OnTouch: mes "password to open the door.^000000"; next; while (true) { - input @sneakpass; + input(@sneakpass, 0); if(@sneakpass == 738495) { mes "^3355FF*Beep~*"; @@ -10327,7 +10327,7 @@ sec_in02,17,170,4 script boss::lght_boss_admin 1_M_SIGNMONK,{ case 1: break; case 2: - input .@input,0,1000; + input(.@input, 0, 1000); lght_boss = .@input; break; case 3: diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index 03816faf2b7..22f8eabb9e9 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -1856,7 +1856,7 @@ lou_in02,210,47,0 script City Hall Officer#lou 4_M_CHNSOLDIER,{ mes "Nothing of importance. Now, I'm very busy, so if you would go fill the application over there..."; close; } - input .@input; + input(.@input, 0); if (.@input < 10000) { mes "[Jin Chiyuan]"; mes "Good lord,"; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index e49886dbd98..73c232cbe34 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -3996,7 +3996,7 @@ moscovia,208,182,7 script Acorn Dealer#mos 4_M_RUSMAN1,{ mes "How many acorns do you need?"; next; while(.@input <= 0 || .@input > 500) { - input .@input; + input(.@input, 0); if (.@input <= 0) { mes "[Acorn Dealer]"; mes "Do you want to cancel this trade?"; @@ -5349,7 +5349,7 @@ mosk_in,221,43,0 script #bowl HIDDEN_NPC,{ mes "Ok, I will stir it up this time."; mes "How many times should I..?"; next; - input .@input; + input(.@input, 0); if (.@input == 20) { mes "-It must be 20 times.-"; next; @@ -5453,7 +5453,7 @@ mosk_in,221,43,0 script #bowl HIDDEN_NPC,{ mes "Ok, I will stir it up this time."; mes "How many times should I...?"; next; - input .@input; + input(.@input, 0); if (.@input == 15) { mes "-It must be 15 times.-"; next; @@ -10225,7 +10225,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "How many do you want me to make? I can only make 100 at a time. If you don't want any, then just say '0'. Kehehehehe."; next; while(1) { - input .@input; + input(.@input, 0); if (!.@input) { mes "[Baba Yaga]"; mes "You don't want it?"; @@ -10312,7 +10312,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "How many do you want me to make? Tell me the number less than 100. If you don't want, tell me zero. Kehehehehe."; next; while(1) { - input .@input; + input(.@input, 0); if (!.@input) { mes "[Baba Yaga]"; mes "You don't want it?"; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 55f5c319c65..fa2cab7f865 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -1494,13 +1494,13 @@ sec_in02,15,15,4 script boss::boss_aru_monas 1_M_SIGNMONK,{ mes ""+aru_monas; close; case 2: - input .@input,0,1000; + input(.@input, 0, 1000); aru_monas = .@input; mes " "; mes ""+aru_monas; close; case 3: - input .@input,0,1000; + input(.@input, 0, 1000); prt_curse = .@input; mes " "; mes ""+prt_curse; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index 6fc89a0cf20..6bc672997d6 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -554,7 +554,7 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ mes "this request, enter '0.'"; next; while(1) { - input .@input,0,10; + input(.@input, 0, 10); if (.@input == 0) { mes "[Puchuchartan]"; mes "I see. It's your call."; @@ -707,7 +707,7 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ mes "to divide. I can only"; mes "divide up to 10 at a time."; next; - input .@input,0,11; + input(.@input, 0, 11); if ((.@input > 0) && (.@input < 11)) { if (countitem(.@divide) >= .@input) { if (checkweight(Spawn,(.@input * 30)) == 0) { @@ -727,7 +727,7 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ mes "you decide to cancel."; next; while(1) { - input .@input2,0,10; + input(.@input2, 0, 10); if (.@input2 == 0) { mes "[Puchuchartan]"; mes "You want to cancel?"; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 2fde49c3ee4..3acfa494ac5 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -2654,7 +2654,7 @@ sec_in02,10,43,4 script Extra Story Patch 1_M_SIGNMONK,{ mes "Yeah, you can try."; next; if(select("Now", "How many?") == 2) { - input .@input,0,1000; + input(.@input, 0, 1000); que_sch = .@input; } mes " "; diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt index 7486bcc2334..fb2b13aebbd 100644 --- a/npc/quests/seals/god_global.txt +++ b/npc/quests/seals/god_global.txt @@ -93,7 +93,7 @@ sec_in02,15,170,0 script Golbal var 4_F_CHNDRESS3,{ } L_Number: - input .@input,0,$@god_check2; + input(.@input, 0, $@god_check2); mes "[Check]"; mes "Would you like to change to "+.@input+"?"; mes "Please enter the password."; @@ -112,7 +112,7 @@ L_Number: } L_Var: - input .@input; + input(.@input, 0); setd getarg(0),.@input; next; mes "[Check]"; diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index ea01a926d59..81406b19c8b 100644 --- a/npc/quests/thana_quest.txt +++ b/npc/quests/thana_quest.txt @@ -1048,7 +1048,7 @@ tha_t04,195,195,0 script Rune Device#tt2 HIDDEN_NPC,3,3,{ } while (1) { while (1) { - input .@input; + input(.@input, 0); if (.@input < 100 || .@input > 999) { mes "[Screen]"; mes "Number input"; diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index eb30a3225f5..5469682500d 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -133,7 +133,7 @@ brasilis,137,77,5 script Ice-Cream Maker 4_M_03,{ mes "So how many d'ya want?"; next; while(1) { - input .@input; //,1,5; + input(.@input, 0); //,1,5; if (.@input == 0) { mes "[Ice Cream Maker]"; mes "None?"; diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index d8bac5986c9..75acbb0a0e4 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -489,7 +489,7 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ mes "^FF00001,000 ~ 100,000 Zeny^000000"; mes "How much do you want to donate?"; next; - input .@input,0,100000; + input(.@input, 0, 100000); if (.@input < 1000) { mes "- Cancelled. -"; close; diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index a58ee44634c..a263f58ede6 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -452,7 +452,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ mes "You can pay me in the currencies listed below."; mes "Enter the sum you're willing to pay. Enter 0 if you don't want to pay anything."; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Raffle Philosopher]"; mes "So you don't want to hear a quote, eh?"; diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 87cf554ade9..d63124f0cb4 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -521,7 +521,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ switch(select("Royal Guard", "Rune Knight", "Sorcerer")) { case 1: mes "1~5"; - input .@input; + input(.@input, 0); next; if (.@input < 1 || .@input > 5) { mes "Set item to adjust the Royal Guard"; @@ -533,7 +533,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ close; case 2: mes "1~24"; - input .@input; + input(.@input, 0); next; if (.@input < 1 || .@input > 24) { mes "Set item to adjust the Rune Knight"; @@ -545,7 +545,7 @@ sec_in02,12,43,3 script sorcereryal 1_M_LIBRARYMASTER,1,1,{ close; case 3: mes "1~5"; - input .@input; + input(.@input, 0); next; if (.@input < 1 || .@input > 5) { mes "Set item to adjust the Sorcerer"; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 9cdd3f7325c..e5d3dc4ac3b 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -2042,7 +2042,7 @@ job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ next; switch(select("Input the answer.", "I can't get it.")) { case 1: - input .@input; + input(.@input, 0); if (.@input == .@numbers[.@i]) { mes "You put 2 and "+(.@numbers[.@i]-20)+"."; mes "The box opens and you get one key."; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 3b260d3dbf2..b095552badf 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -4512,7 +4512,7 @@ iz_ac01,68,49,3 script General Store Owner#ac 4_F_03,{ mes("Tell me how many pieces you need?"); } next(); - input(.@input); + input(.@input, 0); if (!.@input) { mes("[Querrie]"); mes("Well, you don't need to buy it now."); @@ -5944,7 +5944,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("There are many styles so pick ^ff0000from page 1 to 19^000000."); mes("If you want to stop, say 0."); next(); - input(.@style); + input(.@style, 0); if (.@style > 19) { mes("[Otter Samssoon]"); mes("Oh my!!? Honey~ You can use a coupon for the hair style in here~"); @@ -6151,7 +6151,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("You are totally my style. So I am very excited~~"); mes("Pick the style from page 1 to 19."); next(); - input(.@style); + input(.@style, 0); if (.@style > 19) { mes("[Otter Samssoon]"); mes("Come on.. Honey~ You can use a coupon for the hair style in here~"); diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index dcf66a19fe5..d6d5b44f61e 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -72,7 +72,7 @@ mes "You can only buy a maximum of '"+.@max+"' ea."; mes "Enter '0' if you want to cancel."; next; - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes "[Poison Herb Merchant]"; mes "You've cancelled the trade."; @@ -133,7 +133,7 @@ lhz_in02,16,205,4 duplicate(phs) Poison Herb Merchant#lhz 4_F_YUNYANG mes "and remember, you can only"; mes "buy a maximum of '2000' ea."; next; - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes "[Rune Merchant]"; mes "You're not buying? Please leave!"; @@ -199,7 +199,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ mes "You can only buy a maximum of '2000' ea."; mes "Enter '0' if you want to cancel."; next; - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes "[Rare Poison Herb Collector]"; mes "You've cancelled the trade."; @@ -254,7 +254,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ mes "How many do you want?"; mes "If you want to cancel, enter 0."; next; - input .@amount; + input(.@amount, 0); mes "[Point Merchant]"; if (.@amount == 0) { mes "You've cancelled the trade."; diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt index 73344a75c80..d4b88525fc3 100644 --- a/npc/re/merchants/alchemist.txt +++ b/npc/re/merchants/alchemist.txt @@ -98,7 +98,7 @@ alde_alche,31,186,3 script Craft Book Merchant#alde 4_M_ALCHE_D,{ mes "100,000 zeny."; mes "How many would you like to purchase?"; next; - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes "[Craft Book Merchant]"; mes "Would you like to see some different books?"; diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index f508014a176..4015a55b8e7 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -72,7 +72,7 @@ moc_para01,22,16,5 script Catalog Magician#catal01 4_M_BIBI,{ mes "Or how many do you need?"; next; while (1) { - input .@input; + input(.@input, 0); mes "[Catalog Magician]"; if (.@input == 0) { mes "The trade has been stopped!"; diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 879e9a5f139..d034a686371 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -258,7 +258,7 @@ function script refinenew { mes "[" + getarg(0) + "]"; mes "How many times would you like me to refine your item?"; next; - input .@refinecnt; + input(.@refinecnt, 0); .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part); if (.@refinecnt < 1 || .@refinecheck > 20) { mes "[" + getarg(0) + "]"; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index aae9a5566a7..eba9ef055e1 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -142,7 +142,7 @@ moc_para01,166,51,3 script Phelix#edco 4_M_03,{ mes "[Phelix]"; mes "How many do you want?"; mes "^ff0000You have enough for up to " + .@available + " Carrots.^000000"; - input .@input; + input(.@input, 0); next; if (.@input < 1 || .@input > 10000) { mes "[Phelix]"; @@ -321,7 +321,7 @@ moc_para01,50,39,4 script Eve Natalia 4_F_SITDOWN,{ mes "So do you want to trade the 1st one in your inventory for ^00CC00"+.@amount+" Random Safe to 7 Certificates^000000?"; mes "Tell me '1' if you do, or '0' to cancel."; next; - input .@input; + input(.@input, 0); if (.@input < 0 || .@input > 1) { mes "[Eve Natalia]"; mes "It is a 0 or 1, it can't be that difficult."; @@ -417,7 +417,7 @@ L_Exchange: mes "I can give you up to 60."; mes "Type 0 to cancel."; next; - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes "[Trader Machine]"; mes "Cancelled."; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index a0f4fa92248..6186fa0187e 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -4302,7 +4302,7 @@ sec_in02,25,33,4 script Assistant#para_suvquest 4_M_BABYCAT,{ .@var = select("para_suv01", "para_suv02"); mes "Enter the modified value"; next; - input .@input,0,9999; + input(.@input, 0, 9999); mes "Value of para_suv0"+.@var+" has been changed to "+.@input+"."; setd "para_suv0"+.@var,.@input; close; diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 4a60fd2bb49..73463a797de 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -2260,7 +2260,7 @@ bra_in01,149,184,3 script Door#bra CLEAR_NPC,{ close; case 2: mes "How many times should I try to knock?"; - input .@input,0,999; + input(.@input, 0, 999); next; mes "You knocked on the door "+.@input+" times."; next; @@ -2268,7 +2268,7 @@ bra_in01,149,184,3 script Door#bra CLEAR_NPC,{ close; case 3: mes "How many times should I turn the key?"; - input .@input,0,999; + input(.@input, 0, 999); next; if (.@input == 7) { mes "You turn the key 7 times."; @@ -2295,7 +2295,7 @@ bra_in01,149,184,3 script Door#bra CLEAR_NPC,{ } case 4: mes "How many times should I insert the key into the door?"; - input .@input,0,999; + input(.@input, 0, 999); next; mes "You inserted the key "+.@input+" times."; next; @@ -2358,7 +2358,7 @@ bra_in01,144,187,3 script Toilet#bra CLEAR_NPC,{ switch(select("Flush the toilet.", "Close the lid.")) { case 1: mes "How many times should I flush?"; - input .@input,0,999; + input(.@input, 0, 999); next; if (.@input == 3) { mes "You flush the toilet 3 times."; @@ -2431,7 +2431,7 @@ bra_in01,134,189,3 script Faucet#bra CLEAR_NPC,{ switch(select("Tap on the faucet.", "Turn on the water.")) { case 1: mes "How many times will you tap the faucet?"; - input .@input,0,999; + input(.@input, 0, 999); next; mes "You tap the faucet "+.@input+" times."; next; @@ -2439,7 +2439,7 @@ bra_in01,134,189,3 script Faucet#bra CLEAR_NPC,{ close; case 2: mes "How many times should I turn the water on?"; - input .@input,0,999; + input(.@input, 0, 999); next; if (.@input == 1) { mes "You turn the faucet on once."; @@ -2506,7 +2506,7 @@ bra_in01,138,184,3 script Carpet#bra CLEAR_NPC,{ switch(select("Jump on the carpet.", "Lie on the carpet.", "Shake the carpet.")) { case 1: mes "How many times should I jump?"; - input .@input,0,999; + input(.@input, 0, 999); next; mes "You jump on the carpet "+.@input+" times."; next; @@ -2514,7 +2514,7 @@ bra_in01,138,184,3 script Carpet#bra CLEAR_NPC,{ close; case 2: mes "How many times should I lie on the carpet?"; - input .@input,0,999; + input(.@input, 0, 999); next; mes "You lie on the carpet "+.@input+" times."; next; @@ -2522,7 +2522,7 @@ bra_in01,138,184,3 script Carpet#bra CLEAR_NPC,{ close; case 3: mes "How many times should I shake the carpet?"; - input .@input,0,999; + input(.@input, 0, 999); next; if (.@input == 7) { mes "You shake the carpet 7 times."; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 817b4780dff..6c3c5c69417 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -131,7 +131,7 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{ mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall."; mes "How many do you want? You can buy up to 100."; next; - input .@input; + input(.@input, 0); .@deal = 500 * .@input; if (.@deal == 0) { mes "[Curious Sapha]"; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index ac6717529ae..17c41bbab95 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -1467,7 +1467,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ emotion e_what; cutin "war_y3",2; next; - input .@inputnum; + input(.@inputnum, 0); if (.@inputnum != 128) { mes "[Yube]"; mes "Hmm~ I don't think so."; @@ -1591,7 +1591,7 @@ eclage,191,200,4 script Yube#ep14_2 4_M_FAIRYKID5,{ mes "I can make as many as 128. How many do you need?"; cutin "war_y4",2; next; - input .@input; + input(.@input, 0); if (.@input < 1 || .@input > 128) { mes "[Yube]"; mes "You aren't going to make them?"; @@ -11753,12 +11753,12 @@ ecl_in04,108,215,4 script Supreme Elec rope#pa0829 HIDDEN_NPC,{ } sec_in02,85,187,4 script #pa0829Reactor11 4_M_FAIRYKID,3,3,{ - input .@input; + input(.@input, 0); if (.@input == 1854) { mes "[????]"; mes "Baby, you don't know why I'm upset, do you?"; mes "Present" + ep14_2_etran + "Dog"; - input .@input; + input(.@input, 0); ep14_2_etran = .@input; if (ep14_2_mylord < 7) { ep14_2_mylord = 7; @@ -13748,7 +13748,7 @@ sec_in02,16,11,5 script New Oz Image#1 4_M_MINSTREL1,1,1,{ //== Memory of Professor Worm ============================== sec_in02,10,17,4 script Professor Aide#worm 4_BULL,{ - input .@input; + input(.@input, 0); if (.@input != 1917) { mes "EEK!"; close; @@ -19129,7 +19129,7 @@ que_avan01,18,38,0 script Desk#tl01 CLEAR_NPC,{ mes "In the middle, there is a small numerical panel. A 5-digit number can be inputted."; next; if (select("Input a number.", "Look at other parts of the desk.")==1) { - input .@input; + input(.@input, 0); if (.@input == 31425) { mes "As soon as the number is inputted, a click is heard."; mes "The hinged device can be opened."; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 786aeccb1dc..58131e96d96 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -185,7 +185,7 @@ mal_in02,134,31,5 script Investment Cat Helper 4_WHITETIGER,{ mes "Isn't it lovely?"; mes "How many will you invest in? Enter 0 to cancel."; next; - input .@input; + input(.@input, 0); if (.@input == 0) { mes "[Investment Cat Helper]"; mes "Please invest next time~"; @@ -299,7 +299,7 @@ mal_in02,134,31,5 script Investment Cat Helper 4_WHITETIGER,{ mes "[Investment Cat Helper]"; mes "The can donation can range from a minimum of 20 to a maximum of 10,000."; next; - input .@input; + input(.@input, 0); if (.@input < 20 || .@input > 10000) { mes "[Investment Cat Helper]"; mes "The can donation can range from a minimum of 20 to a maximum of 10,000."; @@ -5556,7 +5556,7 @@ L_Viewpoint: break; } next; - input .@input; + input(.@input, 0); if (.@input == .@nori_c) { mes "The card slides out with a sound after entering the number."; mes "^4d4dffYou have passed the "+strnpcinfo(NPC_NAME_VISIBLE)+"! Run to the next destination!^000000"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 091d8527ac6..05c191c84e0 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -2088,7 +2088,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "How many Silver Crosses do you need?"; mes "I can make up to 50 at a time."; next; - input .@amount; + input(.@amount, 0); if (.@amount == 0) { mes "[Pandoi]"; mes "Don't need Silver Crosses?"; @@ -8317,7 +8317,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "295 - 343 -> Day 7"; mes "Global 1 = 1 hr."; next; - input .@input; + input(.@input, 0); if (.@input < 0 || .@input > 344) close; $malaya_pintados_00 = .@input; @@ -8326,7 +8326,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "Adjust the accumulated value for the Lesser Agimat."; mes "Values can be adjusted between 0 to 1000."; next; - input .@input; + input(.@input, 0); if (.@input < 0 || .@input > 1000) close; $malaya_pintados_01 = .@input; @@ -8335,7 +8335,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "Adjust the accumulated value of the Silver Cross."; mes "Values can be adjusted between 0 to 1000."; next; - input .@input; + input(.@input, 0); if (.@input < 0 || .@input > 1000) close; $malaya_pintados_02 = .@input; @@ -8344,7 +8344,7 @@ ma_fild01,1,1,4 script Pintados Manager#pin 4_F_KHELLISIA,{ mes "Adjust the accumulated value for the Dyestuff."; mes "Values can be adjusted between 0 to 300."; next; - input .@input; + input(.@input, 0); if (.@input < 0 || .@input > 300) close; $malaya_pintados_03 = .@input; @@ -8577,7 +8577,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 4_M_BARYO_BOY,{ mes "[Isco]"; mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?"; next; - input .@amount; + input(.@amount, 0); if (.@amount < 1 || .@amount > 50) { mes "[Isco]"; mes "Sigh~ I'm lost! I can't count if the numbers are weird."; @@ -8609,7 +8609,7 @@ ma_fild01,179,260,2 script Festival Helper Boy#pin 4_M_BARYO_BOY,{ mes "[Isco]"; mes "He he... I'm slow with numbers. I get lost when it's over 50. How many will you give me?"; next; - input .@amount; + input(.@amount, 0); if (.@amount < 1 || .@amount > 50) { mes "[Isco]"; mes "Sigh~ I told you I'm not good with numbers."; diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index 6a65a9c78a7..9a98df6a740 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -151,7 +151,7 @@ function script F_Invest_Abyss { mes "Please choose between 1 to 200."; mes "Please enter 0 to cancel."; next; - input .@units; + input(.@units, 0); if (.@units < 0 || .@units > 200) { mes getarg(1); mes "You've exceeded the amount per investment."; @@ -199,7 +199,7 @@ function script F_Invest_Abyss { mes "Please choose between 1 to 20."; mes "Please enter 0 to cancel."; next; - input .@tickets; + input(.@tickets, 0); if (.@tickets < 0 || .@tickets > 20) { mes getarg(1); mes "You've exceeded the amount per investment.";