diff options
Diffstat (limited to 'npc/other')
35 files changed, 443 insertions, 435 deletions
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 5b957f9f2..c3d8098ea 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -336,4 +336,4 @@ function script F_CashReduceStat { statusup2 .@type, .@amount; return; -}
\ No newline at end of file +} diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index 904ed7165..81e511ac2 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -9,15 +9,15 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) AnnieRuru -//= Copyright (C) Emistry -//= Copyright (C) Euphy -//= Copyright (C) Paradox924X -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Evera -//= Copyright (C) kobra_k88 -//= Copyright (C) Lupus +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) AnnieRuru +//= Copyright (C) Emistry +//= Copyright (C) Euphy +//= Copyright (C) Paradox924X +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Evera +//= Copyright (C) kobra_k88 +//= Copyright (C) Lupus //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -434,7 +434,7 @@ function script F_ShuffleNumbers { //== Function F_MesColor =================================== // Function to colorize npc dialog without having to memorize the color code // Examples: -// mes callfunc("F_MesColor", C_BLUE) +"This message is now in BLUE"; +// mesf("%sThis message is now in BLUE.", F_MesColor(C_BLUE)); function script F_MesColor { return sprintf("^%06X", min(getarg(0), 0xFFFFFF)); } @@ -446,32 +446,45 @@ function script F_MesColor { function script F_GetTradeRestriction { .@trade = getiteminfo(getarg(0), ITEMINFO_TRADE); - if (.@trade == 0) { + if (.@trade == 0) return "None"; - } .@trade$ = ""; - if (.@trade & ITR_NODROP) { + if (.@trade & ITR_NODROP) .@trade$ += "NoDrop|"; - } - if (.@trade & ITR_NOTRADE) { + if (.@trade & ITR_NOTRADE) .@trade$ += "NoTrade|"; - } - if (.@trade & ITR_PARTNEROVERRIDE) { + if (.@trade & ITR_PARTNEROVERRIDE) .@trade$ += "PartnerOverride|"; - } - if (.@trade & ITR_NOSELLTONPC) { + if (.@trade & ITR_NOSELLTONPC) .@trade$ += "NoSellToNpc|"; - } - if (.@trade & ITR_NOSTORAGE) { + if (.@trade & ITR_NOSTORAGE) .@trade$ += "NoStorage|"; - } - if (.@trade & ITR_NOGSTORAGE) { + if (.@trade & ITR_NOGSTORAGE) .@trade$ += "NoGuildStorage|"; - } - if (.@trade & ITR_NOMAIL) { + if (.@trade & ITR_NOMAIL) .@trade$ += "NoMail|"; - } - if (.@trade & ITR_NOAUCTION) { + if (.@trade & ITR_NOAUCTION) .@trade$ += "NoAuction|"; + return .@trade$; +} + +//== Function F_MesItemInfo =================================== +// Show the item name and a clickable link for the item description +// Only works with mes and mesf, does not work in menu/select +function script F_MesItemInfo { + .@item = getarg(0); + .@itemname$ = getitemname(.@item); + if (.@itemname$ != "null") { + .@itemslot = getitemslots(.@item); + if (.@itemslot) + .@itemname$ = sprintf("%s [%d]", .@itemname$, .@itemslot); } + else + .@itemname$ = "Unknown Item"; + if (PACKETVER >= 20150729) + return sprintf("<ITEM>%s<INFO>%d</INFO></ITEM>", .@itemname$, .@item); + else if (PACKETVER >= 20130130) + return sprintf("<ITEMLINK>%s<INFO>%d</INFO></ITEMLINK>", .@itemname$, .@item); + else + return .@itemname$; } diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt index 256c2d802..bb44bd8e3 100644 --- a/npc/other/acolyte_warp.txt +++ b/npc/other/acolyte_warp.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2013-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2013-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt index 99971eecd..2f6c0a023 100644 --- a/npc/other/arena/arena_aco.txt +++ b/npc/other/arena/arena_aco.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index 32bd12178..3e44c1b30 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/npc/other/arena/arena_lvl50.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index 30734f043..2282cf9fa 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index 9a0c26aa3..1b7adfe05 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/npc/other/arena/arena_lvl70.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index 3bb1cf43a..ef3627651 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/npc/other/arena/arena_lvl80.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index c3133af30..0f1ce3670 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Inkfish -//= Copyright (C) Samuray22 -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Inkfish +//= Copyright (C) Samuray22 +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -165,6 +165,8 @@ OnTouch: } force_1-2,99,31,4 script Slipslowrun#party 4_F_TELEPORTER,{ + end; + OnStart: initnpctimer; $arena_minptst = gettime(GETTIME_MINUTE); @@ -1059,7 +1061,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{ donpcevent "Ponox::OnStart"; } specialeffect(EH_HIT5, AREA, playerattached()); - donpcevent "cast#pt::OnNomal1"; + donpcevent "cast#pt::OnNomal1"; warp "arena_room",100,75; end; } else { @@ -1078,7 +1080,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{ next; switch( select( "Ok.","Let me think." ) ) { case 1: - input .@arnparty$; + input(.@arnparty$); mes "[Staff]"; mes "You have entered ^3131FF"+.@arnparty$+"^000000. Is it correct?"; next; diff --git a/npc/other/arena/arena_point.txt b/npc/other/arena/arena_point.txt index 5292ebab3..5ff3ab75f 100644 --- a/npc/other/arena/arena_point.txt +++ b/npc/other/arena/arena_point.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -80,70 +80,66 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Arena Point Manager]"; mes "You have"; mes "canceled"; mes "this service."; close; } - else if (.@input > 20) { + if (.@input > 20) { mes "[Arena Point Manager]"; mes "Your request exceeds"; mes "the maximum limit. Please"; mes "enter a value no greater than 20."; close; } - else { - .@want_point1 = 10 * .@input; - .@want_point = 5 * .@input; - .@my_arena_all = arena_point + .@want_point; - .@my_turbo_all = tt_point - .@want_point1; - if (.@my_arena_all > 28999) { - mes "[Arena Point Manager]"; - mes "You will exceed the"; - mes "maximum amount of"; - mes "Arena Points if we proceed"; - mes "with this conversion of your"; - mes "Turbo Track Points. You cannot"; - mes "have more than 29,000 Arena Points."; - next; - mes "[Arena Point Manager]"; - mes "Please spend some of"; - mes "your Arena Points before"; - mes "using this service again."; - mes "Thank you for your patronage."; - close; - } - if (.@my_turbo_all < 0) { - mes "[Arena Point Manager]"; - mes "I'm sorry, but"; - mes "you don't have enough"; - mes "Turbo Track Points to"; - mes "perform this Arena"; - mes "Point conversion."; - close; - } - else { - mes "[Arena Point Manager]"; - mes "You have converted"; - mes "10 Turbo Track Points"; - mes "into 5 Arena Points " + .@input + " times."; - mes "A total of " + .@want_point1 + " Turbo Track Points were converted into"; - mes "" + .@want_point +" Arena Points."; - tt_point -= .@want_point1; - arena_point += .@want_point; - next; - mes "[Arena Point Manager]"; - mes "" + strcharinfo(PC_NAME) + ","; - mes "you now have"; - mes "^4682B4" + arena_point + "^000000 Arena Points"; - mes "and ^00688B" + tt_point + "^000000 Turbo Track Points."; - mes "Thank you for your patronage."; - close; - } + .@want_point1 = 10 * .@input; + .@want_point = 5 * .@input; + .@my_arena_all = arena_point + .@want_point; + .@my_turbo_all = tt_point - .@want_point1; + if (.@my_arena_all > 28999) { + mes "[Arena Point Manager]"; + mes "You will exceed the"; + mes "maximum amount of"; + mes "Arena Points if we proceed"; + mes "with this conversion of your"; + mes "Turbo Track Points. You cannot"; + mes "have more than 29,000 Arena Points."; + next; + mes "[Arena Point Manager]"; + mes "Please spend some of"; + mes "your Arena Points before"; + mes "using this service again."; + mes "Thank you for your patronage."; + close; + } + if (.@my_turbo_all < 0) { + mes "[Arena Point Manager]"; + mes "I'm sorry, but"; + mes "you don't have enough"; + mes "Turbo Track Points to"; + mes "perform this Arena"; + mes "Point conversion."; + close; } + mes "[Arena Point Manager]"; + mes "You have converted"; + mes "10 Turbo Track Points"; + mes "into 5 Arena Points " + .@input + " times."; + mes "A total of " + .@want_point1 + " Turbo Track Points were converted into"; + mes "" + .@want_point +" Arena Points."; + tt_point -= .@want_point1; + arena_point += .@want_point; + next; + mes "[Arena Point Manager]"; + mes "" + strcharinfo(PC_NAME) + ","; + mes "you now have"; + mes "^4682B4" + arena_point + "^000000 Arena Points"; + mes "and ^00688B" + tt_point + "^000000 Turbo Track Points."; + mes "Thank you for your patronage."; + close; case 6: mes "[Arena Point Manager]"; mes "You have"; diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt index b8806e112..93f55245a 100644 --- a/npc/other/arena/arena_room.txt +++ b/npc/other/arena/arena_room.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -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,12 +1011,13 @@ 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; - if (.@reward == 0) { + input(.@reward); + if (.@reward <= 0) { mes "[Givu]"; mes "You have canceled your request."; close; - } else if (.@reward > 1500) { + } + if (.@reward > 1500) { mes "[Givu]"; mes "You have exceeded the maximum capacity."; close; diff --git a/npc/other/auction.txt b/npc/other/auction.txt index 76e1a6042..4e86272ae 100644 --- a/npc/other/auction.txt +++ b/npc/other/auction.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/books.txt b/npc/other/books.txt index 919da1ca8..f3ab8ec94 100644 --- a/npc/other/books.txt +++ b/npc/other/books.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/bulletin_boards.txt b/npc/other/bulletin_boards.txt index e1e0ce519..a6e885e3e 100644 --- a/npc/other/bulletin_boards.txt +++ b/npc/other/bulletin_boards.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Silent -//= Copyright (C) Kayla -//= Copyright (C) Nexon -//= Copyright (C) MasterOfMuppets +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Silent +//= Copyright (C) Kayla +//= Copyright (C) Nexon +//= Copyright (C) MasterOfMuppets //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/card_trader.txt b/npc/other/card_trader.txt index 514a032b0..79d746cf2 100644 --- a/npc/other/card_trader.txt +++ b/npc/other/card_trader.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Elias (og2) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Elias (og2) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -121,7 +121,7 @@ prontera,115,90,0 script Putty 4_F_01,{ mes "[Putty]"; mes "Please tell me what card you want to exchange."; next; - input .@i$; + input(.@i$); .@input$ = "_"+.@i$; .@card = 0; freeloop(1); diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index bd2b0d692..1c9494e4a 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -9,18 +9,18 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Masao -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Paradox924X -//= Copyright (C) ultramage -//= Copyright (C) Lupus -//= Copyright (C) MasterOfMuppets -//= Copyright (C) Zefris -//= Copyright (C) Cypress -//= Copyright (C) Reddozen +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Masao +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Paradox924X +//= Copyright (C) ultramage +//= Copyright (C) Lupus +//= Copyright (C) MasterOfMuppets +//= Copyright (C) Zefris +//= Copyright (C) Cypress +//= Copyright (C) Reddozen //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -540,14 +540,15 @@ 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; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Dwayne]"; mes "Alright, you've"; mes "canceled the trade."; mes "Take care!"; close; - } else if (.@amount < 1 || .@amount > 500){ + } + if (.@amount > 500) { mes "[Dwayne]"; mes "The maximum"; mes "amount is 500."; diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index f490df2f9..419b770c0 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) LightFighter -//= Copyright (C) Scriptor -//= Copyright (C) Perkka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) LightFighter +//= Copyright (C) Scriptor +//= Copyright (C) Perkka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/fortune.txt b/npc/other/fortune.txt index 23d65e88f..4482cda18 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -57,23 +57,21 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Lhimetorra]"; mes "Ah...?!"; mes "You have angered the monster spirits!"; close; } - else if (.@input > Zeny) { + if (.@input > Zeny) { mes "[Lhimetorra]"; mes "There's no need to overdo it. Just give with all your heart... *Tsk tsk*"; close; } - else { - mes "[Lhimetorra]"; - mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller."; - Zeny -= .@input; - } + mes "[Lhimetorra]"; + mes "I accept your heart and your devotion with my gratitude. Thoughts are more important than the amount when paying a fortune teller."; + Zeny -= .@input; next; mes "[Lhimetorra]"; mes "Then, I will begin to tell the fortune of your wish. Concentrate on yourself..."; diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt index d86535104..6bcd2bcb5 100644 --- a/npc/other/gm_npcs.txt +++ b/npc/other/gm_npcs.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -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/guildpvp.txt b/npc/other/guildpvp.txt index 5eda61387..4dae87d3a 100644 --- a/npc/other/guildpvp.txt +++ b/npc/other/guildpvp.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt index 50f7b18f7..da7ee3b74 100644 --- a/npc/other/gympass.txt +++ b/npc/other/gympass.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index 9c7b87ee4..be9d37db8 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Kisuka -//= Copyright (C) Samuray22 -//= Copyright (C) Yommy -//= Copyright (C) SinSloth +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Kisuka +//= Copyright (C) Samuray22 +//= Copyright (C) Yommy +//= Copyright (C) SinSloth //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -481,7 +481,7 @@ OnTouch: mes "Quickly, say ''^FF0000Bingo^000000!''"; mes "Remember, you'll only"; mes "have one chance to say it!"; - input @bingoyell$; + input(@bingoyell$); if (@bingoyell$ == "Bingo") { if ($@hu_bingoa == 5) { $@hu_bingoa = 6; @@ -500,14 +500,13 @@ OnTouch: mes "next time, alright?"; close; } - } else { - next; - mes "I'm sorry, but you"; - mes "said it wrong. Next time,"; - mes "make sure that you yell"; - mes "out the word, ''^FF0000Bingo^000000,'' okay?"; - close; } + next; + mes "I'm sorry, but you"; + mes "said it wrong. Next time,"; + mes "make sure that you yell"; + mes "out the word, ''^FF0000Bingo^000000,'' okay?"; + close; } close; } @@ -860,11 +859,17 @@ function script Func_Bingo { } } next; - input .@bingoinput; - if(.@bingoinput < 1 || .@bingoinput > 25) { @bingo_case = .@i; return 0; } - if(.@i > 1) { - for(.@j = .@i; .@j > 0; --.@j) { - if(.@bingoinput == @bingoplate[.@j -1]) { @bingo_case = .@i; return 0; } + input(.@bingoinput); + if (.@bingoinput < 1 || .@bingoinput > 25) { + @bingo_case = .@i; + return 0; + } + if (.@i > 1) { + for (.@j = .@i; .@j > 0; --.@j) { + if (.@bingoinput == @bingoplate[.@j -1]) { + @bingo_case = .@i; + return 0; + } } } setarray @bingoplate[.@i],.@bingoinput; diff --git a/npc/other/inventory_expansion.txt b/npc/other/inventory_expansion.txt index db18e09e1..c9589eb25 100644 --- a/npc/other/inventory_expansion.txt +++ b/npc/other/inventory_expansion.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team -//= Copyright (C) 4144 +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) 4144 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -33,28 +33,28 @@ OnInvExpandRequest: if (countitem(Inventory_Extension_Coupon) < 1) { - expandInventoryAck(EXPAND_INV_MISSING_ITEM); + expandinventoryack(EXPAND_INV_MISSING_ITEM); end; } - if (getInventorySize() + INVENTORY_INCREASE_STEP > MAX_INVENTORY) { - expandInventoryAck(EXPAND_INV_MAX_SIZE); + if (getinventorysize() + INVENTORY_INCREASE_STEP > MAX_INVENTORY) { + expandinventoryack(EXPAND_INV_MAX_SIZE); end; } - expandInventoryAck(EXPAND_INV_ASK_CONFIRMATION, Inventory_Extension_Coupon); + expandinventoryack(EXPAND_INV_ASK_CONFIRMATION, Inventory_Extension_Coupon); end; OnInvExpandConfirmed: if (countitem(Inventory_Extension_Coupon) < 1) { - expandInventoryResult(EXPAND_INV_RESULT_MISSING_ITEM); + expandinventoryresult(EXPAND_INV_RESULT_MISSING_ITEM); end; } - if (getInventorySize() + INVENTORY_INCREASE_STEP > MAX_INVENTORY) { - expandInventoryResult(EXPAND_INV_RESULT_MAX_SIZE); + if (getinventorysize() + INVENTORY_INCREASE_STEP > MAX_INVENTORY) { + expandinventoryresult(EXPAND_INV_RESULT_MAX_SIZE); end; } delitem(Inventory_Extension_Coupon, 1); - if (expandInventory(INVENTORY_INCREASE_STEP) == true) { - expandInventoryResult(EXPAND_INV_RESULT_SUCCESS); + if (expandinventory(INVENTORY_INCREASE_STEP) == true) { + expandinventoryresult(EXPAND_INV_RESULT_SUCCESS); } end; diff --git a/npc/other/item_merge.txt b/npc/other/item_merge.txt index 6f7a9f0e5..666e7998e 100644 --- a/npc/other/item_merge.txt +++ b/npc/other/item_merge.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/mail.txt b/npc/other/mail.txt index 63b53bf24..f6922cc4d 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Daegaladh -//= Copyright (C) Elias -//= Copyright (C) Zephyrus -//= Copyright (C) Samuray22 -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Daegaladh +//= Copyright (C) Elias +//= Copyright (C) Zephyrus +//= Copyright (C) Samuray22 +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 0f640af2a..6d30e935e 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -9,9 +9,9 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -188,7 +188,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "name of your partner using"; mes "the method I just described."; next; - input .@partner$; + input(.@partner$); mes "[Marry Happy]"; mes "Alright, after you've"; mes "decided to get married,"; @@ -329,7 +329,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "down your exact name here."; next; while(1) { - input .@name$; + input(.@name$); if (.@name$ == strcharinfo(PC_NAME)) break; mes "[Marry Happy]"; @@ -599,7 +599,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "her and protect her. Now, may"; mes "I know the name of your bride?"; next; - input $@wed_bride$; + input($@wed_bride$); mes "[Vomars]"; mes "Mr. " + strcharinfo(PC_NAME) + "..."; mes "Do you swear on your life"; diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index 4b0878e79..fd7b311af 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Zephyrus -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Zephyrus +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -252,8 +252,8 @@ 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; - if (!.@input) { + input(.@input); + if (.@input <= 0) { mes "[Mercenary Goods Merchant]"; mes "You changed your mind?"; mes "Alright, feel free to come"; @@ -261,7 +261,7 @@ pay_arche,99,167,4 duplicate(Mercenary Manager#main) Mercenary Manager#Bow 4_M_J mes "to buy any Mercenary Potions."; close; } - if (.@input < 0 || .@input > 10000) { + if (.@input > 10000) { mes "[Mercenary Goods Merchant]"; mes "I'm sorry, but you"; mes "can only buy up to"; diff --git a/npc/other/monster_museum.txt b/npc/other/monster_museum.txt index 0788289c2..46db32590 100644 --- a/npc/other/monster_museum.txt +++ b/npc/other/monster_museum.txt @@ -9,13 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Paradox924X -//= Copyright (C) Samuray22 -//= Copyright (C) Haplo -//= Copyright (C) Lance -//= Copyright (C) L0ne_W0lf -//= Copyright (C) Muad_Dib (The Prometheus Project) +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Paradox924X +//= Copyright (C) Samuray22 +//= Copyright (C) Haplo +//= Copyright (C) Lance +//= Copyright (C) L0ne_W0lf +//= Copyright (C) Muad_Dib (The Prometheus Project) //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt index 9e938c663..87f0210b4 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -9,11 +9,11 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Capuche -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Capuche +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -348,7 +348,7 @@ p_track01,67,45,5 script Medal Distributor#single 4_F_RACING,{ mes "Oh! Congratulations, you"; mes "won! May I have your name?"; next; - input .@input$; + input(.@input$); if (.@input$ == strcharinfo(PC_NAME)) { .@insa = rand(1,1000); mes "[Medal Distributor]"; @@ -359,14 +359,15 @@ 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; - if (!.@input) { + input(.@input); + if (.@input == 0) { mes "[Medal Distributor]"; mes "Oh? You don't want"; mes "to exchange your"; mes "winning ticket?"; close; - } else if (.@input == .@insa) { + } + if (.@input == .@insa) { mes "[Medal Distributor]"; mes "Thank you! You entered"; mes "the correct number..."; @@ -2534,8 +2535,8 @@ S_Reward: mes "number greater than 100."; next; while (true) { - input .@input; - if (!.@input) { + input(.@input); + if (.@input <= 0) { mes "[Ei'felle]"; mes "Aw, so you've decided"; mes "to cancel? Well, it's your"; @@ -2543,7 +2544,8 @@ S_Reward: mes "disappointed. Please come"; mes "back if you change your mind..."; close; - } else if (.@input < 1 || .@input > 100) { + } + if (.@input > 100) { mes "[Ei'felle]"; mes "Remember, you can only"; mes "enter a number from 1 to 100."; @@ -2551,7 +2553,9 @@ S_Reward: mes "medals, then perhaps you"; mes "should just give them all to me~"; next; - } else break; + continue; + } + break; } if (countitem(Marvelous_Medal) < .@input) { mes "[Ei'felle]"; diff --git a/npc/other/msg_boards.txt b/npc/other/msg_boards.txt index 7daad4cba..777ab837e 100644 --- a/npc/other/msg_boards.txt +++ b/npc/other/msg_boards.txt @@ -9,14 +9,14 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) SinSloth -//= Copyright (C) Silent -//= Copyright (C) Nexon -//= Copyright (C) Lupus -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) SinSloth +//= Copyright (C) Silent +//= Copyright (C) Nexon +//= Copyright (C) Lupus +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 326c601be..94d5df0d1 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Slim -//= Copyright (C) CalciumKid -//= Copyright (C) 5511 -//= Copyright (C) Kisuka +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Slim +//= Copyright (C) CalciumKid +//= Copyright (C) 5511 +//= Copyright (C) Kisuka //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt index b784507e6..1af6bd426 100644 --- a/npc/other/powernpc.txt +++ b/npc/other/powernpc.txt @@ -9,10 +9,10 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) L0ne_W0lf -//= Copyright (C) KarLeada +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) L0ne_W0lf +//= Copyright (C) KarLeada //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/private_airship.txt b/npc/other/private_airship.txt index e650e4b96..5c994ff27 100644 --- a/npc/other/private_airship.txt +++ b/npc/other/private_airship.txt @@ -9,8 +9,8 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2018 Hercules Dev Team -//= Copyright (C) Asheraf +//= Copyright (C) 2018-2020 Hercules Dev Team +//= Copyright (C) Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 6978d49d2..cb6547cc7 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Joseph -//= Copyright (C) Euphy -//= Copyright (C) Elias (og2) -//= Copyright (C) L0ne_W0lf -//= Copyright (C) kobra_k88 +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Joseph +//= Copyright (C) Euphy +//= Copyright (C) Elias (og2) +//= Copyright (C) L0ne_W0lf +//= Copyright (C) kobra_k88 //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index f70c97427..0bd95d831 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -9,12 +9,12 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team -//= Copyright (C) Euphy -//= Copyright (C) Joseph -//= Copyright (C) Elias -//= Copyright (C) Kisuka -//= Copyright (C) L0ne_W0lf +//= Copyright (C) 2012-2020 Hercules Dev Team +//= Copyright (C) Euphy +//= Copyright (C) Joseph +//= Copyright (C) Elias +//= Copyright (C) Kisuka +//= Copyright (C) L0ne_W0lf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -4126,15 +4126,15 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Item Exchange Helper]"; mes "You have"; mes "canceled"; mes "your request."; close; } - else if (.@input < 0 || .@input > 50) { + if (.@input > 50) { mes "[Item Exchange Helper]"; mes "Your request exceeds"; mes "the maximum limit. You"; @@ -4142,28 +4142,26 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "of 50 tickets at once."; close; } - else { - .@total_point = 10 * .@input; - if (.@total_point > tt_point) { - mes "[Item Exchange Helper]"; - mes "I'm sorry, but you do"; - mes "not have enough Turbo"; - mes "Track Points. Please check"; - mes "the amount of Turbo Track"; - mes "Points you have earned before"; - mes "redeeming your points again."; - close; - } - tt_point -= .@total_point; - getitem Warp_Free_Ticket,.@input; + .@total_point = 10 * .@input; + if (.@total_point > tt_point) { mes "[Item Exchange Helper]"; - mes "Thank you for"; - mes "your patronage."; - mes "We hope you enjoy"; - mes "your time here in"; - mes "the Turbo Track~"; + mes "I'm sorry, but you do"; + mes "not have enough Turbo"; + mes "Track Points. Please check"; + mes "the amount of Turbo Track"; + mes "Points you have earned before"; + mes "redeeming your points again."; close; } + tt_point -= .@total_point; + getitem Warp_Free_Ticket,.@input; + mes "[Item Exchange Helper]"; + mes "Thank you for"; + mes "your patronage."; + mes "We hope you enjoy"; + mes "your time here in"; + mes "the Turbo Track~"; + close; case 2: mes "[Item Exchange Helper]"; mes "Each Magic Scroll costs"; @@ -4214,15 +4212,15 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Item Exchange Helper]"; mes "You have"; mes "canceled"; mes "your request."; close; } - else if (.@input < 0 || .@input > 50) { + if (.@input > 50) { mes "[Item Exchange Helper]"; mes "I'm sorry, but your"; mes "request has exceeded the"; @@ -4230,28 +4228,26 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "request up to 50 scrolls at once."; close; } - else { - .@total_point = 12 * .@input; - if (.@total_point > tt_point) { - mes "[Item Exchange Helper]"; - mes "I'm sorry, but you do"; - mes "not have enough Turbo"; - mes "Track Points. Please check"; - mes "the amount of Turbo Track"; - mes "Points you have earned before"; - mes "redeeming your points again."; - close; - } - tt_point -= .@total_point; - getitem .@scroll,.@input; + .@total_point = 12 * .@input; + if (.@total_point > tt_point) { mes "[Item Exchange Helper]"; - mes "Thank you for"; - mes "your patronage."; - mes "We hope you enjoy"; - mes "your time here in"; - mes "the Turbo Track~"; + mes "I'm sorry, but you do"; + mes "not have enough Turbo"; + mes "Track Points. Please check"; + mes "the amount of Turbo Track"; + mes "Points you have earned before"; + mes "redeeming your points again."; close; } + tt_point -= .@total_point; + getitem .@scroll,.@input; + mes "[Item Exchange Helper]"; + mes "Thank you for"; + mes "your patronage."; + mes "We hope you enjoy"; + mes "your time here in"; + mes "the Turbo Track~"; + close; case 3: mes "[Item Exchange Helper]"; mes "You can exchange"; @@ -4298,15 +4294,15 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Item Exchange Helper]"; mes "You have"; mes "canceled"; mes "your request."; close; } - else if (.@input < 0 || .@input > 10) { + if (.@input > 10) { mes "[Item Exchange Helper]"; mes "Your request exceeds"; mes "the maximum limit. You"; @@ -4314,28 +4310,26 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "of 10 diamonds at once."; close; } - else { - .@total_point = 150 * .@input; - if (.@total_point > tt_point) { - mes "[Item Exchange Helper]"; - mes "I'm sorry, but you do"; - mes "not have enough Turbo"; - mes "Track Points. Please check"; - mes "the amount of Turbo Track"; - mes "Points you have earned before"; - mes "redeeming your points again."; - close; - } - tt_point -= .@total_point; - getitem Crystal_Jewel__,.@input; + .@total_point = 150 * .@input; + if (.@total_point > tt_point) { mes "[Item Exchange Helper]"; - mes "Thank you for"; - mes "your patronage."; - mes "We hope you enjoy"; - mes "your time here in"; - mes "the Turbo Track~"; + mes "I'm sorry, but you do"; + mes "not have enough Turbo"; + mes "Track Points. Please check"; + mes "the amount of Turbo Track"; + mes "Points you have earned before"; + mes "redeeming your points again."; close; } + tt_point -= .@total_point; + getitem Crystal_Jewel__,.@input; + mes "[Item Exchange Helper]"; + mes "Thank you for"; + mes "your patronage."; + mes "We hope you enjoy"; + mes "your time here in"; + mes "the Turbo Track~"; + close; case 5: mes "[Item Exchange Helper]"; mes "You can exchange"; @@ -4345,15 +4339,15 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Item Exchange Helper]"; mes "You have"; mes "canceled"; mes "your request."; close; } - else if (.@input < 0 || .@input > 10) { + if (.@input > 10) { mes "[Item Exchange Helper]"; mes "Your request exceeds"; mes "the maximum limit. You"; @@ -4361,28 +4355,26 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "of 10 Gift Boxes at once."; close; } - else { - .@total_point = 300 * .@input; - if (.@total_point > tt_point) { - mes "[Item Exchange Helper]"; - mes "I'm sorry, but you do"; - mes "not have enough Turbo"; - mes "Track Points. Please check"; - mes "the amount of Turbo Track"; - mes "Points you have earned before"; - mes "redeeming your points again."; - close; - } - tt_point -= .@total_point; - getitem Gift_Box,.@input; + .@total_point = 300 * .@input; + if (.@total_point > tt_point) { mes "[Item Exchange Helper]"; - mes "Thank you for"; - mes "your patronage."; - mes "We hope you enjoy"; - mes "your time here in"; - mes "the Turbo Track~"; + mes "I'm sorry, but you do"; + mes "not have enough Turbo"; + mes "Track Points. Please check"; + mes "the amount of Turbo Track"; + mes "Points you have earned before"; + mes "redeeming your points again."; close; } + tt_point -= .@total_point; + getitem Gift_Box,.@input; + mes "[Item Exchange Helper]"; + mes "Thank you for"; + mes "your patronage."; + mes "We hope you enjoy"; + mes "your time here in"; + mes "the Turbo Track~"; + close; case 6: mes "[Item Exchange Helper]"; mes "You can exchange"; @@ -4392,15 +4384,15 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Item Exchange Helper]"; mes "You have"; mes "canceled"; mes "your request."; close; } - else if (.@input < 0 || .@input > 10) { + if (.@input > 10) { mes "[Item Exchange Helper]"; mes "Your request exceeds"; mes "the maximum limit. You"; @@ -4408,28 +4400,26 @@ turbo_room,93,117,5 script Point Exchange Helper 4_M_TELEPORTER,{ mes "of 10 potions at once."; close; } - else { - .@total_point = 400 * .@input; - if (.@total_point > tt_point) { - mes "[Item Exchange Helper]"; - mes "I'm sorry, but you do"; - mes "not have enough Turbo"; - mes "Track Points. Please check"; - mes "the amount of Turbo Track"; - mes "Points you have earned before"; - mes "redeeming your points again."; - close; - } - tt_point -= .@total_point; - getitem Speed_Up_Potion,.@input; + .@total_point = 400 * .@input; + if (.@total_point > tt_point) { mes "[Item Exchange Helper]"; - mes "Thank you for"; - mes "your patronage."; - mes "We hope you enjoy"; - mes "your time here in"; - mes "the Turbo Track~"; + mes "I'm sorry, but you do"; + mes "not have enough Turbo"; + mes "Track Points. Please check"; + mes "the amount of Turbo Track"; + mes "Points you have earned before"; + mes "redeeming your points again."; close; } + tt_point -= .@total_point; + getitem Speed_Up_Potion,.@input; + mes "[Item Exchange Helper]"; + mes "Thank you for"; + mes "your patronage."; + mes "We hope you enjoy"; + mes "your time here in"; + mes "the Turbo Track~"; + close; case 7: mes "[Item Exchange Helper]"; mes "This Item Exchange"; @@ -4506,59 +4496,57 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Turbo Track Point Manager]"; mes "You have"; mes "canceled"; mes "your request."; close; } - else if (.@input > 20) { + if (.@input > 20) { mes "[Turbo Track Point Manager]"; mes "Your request exceeds"; mes "the maximum limit. Please"; mes "enter a value no greater than 20."; close; } + .@want_point1 = 10 * .@input; + .@want_point = 5 * .@input; + .@my_turbo_all = tt_point+.@want_point; + .@my_arena_all = arena_point-.@want_point1; + if (.@my_turbo_all > 28999) { + mes "[Turbo Track Point Manager]"; + mes "Unfortunately, your Turbo Track Points will exceed the maximum limit if we proceed with point conversion. Please spend more"; + mes "of your Turbo Track Points before using this service. Thank you."; + close; + } + if (.@my_arena_all < 0) { + mes "[Turbo Track Point Manager]"; + mes "I am sorry, but you do"; + mes "not have enough Arena Points"; + mes "to perform this Turbo Track"; + mes "Point conversion."; + close; + } else { - .@want_point1 = 10 * .@input; - .@want_point = 5 * .@input; - .@my_turbo_all = tt_point+.@want_point; - .@my_arena_all = arena_point-.@want_point1; - if (.@my_turbo_all > 28999) { - mes "[Turbo Track Point Manager]"; - mes "Unfortunately, your Turbo Track Points will exceed the maximum limit if we proceed with point conversion. Please spend more"; - mes "of your Turbo Track Points before using this service. Thank you."; - close; - } - if (.@my_arena_all < 0) { - mes "[Turbo Track Point Manager]"; - mes "I am sorry, but you do"; - mes "not have enough Arena Points"; - mes "to perform this Turbo Track"; - mes "Point conversion."; - close; - } - else { - mes "[Turbo Track Point Manager]"; - mes "You have converted"; - mes "10 Arena Points into"; - mes "Turbo Track Points " + .@input + " times."; - mes "A total of " + .@want_point1 + " Arena Points"; - mes "has been converted into"; - mes "" + .@want_point +" Turbo Track Points."; - arena_point = .@my_arena_all; //arena_point - tt_point = .@my_turbo_all; - next; - mes "[Turbo Track Point Manager]"; - mes "" + strcharinfo(PC_NAME) + ","; - mes "you now have"; - mes "^00688B" + tt_point + "^000000 Turbo Track Points"; - mes "and ^4682B4" + arena_point + "^000000 Arena Points."; - mes "Thank you for your patronage."; - close; - } + mes "[Turbo Track Point Manager]"; + mes "You have converted"; + mes "10 Arena Points into"; + mes "Turbo Track Points " + .@input + " times."; + mes "A total of " + .@want_point1 + " Arena Points"; + mes "has been converted into"; + mes "" + .@want_point +" Turbo Track Points."; + arena_point = .@my_arena_all; //arena_point + tt_point = .@my_turbo_all; + next; + mes "[Turbo Track Point Manager]"; + mes "" + strcharinfo(PC_NAME) + ","; + mes "you now have"; + mes "^00688B" + tt_point + "^000000 Turbo Track Points"; + mes "and ^4682B4" + arena_point + "^000000 Arena Points."; + mes "Thank you for your patronage."; + close; } case 6: mes "[Turbo Track Point Manager]"; |