diff options
Diffstat (limited to 'npc')
139 files changed, 4236 insertions, 3963 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 7bac19e21..75708d167 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -491,9 +491,8 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ " '0' to cancel your order."); next; while (1) { - input .@input; - .@pay = .@input * 15; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes("[Fruitz]"); mes("Thanks for stopping\r" "by my shop. Farewell!"); @@ -502,7 +501,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ "Apple to snack on~"); close; } - else if (.@input < 1 || .@input > 500) { + if (.@input > 500) { mes("[Fruitz]"); mes("You've entered a number\r" "higher than the maximum\r" @@ -510,25 +509,25 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ "the number of Apples you\r" "wish to purchase again."); next; + continue; } - else { + .@pay = .@input * 15; + mes("[Fruitz]"); + mesf("A total of ^FF0000%d^000000 Apples\r" + "will cost you ^FF0000%d Zeny^000000.", + .@input, .@pay); + mes("Would you like to continue?"); + next; + if (select("Yes", "No") == 2) { mes("[Fruitz]"); - mesf("A total of ^FF0000%d^000000 Apples\r" - "will cost you ^FF0000%d Zeny^000000.", - .@input, .@pay); - mes("Would you like to continue?"); - next; - if (select("Yes", "No") == 2) { - mes("[Fruitz]"); - mes("Thanks for stopping\r" - "by my shop. Farewell!"); - mes("Come by anytime when\r" - "you feel like having an\r" - "Apple to snack on~"); - close; - } - break; + mes("Thanks for stopping\r" + "by my shop. Farewell!"); + mes("Come by anytime when\r" + "you feel like having an\r" + "Apple to snack on~"); + close; } + break; } if (Zeny < .@pay) { mes("[Fruitz]"); @@ -853,44 +852,43 @@ airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{ "'0' to cancel your order."); next; while (1) { - input .@input; - .@pay = .@input * 15; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes("[Meltz]"); mes("Thanks for stopping\r" "by my shop. Farewell!"); mes("Come by anytime when\r" "you feel like having an\r" "Apple to snack on~"); - close; + close(); } - else if (.@input < 1 || .@input > 500) { + if (.@input > 500) { mes("[Meltz]"); mes("You've entered a number\r" "higher than the maximum\r" "value of 500. Please enter\r" "the number of Apples you\r" "wish to purchase again."); - next; + next(); + continue; } - else { + .@pay = .@input * 15; + mes("[Meltz]"); + mesf("A total of ^FF0000%d^000000 Apples\r" + "will cost you ^FF0000%d Zeny^000000.", + .@input, .@pay); + mes("Would you like to continue?"); + next; + if (select("Yes", "No") == 2) { mes("[Meltz]"); - mesf("A total of ^FF0000%d^000000 Apples\r" - "will cost you ^FF0000%d Zeny^000000.", - .@input, .@pay); - mes("Would you like to continue?"); - next; - if (select("Yes", "No") == 2) { - mes("[Meltz]"); - mes("Thanks for stopping\r" - "by my shop. Farewell!"); - mes("Come by anytime when\r" - "you feel like having an\r" - "Apple to snack on~"); - close; - } - break; + mes("Thanks for stopping\r" + "by my shop. Farewell!"); + mes("Come by anytime when\r" + "you feel like having an\r" + "Apple to snack on~"); + close; } + break; } if (Zeny < .@pay) { mes("[Meltz]"); @@ -1150,7 +1148,7 @@ airplane_01,32,61,4 script Nils#ein 1_M_03,1,1,{ mes(.@line1_3$[.@wordtest]); .@start_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); next; - input .@save1$; + input(.@save1$); .@end_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); .@total_time = .@end_time - .@start_time; mes("[Nils]"); @@ -1158,7 +1156,7 @@ airplane_01,32,61,4 script Nils#ein 1_M_03,1,1,{ mes(.@line2_2$[.@wordtest]); .@start_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); next; - input .@save2$; + input(.@save2$); .@end_time = gettime(GETTIME_HOUR)*60*60 + gettime(GETTIME_MINUTE)*60 + gettime(GETTIME_SECOND); .@total_time = .@total_time + (.@start_time - .@end_time); .@tasoo = (.@letters[.@wordtest] / .@total_time) * 6; @@ -1329,15 +1327,15 @@ function script applegamble { "to cancel, please enter '0'."); next; while(1) { - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes(.@n$); mes("Changed your mind?"); mes("I understand. Well then,\r" "I hope we can play sometime."); close; } - else if (.@amount < 1 || .@amount > 50) { + if (.@amount > 50) { mes(.@n$); mes("You can't bet more than\r" "50 Apples. Remember, we\r" diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index ed4be5438..abac7b76a 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); next; mes "[Phelix]"; if (.@amount <= 0) { @@ -396,10 +396,10 @@ 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); next; mes "[Phelix]"; - if (.@amount == 0) { + if (.@amount <= 0) { mes "Alright then, see you next time."; close; } diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 57d4205df..bd74a8971 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -1200,8 +1200,9 @@ 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; - if(@input < 1 || @input > 5) @input = rand(1,5); //Lupus's fix + input(@input); + if (@input < 1 || @input > 5) + @input = rand(1,5); // Lupus's fix callsub sF_Spin; mes "[Kafra]"; mes "Ok~ Let me check the results~ guess what it is?"; @@ -1274,7 +1275,8 @@ sF_Spin: next; @temp = rand(10); --@input; - if(@input <= 0) return; + if (@input <= 0) + return; } } diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 7f299dfa2..2bc972c70 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -274,8 +274,8 @@ OnTouch: mes "them at a time."; next; while(1) { - input .@input; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Suspicious Guy]"; if (Sex == SEX_MALE) mes "Ah duuuuuude~ You're breakin' my heart! I mean, at these prices, I'm practically performing charity!"; @@ -283,14 +283,14 @@ OnTouch: mes "W-waaaait! You didn't let me tell you the part about how Red Potions help you lose and gain weight in all the right places! Waaaaait!"; close; } - else if (.@input > 100) { + if (.@input > 100) { mes "[Suspicious Guy]"; mes "Whoa..."; mes "I can't let you buy that many. I mean, it's not like, you know, there's a trace impurity in these Potions or anything like that..."; next; + continue; } - else - break; + break; } .@Red_potion_hap = .@input * 500; if (Zeny < .@Red_potion_hap) { @@ -344,8 +344,8 @@ OnTouch: mes "There's no way you can pass this up! Now, how many do you want?"; next; while(1) { - input .@input; - if (.@input == 0) { + input(.@input); + 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..."; mes "You'd probably"; @@ -353,14 +353,14 @@ OnTouch: close; } - else if (.@input > 100) { + if (.@input > 100) { mes "[Suspicious Guy]"; mes "Whoa!"; mes "I can't sell that many Daggers! That'll attract the Prontera Chiv--I mean, um, I was gonna donate some Daggers to... Hungry children?"; next; + continue; } - else - break; + break; } .@Main_gauche_hap = .@input * 9400; if (Zeny < .@Main_gauche_hap) { @@ -398,21 +398,21 @@ OnTouch: mes "Clearly, this is the deal of the century. So how many do you want?"; next; while(1) { - input .@input; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Suspicious Guy]"; mes "Awww..."; mes "It wasn't because of the whole drawstrings thing, was it?"; close; } - else if (.@input > 100) { + if (.@input > 100) { mes "[Suspicious Guy]"; mes "Whoa~!"; mes "I can't sell you that many! What are you trying to do, take advantage of me?"; next; + continue; } - else - break; + break; } .@Hood__hap = .@input * 930; if (Zeny < .@Hood__hap) { diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 71ec8264f..7e117b45c 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -880,7 +880,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{ mes "Bartender,"; mes "I'm so depressed"; mes "because of..."; - input .@inputstr$; + input(.@inputstr$); mes .@inputstr$+"..."; next; mes "[Bartender]"; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 3cbe900c3..88f117747 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -561,16 +561,8 @@ 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; - if (.@input > 30000 || .@input < 0) { - mes "[Lucius]"; - mes "Please enter a value"; - mes "from 1 to 30,000 in"; - mes "order to make a donation"; - mes "to the needy, youngster."; - close; - } - else if (.@input == 0) { + input(.@input); + if (.@input == 0) { mes "[Lucius]"; mes "How disappointing,"; mes "but I'm sure you have"; @@ -580,6 +572,14 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{ mes "to come back at any time."; close; } + if (.@input > 30000 || .@input < 1) { + mes "[Lucius]"; + mes "Please enter a value"; + mes "from 1 to 30,000 in"; + mes "order to make a donation"; + mes "to the needy, youngster."; + close; + } mes "[Lucius]"; mes "Thank you so much"; mes "for your " + .@input + " zeny donation."; diff --git a/npc/custom/bartershop.txt b/npc/custom/bartershop.txt new file mode 100644 index 000000000..bcb61795e --- /dev/null +++ b/npc/custom/bartershop.txt @@ -0,0 +1,21 @@ +//===== Hercules Script ====================================== +//= Barter shop demo +//===== By: ================================================== +//= 4144 +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Barter shop demo in prontera. +//============================================================ + +prontera,159,284,4 trader Barter Shop#prt 4_M_KID1,{ +OnInit: + tradertype(NST_BARTER); + sellitem White_Herb, 100, Red_Potion, 2; + sellitem Blue_Herb, 200, Orange_Potion, 3; + sellitem Green_Herb, 100, Red_Potion, 4; + sellitem White_Herb, 100, Orange_Potion, 1; + sellitem Apple, -1, Orange_Potion, 1; + sellitem Praetorian_Shield, 100, Berserk_Potion, 10; + end; +} diff --git a/npc/custom/etc/bank.txt b/npc/custom/etc/bank.txt index c5bed187b..4135ed192 100644 --- a/npc/custom/etc/bank.txt +++ b/npc/custom/etc/bank.txt @@ -28,27 +28,25 @@ 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); if (@deposit < 1) { mes "Make sure you ask me to deposit a real amount."; close; } - else if (@deposit > Zeny) { + if (@deposit > Zeny) { mes "It does not appear like you have the amount of zeny you're trying to deposit!"; close; } - else if (@deposit > (Zeny - @cost)) { + if (@deposit > Zeny - @cost) { mes "You need " + @cost + " Zeny to cover the transaction fee!"; close; } - else { Zeny -= @deposit; Zeny -= @cost; - set #bankstorage,#bankstorage + @deposit; + #bankstorage += @deposit; mes "[Banker]"; mes "Thank you very much... Your zeny is in good hands."; close; - } case 2: mes "[Banker]"; @@ -59,16 +57,16 @@ 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); if (@withdrawl < 1) { mes "Please don't play games. I need a real amount to withdraw."; close; } - else if (@withdrawl > #bankstorage) { + if (@withdrawl > #bankstorage) { mes "I show you only have ^00FF00" + #bankstorage +"^000000 zeny in your account!"; close; } - else if ((@cost > Zeny) && ((Zeny + @withdrawl) > @cost)) { + if (@cost > Zeny && Zeny + @withdrawl > @cost) { mes "[Banker]"; mes "You don't have the Zeny for the transaction fee right now. Would you like me to take the fee directly from your withdrawl?"; next; @@ -76,13 +74,13 @@ switch(select("I'd like to make a deposit.", "I'd like to make a withdrawl.", "W case 1: mes "[Banker]"; mes "Removing " + @cost + " from your withdrawl to cover the deposit fee..."; - set @withdrawl,@withdrawl - @cost; - set #bankstorage,#bankstorage - @cost; - set @cost,0; + @withdrawl -= @cost; + #bankstorage -= @cost; + @cost = 0; next; Zeny -= @cost; Zeny += @withdrawl; - set #bankstorage,#bankstorage - @withdrawl; + #bankstorage -= @withdrawl; mes "[Banker]"; mes "There's your Zeny. Have a good day."; close; @@ -92,14 +90,12 @@ switch(select("I'd like to make a deposit.", "I'd like to make a withdrawl.", "W close; } } - else { - Zeny -= @cost; - Zeny += @withdrawl; - set #bankstorage,#bankstorage - @withdrawl; - mes "[Banker]"; - mes "There's your Zeny. Have a good day."; - close; - } + Zeny -= @cost; + Zeny += @withdrawl; + #bankstorage -= @withdrawl; + mes "[Banker]"; + mes "There's your Zeny. Have a good day."; + close; case 3: mes "[Banker]"; mes "Hmmmm let me check some paper work."; diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt index 375a9f611..a970f8302 100644 --- a/npc/custom/etc/bank_kafra.txt +++ b/npc/custom/etc/bank_kafra.txt @@ -44,7 +44,8 @@ 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 +63,8 @@ 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 421fccc78..0c6c987a5 100644 --- a/npc/custom/etc/lottery.txt +++ b/npc/custom/etc/lottery.txt @@ -171,43 +171,64 @@ L_HandPick: set @L5,0; set @L6,0; Input1: - input @L1; - if (@L1 < 1 || @L1 > 40) goto Input1; + input(@L1); + if (@L1 < 1 || @L1 > 40) + goto Input1; mes @L1; Input2: - input @L2; - if (@L2 < 1 || @L2 > 40) goto Input2; - if (@L2 == @L1) goto Input2; + input(@L2); + if (@L2 < 1 || @L2 > 40) + goto Input2; + if (@L2 == @L1) + goto Input2; mes @L2; Input3: - input @L3; - if (@L3 < 1 || @L3 > 40) goto Input3; - if (@L3 == @L1) goto Input3; - if (@L3 == @L2) goto Input3; + input(@L3); + if (@L3 < 1 || @L3 > 40) + goto Input3; + if (@L3 == @L1) + goto Input3; + if (@L3 == @L2) + goto Input3; mes @L3; Input4: - input @L4; - if (@L4 < 1 || @L4 > 40) goto Input4; - if (@L4 == @L1) goto Input4; - if (@L4 == @L2) goto Input4; - if (@L4 == @L3) goto Input4; + input(@L4); + 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; - if (@L5 < 1 || @L5 > 40) goto Input5; - if (@L5 == @L1) goto Input5; - if (@L5 == @L2) goto Input5; - if (@L5 == @L3) goto Input5; - if (@L5 == @L4) goto Input5; + input(@L5); + if (@L5 < 1 || @L5 > 40) + goto Input5; + if (@L5 == @L1) + goto Input5; + if (@L5 == @L2) + goto Input5; + if (@L5 == @L3) + goto Input5; + if (@L5 == @L4) + goto Input5; mes @L5; Input6: - input @L6; - if (@L6 < 1 || @L6 > 40) goto Input6; - if (@L6 == @L1) goto Input6; - if (@L6 == @L2) goto Input6; - if (@L6 == @L3) goto Input6; - if (@L6 == @L4) goto Input6; - if (@L6 == @L5) goto Input6; + input(@L6); + if (@L6 < 1 || @L6 > 40) + goto Input6; + if (@L6 == @L1) + goto Input6; + if (@L6 == @L2) + goto Input6; + if (@L6 == @L3) + goto Input6; + if (@L6 == @L4) + goto Input6; + if (@L6 == @L5) + goto Input6; mes @L6; next; mes "[Lottery]"; @@ -406,43 +427,64 @@ L_GM_Rig: set $LR5,0; set $LR6,0; GMInput1: - input $LR1; - if ($LR1 < 1 || $LR1 > 40) goto GMInput1; + input($LR1); + if ($LR1 < 1 || $LR1 > 40) + goto GMInput1; mes $LR1; GMInput2: - input $LR2; - if ($LR2 < 1 || $LR2 > 40) goto GMInput2; - if ($LR2 == $LR1) goto GMInput2; + input($LR2); + if ($LR2 < 1 || $LR2 > 40) + goto GMInput2; + if ($LR2 == $LR1) + goto GMInput2; mes $LR2; GMInput3: - input $LR3; - if ($LR3 < 1 || $LR3 > 40) goto GMInput3; - if ($LR3 == $LR1) goto GMInput3; - if ($LR3 == $LR2) goto GMInput3; + input($LR3); + if ($LR3 < 1 || $LR3 > 40) + goto GMInput3; + if ($LR3 == $LR1) + goto GMInput3; + if ($LR3 == $LR2) + goto GMInput3; mes $LR3; GMInput4: - input $LR4; - if ($LR4 < 1 || $LR4 > 40) goto GMInput4; - if ($LR4 == $LR1) goto GMInput4; - if ($LR4 == $LR2) goto GMInput4; - if ($LR4 == $LR3) goto GMInput4; + input($LR4); + 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; - if ($LR5 < 1 || $LR5 > 40) goto GMInput5; - if ($LR5 == $LR1) goto GMInput5; - if ($LR5 == $LR2) goto GMInput5; - if ($LR5 == $LR3) goto GMInput5; - if ($LR5 == $LR4) goto GMInput5; + input($LR5); + if ($LR5 < 1 || $LR5 > 40) + goto GMInput5; + if ($LR5 == $LR1) + goto GMInput5; + if ($LR5 == $LR2) + goto GMInput5; + if ($LR5 == $LR3) + goto GMInput5; + if ($LR5 == $LR4) + goto GMInput5; mes $LR5; GMInput6: - input $LR6; - if ($LR6 < 1 || $LR6 > 40) goto GMInput6; - if ($LR6 == $LR1) goto GMInput6; - if ($LR6 == $LR2) goto GMInput6; - if ($LR6 == $LR3) goto GMInput6; - if ($LR6 == $LR4) goto GMInput6; - if ($LR6 == $LR5) goto GMInput6; + input($LR6); + if ($LR6 < 1 || $LR6 > 40) + goto GMInput6; + if ($LR6 == $LR1) + goto GMInput6; + if ($LR6 == $LR2) + goto GMInput6; + if ($LR6 == $LR3) + goto GMInput6; + if ($LR6 == $LR4) + goto GMInput6; + if ($LR6 == $LR5) + goto GMInput6; mes $LR6; next; mes "[Lottery]"; diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index 4e521ec55..c392c5ff1 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -105,7 +105,7 @@ prt_church,100,123,4 script Vomars 1_M_PASTOR,{ npctalk "Ladies and gentlemen, "+strcharinfo(PC_NAME)+" has an objection to the wedding!"; SF_wed_end(); mes "Why should they not be wed?"; - input $@msg$; + input($@msg$); npctalk strcharinfo(PC_NAME)+"'s objection is: "+$@msg$; emotion e_sob; mes "I see..."; diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 8420cd544..249e5518d 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -322,10 +322,11 @@ L_Sell: mes "You have: ^FF0000" + #monpoints + "^000000 experience points"; mes "How many would you like to sell?"; next; - input @sellexp; - if (@sellexp > #monpoints) goto L_NoExp; - set #monpoints,#monpoints-@sellexp; - set @sellearn,100*@sellexp; // Price of exp + input(@sellexp, 0); + if (@sellexp > #monpoints) + goto L_NoExp; + #monpoints -= @sellexp; + @sellearn = 100 * @sellexp; // Price of exp Zeny += @sellearn; mes "[Monster Trainer]"; mes "You earned ^0000FF" + @sellearn + "^000000z."; diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index 35b863e9d..fec9c6b14 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -82,7 +82,7 @@ function script Q_Warpra { case 2: warp $QW_SP_WarpMap$, $QW_SP_WarpX, $QW_SP_WarpY; close2; - debugmes "Please check your special warp menu settings on the Warpra."; + consolemes(CONSOLEMES_WARNING, "Please check your special warp menu settings on the Warpra."); end; case 3: goto L_town; case 4: goto L_dungeon; @@ -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; @@ -1533,7 +1533,7 @@ function script QWS_Dungeon_Warpra { mes "[Warpra]"; mes "Sorry, I can only unlock this location."; } else - debugmes "QWS_Dungeon_Warpra error, improper syntax?"; + consolemes(CONSOLEMES_ERROR, "QWS_Dungeon_Warpra error, improper syntax?"); return; function QWS_D_setbin { @@ -1577,7 +1577,7 @@ function script QWS_Town_Warpra { } else if (QWS_T_getbin(getarg(0)) == 1) { callfunc "Q_Warpra",0; } else - debugmes "QWS_Town_Warpra error, improper syntax ?"; + consolemes(CONSOLEMES_ERROR, "QWS_Town_Warpra error, improper syntax ?"); return; function QWS_T_setbin { diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt index 4acf7c8ac..cc92d3fce 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]"; @@ -83,8 +83,7 @@ morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{ mes "Active Ninjas: "+#ninjas; mes "Resting Ninjas: "+#ninjasr; mes "How many do you want to send?"; - set @number,0; - input @number; + input(@number); if (@number < 1) { mes "[Shifty Assassin]"; mes "You can't kill anyone without ninjas."; @@ -144,7 +143,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 465840dfe..b761d8d16 100644 --- a/npc/custom/etc/stock_market.txt +++ b/npc/custom/etc/stock_market.txt @@ -323,11 +323,8 @@ prontera,140,181,5 script Stock Market::stockmarket 4_M_MANAGER,{ mes "Enter the name of the share company"; mes "Transaction fee of ^FF0000" + $S_Trans + "z^000000 will apply."; - set @buyname$,"0"; - input @buyname$; - - set @buyamount,0; - input @buyamount; + input(@buyname$); + input(@buyamount); // Checks valid number // if (@buyamount < $S_BuyMin) { mes "^FF0000Minimum of " + $S_BuyMin + " shares can be bought at a time.^000000"; @@ -476,10 +473,8 @@ prontera,140,181,5 script Stock Market::stockmarket 4_M_MANAGER,{ if (#S8 > 0) mes "^0000FF"+$S8N$+"^FF0000" + " x " + #S8 + " [" + $S8 + "z]"; if (#S9 > 0) mes "^0000FF"+$S9N$+"^FF0000" + " x " + #S9 + " [" + $S9 + "z]"; if (#S10 > 0) mes "^0000FF"+$S10N$+"^FF0000" + " x " + #S10 + " [" + $S10 + "z]"; - set @sellname$,"0"; - input @sellname$; - set @sellamount,0; - input @sellamount; + input(@sellname$); + input(@sellamount); if (@sellamount < 1) { mes "^FF0000Invalid integer.^000000"; next; @@ -756,7 +751,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 7047ca00e..2e6170693 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 b9071d162..37f8a4f99 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -8,6 +8,7 @@ //= Note: This script requires PCRE to run properly. //= 5.0 Last update by GmOcean. //= 5.1 Cleaned and standardized, mostly. [Euphy] +//= 5.2 Fix a bug that causes this event run indefinitely [AnnieRuru] //============================================================ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ @@ -66,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+"."; @@ -76,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."; @@ -85,11 +86,11 @@ 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); mes .@n$; - if (.@amount<=0 || .@amount>=10000) { + if (.@amount <= 0 || .@amount >= 10000) { mes "That amount is invalid. Using default ammount of 1."; - set .@amount,1; + .@amount = 1; next; mes .@n$; } @@ -183,6 +184,15 @@ OnTimer30000: deletepset 1; stopnpctimer; setnpctimer 0; + ++.RoundCount; + if (.RoundCount >= .Rounds) { + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; + .RoundCount = 0; + .Change = 0; + .EventON = 0; + npctalk "Thank you all for playing. That was the last round of the Disguise Event. Come play again later."; + end; + } initnpctimer; end; OnTimer60000: diff --git a/npc/custom/events/mushroom_event.txt b/npc/custom/events/mushroom_event.txt index b9c54c09e..fc7446814 100644 --- a/npc/custom/events/mushroom_event.txt +++ b/npc/custom/events/mushroom_event.txt @@ -41,7 +41,7 @@ OnMinute10: // Start time (every hour) set .status,1; set .Spawn,rand(1,10); // How many Mushrooms should spawn? set .Map$,.maps$[rand(getarraysize(.maps$))]; - killmonster .Map$,"All"; + killmonster(.Map$, "all"); monster .Map$,0,0,"Please don't kill me!",1084,.Spawn,strnpcinfo(NPC_NAME)+"::OnMobKilled"; announce "Find the Mushroom : Total of "+.Spawn+" Mushrooms have been spawned in "+.Map$+"!",0; sleep 2500; @@ -50,9 +50,12 @@ OnMinute10: // Start time (every hour) OnMobKilled: set .Spawn, .Spawn - 1; - getitem .Prize, .Amount; - if (.Spawn) announce "[ "+strcharinfo(PC_NAME)+" ] has killed a Mushroom. There are now "+.Spawn+" Mushroom(s) left.",bc_map; - else { + if (playerattached() != 0) { + getitem .Prize, .Amount; + if (.Spawn) + announce "[ "+strcharinfo(PC_NAME)+" ] has killed a Mushroom. There are now "+.Spawn+" Mushroom(s) left.",bc_map; + } + if (!.Spawn) { announce "The Find the Mushroom Event has ended. All the Mushrooms have been killed.",0; set .status,0; } diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt index 33339dcd9..195f20275 100644 --- a/npc/custom/events/valentinesdayexp.txt +++ b/npc/custom/events/valentinesdayexp.txt @@ -95,12 +95,15 @@ alberta,26,243,4 script Stephen#val1 1_M_MERCHANT,{ mes "you can come back again."; mes "So how many do you want?"; next; - set @needmon,0; - input @flag_num; - if (@flag_num <= 0) goto L_NONE; - if (@flag_num > 5) goto L_ERR; - set @needmon,@flag_num*5000; - if (Zeny < @needmon) goto L_NOTENO; + @needmon = 0; + input(@flag_num); + if (@flag_num <= 0) + goto L_NONE; + if (@flag_num > 5) + goto L_ERR; + @needmon = @flag_num * 5000; + if (Zeny < @needmon) + goto L_NOTENO; Zeny -= @needmon; getitem 558,@flag_num; mes "[Stephen]"; @@ -154,13 +157,17 @@ alberta,29,243,4 script Jainie#val1 1_M_INNKEEPER,{ mes "you can come back again."; mes "So how many do you want? 1 portion is 4500z + 1 Milk."; next; - set @needmon,0; - input @flag_num; - if (@flag_num == 0) goto L_NONE; - if (@flag_num > 5) goto L_ERR; - set @needmon,@flag_num*4500; - if (Zeny < @needmon) goto L_NOTENO; - if (countitem(Milk) < @flag_num) goto L_NOMILK; + @needmon = 0; + input(@flag_num); + if (@flag_num == 0) + goto L_NONE; + if (@flag_num > 5) + goto L_ERR; + @needmon = @flag_num * 4500; + if (Zeny < @needmon) + goto L_NOTENO; + if (countitem(Milk) < @flag_num) + goto L_NOMILK; Zeny -= @needmon; delitem 519,@flag_num; getitem 561,@flag_num; diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt index 739b53c02..c2481e991 100644 --- a/npc/custom/quests/quest_shop.txt +++ b/npc/custom/quests/quest_shop.txt @@ -170,13 +170,13 @@ OnEnd: function Add { if (getitemname(getarg(1)) == "null") { - debugmes "Quest reward #"+getarg(1)+" invalid (skipped)."; + consolemes(CONSOLEMES_WARNING, "Quest reward #"+getarg(1)+" invalid (skipped)."); return; } setarray .@j[0],getarg(2),getarg(3),getarg(4); for(set .@i,5; .@i<getargcount(); set .@i,.@i+2) { if (getitemname(getarg(.@i)) == "null") { - debugmes "Quest requirement #"+getarg(.@i)+" invalid (skipped)."; + consolemes(CONSOLEMES_WARNING, "Quest requirement #"+getarg(.@i)+" invalid (skipped)."); return; } else setarray .@j[.@i-2],getarg(.@i),getarg(.@i+1); diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt index 96e7346d3..4c12f9938 100644 --- a/npc/custom/quests/thq/THQS_TTShop.txt +++ b/npc/custom/quests/thq/THQS_TTShop.txt @@ -93,7 +93,7 @@ function script thqs_trade_token { // getarg(1) - .@mp$ -> PRICE function script thqs_menu_buy { if( getargcount() != 2 ) { - debugmes "thqs_menu_buy: Wrong number of arguments!!"; + consolemes(CONSOLEMES_ERROR, "thqs_menu_buy: Wrong number of arguments!!"); close; } @@ -101,7 +101,7 @@ function script thqs_menu_buy { .@mp$ = getarg(1); if( getarraysize( getd(.@mw$) ) != getarraysize( getd(.@mp$) ) ) { - debugmes "thqs_menu_buy: Missing entries in data!"; + consolemes(CONSOLEMES_ERROR, "thqs_menu_buy: Missing entries in data!"); close; } diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt index 0ee7d8822..188a91ca7 100644 --- a/npc/custom/stylist.txt +++ b/npc/custom/stylist.txt @@ -3,32 +3,72 @@ //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Description: ========================================= //= Changes your hair style, hair color, and cloth color. //===== Additional Comments: ================================= //= 1.1 Switched to 'getbattleflag', credits to Saithis. [Euphy] +//= 1.2 Fix style start at min_style, add Job_Summoner [AnnieRuru] //============================================================ prontera,170,180,1 script Stylist#custom_stylist 2_M_DYEINGER,{ - - setarray .@styles[1],getbattleflag("max_cloth_color"),getbattleflag("max_hair_style"),getbattleflag("max_hair_color"); - setarray .@Look[1],7,1,6; - set .@s, select(" ~ Cloth color", " ~ Hairstyle", " ~ Hair color"); - set .@Revert, getlook(.@Look[.@s]); - set .@style,1; - while(1) { - setlook .@Look[.@s], .@style; - message strcharinfo(PC_NAME),"This is style #"+.@style+"."; - set .@menu$, " ~ Next (^0055FF"+((.@style!=.@styles[.@s])?.@style+1:1)+"^000000): ~ Previous (^0055FF"+((.@style!=1)?.@style-1:.@styles[.@s])+"^000000): ~ Jump to...: ~ Revert to original (^0055FF"+.@Revert+"^000000)"; - switch(select(.@menu$)) { - 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]; - if (!.@style) set .@style, rand(1,.@styles[.@s]); - break; - case 4: set .@style, .@Revert; setlook .@Look[.@s], .@Revert; break; + .@choose = select("Hair style", "Hair color", "Cloth color") - 1; + .@part = .look[.@choose]; + if (BaseClass != Job_Summoner) + callsub(L_styles, .@part, .minstyle[.@part], .maxstyle[.@part]); + else + callsub(L_styles, .@part, .summoner_minstyle[.@part], .summoner_maxstyle[.@part]); +L_styles: + .@lookpart = getarg(0); + .@minstyle = getarg(1); + .@maxstyle = getarg(2); + .@i = .@revert = getlook(.@lookpart); + while (true) { + setlook(.@lookpart, .@i); + message(strcharinfo(PC_NAME), sprintf(_("This is style #%d."), .@i)); + if (.@i == .@maxstyle) + .@next = .@minstyle; + else + .@next = .@i + 1; + if (.@i == .@minstyle) + .@previous = .@maxstyle; + else + .@previous = .@i - 1; + switch(select( + sprintf(_(" ~ Next (%s%d%s)"), F_MesColor(C_BLUE), .@next, F_MesColor(C_BLACK)), + sprintf(_(" ~ Previous (%s%d%s)"), F_MesColor(C_BLUE), .@previous, F_MesColor(C_BLACK)), + " ~ Jump to...", + sprintf(_(" ~ Revert to original (%s%d%s)"), F_MesColor(C_BLUE), .@revert, F_MesColor(C_BLACK)))) { + case 1: + .@i = .@next; + break; + case 2: + .@i = .@previous; + break; + case 3: + message(strcharinfo(PC_NAME), sprintf(_("Choose a style between %d - %d."), .@minstyle, .@maxstyle)); + input(.@i, .@minstyle, .@maxstyle); + break; + case 4: + .@i = .@revert; } } + end; +OnInit: + setarray .look[0], LOOK_HAIR, LOOK_HAIR_COLOR, LOOK_CLOTHES_COLOR; + + .minstyle[LOOK_HAIR] = getbattleflag("min_hair_style"); + .maxstyle[LOOK_HAIR] = getbattleflag("max_hair_style"); + .minstyle[LOOK_HAIR_COLOR] = getbattleflag("min_hair_color"); + .maxstyle[LOOK_HAIR_COLOR] = getbattleflag("max_hair_color"); + .minstyle[LOOK_CLOTHES_COLOR] = getbattleflag("min_cloth_color"); + .maxstyle[LOOK_CLOTHES_COLOR] = getbattleflag("max_cloth_color"); + + .summoner_minstyle[LOOK_HAIR] = getbattleflag("min_hair_style"); + .summoner_maxstyle[LOOK_HAIR] = getbattleflag("max_hair_style"); + .summoner_minstyle[LOOK_HAIR_COLOR] = getbattleflag("min_hair_color"); + .summoner_maxstyle[LOOK_HAIR_COLOR] = getbattleflag("max_hair_color"); + .summoner_minstyle[LOOK_CLOTHES_COLOR] = getbattleflag("min_cloth_color"); + .summoner_maxstyle[LOOK_CLOTHES_COLOR] = getbattleflag("max_cloth_color"); + end; } diff --git a/npc/dev/test.txt b/npc/dev/test.txt index 2822ee65c..a867a09b2 100644 --- a/npc/dev/test.txt +++ b/npc/dev/test.txt @@ -786,10 +786,10 @@ function script HerculesSelfTestHelper { callsub(OnCheck, "data_to_string (integer variable)", data_to_string(.@x), ".@x"); if (.errors) { - debugmes "Script engine self-test [ \033[0;31mFAILED\033[0m ]"; - debugmes "**** The test was completed with " + .errors + " errors. ****"; + consolemes(CONSOLEMES_DEBUG, "Script engine self-test [ \033[0;31mFAILED\033[0m ]"); + consolemes(CONSOLEMES_DEBUG, "**** The test was completed with " + .errors + " errors. ****"); } else { - debugmes "Script engine self-test [ \033[0;32mPASSED\033[0m ]"; + consolemes(CONSOLEMES_DEBUG, "Script engine self-test [ \033[0;32mPASSED\033[0m ]"); } return .errors; end; @@ -840,8 +840,8 @@ OnReportError: .@val$ = getarg(1,""); .@ref$ = getarg(2,""); if (.errors == 1) - debugmes "**** WARNING: Any self-test results past this point are unreliable because of previous errors. ****"; - debugmes "Error: "+.@msg$+": '"+.@val$+"' (found) != '"+.@ref$+"' (expected)"; + consolemes(CONSOLEMES_DEBUG, "**** WARNING: Any self-test results past this point are unreliable because of previous errors. ****"); + consolemes(CONSOLEMES_DEBUG, "Error: "+.@msg$+": '"+.@val$+"' (found) != '"+.@ref$+"' (expected)"); ++.errors; //end; return; diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index 641b8f2da..9f5ac381a 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -67,8 +67,8 @@ 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; - if (@input == 0) + input(@input); + if (@input <= 0) close; if (@input > 5) { mes "[Exorcist Master Fahae]"; diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index 4d914ebcb..a2d6a2155 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); if (.@input == 0) { mes "[Egg Salesman]"; mes "Hey, if you're not"; @@ -101,7 +101,7 @@ prontera,111,99,5 script Egg Salesman#prt::EggVendor 4W_M_02,{ mes "help out my customers?"; close; } - else if (.@input < 0 || .@input > 1000) { + if (.@input < 1 || .@input > 1000) { mes "[Egg Salesman]"; mes "Hey, you mind giving"; mes "me a real number? I also"; @@ -110,42 +110,37 @@ prontera,111,99,5 script Egg Salesman#prt::EggVendor 4W_M_02,{ mes "you know. C'mon, tell me how"; mes "many you want for real now."; next; + continue; } - else { - .@egg_zeny = .@input*500; - if (Zeny < .@egg_zeny) { - mes "[Egg Salesman]"; - mes "You don't have enough Zeny."; - next; - mes "[Egg Salesman]"; - mes "No discount, go and get enough Zeny."; - close; - } - else { - if (checkweight(Chicken_Egg,.@input) == 0) { - mes "[Egg Salesman]"; - mes "Hey, I know you really"; - mes "want to buy some Chicken"; - mes "Eggs, but you won't be able"; - mes "to carry that much now. Why"; - mes "don't you free up some"; - mes "Inventory space first?."; - close; - } - else { - mes "[Egg Salesman]"; - mes "Here's your Chicken Eggs!"; - mes "I guess there's some festival"; - mes "happening where you'll need"; - mes "them, but I don't know anything"; - mes "about that. Well, have a good"; - mes "time, and I'll see you again!"; - Zeny -= .@egg_zeny; - getitem Chicken_Egg,.@input; - close; - } - } + .@egg_zeny = .@input*500; + if (Zeny < .@egg_zeny) { + mes "[Egg Salesman]"; + mes "You don't have enough Zeny."; + next; + mes "[Egg Salesman]"; + mes "No discount, go and get enough Zeny."; + close; } + if (checkweight(Chicken_Egg,.@input) == 0) { + mes "[Egg Salesman]"; + mes "Hey, I know you really"; + mes "want to buy some Chicken"; + mes "Eggs, but you won't be able"; + mes "to carry that much now. Why"; + mes "don't you free up some"; + mes "Inventory space first?."; + close; + } + mes "[Egg Salesman]"; + mes "Here's your Chicken Eggs!"; + mes "I guess there's some festival"; + mes "happening where you'll need"; + mes "them, but I don't know anything"; + mes "about that. Well, have a good"; + mes "time, and I'll see you again!"; + Zeny -= .@egg_zeny; + getitem Chicken_Egg,.@input; + close; } case 4: mes "[Egg Salesman]"; @@ -263,8 +258,8 @@ prontera,230,312,3 script Nerlen#es07 1_F_PRIEST,{ mes "Enter ''0'' to cancel."; next; while(1) { - input .@input; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Nerlen]"; mes "Oh, you changed your"; mes "mind? Feel free to visit me"; @@ -272,35 +267,32 @@ prontera,230,312,3 script Nerlen#es07 1_F_PRIEST,{ mes "make you some Holy Eggs~"; close; } - else if (.@input < 0 || .@input > 10) { + if (.@input > 10) { mes "[Nerlen]"; mes "I'm sorry, but I can only"; mes "make up to 10 Holy Eggs"; mes "at a time. If you wanted to"; mes "cancel, then just enter ''0.''"; next; + continue; } - else { - if ((countitem(White_Herb) < .@input) || (countitem(Green_Herb) < .@input) || (countitem(Yellow_Herb) < .@input) || (countitem(Holy_Water) < .@input) || (countitem(Chicken_Egg) < .@input)) { - mes "[Nerlen]"; - mes "I'm sorry, but you don't"; - mes "have enough items to make"; - mes "Holy Eggs. You need the"; - mes "following for me to create"; - mes "each Holy Egg for you."; - next; - mes "[Nerlen]"; - mes "^4D4DFF1 White Herb^000000,"; - mes "^4D4DFF1 Green Herb^000000,"; - mes "^4D4DFF1 Yellow Herb^000000,"; - mes "^4D4DFF1 Holy Water^000000, and"; - mes "^4D4DFF1 Chicken Egg^000000."; - close; - } - else { - break; - } + if ((countitem(White_Herb) < .@input) || (countitem(Green_Herb) < .@input) || (countitem(Yellow_Herb) < .@input) || (countitem(Holy_Water) < .@input) || (countitem(Chicken_Egg) < .@input)) { + mes "[Nerlen]"; + mes "I'm sorry, but you don't"; + mes "have enough items to make"; + mes "Holy Eggs. You need the"; + mes "following for me to create"; + mes "each Holy Egg for you."; + next; + mes "[Nerlen]"; + mes "^4D4DFF1 White Herb^000000,"; + mes "^4D4DFF1 Green Herb^000000,"; + mes "^4D4DFF1 Yellow Herb^000000,"; + mes "^4D4DFF1 Holy Water^000000, and"; + mes "^4D4DFF1 Chicken Egg^000000."; + close; } + break; } if (checkweight(Holy_Egg,.@input) == 0) { mes "[Nerlen]"; @@ -311,20 +303,18 @@ prontera,230,312,3 script Nerlen#es07 1_F_PRIEST,{ mes "space in your Inventory first."; close; } - else { - delitem White_Herb,.@input; - delitem Green_Herb,.@input; - delitem Yellow_Herb,.@input; - delitem Holy_Water,.@input; - delitem Chicken_Egg,.@input; //Egg - getitem Holy_Egg,.@input; - mes "[Nerlen]"; - mes "Thank you!"; - mes "I hope you enjoy"; - mes "these Holy Eggs~"; - mes "Hope you to be with God's love."; - close; - } + delitem White_Herb,.@input; + delitem Green_Herb,.@input; + delitem Yellow_Herb,.@input; + delitem Holy_Water,.@input; + delitem Chicken_Egg,.@input; //Egg + getitem Holy_Egg,.@input; + mes "[Nerlen]"; + mes "Thank you!"; + mes "I hope you enjoy"; + mes "these Holy Eggs~"; + mes "Hope you to be with God's love."; + close; case 3: mes "[Nerlen]"; mes "Alright, I understand."; diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 940ffe30a..6f954c299 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -614,20 +614,20 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Chicken Masta]"; mes "You don't have to buy it, if you don't need it."; close; } - else if (@input > 3) { + if (@input > 3) { mes "[Chicken Masta]"; mes "What did I tell you."; mes "I'm going to sell only three eggs."; next; + continue; } - else - break; + break; } .@hw_egg = .@input * 1000; if (Zeny < @hw_egg) { @@ -666,7 +666,7 @@ nif_fild01,167,113,3 script Masta's chicken#06_hw01 4_NFCOCK,{ mes "Oh, this must be Chicken Masta's chicken."; mes "I should insert the magic word."; next; - input .@inputstr$; + input(.@inputstr$); if( .@inputstr$ == "Return" ) { emotion e_omg; specialeffect EF_TELEPORTATION; diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt index e71abeaef..532e04b2e 100644 --- a/npc/events/halloween_2009.txt +++ b/npc/events/halloween_2009.txt @@ -349,8 +349,8 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Halloween Wizard]"; mes "You have no definite idea."; mes "It's not a big deal."; @@ -358,91 +358,89 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2 next; break; } - else if (.@input > 100) { + if (.@input > 100) { mes "[Halloween Wizard]"; mes "I told you that it must be between 1 to 100!"; mes "You didn't pay attention!"; next; break; } - else { - .@fabric = countitem(Transparent_Cloth); - .@jack = countitem(Pumpkin_Head); - .@worn = countitem(Worn_Cloth_Piece); - .@crushed = countitem(Pumpkin_Head_Crushed); - .@whispers = 0; - .@darklords = 0; + .@fabric = countitem(Transparent_Cloth); + .@jack = countitem(Pumpkin_Head); + .@worn = countitem(Worn_Cloth_Piece); + .@crushed = countitem(Pumpkin_Head_Crushed); + .@whispers = 0; + .@darklords = 0; - .@total = .@fabric + .@jack + .@worn + .@crushed; + .@total = .@fabric + .@jack + .@worn + .@crushed; - if(.@total < .@input) { - mes "[Halloween Wizard]"; - mes "Recount the number of items you have and tell me the total."; - mes "Huhuhuhuhuhu..."; - next; - break; - } + if(.@total < .@input) { + mes "[Halloween Wizard]"; + mes "Recount the number of items you have and tell me the total."; + mes "Huhuhuhuhuhu..."; + next; + break; + } - if(.@fabric > 0) { - if(.@fabric >= .@input) { - delitem 1059,.@input; - .@whispers += .@input; - .@input = 0; - } - else{ - delitem 1059,.@fabric; - .@input -= .@fabric; - .@whispers += .@fabric; - } + if(.@fabric > 0) { + if(.@fabric >= .@input) { + delitem 1059,.@input; + .@whispers += .@input; + .@input = 0; } - if(.@worn > 0 && .@input != 0) { - if(.@worn >= .@input) { - delitem 6299,.@input; - .@whispers += .@input; - .@input = 0; - } - else{ - delitem 6299,.@worn; - .@input -= .@worn; - .@whispers += .@worn; - } + else{ + delitem 1059,.@fabric; + .@input -= .@fabric; + .@whispers += .@fabric; } - if(.@jack > 0 && .@input != 0) { - if(.@jack >= .@input) { - delitem 1062,.@input; - .@darklords += .@input; - .@input = 0; - } - else{ - delitem 1062,.@jack; - .@input -= .@jack; - .@darklords += .@jack; - } + } + if(.@worn > 0 && .@input != 0) { + if(.@worn >= .@input) { + delitem 6299,.@input; + .@whispers += .@input; + .@input = 0; } - if(.@crushed > 0 && .@input != 0) { - if(.@crushed >= .@input) { - delitem 6298,.@input; - .@darklords += .@input; - .@input = 0; - } - else{ - delitem 6298,.@crushed; - .@input -= .@crushed; - .@darklords += .@crushed; - } + else{ + delitem 6299,.@worn; + .@input -= .@worn; + .@whispers += .@worn; } - if (.@input > 0) { - mes "Theres a problem."; - close; + } + if(.@jack > 0 && .@input != 0) { + if(.@jack >= .@input) { + delitem 1062,.@input; + .@darklords += .@input; + .@input = 0; } - monster ""+.@HallowTowns$[.@HallowTown]+"",0,0,"Halloween Whisper",3014,.@whispers; - monster ""+.@HallowTowns$[.@HallowTown]+"",0,0,"Halloween Dark Lord",3015,.@darklords; - mes "[Halloween Wizard]"; - mes "Here's what you wanted."; - mes "Imagine what the people must be thinking in the other villages?"; - mes "Muahahaha"; + else{ + delitem 1062,.@jack; + .@input -= .@jack; + .@darklords += .@jack; + } + } + if(.@crushed > 0 && .@input != 0) { + if(.@crushed >= .@input) { + delitem 6298,.@input; + .@darklords += .@input; + .@input = 0; + } + else{ + delitem 6298,.@crushed; + .@input -= .@crushed; + .@darklords += .@crushed; + } + } + if (.@input > 0) { + mes "Theres a problem."; close; } + monster ""+.@HallowTowns$[.@HallowTown]+"",0,0,"Halloween Whisper",3014,.@whispers; + monster ""+.@HallowTowns$[.@HallowTown]+"",0,0,"Halloween Dark Lord",3015,.@darklords; + mes "[Halloween Wizard]"; + mes "Here's what you wanted."; + mes "Imagine what the people must be thinking in the other villages?"; + mes "Muahahaha"; + close; case 3: mes "[Halloween Wizard]"; mes "If you change your mind, come back here..."; diff --git a/npc/events/valentinesday.txt b/npc/events/valentinesday.txt index bb64f4121..89979e166 100644 --- a/npc/events/valentinesday.txt +++ b/npc/events/valentinesday.txt @@ -58,8 +58,9 @@ 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; - if (.@i <= 0) close; + input(.@i); + if (.@i <= 0) + close; mes "[Stephen]"; if (.@i > 5) { mes "I'm sorry, but I can't give you that many."; diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 1151a08fb..919f4255f 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); 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); 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); 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); 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); if (.@input <= 0) { mes "[Valentine Vote Manager]"; diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index 58655bf11..b7bae2d97 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -118,16 +118,18 @@ S_Purchase: .@price = getarg(0); .@item_id = getarg(1); while (true) { - input .@amount; - if (.@amount <= 5) - break; - mes "[Sugar]"; - mes "???"; - mes "You seem to have a failure on hearing."; - mes "I will tell you once again?"; - mes "You can only purchase"; - mes "^ff0000 5 pieces^000000 at once."; - next; + input(.@amount); + if (.@amount < 0 || .@amount > 5) { + mes "[Sugar]"; + mes "???"; + mes "You seem to have a failure on hearing."; + mes "I will tell you once again?"; + mes "You can only purchase"; + mes "^ff0000 5 pieces^000000 at once."; + next; + continue; + } + break; } if (.@amount == 0) // Cancel return; diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 2964f7e2a..4353de224 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -1300,7 +1300,7 @@ OnTimer120000: mes("This NPC manages the tower from the 1st to the 25th Level."); mes("Please enter the Level number to open."); mes("(i.g.: 1F->1, 25F->25)"); - input(.@input, 1, 25); + input(.@input); next(); if (.@input < 1 || .@input > 25) { mes("You can only enter a number from 1 to 25."); @@ -1412,9 +1412,9 @@ OnTouch_: mes("This NPC manages the tower from the 26st to the 50th Level."); mes("Please enter the Level number to open."); mes("(i.g.: 26F->26, 50F->50)"); - input(.@input, 26, 50); + input(.@input); next(); - if (.@onput < 26 || .@input > 50) { + if (.@input < 26 || .@input > 50) { mes("You can only enter a number from 26 to 50."); } else { donpcevent(instance_npcname(.@input+"FGate102tower")+"::OnEnable"); @@ -1524,7 +1524,7 @@ OnTouch_: mes("This NPC manages the tower from the 51st to the 75th Level."); mes("Please enter the Level number to open."); mes("(i.g.: 51F->51, 75F->75)"); - input(.@input, 51, 75); + input(.@input); next(); if (.@input < 51 || .@input > 75) { mes("You can only enter a number from 51 to 75."); @@ -1635,7 +1635,7 @@ OnTouch_: mes("This NPC manages the tower from the 76th to the 99th Level."); mes("Please enter the Level number to open."); mes("(i.g.: 76F->76, 99F->99)"); - input(.@input, 76, 99); + input(.@input); next(); if (.@input < 76 || .@input > 99) { mes("You can only enter a number from 76 to 99."); diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index d39d90cd3..ebaf70f92 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/1-1e/ninja.txt b/npc/jobs/1-1e/ninja.txt index 762f94b4b..8911b5795 100644 --- a/npc/jobs/1-1e/ninja.txt +++ b/npc/jobs/1-1e/ninja.txt @@ -93,9 +93,9 @@ alberta,30,65,3 script Akagi 4_M_JOB_ASSASSIN,{ } } -que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ +que_ng,30,65,3 script Kuuga Gai#nq 4_M_JOB_ASSASSIN,{ if (Upper == 2) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I... I've never"; mes "seen a baby as"; mes "powerful as you!"; @@ -105,7 +105,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ } if (Class == Job_Novice) { if (JobLevel < 10) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Hm? Have you come to"; mes "learn how to be a Ninja?"; mes "You're not quite experienced"; @@ -119,7 +119,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "Excuse me."; mes "H-hello?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "..............................."; mes "How did you do that?"; next; @@ -127,7 +127,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "Do what? I didn't"; mes "do anything, I don't think..."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "H-How are you able to"; mes "see me? I'm supposed to"; mes "be invisible to the naked eye."; @@ -140,7 +140,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "Calm down, there's no"; mes "need to get violent!"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "What...?"; mes "How did you dodge"; mes "all of my attacks?"; @@ -153,7 +153,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "to change my job"; mes "to a Ninja."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "...Oh. Is that all?"; mes "Hmm, you've got great"; mes "potential, but I can't help"; @@ -161,14 +161,14 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "enemies, and I can't let my"; mes "guard down for even a second."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "That Wildcat Joe is"; mes "completely ruthless...!"; mes "He could strike at any time!"; mes "He'll do anything to achieve"; mes "victory over his enemies!"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Wait, wait, I just"; mes "thought of something."; mes "Maybe you can help me out."; @@ -177,7 +177,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "really want to be a Ninja."; next; if(select("Sure.", "No, thanks.") == 2) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Hm? Well, alright."; mes "Still, I don't see"; mes "why we can't help"; @@ -185,7 +185,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "little predicament..."; close; } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Great! Now, I wanted to"; mes "ask Wildcat Joe if he'd"; mes "agree to a temporary truce."; @@ -193,7 +193,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "are out of weapons, so we"; mes "should get well equipped first."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Please take this letter,"; mes "and deliver it to Wildcat"; mes "Joe in Einbroch. He's a master"; @@ -201,7 +201,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "eye out for him. Ah, and look"; mes "for him in a high place."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Yeah, Wildcat Joe"; mes "always did have a thing"; mes "for hiding in high places."; @@ -213,7 +213,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ close; } else if (NINJ_Q == 1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Even if this task"; mes "isn't that urgent,"; mes "please hurry over to"; @@ -222,7 +222,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ close; } else if (NINJ_Q == 2) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Did you deliver that"; mes "letter to Wildcat Joe?"; mes "I still need to know his"; @@ -232,14 +232,14 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ close; } else if (NINJ_Q == 3) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Ah, you've returned."; mes "So did Wildcat Joe send"; mes "you back here with his"; mes "response? Great, great,"; mes "please let me read it."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "What...?! How could he"; mes "reject my proposal for"; mes "a truce?! This can only"; @@ -247,14 +247,14 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "Kunai. Nuts! I have to catch"; mes "up to him, or I'm a goner!"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Listen, you've got to help"; mes "me out again! I need you to"; mes "gather some materials so that"; mes "I can craft my own Kunai to fight Wildcat Joe. Then, I'll go ahead"; mes "and change your job to a Ninja."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "All you need"; mes "to bring me is"; mes "^3355FF5 Cyfars^000000 and"; @@ -268,7 +268,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "asked me to gather"; mes "those same materials."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Curses! Then that means..."; mes "You actually helped Joe"; mes "in crafting his Kunai! No!"; @@ -281,7 +281,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ } else if (NINJ_Q == 4) { if (countitem(Cyfar) < 5 || countitem(Phracon) < 1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Hurry and bring"; mes "^3355FF5 Cyfars^000000 and"; mes "^3355FF1 Phracon^000000 to me,"; @@ -291,7 +291,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ close; } if (SkillPoint != 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Whoa, whoa..."; mes "You still have some"; mes "leftover Skill Points."; @@ -300,7 +300,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "change jobs, right?"; close; } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Ah, you're back with"; mes "everything that I need."; mes "You've come earlier than"; @@ -308,14 +308,14 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "as promised, I'll turn"; mes "you into a Ninja."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Let me formally introduce"; - mes "myself. I am High Ninja Cougar"; + mes "myself. I am High Ninja Kuuga Gai"; mes "in the Touga Ninja Corps, and"; mes "I'm in charge of the search"; mes "party to find Sir Kazma."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Sir Kazma is the chief"; mes "of my village, but he's"; mes "run away. This has resulted"; @@ -323,7 +323,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "the Ninja Corps. Things are"; mes "pretty unstable right now..."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I initially didn't want to"; mes "accept you as a Ninja because"; mes "of this complicated situation."; @@ -331,14 +331,14 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "you're truly worthy of joining"; mes "the Ninja ranks."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "According to his letter, even"; mes "Joe thinks highly of you. Just"; mes "remember that, as a Ninja, your"; mes "mission is your highest priority. But don't let mission objectives"; mes "supercede your conscience."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "''Secrecy above all else.''"; mes "To keep our secrets in the"; mes "shadows, you can only buy"; @@ -346,7 +346,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "authorized dealers. Please"; mes "keep that in mind."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "As of today, you are"; mes "now a proud member of the"; mes "Touga Ninja Corps. Be as"; @@ -361,7 +361,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ close; } else { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "How have you been?"; mes "Train hard: you want"; mes "to be able to vanish"; @@ -372,7 +372,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ } } else { if (BaseClass == Job_Ninja) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "How have you been?"; mes "Train hard: you want"; mes "to be able to vanish"; @@ -381,7 +381,7 @@ que_ng,30,65,3 script Cougar#nq 4_M_JOB_ASSASSIN,{ mes "the respect of any Ninja~"; close; } else { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "What...?"; mes "How were you able"; mes "to find me hidden"; @@ -478,7 +478,7 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{ mes "?????!!"; next; mes "[Suspicious Man]"; - mes "Why? Didn't you bring Cougar's letter for me?"; + mes "Why? Didn't you bring Kuuga Gai's letter for me?"; next; mes "["+strcharinfo(PC_NAME)+"]"; mes "Are you..."; @@ -487,7 +487,7 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{ mes "[Suspicious Man]"; mes "...Yes, but I prefer to"; mes "be called Red Leopard Joe."; - mes "Cougar sent you to me, right?"; + mes "Kuuga Gai sent you to me, right?"; mes "He's the only one who calls"; mes "me that. So you want to be"; mes "a Ninja, eh? Hmm, alright."; @@ -513,7 +513,7 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{ mes "[Red Leopard Joe]"; mes "For now, let me read"; mes "this letter. Let's see..."; - mes "Hm. I thought that Cougar"; + mes "Hm. I thought that Kuuga Gai"; mes "would want to challenge me"; mes "again, but he actually wants"; mes "a temporary truce? Hah!"; @@ -540,7 +540,7 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{ mes "[Red Leopard Joe]"; mes "Here you go."; mes "Please bring this"; - mes "letter to Cougar."; + mes "letter to Kuuga Gai."; mes "It'll take a while to"; mes "return to Amatsu, so let"; mes "me send you there directly..."; @@ -557,7 +557,7 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{ mes "Eh? I'm not sure what"; mes "happened, but it seems"; mes "that you haven't delivered"; - mes "my response to Cougar yet."; + mes "my response to Kuuga Gai yet."; mes "Shall I directly send you"; mes "to Amatsu right now?"; next; @@ -577,7 +577,7 @@ einbroch,184,194,3 script Suspicious Man#nq 4_M_SITDOWN,{ } else if (NINJ_Q == 4) { mes "[Red Leopard Joe]"; - mes "Cougar asked you to"; + mes "Kuuga Gai asked you to"; mes "gather some materials"; mes "too? Oh well, I suppose"; mes "that I can't blame him."; diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 634e0753b..3db39f11c 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -567,33 +567,39 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ mes "[Raspuchin Gregory]"; mes "12 + 23 + 34 + 45 = ?"; next; - input .@input; - if (.@input != 114) .@w_point += 1; + input(.@input); + if (.@input != 114) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "1000 - 36 - 227 - 348 = ?"; next; - input .@input; - if (.@input != 389) .@w_point += 1; + input(.@input); + if (.@input != 389) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "14 * 17 * 3 = ?"; next; - input .@input; - if (.@input != 714) .@w_point += 1; + input(.@input); + if (.@input != 714) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "9765 / 3 / 5 / 7 = ?"; next; - input .@input; - if (.@input != 93) .@w_point += 1; + input(.@input); + if (.@input != 93) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(47 * 28) - (1376 / 4) = ?"; next; - input .@input; - if (.@input != 972) .@w_point += 1; + input(.@input); + if (.@input != 972) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2646 / 7) + (13 * 28) = ?"; next; - input .@input; - if (.@input != 742) .@w_point += 1; + input(.@input); + if (.@input != 742) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("How much do\r" "12 %s,\r" @@ -604,8 +610,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Wing_Of_Butterfly), getitemname(Wing_Of_Fly)); next; - input .@input; - if (.@input != 909) .@w_point += 1; + input(.@input); + if (.@input != 909) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total weight of\r" @@ -615,8 +622,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Helm), getitemname(Coat)); next; - input .@input; - if (.@input != 450) .@w_point += 1; + input(.@input); + if (.@input != 450) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total defense of\r" @@ -632,8 +640,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Boots), getitemname(Ear_Mufs)); next; - input .@input; - if (.@input != 20) .@w_point += 1; + input(.@input); + if (.@input != 20) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("If you buy 5 %s\r" "with a 24%% discount\r" @@ -642,45 +651,53 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ "do you earn?", getitemname(Helm)); next; - input .@input; - if (.@input != 8800) .@w_point += 1; + input(.@input); + if (.@input != 8800) + .@w_point += 1; break; case 2: mes "[Raspuchin Gregory]"; mes "13 + 25 + 37 + 48 = ?"; next; - input .@input; - if (.@input != 123) .@w_point += 1; + input(.@input); + if (.@input != 123) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "1000 - 58 - 214 - 416 = ?"; next; - input .@input; - if (.@input != 312) .@w_point += 1; + input(.@input); + if (.@input != 312) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "12 * 24 * 3 = ?"; next; - input .@input; - if (.@input != 864) .@w_point += 1; + input(.@input); + if (.@input != 864) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "10530 / 3 / 5 / 2 = ?"; next; - input .@input; - if (.@input != 351) .@w_point += 1; + input(.@input); + if (.@input != 351) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(35 * 19) - (1792 / 7) = ?"; next; - input .@input; - if (.@input != 409) .@w_point += 1; + input(.@input); + if (.@input != 409) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2368 / 8) + (24 * 17) = ?"; next; - input .@input; - if (.@input != 704) .@w_point += 1; + input(.@input); + if (.@input != 704) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2646 / 7) + (13 * 28) = ?"; next; - input .@input; - if (.@input != 742) .@w_point += 1; + input(.@input); + if (.@input != 742) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total price of\r" @@ -692,8 +709,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Spectacles), getitemname(Booby_Trap)); next; - input .@input; - if (.@input != 934) .@w_point += 1; + input(.@input); + if (.@input != 934) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total weight of\r" @@ -703,8 +721,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Cap), getitemname(Boots)); next; - input .@input; - if (.@input != 550) .@w_point += 1; + input(.@input); + if (.@input != 550) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total defense of\r" @@ -720,8 +739,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Sahkkat), getitemname(Glasses)); next; - input .@input; - if (.@input != 16) .@w_point += 1; + input(.@input); + if (.@input != 16) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("How much profit do you\r" "make if you buy %s\r" @@ -730,40 +750,47 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ "the normal price?", getitemname(Tights)); next; - input .@input; - if (.@input != 8520) .@w_point += 1; + input(.@input); + if (.@input != 8520) + .@w_point += 1; break; case 3: mes "[Raspuchin Gregory]"; mes "12 + 23 + 34 + 45 = ?"; next; - input .@input; - if (.@input != 114) .@w_point += 1; + input(.@input); + if (.@input != 114) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "1000 - 58 - 214 - 416 = ?"; next; - input .@input; - if (.@input != 312) .@w_point += 1; + input(.@input); + if (.@input != 312) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "14 * 17 * 3 = ?"; next; - input .@input; - if (.@input != 714) .@w_point += 1; + input(.@input); + if (.@input != 714) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "10530 / 3 / 5 / 2 = ?"; next; - input .@input; - if (.@input != 351) .@w_point += 1; + input(.@input); + if (.@input != 351) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(47 * 28) - (1376 / 4) = ?"; next; - input .@input; - if (.@input != 972) .@w_point += 1; + input(.@input); + if (.@input != 972) + .@w_point += 1; mes "[Raspuchin Gregory]"; mes "(2646 / 7) + (13 * 28) = ?"; next; - input .@input; - if (.@input != 742) .@w_point += 1; + input(.@input); + if (.@input != 742) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total cost of\r" @@ -775,8 +802,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Green_Potion), getitemname(Wing_Of_Fly)); next; - input .@input; - if (.@input != 798) .@w_point += 1; + input(.@input); + if (.@input != 798) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total weight of\r" @@ -786,8 +814,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Cap), getitemname(Boots)); next; - input .@input; - if (.@input != 480) .@w_point += 1; + input(.@input); + if (.@input != 480) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("What is the\r" "total defense of\r" @@ -800,8 +829,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Muffler), getitemname(Eye_Bandage)); next; - input .@input; - if (.@input != 12) .@w_point += 1; + input(.@input); + if (.@input != 12) + .@w_point += 1; mes "[Raspuchin Gregory]"; mesf("If you buy 4 Padded Armors\r" "at a 24%% discount and sell\r" @@ -810,8 +840,9 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ "you make from this sale?", getitemname(Padded_Armor)); next; - input .@input; - if (.@input != 7680) .@w_point += 1; + input(.@input); + if (.@input != 7680) + .@w_point += 1; } if (.@w_point == 0) { mes "[Raspuchin Gregory]"; diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index e44299193..d75ec7458 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -499,7 +499,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "The evil giant Papner,"; mes "Turned into a dragon and ate him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "There was a man") .@w_point += 1; @@ -510,7 +510,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "The evil giant Papner,"; mes "Turned into a dragon and ate him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "who was said to be immortal.") .@w_point += 1; @@ -521,7 +521,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "The evil giant Papner,"; mes "Turned into a dragon and ate him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "His name Jichfreid,") .@w_point += 1; @@ -532,7 +532,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "The evil giant Papner,"; mes "Turned into a dragon and ate him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Son of the hero Jichmunt.") .@w_point += 1; @@ -543,7 +543,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "The evil giant Papner,^000000"; mes "Turned into a dragon and ate him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "The evil giant Papner,") .@w_point += 1; @@ -554,7 +554,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "The evil giant Papner,"; mes "Turned into a dragon and ate him.^000000"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Turned into a dragon and ate him.") .@w_point += 1; } @@ -566,7 +566,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "At first he only sold Red Potions."; mes "Some say he sold Sweet Potatoes, too."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "A Merchant without money or equipment,") .@w_point += 1; @@ -577,7 +577,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "At first he only sold Red Potions."; mes "Some say he sold Sweet Potatoes, too."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "a Merchant that couldn't sell anything.") .@w_point += 1; @@ -588,7 +588,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "At first he only sold Red Potions."; mes "Some say he sold Sweet Potatoes, too."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "But he was too proud to beg.") .@w_point += 1; @@ -599,7 +599,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "At first he only sold Red Potions."; mes "Some say he sold Sweet Potatoes, too."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "So he gathered some money selling items.") .@w_point += 1; @@ -610,7 +610,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "At first he only sold Red Potions.^000000"; mes "Some say he sold Sweet Potatoes, too."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "At first he only sold Red Potions.") .@w_point += 1; @@ -621,7 +621,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "At first he only sold Red Potions."; mes "Some say he sold Sweet Potatoes, too.^000000"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Some say he sold Sweet Potatoes, too.") .@w_point += 1; } @@ -633,7 +633,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Her sweet apples in her basket,"; mes "All thanks to her sweet apples."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "All Gods never age.") .@w_point += 1; @@ -644,7 +644,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Her sweet apples in her basket,"; mes "All thanks to her sweet apples."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "The ever so Beautiful Goddess Eden,") .@w_point += 1; @@ -655,7 +655,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Her sweet apples in her basket,"; mes "All thanks to her sweet apples."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Beautiful and graceful Goddess Eden,") .@w_point += 1; @@ -666,7 +666,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Her sweet apples in her basket,"; mes "All thanks to her sweet apples."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Odin's daughter-in-law and Bragi's wife.") .@w_point += 1; @@ -677,7 +677,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Her sweet apples in her basket,^000000"; mes "All thanks to her sweet apples."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Her sweet apples in her basket,") .@w_point += 1; @@ -688,7 +688,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Her sweet apples in her basket,"; mes "All thanks to her sweet apples.^000000"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "All thanks to her sweet apples.") .@w_point += 1; } @@ -700,7 +700,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "All wandering poets are his people,"; mes "And all praise shall go to him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Bragi, Bragi,") .@w_point += 1; @@ -711,7 +711,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "All wandering poets are his people,"; mes "And all praise shall go to him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Forever call the poets name.") .@w_point += 1; @@ -722,7 +722,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "All wandering poets are his people,"; mes "And all praise shall go to him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "My songs are his breath,") .@w_point += 1; @@ -733,7 +733,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "All wandering poets are his people,"; mes "And all praise shall go to him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "My mind is his will,") .@w_point += 1; @@ -744,7 +744,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "All wandering poets are his people,^000000"; mes "And all praise shall go to him."; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "All wandering poets are his people,") .@w_point += 1; @@ -755,7 +755,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "All wandering poets are his people,"; mes "And all praise shall go to him.^000000"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "And all praise shall go to him.") .@w_point += 1; } @@ -767,7 +767,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Let the castle walls ring."; mes "This day will never come again!"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Louder, louder, louder.") .@w_point += 1; @@ -778,7 +778,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Let the castle walls ring."; mes "This day will never come again!"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Give strength to the warriors!") .@w_point += 1; @@ -789,7 +789,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Let the castle walls ring."; mes "This day will never come again!"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Shake the sky and roar through the land.") .@w_point += 1; @@ -800,7 +800,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Let the castle walls ring."; mes "This day will never come again!"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Make my heart pound again!") .@w_point += 1; @@ -811,7 +811,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Let the castle walls ring.^000000"; mes "This day will never come again!"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "Let the castle walls ring.") .@w_point += 1; @@ -822,7 +822,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Let the castle walls ring."; mes "This day will never come again!^000000"; next; - input .@Song$; + input(.@Song$); if (.@Song$ != "This day will never come again!") .@w_point += 1; } diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 311915097..656b9eed4 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); if (.@input < 1 || .@input > 10000) { if (ROGUE_Q == 12) mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000"; @@ -1300,7 +1300,7 @@ OnTouch: mes "^3355FFPlease enter a combination of four numbers.^000000"; close; } - else if (.@input == 3019) { + if (.@input == 3019) { if (ROGUE_Q == 12) { mes "^3355FFThe door"; mes "has opened.^000000"; @@ -1308,8 +1308,7 @@ OnTouch: warp "in_rogue",10,21; ROGUE_Q = 12; end; - } - else { + } else { mes "[HermanthornJr.]"; mes "Well..."; mes "Didn't I tell you"; @@ -1318,11 +1317,9 @@ OnTouch: close; } } - else { - mes "^3355FFThe door"; - mes "is still locked.^000000"; - close; - } + mes "^3355FFThe door"; + mes "is still locked.^000000"; + close; } in_rogue,200,389,0 script gen_ro#1 FAKE_NPC,3,3,{ diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index a482652ed..057429ae0 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -1209,8 +1209,8 @@ 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; - if ((.@input < 0) || (.@input > 1000)) { + input(.@input); + if (.@input < 0 || .@input > 1000) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; @@ -1223,8 +1223,8 @@ 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; - if ((.@input < 0) || (.@input > 1000)) { + input(.@input); + if (.@input < 0 || .@input > 1000) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; @@ -1237,8 +1237,8 @@ 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; - if ((.@input < 0) || (.@input > 1000)) { + input(.@input); + if (.@input < 0 || .@input > 1000) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; @@ -1251,8 +1251,8 @@ 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; - if ((.@input < 0) || (.@input > 3)) { + input(.@input); + if (.@input < 0 || .@input > 3) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; @@ -1265,8 +1265,8 @@ 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; - if ((.@input < 0) || (.@input > 1000)) { + input(.@input); + if (.@input < 0 || .@input > 1000) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; @@ -1279,8 +1279,8 @@ 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; - if ((.@input < 0) || (.@input > 2)) { + input(.@input); + if (.@input < 0 || .@input > 2) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; @@ -1293,8 +1293,8 @@ 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; - if ((.@input < 0) || (.@input > 2)) { + input(.@input); + if (.@input < 0 || .@input > 2) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; @@ -1307,8 +1307,8 @@ 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; - if ((.@input < 0) || (.@input > 10000)) { + input(.@input); + if (.@input < 0 || .@input > 10000) { mes "[Christy's Maid]"; mes "The value is incorrect."; close; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 90334cc6e..d9253cd13 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/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt index 9632f95f7..ec263e192 100644 --- a/npc/merchants/advanced_refiner.txt +++ b/npc/merchants/advanced_refiner.txt @@ -44,14 +44,19 @@ //========================================================================= payon,157,146,6 script Suhnbi#cash 4_M_03,{ - disable_items; - mes "[Suhnbi]"; - mes "I am the Armsmith"; - mes "I can refine all kinds of weapons,"; - mes "armor and equipment, so let me"; - mes "know what you want to refine."; - next; + mes("[Suhnbi]"); + mes("I am the Armsmith"); + mes("I can refine all kinds of weapons,"); + mes("armor and equipment, so let me"); + mes("know what you want to refine."); + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + + disable_items; setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3"; .@menu$ = ""; for(.@i = 1; .@i<=10; ++.@i) { diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt index ea926ae6b..cdfdd06fc 100644 --- a/npc/merchants/alchemist.txt +++ b/npc/merchants/alchemist.txt @@ -64,22 +64,21 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Gever Al Sharp]"; mes "The deal was cancelled."; mes "Come again next time."; close; } - else if (.@input < 1 || .@input > 2000) { + if (.@input > 2000) { mes "[Gever Al Sharp]"; mes "The number must"; mes "be less than 2000."; next; + continue; } - else { - break; - } + break; } if (RENEWAL) { .@sell = .@input * 250; diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt index 69310388f..aef74f81f 100644 --- a/npc/merchants/ammo_boxes.txt +++ b/npc/merchants/ammo_boxes.txt @@ -102,8 +102,8 @@ 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; - if (.@amount > 50 || .@amount == 0) { + input(.@amount); + if (.@amount > 50 || .@amount <= 0) { mes "[Kenny]"; mes "Hey, I can't give you"; mes "that many Magazines."; diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt index 490be66ba..313f54653 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); 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 eaf62bbe1..ff368d910 100644 --- a/npc/merchants/buying_shops.txt +++ b/npc/merchants/buying_shops.txt @@ -67,31 +67,32 @@ 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); mes "[Mr. Jass]"; - if (.@input == 0) { + if (.@input <= 0) { mes "Don't you need those licenses?"; close; - } else if (.@input > 10) { + } + if (.@input > 10) { mes "I can only make up to 10 at a time, you know."; next; - } else { - mes "It'll cost "+(.@input*500)+" zeny."; - if (Zeny < (.@input*500)) { - mes "but you don't have enough money."; - next; - mes "[Mr. Jass]"; - mes "Don't you know the basics of business? Everything has a price."; - mes "If you want something, you gotta pay for it."; - } else { - mes "Ha... Ha ha ha!"; - mes "Mr. Hugh, I'll take over your license business. You'll see!"; - mes "*Giggle Giggle*"; - getitem Buy_Market_Permit2,.@input; - Zeny -= (.@input*500); - } - close; + continue; } + mes "It'll cost "+(.@input*500)+" zeny."; + if (Zeny < (.@input*500)) { + mes "but you don't have enough money."; + next; + mes "[Mr. Jass]"; + mes "Don't you know the basics of business? Everything has a price."; + mes "If you want something, you gotta pay for it."; + close(); + } + mes "Ha... Ha ha ha!"; + mes "Mr. Hugh, I'll take over your license business. You'll see!"; + mes "*Giggle Giggle*"; + getitem Buy_Market_Permit2,.@input; + Zeny -= (.@input*500); + close; } case 2: mes "[Mr. Jass]"; @@ -139,26 +140,27 @@ 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); mes "[Mr. Hugh]"; - if (.@input == 0) { + if (.@input <= 0) { mes "You have cancelled the trade."; mes "Have a good day."; close; - } else if (.@input > 50) { + } + if (.@input > 50) { mes "Please enter a value of 50 or less."; next; + continue; + } + mes "It'll cost "+(.@input*200)+" zeny for "+.@input+" licenses."; + if (Zeny < (.@input*200)) { + mes "but you don't seem to have enough money."; } else { - mes "It'll cost "+(.@input*200)+" zeny for "+.@input+" licenses."; - if (Zeny < (.@input*200)) { - mes "but you don't seem to have enough money."; - } else { - mes "Thank you for your patronage."; - getitem Buy_Market_Permit,.@input; //Buy_Stall_Permit - Zeny -= (.@input*200); - } - close; + mes "Thank you for your patronage."; + getitem Buy_Market_Permit,.@input; //Buy_Stall_Permit + Zeny -= (.@input*200); } + close; } } else { mes "I'm Hugh from the Purchasing Team at the Alberta Merchant Guild."; @@ -234,7 +236,7 @@ alberta_in,58,52,4 script Purchasing Team#Buying 1_M_ORIENT01,{ mes "You've made a good decision."; mes "Please give me the registration fee, and sign right here...."; next; - input .@name$; + input(.@name$); mes "[Mr. Hugh]"; mes .@name$+"...."; mes "I like your handwriting."; diff --git a/npc/merchants/gemstone.txt b/npc/merchants/gemstone.txt index 6028d9ddb..44be2569c 100644 --- a/npc/merchants/gemstone.txt +++ b/npc/merchants/gemstone.txt @@ -84,31 +84,33 @@ S_TradeGems: mes "that you can enter is 100."; next; while(1) { - input .@input,0,101; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Jade]"; mes "None at all?"; mes "I guess you"; mes "changed your mind..."; close; } - else if (.@input > 100) { + if (.@input > 100) { mes "[Jade]"; mes "Errm..."; mes "I asked you to enter"; mes "an amount no greater"; mes "than 100, remember...?"; next; + continue; } - else if (.@gems < .@input) { + if (.@gems < .@input) { // Custom dialogue mes "[Jade]"; mes "Errm..."; mes "You don't have that"; mes "many gems to trade..."; next; + continue; } - else break; + break; } delitem getarg(0),.@input * 2; getitem getarg(1),.@input; diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt index f940a5982..fd6cc1b96 100644 --- a/npc/merchants/hair_style.txt +++ b/npc/merchants/hair_style.txt @@ -51,15 +51,8 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "If you wish to cancel,"; mes "please enter 0."; next; - input .@style; - if(.@style > 19) { - mes "[Veronica]"; - mes "Oops, I'm sorry, but that"; - mes "style is not available."; - mes "Remember to enter a number"; - mes "from 1 to 19."; - next; - } else if(.@style == 0) { + input(.@style); + if(.@style == 0) { mes "[Veronica]"; mes "So, how do you like the style?"; mes "Feel free to ask me about any"; @@ -68,313 +61,357 @@ alberta_in,55,142,7 script Hair Dresser 4_F_02,{ mes "hair."; close; } - else { - callsub L_cutin,.@style; + if (.@style < 1 || .@style > 19) { mes "[Veronica]"; - switch(.@style) { - case 1: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Play Dead' style!"; - mes "It's a nice, basic haircut."; - mes "I notice that usually the"; - mes "cute, conversative types seem"; - mes "to prefer this style."; - close2; cutin "",255; end; - } - mes "Oh, that's 'First Aid' style!"; - mes "The shoulder length tresses"; - mes "are straightened for those"; - mes "no nonsense adventurers. It"; - mes "seems to be the style of"; - mes "choice for Novices."; - close2; cutin "",255; end; - case 2: - if (Sex == SEX_MALE) { - mes "Oh, that's the 'Two Handed Sword"; - mes "Mastery' style! It's perfect for"; - mes "for Swordmen who might muss their"; - mes "hair while swinging their swords"; - mes "all day long."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Bash' style!"; - mes "For the powerful woman that's"; - mes "not afraid to get a little"; - mes "blood on her hands, but knows"; - mes "how great her hair will look"; - mes "while wildly flailing a sword."; - close2; cutin "",255; end; - case 3: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Napalm Beat' style!"; - mes "It's a unique look with a hint"; - mes "of eccentricity that's offset"; - mes "with a helping of elegance."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Frost Diver' style!"; - mes "The pigtails lend an innocent,"; - mes "demure look for those Mages"; - mes "and Wizards that usually scare"; - mes "off the boys with their spells."; - close2; cutin "",255; end; - case 4: - if (Sex == SEX_MALE) { - mes "Oh, that's the 'Double Strafe'"; - mes "style! The arrangement of the"; - mes "hair conducts ambient static"; - mes "electricity, naturally clearing"; - mes "the mind. At least, that's what"; - mes "I was taught in fashion school."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Arrow Shower' style!"; - mes "For the Bowswoman who doesn't"; - mes "want fashion to interfere with"; - mes "her depth perception. Much more"; - mes "attractive than those horrid"; - mes "granny-style hairbuns."; - close2; cutin "",255; end; - case 5: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Angelus' style!"; - mes "It's for calm and devout people,"; - mes "as well as those bashful,"; - mes "mild-mannered types."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Heal' style!"; - mes "This is in trend among"; - mes "Priests and Acolytes since"; - mes "this style is appropriate"; - mes "for formal situations, but"; - mes "is also practical in battle."; - close2; cutin "",255; end; - case 6: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Push Cart' style!"; - mes "It was based on the design of a"; - mes "cart...at least, that's what"; - mes "I learned in beautician school."; - close2; cutin "",255; end; - } - mes "Ooh, that's 'Vending' style!"; - mes "It's the hairdo of money"; - mes "makers...and if I may say so,"; - mes "it's also economical."; - close2; cutin "",255; end; - case 7: - if (Sex == SEX_MALE) { - mes "Ooh, that's 'Envenom' style!"; - mes "It looks great on Thieves and"; - mes "and Assassins when they're"; - mes "out poisoning people and animals."; - mes "It's fashion for the aggressive"; - mes "and eclectic~!"; - close2; cutin "",255; end; - } - mes "Oh, that's 'Double Attack' style!"; - mes "The adorable pigtail, paired with"; - mes "those provacative bangs are sure"; - mes "to help you steal the heart of"; - mes "some cute guy."; - close2; cutin "",255; end; - case 8: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Bowling Bash' style!"; - mes "A popular style for Knights, its"; - mes "manly, rugged look tends to"; - mes "attract all of the ladies,"; - mes "and looks great on men with"; - mes "strong chins."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Gloria' style!"; - mes "It's very elegant and looks"; - mes "great on holy Priests. This"; - mes "style is most attractive to"; - mes "ladies who aren't that used"; - mes "to fighting with their hands."; - close2; cutin "",255; end; - case 9: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Venom Dust' style!"; - mes "Definitely a look for rebels,"; - mes "the sweeping, yet decidedly"; - mes "luxorious locks seems to enchant"; - mes "girls with a fatal attraction."; - close2; cutin "",255; end; - } - mes "Oh, that's 'SP Recovery' style!"; - mes "To add more body to the special"; - mes "style of these bangs, I use a"; - mes "special conditioner that makes"; - mes "you feel like you're regaining SP"; - mes "...Although, it acutally doesn't."; - close2; cutin "",255; end; - case 10: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Turn Undead' style!"; - mes "This is popular among Priests"; - mes "that want a serious, yet a bit"; - mes "of a wild, agressive look."; - mes "Definitely more attractive"; - mes "than the 'Holy Light' mullet."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Prepare Potion' style!"; - mes "The flared out tresses are chosen"; - mes "by beginning Alchemists, since"; - mes "early, explosive experiments would"; - mes "make their hair to stick out anyway."; - close2; cutin "",255; end; - case 11: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Dragonology' style!"; - mes "It's neat and clean cut, perfect"; - mes "for studious people and looks"; - mes "great with eyeglasses. This"; - mes "is a fashion well suited to"; - mes "intellectual types."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Grand Cross' style!"; - mes "It's in style among those pious"; - mes "Crusaders that need hair that"; - mes "won't muss during fighting, yet"; - mes "is respectable enough to attend"; - mes "religious services."; - close2; cutin "",255; end; - case 12: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Mace Mastery' style!"; - mes "A lot of care goes into making"; - mes "that tussled hair say, 'I don't"; - mes "care how I look at all.'"; - close2; cutin "",255; end; - } - mes "Oh, that's 'Intimidate' style!"; - mes "The Rogue women seem to like"; - mes "this style...although I imagine"; - mes "that more of them would prefer"; - mes "something wilder to match those"; - mes "stockings..."; - close2; cutin "",255; end; - case 13: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Thunder Storm' style!"; - mes "This hot, flamboyant hairstyle"; - mes "flares out wildly like thunder."; - mes "...And you will too with this new look."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Spiritual Sphere"; - mes "Absorption' style! There's a"; - mes "charismatic quality to this"; - mes "fashion: it's tough, slightly"; - mes "tomboyish, but not so much"; - mes "that it can't be cute."; - close2; cutin "",255; end; - case 14: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Encore' style!"; - mes "The elegant, flowing locks"; - mes "fit well with Bards, or men who"; - mes "appreciate the value of male"; - mes "beauty."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Gypsy's Kiss' style!"; - mes "Dancers seem to like this style,"; - mes "although personally, I think"; - mes "this fashion fits very well"; - mes "with glasses."; - close2; cutin "",255; end; - case 15: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Grimtooth' style!"; - mes "Spiky and unkempt, this style"; - mes "is a popular counterculture"; - mes "street fashion. You might"; - mes "not want to wear your hair"; - mes "this way at a wedding, though."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Counter Attack' style!"; - mes "This is an intimidating look for"; - mes "girls that want to say 'You hit"; - mes "me, I'll hit you back!' It really"; - mes "emphasizes strong looking"; - mes "foreheads and cheekbones."; - close2; cutin "",255; end; - case 16: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Blitz Beat' style!"; - mes "A funky and lively fashion,"; - mes "this style was developed for a"; - mes "Hunter who liked really long"; - mes "bangs and wanted to see"; - mes "through them at the same time."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Anke Snare' style!"; - mes "The style style is specially"; - mes "made for Hunters that don't like"; - mes "to get their hair tangled..."; - mes "After all, what kind of Hunter"; - mes "lets their hair get trapped?"; - close2; cutin "",255; end; - case 17: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Find Ore' style!"; - mes "It's a practical, economical look"; - mes "that is popular among Blacksmiths."; - mes "Some swear that this fashion helps"; - mes "them in finding ores, but where's"; - mes "the science in that??"; - close2; cutin "",255; end; - } - mes "Oh, that's 'Hammer Fall' style!"; - mes "For the woman that doesn't want"; - mes "her hair to get in the way when"; - mes "she's savagely swinging heavy"; - mes "objects. Of course, this is a"; - mes "Blacksmith favorite."; - close2; cutin "",255; end; - case 18: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Fire Pillar' style!"; - mes "It's a trendy look, in which"; - mes "you cover one eye for that"; - mes "intrigue effect. The element"; - mes "of mystery is always in"; - mes "fashion, don't you think?"; - close2; cutin "",255; end; - } - mes "Oh, that's 'Jupitel Thunder'"; - mes "style! A look that strikes"; - mes "like lightening, without"; - mes "any of that annoying static"; - mes "cling or muss. This fashion"; - mes "looks great with Mage Hats."; - close2; cutin "",255; end; - case 19: - if (Sex == SEX_MALE) { - mes "Oh, that's 'Guillotine Fist'"; - mes "style! The smooth, slicked back"; - mes "pompadour shows that you're"; - mes "serious about your passion"; - mes "for brawling... or just your passion."; - close2; cutin "",255; end; - } - mes "Oh, that's 'Whirlwind' style!"; - mes "A favorite among the studious"; - mes "Sages, the hair is tied back"; - mes "in a stylish braid so that"; - mes "it doesn't fly around after"; - mes "casting those windy spells."; - close2; cutin "",255; end; + mes "Oops, I'm sorry, but that"; + mes "style is not available."; + mes "Remember to enter a number"; + mes "from 1 to 19."; + close(); + } + callsub L_cutin,.@style; + mes "[Veronica]"; + switch(.@style) { + case 1: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Play Dead' style!"; + mes "It's a nice, basic haircut."; + mes "I notice that usually the"; + mes "cute, conversative types seem"; + mes "to prefer this style."; + } else { + mes "Oh, that's 'First Aid' style!"; + mes "The shoulder length tresses"; + mes "are straightened for those"; + mes "no nonsense adventurers. It"; + mes "seems to be the style of"; + mes "choice for Novices."; + } + close2; + cutin "",255; + end; + case 2: + if (Sex == SEX_MALE) { + mes "Oh, that's the 'Two Handed Sword"; + mes "Mastery' style! It's perfect for"; + mes "for Swordmen who might muss their"; + mes "hair while swinging their swords"; + mes "all day long."; + } else { + mes "Oh, that's 'Bash' style!"; + mes "For the powerful woman that's"; + mes "not afraid to get a little"; + mes "blood on her hands, but knows"; + mes "how great her hair will look"; + mes "while wildly flailing a sword."; + } + close2; + cutin "",255; + end; + case 3: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Napalm Beat' style!"; + mes "It's a unique look with a hint"; + mes "of eccentricity that's offset"; + mes "with a helping of elegance."; + } else { + mes "Oh, that's 'Frost Diver' style!"; + mes "The pigtails lend an innocent,"; + mes "demure look for those Mages"; + mes "and Wizards that usually scare"; + mes "off the boys with their spells."; + } + close2; + cutin "",255; + end; + case 4: + if (Sex == SEX_MALE) { + mes "Oh, that's the 'Double Strafe'"; + mes "style! The arrangement of the"; + mes "hair conducts ambient static"; + mes "electricity, naturally clearing"; + mes "the mind. At least, that's what"; + mes "I was taught in fashion school."; + } else { + mes "Oh, that's 'Arrow Shower' style!"; + mes "For the Bowswoman who doesn't"; + mes "want fashion to interfere with"; + mes "her depth perception. Much more"; + mes "attractive than those horrid"; + mes "granny-style hairbuns."; + } + close2; + cutin "",255; + end; + case 5: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Angelus' style!"; + mes "It's for calm and devout people,"; + mes "as well as those bashful,"; + mes "mild-mannered types."; + } else { + mes "Oh, that's 'Heal' style!"; + mes "This is in trend among"; + mes "Priests and Acolytes since"; + mes "this style is appropriate"; + mes "for formal situations, but"; + mes "is also practical in battle."; + } + close2; + cutin "",255; + end; + case 6: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Push Cart' style!"; + mes "It was based on the design of a"; + mes "cart...at least, that's what"; + mes "I learned in beautician school."; + } else { + mes "Ooh, that's 'Vending' style!"; + mes "It's the hairdo of money"; + mes "makers...and if I may say so,"; + mes "it's also economical."; + } + close2; + cutin "",255; + end; + case 7: + if (Sex == SEX_MALE) { + mes "Ooh, that's 'Envenom' style!"; + mes "It looks great on Thieves and"; + mes "and Assassins when they're"; + mes "out poisoning people and animals."; + mes "It's fashion for the aggressive"; + mes "and eclectic~!"; + } else { + mes "Oh, that's 'Double Attack' style!"; + mes "The adorable pigtail, paired with"; + mes "those provacative bangs are sure"; + mes "to help you steal the heart of"; + mes "some cute guy."; + } + close2; + cutin "",255; + end; + case 8: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Bowling Bash' style!"; + mes "A popular style for Knights, its"; + mes "manly, rugged look tends to"; + mes "attract all of the ladies,"; + mes "and looks great on men with"; + mes "strong chins."; + } else { + mes "Oh, that's 'Gloria' style!"; + mes "It's very elegant and looks"; + mes "great on holy Priests. This"; + mes "style is most attractive to"; + mes "ladies who aren't that used"; + mes "to fighting with their hands."; + } + close2; + cutin "",255; + end; + case 9: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Venom Dust' style!"; + mes "Definitely a look for rebels,"; + mes "the sweeping, yet decidedly"; + mes "luxorious locks seems to enchant"; + mes "girls with a fatal attraction."; + } else { + mes "Oh, that's 'SP Recovery' style!"; + mes "To add more body to the special"; + mes "style of these bangs, I use a"; + mes "special conditioner that makes"; + mes "you feel like you're regaining SP"; + mes "...Although, it acutally doesn't."; + } + close2; + cutin "",255; + end; + case 10: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Turn Undead' style!"; + mes "This is popular among Priests"; + mes "that want a serious, yet a bit"; + mes "of a wild, agressive look."; + mes "Definitely more attractive"; + mes "than the 'Holy Light' mullet."; + } else { + mes "Oh, that's 'Prepare Potion' style!"; + mes "The flared out tresses are chosen"; + mes "by beginning Alchemists, since"; + mes "early, explosive experiments would"; + mes "make their hair to stick out anyway."; + } + close2; + cutin "",255; + end; + case 11: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Dragonology' style!"; + mes "It's neat and clean cut, perfect"; + mes "for studious people and looks"; + mes "great with eyeglasses. This"; + mes "is a fashion well suited to"; + mes "intellectual types."; + } else { + mes "Oh, that's 'Grand Cross' style!"; + mes "It's in style among those pious"; + mes "Crusaders that need hair that"; + mes "won't muss during fighting, yet"; + mes "is respectable enough to attend"; + mes "religious services."; + } + close2; + cutin "",255; + end; + case 12: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Mace Mastery' style!"; + mes "A lot of care goes into making"; + mes "that tussled hair say, 'I don't"; + mes "care how I look at all.'"; + } else { + mes "Oh, that's 'Intimidate' style!"; + mes "The Rogue women seem to like"; + mes "this style...although I imagine"; + mes "that more of them would prefer"; + mes "something wilder to match those"; + mes "stockings..."; + } + close2; + cutin "",255; + end; + case 13: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Thunder Storm' style!"; + mes "This hot, flamboyant hairstyle"; + mes "flares out wildly like thunder."; + mes "...And you will too with this new look."; + } else { + mes "Oh, that's 'Spiritual Sphere"; + mes "Absorption' style! There's a"; + mes "charismatic quality to this"; + mes "fashion: it's tough, slightly"; + mes "tomboyish, but not so much"; + mes "that it can't be cute."; + } + close2; + cutin "",255; + end; + case 14: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Encore' style!"; + mes "The elegant, flowing locks"; + mes "fit well with Bards, or men who"; + mes "appreciate the value of male"; + mes "beauty."; + } else { + mes "Oh, that's 'Gypsy's Kiss' style!"; + mes "Dancers seem to like this style,"; + mes "although personally, I think"; + mes "this fashion fits very well"; + mes "with glasses."; + } + close2; + cutin "",255; + end; + case 15: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Grimtooth' style!"; + mes "Spiky and unkempt, this style"; + mes "is a popular counterculture"; + mes "street fashion. You might"; + mes "not want to wear your hair"; + mes "this way at a wedding, though."; + } else { + mes "Oh, that's 'Counter Attack' style!"; + mes "This is an intimidating look for"; + mes "girls that want to say 'You hit"; + mes "me, I'll hit you back!' It really"; + mes "emphasizes strong looking"; + mes "foreheads and cheekbones."; + } + close2; + cutin "",255; + end; + case 16: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Blitz Beat' style!"; + mes "A funky and lively fashion,"; + mes "this style was developed for a"; + mes "Hunter who liked really long"; + mes "bangs and wanted to see"; + mes "through them at the same time."; + } else { + mes "Oh, that's 'Anke Snare' style!"; + mes "The style style is specially"; + mes "made for Hunters that don't like"; + mes "to get their hair tangled..."; + mes "After all, what kind of Hunter"; + mes "lets their hair get trapped?"; + } + close2; + cutin "",255; + end; + case 17: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Find Ore' style!"; + mes "It's a practical, economical look"; + mes "that is popular among Blacksmiths."; + mes "Some swear that this fashion helps"; + mes "them in finding ores, but where's"; + mes "the science in that??"; + } else { + mes "Oh, that's 'Hammer Fall' style!"; + mes "For the woman that doesn't want"; + mes "her hair to get in the way when"; + mes "she's savagely swinging heavy"; + mes "objects. Of course, this is a"; + mes "Blacksmith favorite."; + } + close2; + cutin "",255; + end; + case 18: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Fire Pillar' style!"; + mes "It's a trendy look, in which"; + mes "you cover one eye for that"; + mes "intrigue effect. The element"; + mes "of mystery is always in"; + mes "fashion, don't you think?"; + } else { + mes "Oh, that's 'Jupitel Thunder'"; + mes "style! A look that strikes"; + mes "like lightening, without"; + mes "any of that annoying static"; + mes "cling or muss. This fashion"; + mes "looks great with Mage Hats."; } + close2; + cutin "",255; + end; + case 19: + if (Sex == SEX_MALE) { + mes "Oh, that's 'Guillotine Fist'"; + mes "style! The smooth, slicked back"; + mes "pompadour shows that you're"; + mes "serious about your passion"; + mes "for brawling... or just your passion."; + } else { + mes "Oh, that's 'Whirlwind' style!"; + mes "A favorite among the studious"; + mes "Sages, the hair is tied back"; + mes "in a stylish braid so that"; + mes "it doesn't fly around after"; + mes "casting those windy spells."; + } + close2; + cutin "",255; + end; } case 2: if(BaseLevel < 60) { @@ -413,17 +450,19 @@ 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; - if(.@style > 19) { + input(.@style); + if(.@style == 0) { mes "[Veronica]"; - mes "I am sorry, you chose an unavailable style."; - mes "Make sure you enter the correct number."; + mes "You have canceled your request."; close; - } else if(.@style == 0) { + } + if (.@style < 1 || .@style > 19) { mes "[Veronica]"; - mes "You have canceled your request."; + mes "I am sorry, you chose an unavailable style."; + mes "Make sure you enter the correct number."; close; - } else if(getlook(1) == .@style) { + } + if(getlook(1) == .@style) { mes "[Veronica]"; mes "I am sorry, but you are already"; mes "wearing the style you have"; @@ -976,7 +1015,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "No. 27: Oratio Cut."; } next; - input .@input; + input(.@input); if (.@input == 0) { mes "[Prince Shammi]"; mes "Oh...?"; @@ -986,7 +1025,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "Still, I'm so disappointed~"; close; } - else if ((.@input < 20) || (.@input > 27)) { + if (.@input < 20 || .@input > 27) { mes "[Prince Shammi]"; mes "Dearie, please enter"; mes "a number from ''20'' to"; @@ -995,7 +1034,7 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "you soooooooo beautiful!"; close; } - else if (getlook(LOOK_HAIR) == .@input) { + if (getlook(LOOK_HAIR) == .@input) { mes "[Prince Shammi]"; mes "Oh dear me, you're not"; mes "going to waste money for"; @@ -1005,107 +1044,104 @@ lhz_in02,100,143,3 script Hair Dresser#li 2_M_DYEINGER,{ mes "your hair color, you know."; close; } - else { - if (Sex == SEX_MALE) - cutin "hair_m_"+.@input+".BMP",4; - else - cutin "hair_f_"+.@input+".BMP",4; - mes "[Prince Shammi]"; - mes "Oooh! Now, is this the"; - mes "hairstyle that you wanted?"; - mes "This is No. "+.@input+", by the way."; - next; - switch(select("Yes.", "No.")) { - case 1: - if (getlook(LOOK_HAIR_COLOR) == 0) { - mes "[Prince Shammi]"; - mes "Oh, Sweet Christmas,"; - mes "I almost forgot! Would"; - mes "you like me to dye your"; - mes "hair, free of charge? It's"; - mes "a part of my service, so"; - mes "please choose a color~"; - next; - switch(select("Red", "Yellow", "Purple", "Orange", "Green", "Blue", "White", "Dark Brown")) { - case 1: - .@headpalette = 8; - break; - case 2: - .@headpalette = 1; - break; - case 3: - .@headpalette = 2; - break; - case 4: - .@headpalette = 3; - break; - case 5: - .@headpalette = 4; - break; - case 6: - .@headpalette = 5; - break; - case 7: - .@headpalette = 6; - break; - case 8: - .@headpalette = 7; - break; - } - } + if (Sex == SEX_MALE) + cutin "hair_m_"+.@input+".BMP",4; + else + cutin "hair_f_"+.@input+".BMP",4; + mes "[Prince Shammi]"; + mes "Oooh! Now, is this the"; + mes "hairstyle that you wanted?"; + mes "This is No. "+.@input+", by the way."; + next; + switch(select("Yes.", "No.")) { + case 1: + if (getlook(LOOK_HAIR_COLOR) == 0) { mes "[Prince Shammi]"; - mes "Okay, let's get"; - mes "started, shall we?"; - mes "Keep your head still,"; - mes "now. Yes, that's good..."; + mes "Oh, Sweet Christmas,"; + mes "I almost forgot! Would"; + mes "you like me to dye your"; + mes "hair, free of charge? It's"; + mes "a part of my service, so"; + mes "please choose a color~"; next; - mes "^3355FF*Snip snip*"; - mes "*Rustle rustle*"; - mes "*Clip clip clip clip*"; - mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000"; - next; - Zeny -= 99800; - delitem Counteragent,3; - delitem Mixture,3; - delitem Danggie,100; - delitem Short_Daenggie,100; - delitem Long_Hair,100; - delitem Golden_Hair,100; - delitem Glossy_Hair,100; - setlook LOOK_HAIR,.@input; - setlook LOOK_HAIR_COLOR,.@headpalette; - mes "[Prince Shammi]"; - mes "Well, we're all finished!"; - mes "And my, oh my, you look even"; - mes "more fabulous that I thought"; - mes "you would! Oh, I can't believe"; - if (Sex == SEX_MALE) { - mes "how tough and elegant you are~"; - mes "So ruggedly manly and handsome!"; - } - else { - mes "how graceful and elegant you"; - mes "look! Absolutely gorgeous!"; + switch(select("Red", "Yellow", "Purple", "Orange", "Green", "Blue", "White", "Dark Brown")) { + case 1: + .@headpalette = 8; + break; + case 2: + .@headpalette = 1; + break; + case 3: + .@headpalette = 2; + break; + case 4: + .@headpalette = 3; + break; + case 5: + .@headpalette = 4; + break; + case 6: + .@headpalette = 5; + break; + case 7: + .@headpalette = 6; + break; + case 8: + .@headpalette = 7; + break; } - emotion e_kis,"Hair Dresser#li"; - next; - mes "[Prince Shammi]"; - mes "You love your new"; - mes "hair, don't you? Feel"; - mes "free to come back anytime."; - mes "I'll make you the best looking"; - mes "person in the entire world!"; - emotion e_no1,"Hair Dresser#li"; - close; - case 2: - mes "[Prince Shammi]"; - mes "Oh, did you forget which"; - mes "hairstyle goes with which"; - mes "number? By all means, please"; - mes "check again! Find the one that"; - mes "is perfect just for you, okay?"; - close; } + mes "[Prince Shammi]"; + mes "Okay, let's get"; + mes "started, shall we?"; + mes "Keep your head still,"; + mes "now. Yes, that's good..."; + next; + mes "^3355FF*Snip snip*"; + mes "*Rustle rustle*"; + mes "*Clip clip clip clip*"; + mes "*Bzzzzzzzzzzzzzzzzzzzz*^000000"; + next; + Zeny -= 99800; + delitem Counteragent,3; + delitem Mixture,3; + delitem Danggie,100; + delitem Short_Daenggie,100; + delitem Long_Hair,100; + delitem Golden_Hair,100; + delitem Glossy_Hair,100; + setlook LOOK_HAIR,.@input; + setlook LOOK_HAIR_COLOR,.@headpalette; + mes "[Prince Shammi]"; + mes "Well, we're all finished!"; + mes "And my, oh my, you look even"; + mes "more fabulous that I thought"; + mes "you would! Oh, I can't believe"; + if (Sex == SEX_MALE) { + mes "how tough and elegant you are~"; + mes "So ruggedly manly and handsome!"; + } else { + mes "how graceful and elegant you"; + mes "look! Absolutely gorgeous!"; + } + emotion e_kis,"Hair Dresser#li"; + next; + mes "[Prince Shammi]"; + mes "You love your new"; + mes "hair, don't you? Feel"; + mes "free to come back anytime."; + mes "I'll make you the best looking"; + mes "person in the entire world!"; + emotion e_no1,"Hair Dresser#li"; + close; + case 2: + mes "[Prince Shammi]"; + mes "Oh, did you forget which"; + mes "hairstyle goes with which"; + mes "number? By all means, please"; + mes "check again! Find the one that"; + mes "is perfect just for you, okay?"; + close; } break; case 3: @@ -1200,7 +1236,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); if (.@input == 0) { mes "[Assistant Beautician]"; mes "Awwww..."; @@ -1208,7 +1244,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "trust me after all..."; close; } - else if ((.@input < 1) || (.@input > 23)) { + if (.@input < 1 || .@input > 23) { mes "[Assistant Beautician]"; mes "Huh? I thought I asked"; mes "you to enter a number from"; @@ -1216,34 +1252,31 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ mes "wrong this time? Hmmm..."; close; } - else { + mes "[Assistant Beautician]"; + mes "So this is the"; + mes "style you want me"; + mes "to try to do for you?"; + if (Sex == SEX_MALE) { + if (.@input < 10) + cutin "hair_m_0"+.@input+".BMP",4; + else + cutin "hair_m_"+.@input+".BMP",4; + } else { + if (.@input < 10) + cutin "hair_f_0"+.@input+".BMP",4; + else + cutin "hair_f_"+.@input+".BMP",4; + } + next; + switch(select("Yes, let's try it~", "Cancel.")) { + case 1: + break; + case 2: mes "[Assistant Beautician]"; - mes "So this is the"; - mes "style you want me"; - mes "to try to do for you?"; - if (Sex == SEX_MALE) { - if (.@input < 10) - cutin "hair_m_0"+.@input+".BMP",4; - else - cutin "hair_m_"+.@input+".BMP",4; - } - else { - if (.@input < 10) - cutin "hair_f_0"+.@input+".BMP",4; - else - cutin "hair_f_"+.@input+".BMP",4; - } - next; - switch(select("Yes, let's try it~", "Cancel.")) { - case 1: - break; - case 2: - mes "[Assistant Beautician]"; - mes "Oooh, there must"; - mes "be some style that"; - mes "you like, right? Hmmm..."; - close; - } + mes "Oooh, there must"; + mes "be some style that"; + mes "you like, right? Hmmm..."; + close; } mes "[Assistant Beautician]"; mes "Great, you finally"; @@ -1279,8 +1312,7 @@ lhz_in02,91,155,5 script Assistant Beautician#li 4_F_LGTGIRL,{ if (.@input == .@style_r) { mes "So... How do you like"; mes "your new style? I love it!"; - } - else { + } else { mes "Wha...? This isn't what"; mes "you wanted? Uh oh... Um..."; mes "Well, next time I know I can"; diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt index a7fc5e922..1a5a43621 100644 --- a/npc/merchants/hd_refine.txt +++ b/npc/merchants/hd_refine.txt @@ -39,6 +39,17 @@ //== Blacksmith Mighty Hammer (+7~9) ======================= - script ::MightyHammer FAKE_NPC,{ + mes("[Blacksmith Mighty Hammer]"); + mes("I'm a blacksmith skilled in refining weapons and armors."); + mes("I can refine an item of your choice among the items you are equipped with."); + mes("Which item do you want to refine?"); + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + disable_items; mes "[Blacksmith Mighty Hammer]"; mes "Unlike others, I am a blacksmith who refines a very limited number of items."; @@ -179,6 +190,10 @@ lhz_in02,280,19,3 duplicate(MightyHammer) Mighty Hammer#lhz 4_M_DWARF //== Basta (+10 and up) ==================================== - script ::Basta FAKE_NPC,{ + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + end(); + } disable_items; mes "[Basta]"; mes "I'm the best Blacksmith in the whole world, Basta."; diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index 14f83b2a0..99da2fc18 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -56,8 +56,8 @@ mes "so you can only purchase 5 at a time!!"; next; while(1) { - input .@input; - if(.@input < 1) { + input(.@input); + if (.@input <= 0) { mes "[Ice Cream Maker]"; mes "If you don't want to buy any,"; mes "could you please let the next customer"; @@ -65,7 +65,7 @@ mes "Thank you."; close; } - if(.@input > 5) { + if (.@input > 5) { mes "[Ice Cream Maker]"; mes "Ouch"; mes "You expect too much."; @@ -74,7 +74,9 @@ mes "If you might haveto make a lot of trips"; mes "to the bathroom tonight."; next; + continue; } + break; } if(Zeny<.@input*100) { mes "[Ice Cream Maker]"; diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt index 06a2f8bdb..05d322ec6 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); 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 c27fc6570..7e023588d 100644 --- a/npc/merchants/novice_exchange.txt +++ b/npc/merchants/novice_exchange.txt @@ -355,8 +355,8 @@ function script F_PotExchange { mes "mind, just enter '0' to cancel."; next; while(1) { - input .@input,0,101; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Merchant]"; mes "What...?"; mes "Why the hell do you"; @@ -364,17 +364,16 @@ function script F_PotExchange { mes "Pretty indecisive, aren't you?"; close; } - else if (.@input > 100) { + if (.@input > 100) { mes "[Merchant]"; mes "I can't give you more"; mes "than 100 Red Potions"; mes "at once. Let's try"; mes "this again."; next; + continue; } - else { - break; - } + break; } .@put_out_item = .@input * getarg(1); if (countitem(getarg(0)) < .@put_out_item) { diff --git a/npc/merchants/old_pharmacist.txt b/npc/merchants/old_pharmacist.txt index 0cbbeda6d..f87f55d83 100644 --- a/npc/merchants/old_pharmacist.txt +++ b/npc/merchants/old_pharmacist.txt @@ -106,8 +106,8 @@ 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; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { next; mes "[Old Pharmacist]"; mes "Make up your mind, will you?!"; @@ -235,9 +235,9 @@ 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); next; - if (.@amount == 0) { + if (.@amount <= 0) { mes "[Old Pharmacist]"; mes "Make up your mind, will you?!"; close; diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index 7f1b4d9a3..87b5270a8 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -120,20 +120,19 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Christopher Guillenrow]"; mes "Aye, the deal is canceled. Fare ye well."; close; } - else if ((.@input < 0) || (.@input > 500)) { + if (.@input > 500) { mes "[Christopher Guillenrow]"; mes "Ye can buy 500, er less."; next; + continue; } - else { - break; - } + break; } .@sell = .@input * 150; if (Zeny < .@sell) { @@ -199,22 +198,21 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Christopher Guillenrow]"; mes "Deal has"; mes "been canceled."; mes "Fare ye well."; close; } - else if ((.@input < 0) || (.@input > 500)) { + if (.@input > 500) { mes "[Christopher Guillenrow]"; mes "Ye can buy 500, er less."; next; + continue; } - else { - break; - } + break; } .@sell = .@input * 200; if (Zeny < .@sell) { @@ -237,22 +235,21 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Christopher Guillenrow]"; mes "Deal has"; mes "been canceled."; mes "Fare ye well."; close; } - else if ((.@input < 0) || (.@input > 500)) { + if (.@input > 500) { mes "[Christopher Guillenrow]"; mes "Ye can buy 500, er less."; next; + continue; } - else { - break; - } + break; } .@sell = .@input * 1000; if (Zeny < .@sell) { @@ -424,20 +421,19 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Paul Spanner]"; mes "You have canceled the trade. If you need anything, just let me know."; close; } - else if ((.@input < 0) || (.@input > 500)) { + if (.@input > 500) { mes "[Paul Spanner]"; mes "You can only buy 500 or less at a time."; next; + continue; } - else { - break; - } + break; } .@sell = .@input * .@item_cost; if (Zeny < .@sell) { @@ -478,20 +474,19 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Paul Spanner]"; mes "The trade has been canceled. If you need anything, just let me know."; close; } - else if ((.@input < 0) || (.@input > 500)) { + if (.@input > 500) { mes "[Paul Spanner]"; mes "You can buy 500 or less at a time."; next; + continue; } - else { - break; - } + break; } .@sell = .@input * .@item_price; if (Zeny < .@sell) { @@ -589,14 +584,19 @@ lhz_in02,282,20,7 script Fulerr 4_M_LGTMAN,{ // If you enable this function, be sure to edit the value of .@safe to the max // safe refine in refine_db.txt as well. function script refinemain { + mesf("[%s]", getarg(0)); + mes("I'm the Armsmith."); + mes("I can refine all kinds of weapons, armor and equipment, so let me"); + mes("know what you want me to refine."); + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + disable_items; .@features = getarg(1); - mes "[" + getarg(0) + "]"; - mes "I'm the Armsmith."; - mes "I can refine all kinds of weapons, armor and equipment, so let me"; - mes "know what you want me to refine."; - next; - setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3"; .@menu$ = ""; for(.@i = 1; .@i <= 10; ++.@i) { @@ -803,7 +803,7 @@ function script refinemain { mes "[" + getarg(0) + "]"; mes "How many times would you like me to refine your item?"; next; - input .@refinecnt; + input(.@refinecnt); .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part); if (.@refinecnt < 1 || .@refinecheck > 10) { mes "[" + getarg(0) + "]"; @@ -949,24 +949,23 @@ function script phramain { mes "If you don't want any, please enter the number, '0.'"; next; while(1) { - input .@input; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[" + getarg(0) + "]"; mes "The deal has"; mes "been cancelled."; close; } - else if (.@input < 0 || .@input > 500) { + if (.@input > 500) { mes "[" + getarg(0) + "]"; mes "Alright, you can"; mes "puchase up to 500."; mes "No more than that,"; mes "got it? Good."; next; + continue; } - else { - break; - } + break; } .@sell = .@input * .@price; if (Zeny < .@sell) { diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 92fe841e1..5b957f9f2 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -310,3 +310,30 @@ function script F_Snowball { } end; } + +// Status reduction potion +//============================================================ +// - Permanently reduces base stat <type> by <val>. +// - Returns status points equals to points needed to raise +// that stat to original value. +// - Doesn't work if base status <type> would become lower than 1 after reduction. +// * callfunc("F_CashReduceStat", <type>{, <val>, <itemid>}); +function script F_CashReduceStat { + .@type = getarg(0); + .@amount = getarg(1, -1); + .@itemid = getarg(2, 0); + + if ((readparam(.@type) + .@amount) < 1) return; + + if (.@itemid) { + if (countitem(.@itemid)) + delitem .@itemid, 1; + else + return; + } + + StatusPoint += needed_status_point(.@type, .@amount); + 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..e3741b495 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -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/arena/arena_party.txt b/npc/other/arena/arena_party.txt index c3133af30..67c69f8e8 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -1059,7 +1059,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 +1078,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..c2ef52e6a 100644 --- a/npc/other/arena/arena_point.txt +++ b/npc/other/arena/arena_point.txt @@ -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..b70ce7e4c 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,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/card_trader.txt b/npc/other/card_trader.txt index 514a032b0..1fca99440 100644 --- a/npc/other/card_trader.txt +++ b/npc/other/card_trader.txt @@ -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..dab52fbbc 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -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/fortune.txt b/npc/other/fortune.txt index 23d65e88f..c3bec40f3 100644 --- a/npc/other/fortune.txt +++ b/npc/other/fortune.txt @@ -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..b4ee7028e 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 9c7b87ee4..bf64d7105 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -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 new file mode 100644 index 000000000..8a5ac5e6c --- /dev/null +++ b/npc/other/inventory_expansion.txt @@ -0,0 +1,63 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2018 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 +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Inventory expansion +//========================================================================= + +- script inventory_expansion FAKE_NPC,{ + end; + +OnInvExpandRequest: + if (countitem(Inventory_Extension_Coupon) < 1) { + expandinventoryack(EXPAND_INV_MISSING_ITEM); + end; + } + if (getinventorysize() + INVENTORY_INCREASE_STEP > MAX_INVENTORY) { + expandinventoryack(EXPAND_INV_MAX_SIZE); + end; + } + expandinventoryack(EXPAND_INV_ASK_CONFIRMATION, Inventory_Extension_Coupon); + end; + +OnInvExpandConfirmed: + if (countitem(Inventory_Extension_Coupon) < 1) { + expandinventoryresult(EXPAND_INV_RESULT_MISSING_ITEM); + end; + } + 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); + } + end; + +OnInvExpandRejected: + end; +} diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 0f640af2a..42c817957 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -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..cc7364bf4 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -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_race.txt b/npc/other/monster_race.txt index 9e938c663..84087fb6d 100644 --- a/npc/other/monster_race.txt +++ b/npc/other/monster_race.txt @@ -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/turbo_track.txt b/npc/other/turbo_track.txt index f70c97427..948f190ba 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -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]"; diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 47ae792fe..684c7335e 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -437,50 +437,50 @@ 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]"; mes "Error: Item limit exceeded. Please enter values less than 10,000 try again."; next; + continue; } - else { - if (countitem(Jellopy) > 0) .@mixitem1_1 += .@input; - .@progress = 2; - break; - } + if (countitem(Jellopy) > 0) + .@mixitem1_1 += .@input; + .@progress = 2; + break; } break; case 2: while(1) { - input .@input; + input(.@input, 0); if (.@input > 10000) { next; mes "[Mixing Machine]"; mes "Error: Item limit exceeded. Please enter values less than 10,000 try again."; next; + continue; } - else { - if (countitem(Fluff) > 0) .@mixitem1_2 += .@input; - .@progress = 2; - break; - } + if (countitem(Fluff) > 0) + .@mixitem1_2 += .@input; + .@progress = 2; + break; } break; case 3: while(1) { - input .@input; + input(.@input, 0); if (.@input > 10000) { next; mes "[Mixing Machine]"; mes "Error: Item limit exceeded. Please enter values less than 10,000 try again."; next; + continue; } - else { - if (countitem(Milk) > 0) .@mixitem1_3 += .@input; - .@progress = 2; - break; - } + if (countitem(Milk) > 0) + .@mixitem1_3 += .@input; + .@progress = 2; + break; } break; @@ -499,40 +499,39 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{ mes "the Magic Powder."; next; while(1) { - input .@input; - if (.@input < 1000 || .@input > 9999) { + input(.@input); + if (.@input == 0) { mes "[Mixing Machine]"; - if (.@input == 0) { - mes "Do you want to skip this Menu?"; - next; - if (select("Yes.", "No.") == 1) { - break; - } - } - else { - mes "Invalid Serial Number."; - mes "Please try again."; - next; + mes "Do you want to skip this Menu?"; + next; + if (select("Yes.", "No.") == 1) { + break; } + continue; } - else { + if (.@input < 1000 || .@input > 9999) { mes "[Mixing Machine]"; - mes "The Serial Number is #" + .@input + ", correct?"; + mes "Invalid Serial Number."; + mes "Please try again."; next; - if (select("Confirm.", "Cancel.") == 1) { - if (.@input == 8472) - .@magic_powder = 1; - else if (.@input == 3735) - .@magic_powder = 2; - else if (.@input == 2750) - .@magic_powder = 3; - else if (.@input == 5429) - .@magic_powder = 4; - else - .@magic_powder = 5; - } - break; + continue; } + mes "[Mixing Machine]"; + mes "The Serial Number is #" + .@input + ", correct?"; + next; + if (select("Confirm.", "Cancel.") == 1) { + if (.@input == 8472) + .@magic_powder = 1; + else if (.@input == 3735) + .@magic_powder = 2; + else if (.@input == 2750) + .@magic_powder = 3; + else if (.@input == 5429) + .@magic_powder = 4; + else + .@magic_powder = 5; + } + break; } mes "[Mixing Machine]"; mes "Choose a"; diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 2d1cd9ba3..b6ce65b3d 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); if (.@input == 0) { mes "[Union Staff Kay]"; mes "Are you sure that you wanna cancel?"; @@ -714,14 +714,15 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{ close; } next; + continue; } - else if (.@input < 1000000 || .@input > 5000000) { + if (.@input < 1000000 || .@input > 5000000) { mes "[Union Staff Kay]"; mes "Hey hey. That number's not valid! Enter a value from 1000000 to 5000000. got it?"; next; - } else { - break; + continue; } + break; } mes "[Union Staff Kay]"; if (.@where_village == 1) diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt index 356eaae7d..bbae29988 100644 --- a/npc/pre-re/jobs/novice/novice.txt +++ b/npc/pre-re/jobs/novice/novice.txt @@ -82,8 +82,8 @@ new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{ mes "Hello, you look to be new here."; mes "What is your name?"; next; - input .@charname$; - if (.@charname$!=strcharinfo(PC_NAME)) { + input(.@charname$); + if (.@charname$ != strcharinfo(PC_NAME)) { mes "[Training Grounds Receptionist]"; mes "Sorry, but I don't think I heard"; mes "you correctly"; diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt index 7a187e6a3..43ef61cbf 100644 --- a/npc/quests/bard_quest.txt +++ b/npc/quests/bard_quest.txt @@ -320,7 +320,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{ mes "[" + @name$ + "]"; mes "Don't you think..."; mes "The person would be..."; - input .@inputstr$; + input(.@inputstr$); mes .@inputstr$ + "?"; next; @@ -546,7 +546,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{ mes "The lyrics. They must have been changed. Did Gunther say anything about this?! Hmmm, but who would change the lyrics...?"; next; cutin "bard_eland01",2; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Kino Kitty") { mes "[Errende]"; @@ -678,7 +678,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{ mes "Could it be that"; mes "the person who"; mes "changed the song is..."; - input .@inputstr$; + input(.@inputstr$); mes "" + .@inputstr$ + "?"; next; @@ -879,7 +879,7 @@ geffen,132,38,3 script Bard#2 1_M_BARD,{ mes "[Errende]"; mes "The lyrics. They must have been changed. Did Gunther say anything about this?! Hmmm, but who would change the lyrics...?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Kino Kitty") { cutin "bard_eland01",2; mes "[Errende]"; @@ -2486,14 +2486,14 @@ payon,181,172,3 script Bard#4 1_M_BARD,{ mes "Now, what was the"; mes "name of the song again?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "At One, I Fall in Love") { mes "[Gunther Doubleharmony]"; mes "Ah~ that song...?"; mes "By the way, who asked you"; mes "to find out about the song?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Minty Errende") { mes "[Gunther Doubleharmony]"; mes "Yes, that's my friend! Minty Errende! We used to so close to each other, so I'll write every word of the song for my friend Minty Errende, so turn around please!"; @@ -2843,7 +2843,7 @@ yuno_in04,20,123,7 script Representative#bq 4_F_SISTER,{ mes "[Marlin Putiur]"; mes "I also hear the Bards have been helping scholars instill bulletin boards in fields which indicate the location for new adventurers. Would you let me know the full name of the person you're looking for?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Minty Errende") { mes "[Marlin Putiur]"; mes "Minty Errende..."; @@ -2909,7 +2909,7 @@ yuno_in04,33,119,3 script Adventurer#1 4_M_ROGUE,{ mes "My name is Pane."; mes "May I ask yours?"; @name$ = strcharinfo(PC_NAME); - input .@inputstr$; + input(.@inputstr$); next; mes "[Energetic Young Man]"; mes "Oh..."; diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 505561f52..f124a07d4 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -1102,8 +1102,8 @@ 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; - if (.@new_book < 0 || .@new_book > 5) { + input(.@new_book); + if (.@new_book > 5) { cutin "orleans_5",0; mes "[Charles Orleans]"; mes "Hmm..."; @@ -1113,8 +1113,9 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "only cookbooks that I will"; mes "lend out to my students."; callsub L_End; + end; } - else if (.@new_book == 0) { + if (.@new_book <= 0) { cutin "orleans_5",0; mes "[Charles Orleans]"; mes "So you changed your mind?"; @@ -1123,6 +1124,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "have right now before trying"; mes "something new, I suppose."; callsub L_End; + end; } mes "[Charles Orleans]"; mes "So you wanted to borrow a"; @@ -1131,8 +1133,8 @@ 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; - if (.@old_book < 0 || .@old_book > 5) { + input(.@old_book); + if (.@old_book > 5) { mes "[Charles Orleans]"; mes "There must be some"; mes "kind of mistake-- I only"; @@ -1141,8 +1143,9 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "me again when you remember"; mes "which cookbook you have, okay?"; callsub L_End; + end; } - else if (.@old_book == 0) { + if (.@old_book <= 0) { cutin "orleans_5",0; mes "[Charles Orleans]"; mes "So you changed your mind?"; @@ -1151,8 +1154,9 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "have right now before trying"; mes "something new, I suppose."; callsub L_End; + end; } - else if (.@old_book == .@new_book) { + if (.@old_book == .@new_book) { cutin "orleans_4",0; mes "[Charles Orleans]"; mes "Wait, wait..."; @@ -1162,62 +1166,62 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "have? I guess you made"; mes "some sort of mistake?"; callsub L_End; + end; } - else { - if (countitem(7471+.@old_book) < 1) { - mes "[Charles Orleans]"; - mes "Wait, wait..."; - mes "Why don't you have"; - mes "the book that you said"; - mes "that you'd return to me?"; - mes "Find it first, and then I can"; - mes "lend another cookbook to you."; - callsub L_End; - } - cutin "orleans_2",0; + if (countitem(7471+.@old_book) < 1) { mes "[Charles Orleans]"; - switch(.@old_book) { - case 1: - mes "Ah, so you're done"; - mes "with the Level 1 Cookbook."; - mes "That's good, that means you're"; - mes "ready to graduate from the most"; - mes "basic of basics. From now on,"; - mes "the recipes will be harder..."; - break; - case 2: - mes "Ah, so what did you"; - mes "think of the recipes in"; - mes "the Level 2 Cookbook?"; - mes "Homestyle cooking may be"; - mes "simple, but it should never"; - mes "be neglected by chefs."; - break; - case 3: - mes "Ah, done with the Level 3"; - mes "Cookbook already? The recipes"; - mes "in there are really good when you're cooking romantic dinners."; - mes "They'll come in handy someday,"; - mes "if you know what I mean."; - break; - case 4: - mes "So you've finished the"; - mes "Level 4 Cookbook. That's"; - mes "no small feat! You've got to"; - mes "use very strange ingredients"; - mes "to create delicious cuisine!"; - break; - case 5: - mes "You're done with the"; - mes "Level 5 Cookbook? Good"; - mes "work: most beginners don't"; - mes "even get this far. I suppose"; - mes "you'll want to review some"; - mes "of the easier recipes now~"; - break; - } - next; + mes "Wait, wait..."; + mes "Why don't you have"; + mes "the book that you said"; + mes "that you'd return to me?"; + mes "Find it first, and then I can"; + mes "lend another cookbook to you."; + callsub L_End; + end; } + cutin "orleans_2",0; + mes "[Charles Orleans]"; + switch(.@old_book) { + case 1: + mes "Ah, so you're done"; + mes "with the Level 1 Cookbook."; + mes "That's good, that means you're"; + mes "ready to graduate from the most"; + mes "basic of basics. From now on,"; + mes "the recipes will be harder..."; + break; + case 2: + mes "Ah, so what did you"; + mes "think of the recipes in"; + mes "the Level 2 Cookbook?"; + mes "Homestyle cooking may be"; + mes "simple, but it should never"; + mes "be neglected by chefs."; + break; + case 3: + mes "Ah, done with the Level 3"; + mes "Cookbook already? The recipes"; + mes "in there are really good when you're cooking romantic dinners."; + mes "They'll come in handy someday,"; + mes "if you know what I mean."; + break; + case 4: + mes "So you've finished the"; + mes "Level 4 Cookbook. That's"; + mes "no small feat! You've got to"; + mes "use very strange ingredients"; + mes "to create delicious cuisine!"; + break; + case 5: + mes "You're done with the"; + mes "Level 5 Cookbook? Good"; + mes "work: most beginners don't"; + mes "even get this far. I suppose"; + mes "you'll want to review some"; + mes "of the easier recipes now~"; + break; + } + next; cutin "orleans_1",0; mes "[Charles Orleans]"; mes "Now, before I let you"; @@ -2079,8 +2083,8 @@ S_SellSets: mes "enter the number 0."; next; while(1) { - input .@sell; - if (.@sell == 0) { + input(.@sell); + if (.@sell <= 0) { mes "[Madeleine Chu]"; mes "You've changed your"; mes "mind? Well, if you need"; @@ -2089,15 +2093,16 @@ S_SellSets: mes "to me at anytime, alright?"; close; } - else if (.@sell > 100) { + if (.@sell > 100) { mes "[Madeleine Chu]"; mes "Oh, I'm sorry, but"; mes "I don't sell more than"; mes "100 "+getitemname(getarg(0)); mes "at a time, just to be safe."; next; + continue; } - else break; + break; } .@total_cost = .@sell * .@item_cost; .@total_weight = .@sell * .@item_weight; diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index a070bf8df..964cfb13b 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -1109,7 +1109,7 @@ OnTouch: mes "all the message says is, um,"; mes "what was that last word again?"; next; - input .@input$; + input(.@input$); if (.@input$ == "BINGO") { mes "[" + strcharinfo(PC_NAME) + "]"; mes "Of course!"; @@ -1211,7 +1211,7 @@ prt_in,128,79,0 script Unknown Machine#prt_key HIDDEN_NPC,{ mes "Ah, right, the numbers"; mes "that Veggie Lady gave me!"; next; - input .@input$; + input(.@input$); if (.@input$ == "3847147298") { mes "^3355FFThe machine responds to"; mes "the password with a pleasant"; @@ -1262,7 +1262,7 @@ prt_in,128,79,0 script Unknown Machine#prt_key HIDDEN_NPC,{ mes "if I can enter the"; mes "right number this time..."; next; - input .@input$; + input(.@input$); if (.@input$ == "3847147298") { mes "^3355FFThe machine responds to"; mes "the password with a pleasant"; @@ -2107,7 +2107,7 @@ geffen,110,200,3 script Sage Welshyun#hellion 4_M_SAGE_A,3,3,{ mes "in the third part of the ballad"; mes "of Grimnir? Well, adventurer?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Valaskjalf") { mes "[Welshyun]"; mes "Ah, well met, well met."; @@ -2291,7 +2291,7 @@ gef_tower,116,37,0 script Enoz#hellion 4_M_ALCHE_A,{ mes "I haven't submitted to him"; mes "yet? So what was it called?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Monster Life in the Geffen Area") { mes "[Enoz]"; mes "''Monster Life in"; diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt index fa4c0defb..5c847d7cc 100644 --- a/npc/quests/first_class/tu_sword.txt +++ b/npc/quests/first_class/tu_sword.txt @@ -1888,69 +1888,8 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ mes "from all the suspects? First,"; mes "tell me the code that Hans had."; next; - input .@inputstr$; - if(.@inputstr$ == .@hans$){ - mes "[Dequ'ee]"; - mes "victkleyundncem?"; - mes "That's certainly"; - mes "strange sounding."; - mes "Now, tell me Bankley's."; - next; - input .@inputstr$; - if(.@inputstr$ == .@bang$){ - mes "[Dequ'ee]"; - mes "hekdlfiDrindkelsd.."; - mes "What the hell is that...?"; - mes "It's certainly cryptic."; - mes "What about Muetro's?"; - next; - input .@inputstr$; - if(.@inputstr$ == .@mutr$){ - mes "[Dequ'ee]"; - mes "ConBanfoevidehi."; - mes "This is going to"; - mes "be tough to figure"; - mes "out. Alright, now"; - mes "tell me Geil's."; - next; - input .@inputstr$; - if(.@inputstr$ == .@geil$){ - mes "[Dequ'ee]"; - mes "TheisWesomeof..."; - mes "Alright, great."; - mes "Now all we have to"; - mes "do is figure out what"; - mes "all of this means."; - next; - mes "[Dequ'ee]"; - mes "This is going to"; - mes "be really difficult."; - mes "Do you have any ideas?"; - mes "We have to figure this"; - mes "out, it's the only clue"; - mes "that we have..."; - tu_swordman = 16; - changequest 8223,8224; - close; - } else { - mes "[Dequ'ee]"; - mes "...Are you sure that you heard"; - mes "him right? Why don't you go check it out again?"; - close; - } - } else { - mes "[Dequ'ee]"; - mes "...Are you sure that you heard"; - mes "him right? Why don't you go check it out again?"; - close; - } - } else { - mes "[Dequ'ee]"; - mes "...Are you sure that you heard"; - mes "him right? Why don't you go check it out again?"; - close; - } - } else { + input(.@inputstr$); + if(.@inputstr$ != .@hans$) { mes "[Dequ'ee]"; mes "Are you sure that's right?"; mes "No, no, I don't think it is."; @@ -1958,6 +1897,63 @@ geffen,154,143,3 script Dequ'ee 4_M_JOB_KNIGHT2,{ mes "if you need to?"; close; } + mes "[Dequ'ee]"; + mes "victkleyundncem?"; + mes "That's certainly"; + mes "strange sounding."; + mes "Now, tell me Bankley's."; + next; + input(.@inputstr$); + if(.@inputstr$ != .@bang$) { + mes "[Dequ'ee]"; + mes "...Are you sure that you heard"; + mes "him right? Why don't you go check it out again?"; + close; + } + mes "[Dequ'ee]"; + mes "hekdlfiDrindkelsd.."; + mes "What the hell is that...?"; + mes "It's certainly cryptic."; + mes "What about Muetro's?"; + next; + input(.@inputstr$); + if(.@inputstr$ != .@mutr$) { + mes "[Dequ'ee]"; + mes "...Are you sure that you heard"; + mes "him right? Why don't you go check it out again?"; + close; + } + mes "[Dequ'ee]"; + mes "ConBanfoevidehi."; + mes "This is going to"; + mes "be tough to figure"; + mes "out. Alright, now"; + mes "tell me Geil's."; + next; + input(.@inputstr$); + if(.@inputstr$ != .@geil$) { + mes "[Dequ'ee]"; + mes "...Are you sure that you heard"; + mes "him right? Why don't you go check it out again?"; + close; + } + mes "[Dequ'ee]"; + mes "TheisWesomeof..."; + mes "Alright, great."; + mes "Now all we have to"; + mes "do is figure out what"; + mes "all of this means."; + next; + mes "[Dequ'ee]"; + mes "This is going to"; + mes "be really difficult."; + mes "Do you have any ideas?"; + mes "We have to figure this"; + mes "out, it's the only clue"; + mes "that we have..."; + tu_swordman = 16; + changequest 8223,8224; + close; } if(tu_swordman == 14){ mes "[Dequ'ee]"; diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt index 4c5d34b3c..250090495 100644 --- a/npc/quests/juice_maker.txt +++ b/npc/quests/juice_maker.txt @@ -256,21 +256,20 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Merchant Marx Hansen]"; mes "Well then..."; mes "Come again."; close; } - else if (.@input > 100) { + if (.@input > 100) { mes "[Merchant Marx Hansen]"; mes "More than 100 bottles is impossible. Choose a different amount."; next; + continue; } - else { - break; - } + break; } .@make = .@input; break; diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index 677a81f8d..d1ab7fcaf 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/npc/quests/kiel_hyre_quest.txt @@ -566,7 +566,7 @@ yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 4_M_EIN_SOLDIER,{ mes "delivered, and I'll verify it"; mes "before letting you inside."; next; - input .@KHDelivery$; + input(.@KHDelivery$); if (.@KHDelivery$ != "Lecollane") { mes "[Security Guard]"; mes "You're here to deliver some"; @@ -576,7 +576,7 @@ yuno_fild08,158,194,6 script Security Guard#1::KHAGuard 4_M_EIN_SOLDIER,{ mes "academy named "+.@KHDelivery$+""; close; } - input .@KHDelivery$ ; + input(.@KHDelivery$); if (.@KHDelivery$ != "Culinary Wine") { mes "[Security Guard]"; mes "So you're here to make"; @@ -1438,7 +1438,7 @@ kh_school,178,180,4 script Elly 4_F_KHELLY,{ mes "^3355FFElly's not responding...^000000"; close; case 2: - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Wake up, Elly!") { mes "[Elly]"; mes "............."; @@ -1453,15 +1453,13 @@ kh_school,178,180,4 script Elly 4_F_KHELLY,{ KielHyreQuest = 34; close; } - else { - mes "[Elly]"; - mes "......"; - mes "........."; - mes "............"; - next; - mes "^3355FFElly's not responding...^000000"; - close; - } + mes "[Elly]"; + mes "......"; + mes "........."; + mes "............"; + next; + mes "^3355FFElly's not responding...^000000"; + close; case 3: mes "^3355FFAlright..."; mes "But sooner or later,"; @@ -1647,7 +1645,7 @@ kh_school,175,176,0 script Cookie Basket#kh HIDDEN_NPC,{ mes "deliciously bittersweet."; KielHyreQuest = 109; next; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes ""+.@input$+""; mes "It's time to go back. I can't"; @@ -1703,7 +1701,7 @@ yuno_fild08,71,170,0 script Grave#kh HIDDEN_NPC,{ mes "^3355FFWhat should you"; mes "insert into the slot?^000000"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Yellow Keycard") { mes "^3355FFAn electronic confirmation"; mes "chime sounds once you insert"; @@ -1713,7 +1711,7 @@ yuno_fild08,71,170,0 script Grave#kh HIDDEN_NPC,{ mes "[Security System]"; mes "Please enter the password."; next; - input .@KHInput$; + input(.@KHInput$); next; if (.@KHInput$ == "4772961") { mes "[Security System]"; @@ -1726,19 +1724,15 @@ yuno_fild08,71,170,0 script Grave#kh HIDDEN_NPC,{ KielHyreQuest = 38; close; } - else { - mes "[Security System]"; - mes "Incorrect password."; - mes "Please try again."; - close; - } - } - else { - mes "^3355FFWhatever you're trying"; - mes "to insert into the slot"; - mes "isn't working at all...^000000"; + mes "[Security System]"; + mes "Incorrect password."; + mes "Please try again."; close; } + mes "^3355FFWhatever you're trying"; + mes "to insert into the slot"; + mes "isn't working at all...^000000"; + close; } } else if ((KielHyreQuest >= 38) && (KielHyreQuest < 106)) { @@ -2974,7 +2968,7 @@ kh_vila,185,68,0 script Test Tube::TestTubeKHQ2 HIDDEN_NPC,{ mes "then you know what to call me,"; mes "right? Do you know what I am?"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "little lost devil") { mes "[???]"; mes "Heh... Heh heh..."; @@ -2994,14 +2988,12 @@ kh_vila,185,68,0 script Test Tube::TestTubeKHQ2 HIDDEN_NPC,{ KielHyreQuest = 30; close; } - else { - mes "[???]"; - mes "No... No..."; - mes "That's not right."; - mes "I don't think we"; - mes "were friends. No..."; - close; - } + mes "[???]"; + mes "No... No..."; + mes "That's not right."; + mes "I don't think we"; + mes "were friends. No..."; + close; case 2: mes "^3355FFLet's investigate"; mes "this area a little"; @@ -3041,7 +3033,7 @@ kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 HIDDEN_NPC,{ next; switch(select("Open Door", "Cancel")) { case 1: - input .@KHInput$; + input(.@KHInput$); mes "^3355FFYou try to push the"; mes "door open with all"; mes "your might, but fail"; @@ -3061,7 +3053,7 @@ kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 HIDDEN_NPC,{ next; switch(select("Open Door", "Cancel")) { case 1: - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Blue Keycard") { mes "^3355FFYou've successfully"; mes "opened the door."; @@ -3069,13 +3061,11 @@ kh_dun01,235,48,0 script Heavy Door#kh1::HeavyDoorKHQ1 HIDDEN_NPC,{ warp "kh_school",119,144; end; } - else { - mes "^3355FFYou try to push the"; - mes "door open with all"; - mes "your might, but fail"; - mes "to make it budge.^000000"; - close; - } + mes "^3355FFYou try to push the"; + mes "door open with all"; + mes "your might, but fail"; + mes "to make it budge.^000000"; + close; case 2: mes "^3355FFYou decided to leave"; mes "this door alone until"; @@ -3101,7 +3091,7 @@ kh_dun01,76,233,0 script Heavy Door::HeavyDoorKHQ2 HIDDEN_NPC,{ next; switch(select("Open Door", "Cancel")) { case 1: - input .@KHInput$; + input(.@KHInput$); mes "^3355FFYou try to push the"; mes "door open with all"; mes "your might, but fail"; @@ -3421,7 +3411,7 @@ kh_dun01,166,223,0 script Mechanical Device#kh::KHKeyardReader HIDDEN_NPC,{ mes "operated by inserting the"; mes "correct keycard into the slot.^000000"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Red Keycard") { mes "^3355FFThe door opens once"; mes "you insert the Red Keycard.^000000"; @@ -3429,10 +3419,8 @@ kh_dun01,166,223,0 script Mechanical Device#kh::KHKeyardReader HIDDEN_NPC,{ warp "kh_dun01",170,227; end; } - else { - mes "^3355FFNothing happened.^000000"; - close; - } + mes "^3355FFNothing happened.^000000"; + close; } } @@ -3530,42 +3518,38 @@ kh_dun01,44,203,0 script Entrance Device#khd2::KHAccess HIDDEN_NPC,{ mes "correct keycard into the slot.^000000"; close; } - else { - mes "^3355FFYou encounter"; - mes "a mechanical device."; - mes "It looks like it can be"; - mes "operated by inserting the"; - mes "correct keycard into the slot.^000000"; - next; - input .@KHInput$; - if (.@KHInput$ == "Luxurious Keycard") { - mes "^3355FFAs you insert the"; - mes "Luxurious Keycard"; - mes "into the keycard slot,"; - mes "the door swings open"; - mes "to reveal a long flight"; - mes "of descending stairs.^000000"; - next; - switch(select("Descend Stairs", "Cancel")) { - case 1: - warp "kh_dun02",41,198; - end; - case 2: - mes "^3355FFIt looks like this door"; - mes "has automatically closed"; - mes "after the preprogrammed"; - mes "time limit has elapsed.^000000"; - close; - } - } - else { - mes "^3355FFYou try to push the"; - mes "door open with all"; - mes "your might, but fail"; - mes "to make it budge.^000000"; + mes "^3355FFYou encounter"; + mes "a mechanical device."; + mes "It looks like it can be"; + mes "operated by inserting the"; + mes "correct keycard into the slot.^000000"; + next; + input(.@KHInput$); + if (.@KHInput$ == "Luxurious Keycard") { + mes "^3355FFAs you insert the"; + mes "Luxurious Keycard"; + mes "into the keycard slot,"; + mes "the door swings open"; + mes "to reveal a long flight"; + mes "of descending stairs.^000000"; + next; + switch(select("Descend Stairs", "Cancel")) { + case 1: + warp "kh_dun02",41,198; + end; + case 2: + mes "^3355FFIt looks like this door"; + mes "has automatically closed"; + mes "after the preprogrammed"; + mes "time limit has elapsed.^000000"; close; } } + mes "^3355FFYou try to push the"; + mes "door open with all"; + mes "your might, but fail"; + mes "to make it budge.^000000"; + close; } kh_dun01,36,195,0 duplicate(KHAccess) Entrance Device#khd1 HIDDEN_NPC @@ -5703,7 +5687,7 @@ kh_kiehl01,19,25,0 script Box#kh1 HIDDEN_NPC,{ mes "a button for each letter"; mes "of the alphabet on top of it.^000000"; next; - input .@KHInput$; + input(.@KHInput$); mes "^3355FFNothing happened.^000000"; close; } @@ -5713,7 +5697,7 @@ kh_kiehl01,19,25,0 script Box#kh1 HIDDEN_NPC,{ mes "a button for each letter"; mes "of the alphabet on top of it.^000000"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "open the door") { mes "^3355FFAs soon as you enter the"; mes "password, the nearby door"; @@ -5723,23 +5707,17 @@ kh_kiehl01,19,25,0 script Box#kh1 HIDDEN_NPC,{ getitem Toy_Key,1; close; } - else { - mes "^3355FFNothing happened.^000000"; - close; - } - } - else { - mes "^3355FFThis is where you"; - mes "found the Toy key^000000"; + mes "^3355FFNothing happened.^000000"; close; } - } - else{ - mes "^3355FFThe box is wide"; - mes "open, and there"; - mes "is nothing in it.^000000"; + mes "^3355FFThis is where you"; + mes "found the Toy key^000000"; close; } + mes "^3355FFThe box is wide"; + mes "open, and there"; + mes "is nothing in it.^000000"; + close; } //- Kiehl's Room; Big Door, (First) - @@ -5752,7 +5730,7 @@ kh_kiehl01,44,33,0 script Big Door#BigDoorKHQ1 HIDDEN_NPC,{ mes "but there is a narrow"; mes "slot next to the doorknob.^000000"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Black Keycard") { if (countitem(Black_Key_Card) >= 1) { mes "^3355FFYou insert the"; @@ -5811,7 +5789,7 @@ kh_kiehl01,174,40,0 script Big Door#BigDoorKHQ2 HIDDEN_NPC,{ mes "but there is a small"; mes "keyhole next to the knob.^000000"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Toy Key") { if (countitem(Toy_Key) >= 1) { mes "^3355FFYou insert the key into"; @@ -5832,10 +5810,8 @@ kh_kiehl01,174,40,0 script Big Door#BigDoorKHQ2 HIDDEN_NPC,{ mes "to make it budge.^000000"; close; } - else { - mes "^3355FFThe door is open.^000000"; - close; - } + mes "^3355FFThe door is open.^000000"; + close; } kh_kiehl01,174,39,0 script Big_Door_2_Warp WARPNPC,1,1,{ @@ -5869,7 +5845,7 @@ kh_kiehl01,77,108,0 script Big Door#BigDoorKHQ3 HIDDEN_NPC,{ mes "but there is a narrow"; mes "slot next to the doorknob.^000000"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Black Keycard") { if (countitem(Black_Key_Card) >= 1) { mes "^3355FFYou insert the"; @@ -5927,7 +5903,7 @@ kh_kiehl01,42,177,0 script Big Door#BigDoorKHQ4 HIDDEN_NPC,{ mes "but there is a narrow"; mes "slot next to the doorknob.^000000"; next; - input .@KHInput$; + input(.@KHInput$); if (.@KHInput$ == "Black Keycard") { if (countitem(Black_Key_Card) >= 2) { mes "^3355FFYou insert the"; @@ -5947,11 +5923,8 @@ kh_kiehl01,42,177,0 script Big Door#BigDoorKHQ4 HIDDEN_NPC,{ mes "to make it budge.^000000"; close; } - - else { - mes "^3355FFThe door is open.^000000"; - close; - } + mes "^3355FFThe door is open.^000000"; + close; } kh_kiehl01,41,177,0 script Big_Door_4_Warp WARPNPC,1,1,{ diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt index 977071343..a6a3d8e9b 100644 --- a/npc/quests/lvl4_weapon_quest.txt +++ b/npc/quests/lvl4_weapon_quest.txt @@ -2078,7 +2078,7 @@ niflheim,240,193,3 script Kayron#lv4 4_M_NFDEADMAN2,{ mes "[Kayron]"; mes "There's nothing I can do."; mes "I'm... Um... I'm...?"; - input .@input$; + input(.@input$); next; if (.@input$ == "I'm utterly helpless here.") { mes "[Kayron]"; @@ -2112,14 +2112,12 @@ niflheim,240,193,3 script Kayron#lv4 4_M_NFDEADMAN2,{ lv4_weapon = 24; close; } - else { - mes "[Kayron]"; - mes "Huh...?"; - mes "What did you just say?"; - mes "I'm sorry, I'm trying to remember something my father always used"; - mes "to say..."; - close; - } + mes "[Kayron]"; + mes "Huh...?"; + mes "What did you just say?"; + mes "I'm sorry, I'm trying to remember something my father always used"; + mes "to say..."; + close; } if (lv4_weapon == 22) { mes "[Kayron]"; @@ -2530,7 +2528,7 @@ niflheim,99,268,5 script Reyghema#lv4 4_M_NFDEADMAN2,{ mes "something like that,"; mes "but there was more to it..."; next; - input .@input$; + input(.@input$); if (.@input$ == "Live without regret.") { mes "[Reyghema]"; mes "..."; @@ -2562,14 +2560,12 @@ niflheim,99,268,5 script Reyghema#lv4 4_M_NFDEADMAN2,{ lv4_weapon = 33; close; } - else { - mes "[Reyghema]"; - mes "What...?"; - mes "You playin' games"; - mes "with me or what?"; - mes "Get outta my face~"; - close; - } + mes "[Reyghema]"; + mes "What...?"; + mes "You playin' games"; + mes "with me or what?"; + mes "Get outta my face~"; + close; } if (lv4_weapon == 31) { mes "[Reyghema]"; @@ -2986,7 +2982,7 @@ niflheim,187,280,3 script Hein#lv4 4_M_NFDEADMAN,{ mes "Back during those days,"; mes "I never accepted money for my work. Father always used to say, 'Never accept payment to forge a good weapon. It... It...'"; next; - input .@input$; + input(.@input$); if (.@input$ == "It brings bad luck.") { mes "[Hein]"; mes "That's right!"; @@ -3017,14 +3013,12 @@ niflheim,187,280,3 script Hein#lv4 4_M_NFDEADMAN,{ mes "of a deal... Right?"; close; } - else { - mes "[Hein]"; - mes "Wha...?"; - mes "What are you talking about?"; - mes "What was I going to say?"; - mes "Oww... My head hurts!"; - close; - } + mes "[Hein]"; + mes "Wha...?"; + mes "What are you talking about?"; + mes "What was I going to say?"; + mes "Oww... My head hurts!"; + close; } if (lv4_weapon == 40) { mes "[Hein]"; @@ -3435,7 +3429,7 @@ niflheim,331,72,3 script Waltboughst#lv4 4_M_NFDEADMAN,{ mes "[Waltboughst]"; mes "It's funny, you know. My father always used to say, 'Trying your best won't always result in success...' Um, that's ... Huh? There was more, I think."; next; - input .@input$; + input(.@input$); if (.@input$ == "But that's no excuse!") { mes "[Waltboughst]"; mes "Yes! That was it!"; @@ -3461,14 +3455,12 @@ niflheim,331,72,3 script Waltboughst#lv4 4_M_NFDEADMAN,{ mes "It seems that being deceased has impaired my rententive faculties. Give me some time to remember the things I'll need to conduct my experiment. We shall talk later."; close; } - else { - mes "[Waltboughst]"; - mes "What...?"; - mes "No, no. That"; - mes "wasn't it at all..."; - mes "Hmmm."; - close; - } + mes "[Waltboughst]"; + mes "What...?"; + mes "No, no. That"; + mes "wasn't it at all..."; + mes "Hmmm."; + close; } if (lv4_weapon == 49) { mes "[Waltboughst]"; diff --git a/npc/quests/obb_quest.txt b/npc/quests/obb_quest.txt index 504e5ff70..c2b0c681c 100644 --- a/npc/quests/obb_quest.txt +++ b/npc/quests/obb_quest.txt @@ -672,7 +672,7 @@ moc_ruins,105,62,4 script Jacob#thai 1_M_04,{ mes "[Tommy]"; mes "^FF0000Munak Munak Munak Munak!!^000000"; next; - input .@input$; + input(.@input$); if (.@input$ != "Pandger Mayer introduced you") { mes "["+strcharinfo(PC_NAME)+"]"; mes ""+.@input$+""; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index b1e4f90b3..2c2855a8d 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -824,40 +824,38 @@ lhz_in01,132,259,5 script Sikaiz#1 4_M_LGTGUARD,{ mes "[Sikaiz]"; mes "I already accept you. Just write down your name here. Go ahead."; next; - input .@input$; + input(.@input$); if (.@input$ != strcharinfo(PC_NAME)) { mes "[Sikaiz]"; mes "Don't you know your own name?"; mes "Write it again."; close; } - else { - mes "[Sikaiz]"; - mes "Ok. I got your name, " + strcharinfo(PC_NAME) + ". Great name! Registration is done!"; - mes "You've become a member of the three kingdoms!"; - next; - mes "[Sikaiz]"; - mes "All done."; - mes "Go to the field Officer of Schwartzvalt. He should be in the banquet hall of this building downstairs."; - next; - mes "[Sikaiz]"; - mes "Only thing left for you is to go to the Officer to say that you are leaving now."; - next; - mes "[Sikaiz]"; - mes "As soon as you tell him,"; - mes "come back to me again."; - mes "You are not the only one expecting this great challenge. I am too."; - next; - mes "[Sikaiz]"; - mes "I believe you can do it!"; - mes "It would bear watching you."; - next; - changequest 10073,10074; - ep13_ryu = 18; - mes "[Sikaiz]"; - mes "See you then."; - close; - } + mes "[Sikaiz]"; + mes "Ok. I got your name, " + strcharinfo(PC_NAME) + ". Great name! Registration is done!"; + mes "You've become a member of the three kingdoms!"; + next; + mes "[Sikaiz]"; + mes "All done."; + mes "Go to the field Officer of Schwartzvalt. He should be in the banquet hall of this building downstairs."; + next; + mes "[Sikaiz]"; + mes "Only thing left for you is to go to the Officer to say that you are leaving now."; + next; + mes "[Sikaiz]"; + mes "As soon as you tell him,"; + mes "come back to me again."; + mes "You are not the only one expecting this great challenge. I am too."; + next; + mes "[Sikaiz]"; + mes "I believe you can do it!"; + mes "It would bear watching you."; + next; + changequest 10073,10074; + ep13_ryu = 18; + mes "[Sikaiz]"; + mes "See you then."; + close; } if (ep13_ryu == 16) { mes "[Sikaiz]"; @@ -4174,22 +4172,20 @@ mid_camp,188,254,3 script Monster Scholar#ep13 4_M_ALCHE_D,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "The owner of the tricorn hat"; mes "is a monster called..."; - input .@input$; + input(.@input$); if (compare(.@input$,"Tatacho")) { mes "^FF0000Tatacho^000000"; next; break; } - else { - next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes ""+.@input$+"...? I don't think that was the name..."; - next; - } + next; + mes "["+strcharinfo(PC_NAME)+"]"; + mes ""+.@input$+"...? I don't think that was the name..."; + next; } mes "["+strcharinfo(PC_NAME)+"]"; mes "The size of Tatacho is about..."; - input .@input$; + input(.@input$); mes "^3131FF"+.@input$+"^000000, I guess..."; next; mes "["+strcharinfo(PC_NAME)+"]"; @@ -8478,16 +8474,15 @@ 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); next; if (.@input < 1 || .@input > 3000) { mes "Cat trading Point adjust"; mes "You can enter the number between 1~3000."; close; - } else { - ep13_yong1 = .@input; - close; } + ep13_yong1 = .@input; + close; } //== Report from the New World :: ep13_1_edq =============== @@ -10584,7 +10579,7 @@ mid_campin,68,185,3 script Pursuit Party Leader#1 1_F_SIGNZISK,{ mes "[Echinacea]"; mes "Say, what's the tracing pattern number?"; next; - input .@input$; + input(.@input$); setarray .@pattern$[0],"SDHF92F-SDF","VWNM94GVWN90","CM3-TRDFGHE0"; .@quest = mao_morocc2; if (.@quest > 25) .@quest -= 3; @@ -11706,7 +11701,7 @@ mid_camp,256,272,3 script Defaria#moc2 4_M_HUGRANFA,{ mes "[Defaria]"; mes "..Huh? What do you want?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Dandelion") { mes "[Defaria]"; mes "..I know they're involved in this case, but"; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index e64e1c84a..c3dfa5ab0 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -3866,7 +3866,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ mes "Now, let's start with the Fairies! What is the fairy's language like? Please write them down here sentence by sentence!"; next; .@spl_score00 = 0; - input .@input$; + input(.@input$); if (.@input$ == "RLGHLRXLA TKANTLFDMS") { mes "[Linguist Dictionary]"; mes ""+ .@input$ +"...."; @@ -3880,7 +3880,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ .@spl_score01 = .@spl_score00; next; } - input .@input$; + input(.@input$); if (.@input$ == "WJACK TNAHRDNJSDMFH") { mes ""+ .@input$ +"...."; mes "And?"; @@ -3893,7 +3893,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ .@spl_score02 = .@spl_score01; next; } - input .@input$; + input(.@input$); if ((.@input$ == "WLSGHKWND !!") || (.@input$ == "WLSGHKWND")) { mes ""+ .@input$ +"...."; mes "Is that all?"; @@ -3931,7 +3931,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ mes "Good. then next is the Wooden Giants! What's their language like? Write them down sentence by sentence just as you did with the Fairy's."; next; .@man_score00 = 0; - input .@input$; + input(.@input$); if (.@input$ == "TJDTMFJDNS CJFDI") { mes "[Linguist Dictionary]"; mes ""+ .@input$ +"...."; @@ -3945,7 +3945,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ .@man_score01 = .@man_score00; next; } - input .@input$; + input(.@input$); if (.@input$ == "TKADLFDMF QKATOS") { mes ""+ .@input$ +"...."; mes "And?"; @@ -3958,8 +3958,8 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ .@man_score02 = .@man_score01; next; } - input .@input$; - if ((.@input$ == "EKDTLSDML DLFMADMS..") || (.@input$ == "EKDTLSDML DLFMADMS")) { + input(.@input$); + if (.@input$ == "EKDTLSDML DLFMADMS.." || .@input$ == "EKDTLSDML DLFMADMS") { mes ""+ .@input$ +"...."; mes "This is it?"; .@man_score03 = .@man_score02+1; diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt index bc6d73fad..58fde1bdb 100644 --- a/npc/quests/quests_airship.txt +++ b/npc/quests/quests_airship.txt @@ -192,26 +192,26 @@ airplane,47,61,7 script Crewman#ein 4_M_ZONDAOYAJI,{ mes("not send this up after all..."); emotion(e_an); close(); - } else if (.@comment$ == "0") { + } + if (.@comment$ == "0") { mes("[Kain Himere]"); mes("Ah, well, if you have any"); mes("helpful criticism about our"); mes("service, feel free to leave"); mes("me a comment at any time."); close(); - } else { - mesf("[%s]", strcharinfo(PC_NAME)); - mesf("%s.", .@comment$); - next(); - mes("[Kain Himere]"); - mes("Hmmmm..."); - mes("I see. Well, I'll"); - mes("send your message"); - mes("to my superiors as"); - mes("soon as possible."); - mes("Thank you very much."); - close(); } + mesf("[%s]", strcharinfo(PC_NAME)); + mesf("%s.", .@comment$); + next(); + mes("[Kain Himere]"); + mes("Hmmmm..."); + mes("I see. Well, I'll"); + mes("send your message"); + mes("to my superiors as"); + mes("soon as possible."); + mes("Thank you very much."); + close(); } } else if (kain_ticket == 2) { select("About the Airship..."); diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt index f5b2e14a6..5c1ac9ee2 100644 --- a/npc/quests/quests_ein.txt +++ b/npc/quests/quests_ein.txt @@ -3684,7 +3684,7 @@ ein_in01,231,163,7 script Sick Old Man#ein 4_M_DIEMAN,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "It was..."; next; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes "It was"; mes "^3131FF"+.@input$+"^000000!"; @@ -4214,7 +4214,7 @@ OnTouch: .@word2$ = "burapaphurarlandreamduranbatuhiwooikabamturubamdingding"; mes "^3CBCBC"+.@word1$+"^000000"; next; - input .@input1$; + input(.@input1$); mes "[Security System]"; mes "^FF1493"+.@word2$+"^000000"; break; @@ -4223,7 +4223,7 @@ OnTouch: .@word2$ = "opeN,Open!op3n.openOpen0p3nOpEn0pen`open'0Pen open?open!111OPENSESAME"; mes "^3CBCBC"+.@word1$+"^000000"; next; - input .@input1$; + input(.@input1$); mes "[Security System]"; mes "^FF1493"+.@word2$+"^000000"; break; @@ -4232,7 +4232,7 @@ OnTouch: .@word2$ = "hfjdkeldjsieldjshfjdjeiskdlefvbd"; mes "^3CBCBC"+.@word1$+"^000000"; next; - input .@input1$; + input(.@input1$); mes "[Security System]"; mes "^FF1493"+.@word2$+"^000000"; break; @@ -4241,7 +4241,7 @@ OnTouch: .@word2$ = "LiGhTsPeEd RiGhT SPEed LeFT TURn RiGhT BuRn OrIGInAL GaNgSteR SmACk"; mes "^3CBCBC"+.@word1$+"^000000"; next; - input .@input1$; + input(.@input1$); mes "[Security System]"; mes "^FF1493"+.@word2$+"^000000"; break; @@ -4251,7 +4251,7 @@ OnTouch: mes "^3CBCBCBy the power of p-po-poi-po-poi-poin-poing"; mes "GOD-POING. I NEVER LOSE!^000000"; next; - input .@input1$; + input(.@input1$); mes "[Security System]"; mes "^FF1493"+.@word2$+"^000000"; break; @@ -4260,7 +4260,7 @@ OnTouch: .@word2$ = "fReeDoM eCstAcy JoUrnaLiSm ArMpIt DisCoverY hEaDaChE MoonbeAmS jUsTiCE"; mes "^3CBCBC"+.@word1$+"^000000"; next; - input .@input1$; + input(.@input1$); mes "[Security System]"; mes "^800080"+.@word2$+"^000000"; break; @@ -4269,12 +4269,12 @@ OnTouch: .@word2$ = "0uNflAPPaBLe LoVaBLe SeCreTs AnD BoWLiNg aGaINST tHe KarMA of YoUtH"; mes "^3CBCBC"+.@word1$+"^000000"; next; - input .@input1$; + input(.@input1$); mes "[Security System]"; mes "^800080"+.@word2$+"^000000"; } next; - input .@input2$; + input(.@input2$); .@endtime = gettime(GETTIME_HOUR)*60*60+gettime(GETTIME_MINUTE)*60+gettime(GETTIME_SECOND); .@time = .@endtime-.@startseconds; mes "[Security System]"; @@ -4502,7 +4502,7 @@ ein_in01,31,138,3 script Calla#ein 4_F_01,{ mes "me! Would you please"; mes "tell me your name?"; next; - input .@input$; + input(.@input$); if (.@input$ == strcharinfo(PC_NAME)) { mes "[Calla]"; mes "Ah, " + strcharinfo(PC_NAME) + "!"; @@ -4520,14 +4520,12 @@ ein_in01,31,138,3 script Calla#ein 4_F_01,{ changequest 8079,808; close; } - else { - mes "[Calla]"; - mes "I'm sorry..."; - mes "I didn't catch that."; - mes "Would you please tell"; - mes "me your name again?"; - close; - } + mes "[Calla]"; + mes "I'm sorry..."; + mes "I didn't catch that."; + mes "Would you please tell"; + mes "me your name again?"; + close; } if (EIN_LOVERQ == 4) { mes "[Calla]"; @@ -4822,7 +4820,7 @@ ein_in01,200,101,5 script Klitzer#ein 4_M_EINMAN2,{ mes "So..."; mes "What's your name?"; next; - input .@input$; + input(.@input$); if (.@input$ == strcharinfo(PC_NAME)) { mes "[Klitzer]"; mes "" + strcharinfo(PC_NAME) + "..."; @@ -4842,16 +4840,14 @@ ein_in01,200,101,5 script Klitzer#ein 4_M_EINMAN2,{ mes "likes meeting my friends."; close; } - else { - mes "[Klitzer]"; - mes "Hm...?"; - mes "Oh, don't be"; - mes "so nervous~"; - mes "But would you please"; - mes "tell me your name again?"; - mes "I couldn't hear you..."; - close; - } + mes "[Klitzer]"; + mes "Hm...?"; + mes "Oh, don't be"; + mes "so nervous~"; + mes "But would you please"; + mes "tell me your name again?"; + mes "I couldn't hear you..."; + close; } if (EIN_LOVERQ == 5) { mes "[Klitzer]"; @@ -5141,7 +5137,7 @@ ein_in01,31,151,3 script Satra#ein 4_F_EINWOMAN,{ mes "only delivering them? Then"; mes "who actually gathered these?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Klitzer") { mes "[Satra]"; mes "Ah, Klitzer?"; @@ -5192,14 +5188,12 @@ ein_in01,31,151,3 script Satra#ein 4_F_EINWOMAN,{ mes "occasion. Ho ho ho ho ho~"; close; } - else { - mes "[Satra]"; - mes "I beg your pardon?"; - mes .@input$ + "? Oh my..."; - mes "I believe I may have"; - mes "misheard you. Ho ho ho ho~"; - close; - } + mes "[Satra]"; + mes "I beg your pardon?"; + mes .@input$ + "? Oh my..."; + mes "I believe I may have"; + mes "misheard you. Ho ho ho ho~"; + close; } if (EIN_LOVERQ == 12) { mes "[Satra]"; diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt index a582bfa8e..522d96e30 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 9af2ab5fc..a036cd80b 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -2779,7 +2779,7 @@ hu_in01,256,40,3 script Herico 4_M_HUGRANFA,{ mes "[Herico]"; mes "By any chance, do you know a man who can aid his power in stopping them?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "President Karl" || .@inputstr$ == "President Weierstrass" || .@inputstr$ == "President" || .@inputstr$ == "Karl Weierstrass") { mes "["+strcharinfo(PC_NAME)+"]"; mes "I think that I know one..."; @@ -7566,7 +7566,7 @@ L_MilkCow: mes "you need to brush her a"; mes "certain number of times.^000000"; next; - input .@cowbrush; + input(.@cowbrush); if (.@cowbrush != getarg(1)) { soundeffect "taming_fail.wav",0; mes "^3355FFAwwww..."; @@ -7646,7 +7646,7 @@ L_MilkCow: mes "song in Burupu's notes, and then tell her the correct world without"; mes "the tilde character (''~'').^000000"; next; - input .@cowanswer$; + input(.@cowanswer$); if (.@cowanswer$ == .@cowsong$) { soundeffect "tming_success.wav",0; mes "^3355FFSuccess!"; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 4795110d6..a8386ed46 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -737,7 +737,7 @@ lhz_cube,234,202,0 script Picture#cube HIDDEN_NPC,{ mes "hard to move with just"; mes "brute strength alone.^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Jackknife") { mes "^3355FFYou take the"; mes "Jackknife, thrust"; @@ -817,7 +817,7 @@ lhz_cube,242,201,0 script Drawer#cube HIDDEN_NPC,{ mes "it's locked. Hopefully, you"; mes "can figure how to open it.^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Red Key") { mes "^3355FFYou insert the Red Key"; mes "into the lock and open the"; @@ -891,7 +891,7 @@ lhz_cube,237,183,0 script Barrel#cube HIDDEN_NPC,{ mes "you need something to"; mes "smash the barrel open.^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Axe") { mes "^3355FFAxe in hand, you lift"; mes "it above your head and"; @@ -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); mes "^3355FFNothing happened...^000000"; close; } @@ -941,8 +941,9 @@ 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; - if (.@input == .@numbers[.@i]) .@number_line += 1; + input(.@input); + if (.@input == .@numbers[.@i]) + .@number_line += 1; } if (.@number_line == 9) { mes "^3355FFThe metal plate slides"; @@ -980,7 +981,7 @@ lhz_cube,224,192,0 script Power Generator#cube HIDDEN_NPC,{ mes "keyhole on the machine"; mes "right next to this panel.^000000"; next; - input .@input$; + input(.@input$); mes "^3355FFNothing happened."; mes "You probably need"; mes "to find the right key to"; @@ -995,7 +996,7 @@ lhz_cube,224,192,0 script Power Generator#cube HIDDEN_NPC,{ mes "keyhole on the machine"; mes "right next to this panel.^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Yellow Key") { mes "^3355FFYou insert the"; mes "Yellow Key into the"; @@ -1264,7 +1265,7 @@ lhz_cube,247,198,0 script Bed#cube HIDDEN_NPC,{ mes "spot an object. If only you"; mes "could reach it somehow...^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Short Stick") { mes "^3355FFYou try to reach"; mes "the object by using"; @@ -1302,7 +1303,7 @@ lhz_cube,247,198,0 script Bed#cube HIDDEN_NPC,{ mes "spot an object. If only you"; mes "could reach it somehow...^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Long Stick") { mes "^3355FFWith Long Stick in"; mes "hand, you manage to"; @@ -1376,7 +1377,7 @@ lhz_cube,231,202,0 script Chemicals#cube HIDDEN_NPC,{ mes "corrosive chemicals"; mes "that is sitting on the ledge.^000000"; next; - input .@input$; + input(.@input$); mes "^3355FFWhatever you tried to"; mes "pour the chemicals on"; mes "wasn't affected at all."; @@ -1390,7 +1391,7 @@ lhz_cube,231,202,0 script Chemicals#cube HIDDEN_NPC,{ mes "corrosive chemicals"; mes "that is sitting on the ledge.^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Rusty Key") { mes "^3355FFPouring the chemicals"; mes "on the Rusty Key removes"; @@ -1425,7 +1426,7 @@ lhz_cube,249,191,0 script Cabinet#cube HIDDEN_NPC,{ mes "something useful is inside?"; next; if (select("Open", "Cancel") == 1) { - input .@input$; + input(.@input$); mes "^3355FFUnfortunately, the"; mes "cabinet has been locked."; mes "You'll need the right key"; @@ -1439,7 +1440,7 @@ lhz_cube,249,191,0 script Cabinet#cube HIDDEN_NPC,{ mes "many drawers. Perhaps"; mes "something useful is inside?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Green Key") { mes "^3355FFYou take the Green Key"; mes "and finds that it fits into"; @@ -1478,7 +1479,7 @@ lhz_cube,224,197,0 script Experiment Tube#cube HIDDEN_NPC,{ mes "a thin plate with a keyhole"; mes "and a card insertion slot.^000000"; next; - input .@input$; + input(.@input$); mes "^3355FFNothing happened."; mes "You'll probably need"; mes "to find the right key for"; @@ -1494,7 +1495,7 @@ lhz_cube,224,197,0 script Experiment Tube#cube HIDDEN_NPC,{ mes "a thin plate with a keyhole"; mes "and a card insertion slot.^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Black Key") { mes "^3355FFYou insert the Black Key"; mes "into the keyhole, causing"; @@ -1524,7 +1525,7 @@ lhz_cube,224,197,0 script Experiment Tube#cube HIDDEN_NPC,{ mes "rectangular card slot"; mes "in front of the tube.^000000"; next; - input .@input$; + input(.@input$); if (.@input$ == "Laboratory Permit") { if (countitem(Lab_Passport)) { mes "^3355FFYou insert the"; @@ -1575,7 +1576,7 @@ lhz_cube,248,193,0 script Box#cube1 HIDDEN_NPC,{ mes "shaped holes.^000000"; next; select("Oval Hole", "Cubic Hole", "Polygon Hole"); - input .@input$; + input(.@input$); mes "^3355FFNothing happened.^000000"; close; } @@ -1588,7 +1589,7 @@ lhz_cube,248,193,0 script Box#cube1 HIDDEN_NPC,{ case 1: if (lhz_secret01 == 9) { next; - input .@input$; + input(.@input$); if (.@input$ == "Oval") { mes "^3355FFYou insert the Oval"; mes "into the Oval shaped"; @@ -1606,13 +1607,13 @@ lhz_cube,248,193,0 script Box#cube1 HIDDEN_NPC,{ mes "any Ovals to spare, anyway.^000000"; close; } - input .@input$; + input(.@input$); mes "^3355FFNothing happened.^000000"; close; case 2: if (lhz_secret02 == 4) { next; - input .@input$; + input(.@input$); if (.@input$ == "Cube") { mes "^3355FFYou insert the Cube"; mes "into the Cubic hole"; @@ -1634,13 +1635,13 @@ lhz_cube,248,193,0 script Box#cube1 HIDDEN_NPC,{ mes "a total waste of time.^000000"; close; } - input .@input$; + input(.@input$); mes "^3355FFNothing happened.^000000"; close; case 3: if (lhz_secret03 == 3) { next; - input .@input$; + input(.@input$); if (.@input$ == "Polygon") { mes "^3355FFFortunately, the"; mes "nondescript Polygon"; @@ -1662,7 +1663,7 @@ lhz_cube,248,193,0 script Box#cube1 HIDDEN_NPC,{ mes "as this Polygon can do for you.^000000"; close; } - input .@input$; + input(.@input$); mes "^3355FFNothing happened.^000000"; close; } @@ -2829,7 +2830,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "Tell me what that fink"; mes "has to say, line by line!"; next; - input .@input$; + input(.@input$); if (.@input$ == "Hopeless bastard!") { mes "[Maku]"; mes "''Hopeless bastard?!''"; @@ -2838,7 +2839,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "Through somebody else"; mes "anyway! What else'd he say?!"; next; - input .@input$; + input(.@input$); if (.@input$ == "You're still a stubborn jerk!") { mes "[Maku]"; mes "''Stubborn jerk?!''"; @@ -2846,7 +2847,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "bastard! Why I oughta--"; mes "Grrr! What'd he say next?!"; next; - input .@input$; + input(.@input$); if (.@input$ == "You owe me at least 3 lunches!") { mes "[Maku]"; mes "Three lunches?!"; @@ -2856,7 +2857,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "know the meaning of friendship!"; mes "What else did that moron say?!"; next; - input .@input$; + input(.@input$); if (.@input$ == "Not to mention an apology!") { cutin "lhz_macu05",255; mes "[Maku]"; @@ -2867,7 +2868,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "That selfish no-good stupid..."; mes "W-what else did he tell you?!"; next; - input .@input$; + input(.@input$); if (.@input$ == "But who cares what you think?!") { mes "[Maku]"; mes "''Who cares what I think?!''"; @@ -2877,7 +2878,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "dumb creep! He can't possibly"; mes "make me angrier than I am now!"; next; - input .@input$; + input(.@input$); if (.@input$ == "I'm so goddamn happy without you!") { friendship = 5; cutin "lhz_macu06",2; @@ -9071,7 +9072,7 @@ lhz_fild02,228,214,0 script Wounded Man 4_M_DIEMAN,{ mes "What... What organization"; mes "are you working for...?"; next; - input @jargeah$; + input(@jargeah$); if((@jargeah$ == "Kafra Corporation") || (@jargeah$ == "Secret Wing")) { mes "[Jargeah]"; @@ -9689,9 +9690,8 @@ OnTouch: mes "password to open the door.^000000"; next; while (true) { - input @sneakpass; - if(@sneakpass == 738495) - { + input(@sneakpass); + if (@sneakpass == 738495) { mes "^3355FF*Beep~*"; mes "You hear a pleasant"; mes "sounding electronic chirp,"; @@ -9822,7 +9822,7 @@ lhz_in01,182,35,0 script File Search Engine HIDDEN_NPC,{ mes "Please do not use"; mes "capital letters.^000000"; next; - input @sneaksearch$; + input(@sneaksearch$); if((@sneaksearch$ == "kafra") || (@sneaksearch$ == "cool event")) { mes "^663300[Search Result]"; @@ -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 03816faf2..f5edbd744 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -658,7 +658,7 @@ lou_fild01,175,173,3 script Jiu Lian Bu#1-2 4_M_CHN8GUEK,{ mes "Ready~!"; mes "Say it out loud!"; next; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes .@input$; mapannounce "lou_fild01","'"+strcharinfo(PC_NAME)+"' shouts : "+.@input$,bc_map,"0x9CFF00"; @@ -683,7 +683,7 @@ lou_fild01,175,173,3 script Jiu Lian Bu#1-2 4_M_CHN8GUEK,{ mes "Alright~!"; mes "Say it out loud!"; next; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes .@input$; mapannounce "lou_fild01","'"+strcharinfo(PC_NAME)+"' shouts : "+.@input$,bc_map,"0x9CFF00"; @@ -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); if (.@input < 10000) { mes "[Jin Chiyuan]"; mes "Good lord,"; @@ -2070,7 +2070,7 @@ lou_in02,156,38,0 script Studying Officer#lou 4_M_CHNMAN,{ mes "So what kind of document"; mes "did you need?"; next; - input .@input$; + input(.@input$); switch (ch_par) { case 11: if (.@input$ == "Residence Transfer Application") @@ -2686,7 +2686,7 @@ lou_in02,123,39,4 script Poison King#lou 4_M_CHNOLD,{ next; mes "["+strcharinfo(PC_NAME)+"]"; mes "Yeah, I've got some news you might be interested in."; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes ""+.@input$+""; next; @@ -2710,7 +2710,7 @@ lou_in02,123,39,4 script Poison King#lou 4_M_CHNOLD,{ mes "[Nagash Arses]"; mes "I just told you what 'Canine of Desert' is. Now you tell me what it is. If you were listening, you would be able to."; next; - input .@input$; + input(.@input$); if (.@input$ == "Assassin Organization" || .@input$ == "Assassin" || .@input$ == "Assassins") { mes "[Nagash Arses]"; mes "Correct. You listened to me very well. They are Assassins. Assassins that were abandoned by society."; @@ -2843,7 +2843,7 @@ lou_in02,123,39,4 script Poison King#lou 4_M_CHNOLD,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "I have news"; mes "of Morroc..."; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes ""+.@input$+""; next; @@ -2862,7 +2862,7 @@ lou_in02,123,39,4 script Poison King#lou 4_M_CHNOLD,{ mes "[Nagash Arses]"; mes "I just told you what 'Canine of Desert.' If you can't remember what I just told you, it's no use for me to explain further. You go ahead and tell me what it is."; next; - input .@input$; + input(.@input$); if (.@input$ == "Assassin Organization" || .@input$ == "Assassin" || .@input$ == "Assassins") { mes "[Nagash Arses]"; mes "Correct. You listened to me very well. They are Assassins. Assassins that were abandoned by society."; @@ -3449,7 +3449,7 @@ lou_in02,253,45,0 script Employee#poison 4_M_CHNMAN,{ mes "What did"; mes "you just say...?"; next; - input .@input$; + input(.@input$); mes "[Song Zhi Du]"; mes ""+.@input$+"...?"; next; @@ -4158,7 +4158,7 @@ lou_fild01,224,348,0 script Lady#delivery 4_F_CHNDRESS3,{ mes "Please tell me"; mes "his name."; next; - input .@input$; + input(.@input$); if (.@input$ == "Song Zhi Du") { mes "[Lady]"; mes "Oh, I see."; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 592711c24..890c17356 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -2444,7 +2444,7 @@ prt_in,179,92,3 script Library Curator#garas 1_M_LIBRARYMASTER,{ mes "[Curator Guys]"; mes "Oh, do you know the title?"; mes "Sure, now what's the name?"; - input .@input$; + input(.@input$); next; if (compare(.@input$,"The Crow of the Fate") == 1) { mes "[Curator Guys]"; @@ -2462,7 +2462,7 @@ prt_in,179,92,3 script Library Curator#garas 1_M_LIBRARYMASTER,{ mes "[Curator Guys]"; mes "Oh, do you know the author?"; mes "Sure, now what's the name?"; - input .@input$; + input(.@input$); next; if (compare(.@input$,"Oliver Hilpert") == 1) { mes "[Curator Guys]"; @@ -2481,7 +2481,7 @@ prt_in,179,92,3 script Library Curator#garas 1_M_LIBRARYMASTER,{ mes "You must be having a hard time remembering the book's title or author."; mes "No problem; why don't you tell me at least a little bit of what you remember?"; next; - input .@input$; + input(.@input$); if ((compare(.@input$,"Fate") == 1) || (compare(.@input$,"Crow") == 1) || (compare(.@input$,"Oliver") == 1) || (compare(.@input$,"Hilpert") == 1)) { mes "[Curator Guys]"; mes ""+.@input$+"...?"; @@ -3901,7 +3901,7 @@ cave,82,97,3 script Cave Settler#g1 4_M_CAVE1,3,3,{ next; mes "["+ strcharinfo(PC_NAME) +"]"; mes "I'm here to find somebody!"; - input .@input$; + input(.@input$); mes "Her name is ^FF0000"+.@input$+"^000000!"; next; if (compare(.@input$,"Eva") == 0) { @@ -3911,43 +3911,41 @@ cave,82,97,3 script Cave Settler#g1 4_M_CAVE1,3,3,{ warp "cave",81,92; end; } - else { - mes "[Cave Settler]"; - mes "............!!!!"; - next; - mes "[Cave Settler]"; - mes "Did you just say Eva?"; - mes "Hmm..."; - mes "Wait here."; - next; - emotion e_com; - mes "[Cave Settler]"; - mes "Hey, Jaeda!"; - enablenpc "Jaeda#garas1"; - next; - mes "[Cave Settler]"; - mes "Go upstairs, and tell Eva that she has a visitor."; - disablenpc "Jaeda#garas1"; - next; - mes "^660000Surprisingly, he seemed to know who Eva is. You still could not believe that she actually exists! It's all so very strange.^000000"; - next; - mes "^660000You can feel the excitement and anticipation well within you. Maybe you're coming closer to learning what your dreams really mean.^000000"; - enablenpc "Jaeda#garas1"; - next; - mes "[Cave Settler]"; - mes "Hmm... Yeah? I see."; - next; - disablenpc "Jaeda#garas1"; - mes "[Cave Settler]"; - mes "Hey, you can pass. Go upstairs, but you'd better think twice before trying anything funny. Do you understand me?"; - next; - mes "^660000The stern-looking man examined you, and then stepped to the side, allowing you to pass."; - mes "You clenched your fists in nervousness, and then started up the dark stairwell.^000000"; - barmunt_crow = 9; - close2; - warp "cave",82,105; - end; - } + mes "[Cave Settler]"; + mes "............!!!!"; + next; + mes "[Cave Settler]"; + mes "Did you just say Eva?"; + mes "Hmm..."; + mes "Wait here."; + next; + emotion e_com; + mes "[Cave Settler]"; + mes "Hey, Jaeda!"; + enablenpc "Jaeda#garas1"; + next; + mes "[Cave Settler]"; + mes "Go upstairs, and tell Eva that she has a visitor."; + disablenpc "Jaeda#garas1"; + next; + mes "^660000Surprisingly, he seemed to know who Eva is. You still could not believe that she actually exists! It's all so very strange.^000000"; + next; + mes "^660000You can feel the excitement and anticipation well within you. Maybe you're coming closer to learning what your dreams really mean.^000000"; + enablenpc "Jaeda#garas1"; + next; + mes "[Cave Settler]"; + mes "Hmm... Yeah? I see."; + next; + disablenpc "Jaeda#garas1"; + mes "[Cave Settler]"; + mes "Hey, you can pass. Go upstairs, but you'd better think twice before trying anything funny. Do you understand me?"; + next; + mes "^660000The stern-looking man examined you, and then stepped to the side, allowing you to pass."; + mes "You clenched your fists in nervousness, and then started up the dark stairwell.^000000"; + barmunt_crow = 9; + close2; + warp "cave",82,105; + end; } } else if (barmunt_crow < 8) { @@ -3989,7 +3987,7 @@ OnTouch: next; mes "["+ strcharinfo(PC_NAME) +"]"; mes "I'm here to find somebody!"; - input .@input$; + input(.@input$); mes "Her name is ^FF0000"+.@input$+"^000000!"; next; if (compare(.@input$,"Eva") == 0) { @@ -3999,43 +3997,41 @@ OnTouch: warp "cave",81,92; end; } - else { - mes "[Cave Settler]"; - mes "............!!!!"; - next; - mes "[Cave Settler]"; - mes "Did you just say Eva?"; - mes "Hmm..."; - mes "Wait here."; - next; - emotion e_com; - mes "[Cave Settler]"; - mes "Hey, Jaeda!"; - enablenpc "Jaeda#garas1"; - next; - mes "[Cave Settler]"; - mes "Go upstairs, and tell Eva that she has a visitor."; - disablenpc "Jaeda#garas1"; - next; - mes "^660000Surprisingly, he seemed to know who Eva is. You still could not believe that she actually exists! It's all so very strange.^000000"; - next; - mes "^660000You can feel the excitement and anticipation well within you. Maybe you're coming closer to learning what your dreams really mean.^000000"; - enablenpc "Jaeda#garas1"; - next; - mes "[Cave Settler]"; - mes "Hmm... Yeah? I see."; - next; - disablenpc "Jaeda#garas1"; - mes "[Cave Settler]"; - mes "Hey, you can pass. Go upstairs, but you'd better think twice before trying anything funny. Do you understand me?"; - next; - mes "^660000The stern-looking man examined you, and then stepped to the side, allowing you to pass."; - mes "You clenched your fists in nervousness, and then started up the dark stairwell.^000000"; - barmunt_crow = 9; - close2; - warp "cave",82,105; - end; - } + mes "[Cave Settler]"; + mes "............!!!!"; + next; + mes "[Cave Settler]"; + mes "Did you just say Eva?"; + mes "Hmm..."; + mes "Wait here."; + next; + emotion e_com; + mes "[Cave Settler]"; + mes "Hey, Jaeda!"; + enablenpc "Jaeda#garas1"; + next; + mes "[Cave Settler]"; + mes "Go upstairs, and tell Eva that she has a visitor."; + disablenpc "Jaeda#garas1"; + next; + mes "^660000Surprisingly, he seemed to know who Eva is. You still could not believe that she actually exists! It's all so very strange.^000000"; + next; + mes "^660000You can feel the excitement and anticipation well within you. Maybe you're coming closer to learning what your dreams really mean.^000000"; + enablenpc "Jaeda#garas1"; + next; + mes "[Cave Settler]"; + mes "Hmm... Yeah? I see."; + next; + disablenpc "Jaeda#garas1"; + mes "[Cave Settler]"; + mes "Hey, you can pass. Go upstairs, but you'd better think twice before trying anything funny. Do you understand me?"; + next; + mes "^660000The stern-looking man examined you, and then stepped to the side, allowing you to pass."; + mes "You clenched your fists in nervousness, and then started up the dark stairwell.^000000"; + barmunt_crow = 9; + close2; + warp "cave",82,105; + end; } } else if (barmunt_crow < 8) { diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index e49886dbd..130b497cf 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -2903,7 +2903,7 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "What am I going to ask her?"; next; - input .@AnnaInfo$; + input(.@AnnaInfo$); mes "["+strcharinfo(PC_NAME)+"]"; mes "Anna,"; mes ""+.@AnnaInfo$+"?"; @@ -3995,8 +3995,8 @@ moscovia,208,182,7 script Acorn Dealer#mos 4_M_RUSMAN1,{ mes "I'll bet you that they are very fresh!"; mes "How many acorns do you need?"; next; - while(.@input <= 0 || .@input > 500) { - input .@input; + while (true) { + input(.@input); if (.@input <= 0) { mes "[Acorn Dealer]"; mes "Do you want to cancel this trade?"; @@ -4006,7 +4006,9 @@ moscovia,208,182,7 script Acorn Dealer#mos 4_M_RUSMAN1,{ mes "[Acorn Dealer]"; mes "You can't buy more than 500."; next; + continue; } + break; } if (!checkweight(Acorn, .@input)) { mes "[Acorn Dealer]"; @@ -5349,7 +5351,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); if (.@input == 20) { mes "-It must be 20 times.-"; next; @@ -5361,7 +5363,7 @@ mosk_in,221,43,0 script #bowl HIDDEN_NPC,{ ++.@maho; ++.@nankai; next; - } else if (!.@input) { + } else if (.@input <= 0) { mes "-I won't stir it up.-"; next; } else if (.@input > 100) { @@ -5453,7 +5455,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); if (.@input == 15) { mes "-It must be 15 times.-"; next; @@ -5463,7 +5465,7 @@ mosk_in,221,43,0 script #bowl HIDDEN_NPC,{ ++.@maho; ++.@nankai; next; - } else if (.@input == 0) { + } else if (.@input <= 0) { mes "-I won't stir it up.-"; next; } else if (.@input > 100) { @@ -7070,7 +7072,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ mes "Listen very carefully!"; mes "Left the key up, and shout '^0000ffThe Free wind blows and gets you wherever you want^000000'."; next; - input .@input$; + input(.@input$); if (.@input$ == "The Free wind blows and gets you wherever you want") { mes "["+ strcharinfo(PC_NAME) +"]"; mes "^0000ff "+ .@input$ +" !! ^000000"; @@ -7778,7 +7780,7 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{ mes "[Vassili Grandpapa]"; mes "Eh? What do you want to ask me about?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Red Ring") { mes "[Vassili Grandpapa]"; mes "Red Ring?! Why are you looking for that?"; @@ -8126,7 +8128,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ mes "Ah, I forgot asking you."; mes "Why are you here?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Red Ring") { mes "[Ryubaba]"; mes "A Red Ring?!"; @@ -9036,7 +9038,7 @@ prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{ mes "Ah, yes. I have been there..."; mes "By the way, the important thing is.. are you....."; next; - input .@input$; + input(.@input$); if (.@input$ == "Igor") { mes "["+ strcharinfo(PC_NAME) +"]"; mes "Ah, yes. I have been there..."; @@ -9692,7 +9694,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "["+ strcharinfo(PC_NAME) +"]"; mes "Eh, eh.. I mean.. I say.. spell..."; next; - input .@input$; + input(.@input$); if (.@input$ == "Spellshield Protection") { mes "["+ strcharinfo(PC_NAME) +"]"; mes "Eh, eh.. I mean.. I say.. spell..."; @@ -10225,19 +10227,22 @@ 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; - if (!.@input) { + input(.@input); + if (.@input <= 0) { mes "[Baba Yaga]"; mes "You don't want it?"; next; mes "[Baba Yaga]"; mes "I don't understand you. What do you want? Kehehehehe."; close; - } else if (.@input > 100) { + } + if (.@input > 100) { mes "[Baba Yaga]"; mes "I said no more then 100 at a time. Kehehehehe."; next; - } else break; + continue; + } + break; } .@redpotion_send = .@input; .@redtube_send = .@input; @@ -10312,19 +10317,22 @@ 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; - if (!.@input) { + input(.@input); + if (.@input <= 0) { mes "[Baba Yaga]"; mes "You don't want it?"; next; mes "[Baba Yaga]"; mes "I don't understand you. What do you want? Kehehehehe."; close; - } else if (.@input > 100) { + } + if (.@input > 100) { mes "[Baba Yaga]"; mes "I said no more then 100 at a time. Kehehehehe."; next; - } else break; + continue; + } + break; } .@yellpotion_send = .@input; .@yelltube_send = .@input; @@ -10437,7 +10445,7 @@ OnTouch: if (rand(1,4) == 3) { mes "- You almost get hit and dodge its attack and cast the spell !! -"; next; - input .@input$; + input(.@input$); if (.@input$ == "Good feed is orange-flavored") { mes "["+ strcharinfo(PC_NAME) +"]"; mes ""+ .@input$ +" !!!"; @@ -10536,7 +10544,7 @@ OnTouch: if (rand(1,4) == 3) { mes "- You almost get hit and dodge its attack and cast the spell !! -"; next; - input .@input$; + input(.@input$); if (.@input$ == "Good feed is orange-flavored") { mes "["+ strcharinfo(PC_NAME) +"]"; mes ""+ .@input$ +" !!!"; @@ -10636,7 +10644,7 @@ OnTouch: if (rand(1,4) == 3) { mes "- You almost get hit and dodge its attack and cast the spell !! -"; next; - input .@input$; + input(.@input$); if (.@input$ == "Good feed is orange-flavored") { mes "["+ strcharinfo(PC_NAME) +"]"; mes ""+ .@input$ +" !!!"; @@ -11182,7 +11190,7 @@ amatsu,233,234,3 script Momotoro Publisher#rus42 4_F_JPN2,{ mes "[Momotoro Publisher]"; mes "What? Ah, did you come here to pick up the book? Please, let me know your name?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Baba Yaga") { mes "["+ strcharinfo(PC_NAME) +"]"; mes "I am "+ .@input$ +"."; @@ -11643,7 +11651,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "Ok then, who was the first?!"; next; .@rus_kafra01 = 0; - input .@input$; + input(.@input$); if (.@input$ == "Curly Sue") { ++.@rus_kafra01; mes "["+ strcharinfo(PC_NAME) +"]"; @@ -11658,7 +11666,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "[Ghost Tree]"; mes "Who was the second?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Jasmine") { ++.@rus_kafra01; mes "["+ strcharinfo(PC_NAME) +"]"; @@ -11673,7 +11681,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "[Ghost Tree]"; mes "Who was the third?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Roxie") { ++.@rus_kafra01; mes "["+ strcharinfo(PC_NAME) +"]"; @@ -11688,7 +11696,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "[Ghost Tree]"; mes "And then who was the forth?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Pavianne") { ++.@rus_kafra01; mes "["+ strcharinfo(PC_NAME) +"]"; @@ -11703,7 +11711,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "[Ghost Tree]"; mes "And who was the last?!"; next; - input .@input$; + input(.@input$); if (.@input$ == "Blossom") { ++.@rus_kafra01; mes "["+ strcharinfo(PC_NAME) +"]"; @@ -11768,7 +11776,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ mes "[Ghost Tree]"; mes "Have you heard all of them? Who broke the 'Hat of the Sun God'?!"; next; - input .@input$; + input(.@input$); if (.@input$ == "Antonio") { mes "["+ strcharinfo(PC_NAME) +"]"; mes ""+ .@input$ +" !!"; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index 9461461a5..69c0ad902 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -61,7 +61,8 @@ //= 2.4 //========================================================================= -//== Nameless Island and Cursed Monestary Access Quest :: aru_monas = +// Nameless Island and Cursed Monestary Access Quest :: aru_monas +//========================================================================= airplane_01,90,63,0 script Event Switch#pc FAKE_NPC,3,3,{ end; @@ -998,7 +999,7 @@ nameless_i,127,207,0 script Dead Crow#Aru HIDDEN_NPC,{ mes "^3355FFThis grass must be the"; mes "main ingredient of the"; mes "poison used to kill the"; - mes "Gaebolg family princes.^000000"; + mes "Geoborg family princes.^000000"; next; mes "["+strcharinfo(PC_NAME)+"]"; mes "Looks like I just hit"; @@ -1493,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; @@ -3872,7 +3873,7 @@ cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{ mes "Mystic Heater de Elegance"; mes "operates? Hmm? Well?"; next; - input .@input$; + input(.@input$); if (.@input$ == "3 Centrifuge Wavelength Theory") { mes "[Dorian]"; mes "That's right. My apologies."; @@ -3916,16 +3917,14 @@ cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{ diamond_edq = 9; close; } - else { - mes "[Dorian]"; - mes "Oh? You sound dissatisfied"; - mes "with my explanation. Well..."; - mes "I surely can't let you use the"; - mes "machine unless you fathom"; - mes "how it works. Otherwise,"; - mes "you just might break it."; - close; - } + mes "[Dorian]"; + mes "Oh? You sound dissatisfied"; + mes "with my explanation. Well..."; + mes "I surely can't let you use the"; + mes "machine unless you fathom"; + mes "how it works. Otherwise,"; + mes "you just might break it."; + close; case 2: mes "[Dorian]"; mes "Were you too bored while"; @@ -4406,7 +4405,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -4432,7 +4431,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -4458,7 +4457,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -4484,7 +4483,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -4509,7 +4508,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -4535,7 +4534,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -4561,7 +4560,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -4587,7 +4586,7 @@ izlude_in,113,66,0 script Strange Machine HIDDEN_NPC,{ mes "and vibrated violently"; mes "before coming to a sudden"; mes "stop. That was the wrong"; - mes "switch. You'd better ask Dorian... "; + mes "switch. You'd better ask Dorian..."; changequest 3105,3106; diamond_edq = 11; close; @@ -6883,7 +6882,7 @@ in_rogue,359,116,3 script Marybell 4_F_ROGUE,{ mes "Come a little closer,"; mes "and talk right in my ear."; next; - input .@input$; + input(.@input$); if (.@input$ == "The dawn is yet to come.") { mes "[Marybell]"; mes "Valdes sent you?!"; @@ -7386,8 +7385,8 @@ payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{ next; while(1) { .@number = rand(1,2); - input .@input$; - if (((.@input$ == "Odd") && (.@number == 1)) || ((.@input$ == "Even") && (.@number == 2))) { + input(.@input$); + if ((.@input$ == "Odd" && .@number == 1) || (.@input$ == "Even" && .@number == 2)) { ++.@number_right; mes "[Moonho Ahn]"; mes "^0000ff"+.@input$+"^000000?"; @@ -7400,7 +7399,7 @@ payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{ next; } } - else if (((.@input$ == "Odd") && (.@number == 2)) || ((.@input$ == "Even") && (.@number == 1))) { + else if ((.@input$ == "Odd" && .@number == 2) || (.@input$ == "Even" && .@number == 1)) { ++.@number_false; mes "[Moonho Ahn]"; mes "Well, it's ^0000FFEven^000000."; @@ -7433,7 +7432,7 @@ payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{ next; break; } - if ((.@input$ != "Even") && (.@input$ !="Odd")) { + if (.@input$ != "Even" && .@input$ !="Odd") { mes "[Moonho Ahn]"; mes "You can only declare"; mes "your guess as ^0000FFOdd^000000 or ^0000FFEven^000000."; @@ -7625,8 +7624,8 @@ payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{ next; while(1) { .@number = rand(1,2); - input .@input$; - if (((.@input$ == "Odd") && (.@number == 1)) || ((.@input$ == "Even") && (.@number == 2))) { + input(.@input$); + if ((.@input$ == "Odd" && .@number == 1) || (.@input$ == "Even" && .@number == 2)) { ++.@number_right_3; mes "[Moonho Ahn]"; mes "^0000FF"+.@input$+"^000000?"; @@ -7639,7 +7638,7 @@ payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{ next; } } - else if (((.@input$ == "Odd") && (.@number == 2)) || ((.@input$ == "Even") && (.@number == 1))) { + else if ((.@input$ == "Odd" && .@number == 2) || (.@input$ == "Even" && .@number == 1)) { ++.@number_false_3; mes "[Moonho Ahn]"; mes "Well, it's ^0000FF"+.@input$+"^000000."; @@ -7667,7 +7666,7 @@ payon,244,62,3 script Moonho Ahn 4_M_HUGRANFA,{ next; break; } - if ((.@input$ != "Even") && (.@input$ !="Odd")) { + if (.@input$ != "Even" && .@input$ !="Odd") { mes "[Moonho Ahn]"; mes "You can only declare"; mes "your guess as ^0000FFOdd^000000 or ^0000FFEven^000000."; @@ -8558,7 +8557,7 @@ moc_fild17,209,235,0 script Odd Slab HIDDEN_NPC,4,4,{ mes "Well, I guess"; mes "I should talk to it. Um..."; next; - input .@input$; + input(.@input$); if (.@input$ == "Weii arr prowd Z G gna") { mes "[Odd Slab]"; mes "^FF0000*Creak Creak*"; @@ -8570,7 +8569,7 @@ moc_fild17,209,235,0 script Odd Slab HIDDEN_NPC,4,4,{ mes "I must be doing alright."; mes "Now what do I say?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Aynoen hwo sspotp uys") { mes "[Odd Slab]"; mes "^FF0000*Creak Creak*"; @@ -8580,7 +8579,7 @@ moc_fild17,209,235,0 script Odd Slab HIDDEN_NPC,4,4,{ mes "Heh! I'm on the right"; mes "track. Now what do I say?"; next; - input .@input$; + input(.@input$); if (.@input$ == "wlil eb kckide on htier ssa!") { mes "[Odd Slab]"; mes "*Creak Creak*"; @@ -10168,11 +10167,11 @@ moc_fild18,108,116,0 script #treasure CLEAR_NPC,{ mes "to remove the chest's magical"; mes "protection to get the treasure.^000000"; next; - input .@input$; + input(.@input$); getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount > 1) { - if (((.@input$ == "OpenSesame") && (treasure_nd == 9)) || ((.@input$ == "UnlockTreasure") && (treasure_nd == 10))) { + if ((.@input$ == "OpenSesame" && treasure_nd == 9) || (.@input$ == "UnlockTreasure" && treasure_nd == 10)) { mes "^3355FFThe Z Gang must have split"; mes "the spell document in two"; mes "parts because one person"; @@ -10318,7 +10317,7 @@ comodo,139,184,3 script Scholar#zgang 2_M_SAGE_B,{ mes "jewel came into a rich man's"; mes "possession. However, he lost"; mes "his fortune and was completely"; - mes "ruined after obtaining it. Hence the moniker, ''Unlucky Emerald.''"; + mes "ruined after obtaining it. Hence the moniker, ''Unlucky Emerald.''"; next; mes "[Scholar]"; mes "Then the emerald came into"; diff --git a/npc/quests/quests_niflheim.txt b/npc/quests/quests_niflheim.txt index 37beaed06..179b41f77 100644 --- a/npc/quests/quests_niflheim.txt +++ b/npc/quests/quests_niflheim.txt @@ -117,7 +117,7 @@ nif_in,105,81,3 script Crayu#nif 4_M_NFDEADMAN2,{ break; } next; - input .@input$; + input(.@input$); if (.@input$ == .@songline$) { mes "[Crayu]"; mes "Excellent...!"; @@ -135,15 +135,13 @@ nif_in,105,81,3 script Crayu#nif 4_M_NFDEADMAN2,{ mes "you have done for me."; close; } - else { - mes "[Crayu]"; - mes "*Sigh*... If you had only"; - mes "listened to me, it would"; - mes "have been easy to answer."; - mes "Try to remember the line"; - mes "and try again!"; - close; - } + mes "[Crayu]"; + mes "*Sigh*... If you had only"; + mes "listened to me, it would"; + mes "have been easy to answer."; + mes "Try to remember the line"; + mes "and try again!"; + close; } next; mes "[Crayu]"; diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index e0bd9156e..f2743233b 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -37,7 +37,7 @@ //= Collection of Prontera-based quests. //= - Culvert Access //= - Ph.D Hat Quest -//= - Gaebolg Family Curse +//= - Geoborg Family Curse //================= Current Version ======================================= //= 2.9 //================= Variables Used ======================================== @@ -45,7 +45,7 @@ //= - MISC_QUEST (bit 8) //= Ph.D Hat Quest: //= - n/a -//= Gaebolg Family Curse: +//= Geoborg Family Curse: //= - prt_curse (max 61) //========================================================================= @@ -799,7 +799,7 @@ yuno,311,195,3 script Historian#prt01 4_M_SAGE_A,{ mes "With the return of peace,"; mes "the 7 warriors established"; mes "the Rune-Midgarts Kingdom,"; - mes "choosing Tristram Gaebolg III"; + mes "choosing Tristram Geoborg III"; mes "as the kingdom's first ruler. "; next; mes "[Historian]"; @@ -1043,7 +1043,7 @@ morocc_in,45,126,3 script Historian#prt02 4_F_GON,{ mes "^FF0000*swallowed the serpent.*^000000"; mes "......................"; next; - input .@answer$; + input(.@answer$); if (.@answer$ == "Then the eagle built its nest.") { mes "[Historian Rodafrian]"; mes "Really? That makes"; @@ -1078,7 +1078,7 @@ morocc_in,45,126,3 script Historian#prt02 4_F_GON,{ mes "that you heard from Karlomoff.^000000"; next; mes "["+strcharinfo(PC_NAME)+"]"; - input .@line$; + input(.@line$); if (.@line$ == "The great serpent swallowed the sea.") { .@total += 1; mes "*The great serpent*"; @@ -1086,7 +1086,7 @@ morocc_in,45,126,3 script Historian#prt02 4_F_GON,{ } else mes "* "+.@line$+"*"; - input .@line$; + input(.@line$); if (.@line$ == "The eagle of the rainbow swallowed the serpent.") { .@total += 1; mes "*The eagle of the rainbow*"; @@ -1094,14 +1094,14 @@ morocc_in,45,126,3 script Historian#prt02 4_F_GON,{ } else mes "*"+.@line$+"*"; - input .@line$; + input(.@line$); if (.@line$ == "Then the eagle built its nest.") { .@total += 1; mes "*Then the eagle built its nest.*"; } else mes "*"+.@line$+"*"; - input .@line$; + input(.@line$); if (.@line$ == "A nest upon the swallowed sea.") { .@total += 1; mes "*A nest upon the swallowed sea.*"; @@ -1228,7 +1228,7 @@ morocc_in,45,126,3 script Historian#prt02 4_F_GON,{ next; mes "[Historian Rodafrian]"; mes "Anyway, your report about"; - mes "the Gaebolg family will be"; + mes "the Geoborg family will be"; mes "greatly appreciated by the"; mes "Rekenber Historical Research"; mes "Group. But first, I need to"; @@ -1237,7 +1237,7 @@ morocc_in,45,126,3 script Historian#prt02 4_F_GON,{ mes "[Historian Rodafrian]"; mes "Anyway, keep this information"; mes "a secret between me and you"; - mes "for now. Then, when I reveal the secret curse of the Gaebolg royal"; + mes "for now. Then, when I reveal the secret curse of the Geoborg royal"; mes "family, I'll finally outshine that Karlomoff! Bwahahahahaha!"; next; mes "["+strcharinfo(PC_NAME)+"]"; @@ -1514,7 +1514,7 @@ mjolnir_01,135,168,3 script Historian#prt03 4_M_SAGE_A,{ S_Song: mes "["+strcharinfo(PC_NAME)+"]"; - input .@line$; + input(.@line$); if (.@line$ == "The great serpent swallowed the sea.") { .@total += 1; mes "*The great serpent*"; @@ -1522,7 +1522,7 @@ S_Song: } else mes "*"+.@line$+"*"; - input .@line$; + input(.@line$); if (.@line$ == "The eagle of the rainbow swallowed the serpent.") { .@total += 1; mes "*The eagle of the rainbow*"; @@ -1530,11 +1530,11 @@ S_Song: } else mes "*"+.@line$+"*"; - input .@line$; + input(.@line$); if (.@line$ == "Then the eagle built its nest.") .@total += 1; mes "*"+.@line$+"*"; - input .@line$; + input(.@line$); if (.@line$ == "A nest upon the swallowed sea.") .@total += 1; mes "*"+.@line$+"*"; @@ -2291,7 +2291,7 @@ prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{ next; mes "[Father Bamph]"; mes "Finally, the first Tristram of"; - mes "the Gaebolg family defeated"; + mes "the Geoborg family defeated"; mes "Jormungand together with 6"; mes "other warriors, but only after"; mes "it killed his beloved father."; @@ -2306,7 +2306,7 @@ prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{ mes "[Father Bamph]"; mes "To this day..."; mes "^FF0000Every first prince of"; - mes "the Gaebolg family dies"; + mes "the Geoborg family dies"; mes "at a young age^000000. That is"; mes "Jormungand's curse and"; mes "the royal family's secret."; @@ -2429,7 +2429,7 @@ prt_church,185,106,3 script Father Bamph 1_M_PASTOR,{ mes "Oh, my. I learned the song"; mes "when I was a young boy from"; mes "my father. However, your version seems to reveal the secret curse"; - mes "of the Gaebolgs. Please tell me, where did you hear that song?"; + mes "of the Geoborgs. Please tell me, where did you hear that song?"; next; mes "["+strcharinfo(PC_NAME)+"]"; mes "Well, I first heard this"; @@ -3069,7 +3069,7 @@ prt_church,16,114,4 script Father Bamph#tomb 1_M_PASTOR,{ if (prt_curse == 18) { mes "[Father Bamph]"; mes "There are the bodies"; - mes "of the Gaebolg princes"; + mes "of the Geoborg princes"; mes "that were killed during"; mes "the exorcism. Please take"; mes "a look at the body to the left."; @@ -3547,13 +3547,13 @@ OnTouch: mes "["+strcharinfo(PC_NAME)+"]"; mes "Long ago, the giant serpent"; mes "Jormungand threatened mankind."; - mes "7 warriors defeated Jormungand, led by Tristram III of the Gaebolg"; - mes "family, but Jormungand cursed the Gaebolg bloodline in its defeat."; + mes "7 warriors defeated Jormungand, led by Tristram III of the Geoborg"; + mes "family, but Jormungand cursed the Geoborg bloodline in its defeat."; next; mes "["+strcharinfo(PC_NAME)+"]"; mes "Ever since, the curse kills"; mes "the first born prince of the"; - mes "Gaebolg family at an early age."; + mes "Geoborg family at an early age."; mes "However, all of the princes of"; mes "this generation were killed."; next; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 43e4beadb..a0905a3e4 100644 --- a/npc/quests/quests_rachel.txt +++ b/npc/quests/quests_rachel.txt @@ -1803,7 +1803,7 @@ ra_in01,235,194,5 script Katinshuell 4_M_RACHMAN1,{ mes "long time. What the heck do you"; mes "want to ask me about, anyway?"; next; - input .@input$; + input(.@input$); if (.@input$ == "Lighthalzen") { mes "[Katinshuell]"; mes "Lighthalzen...?"; @@ -2222,7 +2222,7 @@ rachel,73,244,3 script Lachellen 4_F_SHABBY,{ mes "so I'll help you if you have"; mes "any questions for me~"; next; - input .@input$; + input(.@input$); if (.@input$ == "Lighthalzen") { mes "[Lachellen]"; mes "Lighthalzen? Oh, that's"; @@ -3210,7 +3210,7 @@ OnTouch: OnTouchNPC: emotion e_an; - //emotion e_gg,1; //Emote on monster - unsupported + unitemote mobattached(), e_gg; end; OnMyMobDead: @@ -5468,7 +5468,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 4_M_RACHOLD1,{ next; mes "["+strcharinfo(PC_NAME)+"]"; mes "Isn't the scientist's name..."; - input .@input$; + input(.@input$); mes "^3131FF"+.@input$+"^000000?"; next; if (.@input$ == "Varmunt") { @@ -5961,7 +5961,7 @@ ra_temin,277,159,3 script High Priest Zhed#rachel 4_M_RACHOLD1,{ mes "for protecting peace here"; mes "in Arunafeltz?"; next; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes ""+.@input$+"?"; next; @@ -6890,7 +6890,7 @@ ra_temsky,99,99,5 script Pope#rachel 4_F_ARUNA_POP,{ mes "So... Um... Where do you"; mes "come from, "+strcharinfo(PC_NAME)+"?"; next; - input @input$; + input(@input$); mes "[Pope]"; mes @input$ +"...?"; mes "I think I might have heard"; @@ -6898,7 +6898,7 @@ ra_temsky,99,99,5 script Pope#rachel 4_F_ARUNA_POP,{ mes "Wow... What did you do"; mes "when you lived there?"; next; - input @input$; + input(@input$); mes "[Pope]"; mes @input$ +"...?"; mes "Wow, that sounds quite"; @@ -6988,7 +6988,7 @@ ra_temsky,99,99,5 script Pope#rachel 4_F_ARUNA_POP,{ mes "interesting stories about"; mes "the outside world again?"; next; - input .@input$; + input(.@input$); mes "[Pope]"; mes "Mm. That sounds pretty"; mes "strange to me. Well, it's"; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index 6fc89a0cf..e23089698 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -554,22 +554,21 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ mes "this request, enter '0.'"; next; while(1) { - input .@input,0,10; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Puchuchartan]"; mes "I see. It's your call."; mes "Come back when you need me."; close; } - else if (.@input > 9) { + if (.@input > 9) { mes "[Puchuchartan]"; mes "Remember to choose a number"; mes "from 1 to 9."; next; + continue; } - else { - break; - } + break; } mes "[Puchuchartan]"; switch(.@success) { @@ -707,124 +706,117 @@ 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; - if ((.@input > 0) && (.@input < 11)) { - if (countitem(.@divide) >= .@input) { - if (checkweight(Spawn,(.@input * 30)) == 0) { + input(.@input); + if (.@input <= 0 || .@input > 10) { + mes "[Puchuchartan]"; + mes "Hm? You need to enter"; + mes "a number from 1 to 10."; + close; + } + if (countitem(.@divide) >= .@input) { + if (checkweight(Spawn,(.@input * 30)) == 0) { + mes "[Puchuchartan]"; + mes "You're carrying too"; + mes "many items right now."; + mes "Put some of your stuff"; + mes "in Kafra Storage, and then"; + mes "come back to me, okay?"; + close; + } + mes "[Puchuchartan]"; + mes "I'll try to revert these"; + mes "enchanted stones to their"; + mes "rough forms. Enter a number"; + mes "from 1 to 9, or enter 0 if"; + mes "you decide to cancel."; + next; + while(1) { + input(.@input2); + if (.@input2 <= 0) { mes "[Puchuchartan]"; - mes "You're carrying too"; - mes "many items right now."; - mes "Put some of your stuff"; - mes "in Kafra Storage, and then"; - mes "come back to me, okay?"; + mes "You want to cancel?"; + mes "Well, if you change your"; + mes "mind, feel free to come"; + mes "ask me to help at any time."; close; } - mes "[Puchuchartan]"; - mes "I'll try to revert these"; - mes "enchanted stones to their"; - mes "rough forms. Enter a number"; - mes "from 1 to 9, or enter 0 if"; - mes "you decide to cancel."; - next; - while(1) { - input .@input2,0,10; - if (.@input2 == 0) { - mes "[Puchuchartan]"; - mes "You want to cancel?"; - mes "Well, if you change your"; - mes "mind, feel free to come"; - mes "ask me to help at any time."; - close; - } - else if (.@input2 > 9) { - mes "[Puchuchartan]"; - mes "Hm? You need to enter"; - mes "a number from 1 to 9."; - next; - } - else { - break; - } - } - mes "[Puchuchartan]"; - mes "I will now chant the"; - mes "sacred words. Remember"; - mes "the number you entered!"; - next; - mes "[Puchuchartan]"; - mes "Umba Umba Kalapum! Umba! Ta!"; - mes "Lukura Ukulele Um! Umba! Ka!"; - mes "Abulaka Tabulakan! Umba! La!"; - mes "Ombaludu Zan Kunu! Umba! Ku!"; - mes "Kum Tum Lakulakun! Umba! Ha!"; - next; - mes "[Puchuchartan]"; - mes "Here's the rough enchanted stones"; - mes "you wished to have. I created this"; - mes "with a lot of effort, so make good"; - mes "use of them."; - while(1) { - if (.@sha_man == .@input) { - break; - } - else { - .@shaman_max += rand(6,10); - ++.@sha_man; - } - } - switch(.@divide) { - case 994: - getitem Boody_Red,.@shaman_max; - break; - case 995: - getitem Crystal_Blue,.@shaman_max; - break; - case 996: - getitem Wind_Of_Verdure,.@shaman_max; - break; - case 997: - getitem Yellow_Live,.@shaman_max; + if (.@input2 > 9) { + mes "[Puchuchartan]"; + mes "Hm? You need to enter"; + mes "a number from 1 to 9."; + next; + continue; } - delitem .@divide,.@input; - close; + break; } - else { - mes "[Puchuchartan]"; - mes "So, you wish to have rough"; - switch(.@divide) { - case 994: - mes "fire stones? Then I will need"; - mes "you to bring "+input_want+" pure fire stone."; - break; - case 995: - mes "water stones? Then I'll need"; - mes "you to bring "+input_want+" pure water stone."; - break; - case 996: - mes "wind stones? Then I will need"; - mes "you to bring "+input_want+" pure wind stone."; - break; - case 997: - mes "earth stones? Then I'll need"; - mes "you to bring "+.@input+" pure earth stone."; + mes "[Puchuchartan]"; + mes "I will now chant the"; + mes "sacred words. Remember"; + mes "the number you entered!"; + next; + mes "[Puchuchartan]"; + mes "Umba Umba Kalapum! Umba! Ta!"; + mes "Lukura Ukulele Um! Umba! Ka!"; + mes "Abulaka Tabulakan! Umba! La!"; + mes "Ombaludu Zan Kunu! Umba! Ku!"; + mes "Kum Tum Lakulakun! Umba! Ha!"; + next; + mes "[Puchuchartan]"; + mes "Here's the rough enchanted stones"; + mes "you wished to have. I created this"; + mes "with a lot of effort, so make good"; + mes "use of them."; + while(1) { + if (.@sha_man == .@input) { break; } - mes "^3377FF"+.@input+" "+getitemname(.@divide)+"^000000."; - next; - mes "[Puchuchartan]"; - mes "That's all I need..."; - mes "Come back when"; - mes "you're ready."; - mes "I will be here."; - close; + .@shaman_max += rand(6,10); + ++.@sha_man; } - } - else { - mes "[Puchuchartan]"; - mes "Hm? You need to enter"; - mes "a number from 1 to 10."; + switch(.@divide) { + case 994: + getitem Boody_Red,.@shaman_max; + break; + case 995: + getitem Crystal_Blue,.@shaman_max; + break; + case 996: + getitem Wind_Of_Verdure,.@shaman_max; + break; + case 997: + getitem Yellow_Live,.@shaman_max; + } + delitem .@divide,.@input; close; } + mes "[Puchuchartan]"; + mes "So, you wish to have rough"; + switch(.@divide) { + case 994: + mes "fire stones? Then I will need"; + mes "you to bring "+input_want+" pure fire stone."; + break; + case 995: + mes "water stones? Then I'll need"; + mes "you to bring "+input_want+" pure water stone."; + break; + case 996: + mes "wind stones? Then I will need"; + mes "you to bring "+input_want+" pure wind stone."; + break; + case 997: + mes "earth stones? Then I'll need"; + mes "you to bring "+.@input+" pure earth stone."; + break; + } + mes "^3377FF"+.@input+" "+getitemname(.@divide)+"^000000."; + next; + mes "[Puchuchartan]"; + mes "That's all I need..."; + mes "Come back when"; + mes "you're ready."; + mes "I will be here."; + close; case 3: mes "[Puchuchartan]"; mes "I see. It's your call."; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 2fde49c3e..a69a495be 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 " "; @@ -5092,7 +5092,7 @@ ra_temin,87,133,1 script Rachel Guard#vol1 4_M_RASWORD,5,2,{ mes "Of course! I should"; mes "talk to him about..."; next; - input .@input$; + input(.@input$); mes "["+strcharinfo(PC_NAME)+"]"; mes "Wait a second..."; mes "Of course! I should"; @@ -6723,7 +6723,7 @@ thor_camp,159,74,3 script Colonel Vito#3 4_M_DST_MASTER,{ mes "^FF0000as a devoted servant"; mes "of Goddess Freya"; next; - input .@input$; + input(.@input$); .@answer$ = "as a devoted servant of Goddess Freya"; if (.@input$ == .@answer$) { mes "["+strcharinfo(PC_NAME)+"]"; @@ -6734,18 +6734,16 @@ thor_camp,159,74,3 script Colonel Vito#3 4_M_DST_MASTER,{ next; break; } - else { - mes "[Colonel Vito]"; - mes "Wrong! Try again!"; - next; - } + mes "[Colonel Vito]"; + mes "Wrong! Try again!"; + next; } while(1) { mes "[Colonel Vito]"; mes "^FF0000I pledge my honor to"; mes "overthrow our mortal enemy"; next; - input .@input$; + input(.@input$); .@answer$ = "I pledge my honor to overthrow our mortal enemy"; if (.@input$ == .@answer$) { mes "["+strcharinfo(PC_NAME)+"]"; @@ -6755,17 +6753,15 @@ thor_camp,159,74,3 script Colonel Vito#3 4_M_DST_MASTER,{ next; break; } - else { - mes "[Colonel Vito]"; - mes "Wrong! Try again!"; - next; - } + mes "[Colonel Vito]"; + mes "Wrong! Try again!"; + next; } while(1) { mes "[Colonel Vito]"; mes "^FF0000I will show no mercy^000000"; next; - input .@input$; + input(.@input$); .@answer$ = "I will show no mercy"; if (.@input$ == .@answer$) { mes "["+strcharinfo(PC_NAME)+"]"; @@ -6774,18 +6770,16 @@ thor_camp,159,74,3 script Colonel Vito#3 4_M_DST_MASTER,{ next; break; } - else { - mes "[Colonel Vito]"; - mes "Wrong! Try again!"; - next; - } + mes "[Colonel Vito]"; + mes "Wrong! Try again!"; + next; } while(1) { mes "[Colonel Vito]"; mes "^FF0000I shall devote"; mes "my entire life^000000"; next; - input .@input$; + input(.@input$); .@answer$ = "I shall devote my entire life"; if (.@input$ == .@answer$) { mes "["+strcharinfo(PC_NAME)+"]"; @@ -6796,18 +6790,16 @@ thor_camp,159,74,3 script Colonel Vito#3 4_M_DST_MASTER,{ next; break; } - else { - mes "[Colonel Vito]"; - mes "Wrong! Try again!"; - next; - } + mes "[Colonel Vito]"; + mes "Wrong! Try again!"; + next; } while(1) { mes "[Colonel Vito]"; mes "^FF0000Down with the"; mes "Rune-Midgarts Kingdom!^000000"; next; - input .@input$; + input(.@input$); .@answer$ = "Down with the Rune-Midgarts Kingdom!"; if (.@input$ == .@answer$) { mes "["+strcharinfo(PC_NAME)+"]"; @@ -6816,11 +6808,9 @@ thor_camp,159,74,3 script Colonel Vito#3 4_M_DST_MASTER,{ next; break; } - else { - mes "[Colonel Vito]"; - mes "Wrong! Try again!"; - next; - } + mes "[Colonel Vito]"; + mes "Wrong! Try again!"; + next; } mes "[Colonel Vito]"; mes "Good. Now you know the"; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index ed63847a2..cd8bd0d12 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -2621,7 +2621,7 @@ gef_dun01,89,192,0 script #lowentrace HIDDEN_NPC,3,3,{ next; switch(select("Yes", "No")) { case 1: - input @lowenstring$; + input(@lowenstring$); if (@lowenstring$ == "Lowen") { if (god_brising == 30) { mes "[Lowen Ellenen]"; @@ -2743,7 +2743,7 @@ gef_dun01,203,48,0 script #lowentrace1 HIDDEN_NPC,3,3,{ next; switch(select("Yes", "No")) { case 1: - input @lowenstring$; + input(@lowenstring$); if (@lowenstring$ == "Lowen") { if (god_brising == 31) { mes "[Lowen Ellenen]"; @@ -4523,35 +4523,35 @@ mjo_dun02,126,36,0 script #brisindwarf4 HIDDEN_NPC,3,3,{ mes "Um, that song."; mes "What was the first line...?"; next; - input @dwarfsong1$; + input(@dwarfsong1$); if (@dwarfsong1$ == "No jewel in the world can compare.") @point += 1; mes "[" + strcharinfo(PC_NAME) + "]"; mes " " + @dwarfsong1$ + ""; mes "Then...ummm.."; mes "The second line?"; next; - input @dwarfsong2$; + input(@dwarfsong2$); if (@dwarfsong2$ == "Our masterpiece made from love.") @point += 1; mes "[" + strcharinfo(PC_NAME) + "]"; mes " " + @dwarfsong2$ + ""; mes "Now, what was"; mes "the third line...?"; next; - input @dwarfsong3$; + input(@dwarfsong3$); if (@dwarfsong3$ == "She wanted the dazzling necklace.") @point += 1; mes "[" + strcharinfo(PC_NAME) + "]"; mes " " + @dwarfsong3$ + ""; mes "Now, the fourth"; mes "line after that..."; next; - input @dwarfsong4$; + input(@dwarfsong4$); if (@dwarfsong4$ == "We wanted the goddess of beauty.") @point += 1; mes "[" + strcharinfo(PC_NAME) + "]"; mes " " + @dwarfsong4$ + ""; mes "Alright, now"; mes "for the last line..."; next; - input @dwarfsong5$; + input(@dwarfsong5$); if (@dwarfsong5$ == "Our happiest times were with her.") @point += 1; mes "[" + strcharinfo(PC_NAME) + "]"; mes " " + @dwarfsong5$ + ""; diff --git a/npc/quests/seals/god_global.txt b/npc/quests/seals/god_global.txt index 7486bcc23..fb2b13aeb 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/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt index 96a634a4e..75510d9a0 100644 --- a/npc/quests/seals/megingard_seal.txt +++ b/npc/quests/seals/megingard_seal.txt @@ -954,7 +954,7 @@ prt_in,172,106,0 script Librarian#megin 4_M_ZONDAOYAJI,{ mes "[" + strcharinfo(PC_NAME) + "]"; mes "But isn't"; mes "the file about..."; - input @str$; + input(@str$); mes "^0000FF" + @str$ + "?"; next; if (@str$ == "the 1st squad's final mission") { @@ -1007,7 +1007,7 @@ prt_in,172,106,0 script Librarian#megin 4_M_ZONDAOYAJI,{ next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "Isn't the file..."; - input @str$; + input(@str$); mes "[" + strcharinfo(PC_NAME) + "]"; mes "^0000FF" + @str$ + "?"; next; @@ -1155,7 +1155,7 @@ prt_in,172,106,0 script Librarian#megin 4_M_ZONDAOYAJI,{ mes "Please do not use"; mes "capital letters.^000000"; next; - input .@input$; + input(.@input$); if (compare(.@input$,"crusader") == 1) { mes "^663300[Keyword: ^996633Crusader^663300]"; mes "Crusaders are warriors preparing for the upcoming Holy War against Evil. Experienced swordsmen, usually with remarkable spiritual prowess.^000000"; @@ -1817,7 +1817,7 @@ morocc_in,146,179,0 script Employee#megin1 1_F_01,{ mes "Are you looking for"; mes "someone...?"; next; - input @str$; + input(@str$); if (@str$ == "Cuaque Donon" || @str$ == "Cuaque" || @str$ == "Donon") { mes "[" + strcharinfo(PC_NAME) + "]"; mes "Do you happen to know a person named " + @str$ + " ...?"; diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt index d3982699c..4450c1778 100644 --- a/npc/quests/seals/sleipnir_seal.txt +++ b/npc/quests/seals/sleipnir_seal.txt @@ -1316,7 +1316,7 @@ que_god01,20,48,0 script Slab#G HIDDEN_NPC,{ mes "wkrdjswhgks shfh wkrdjswhgks wkdus wkr..."; mes "^ff00ffghswka^000000gks ........fusjs tmld........."; next; - input .@input$; + input(.@input$); if (.@input$ == "dirdnl") { mes "Zap~"; mes "^3355FFAs you press the word '^ff0000dirdnl^3355FF,' the slab emitted a strange beeping noise but nothing else happened. Perhaps you must press some of the other words.^000000"; @@ -1335,7 +1335,7 @@ que_god01,20,48,0 script Slab#G HIDDEN_NPC,{ mes "is not on the slab.^000000"; close; } - input .@input$; + input(.@input$); if (.@input$ == "tkaryf") { mes "^3355FFYou press the word '^ff0000tkaryf^3355FF,' and another beep was emitted from"; mes "the slab.^000000"; @@ -1354,7 +1354,7 @@ que_god01,20,48,0 script Slab#G HIDDEN_NPC,{ mes "is not on the slab.^000000"; close; } - input .@input$; + input(.@input$); if (.@input$ == "ghswka") { mes "^3355FFYou press on the word '^ff0000ghswka^3355FF,' resulting in an affirmative beep. Nothing has still happened, so perhaps you must press another word.^000000"; next; diff --git a/npc/quests/skills/alchemist_skills.txt b/npc/quests/skills/alchemist_skills.txt index a8867a1a8..78cf18a25 100644 --- a/npc/quests/skills/alchemist_skills.txt +++ b/npc/quests/skills/alchemist_skills.txt @@ -1438,83 +1438,8 @@ lhz_in01,224,140,3 script Kellasus#qsk_al 1_M_LIBRARYMASTER,{ mes "Homunculus, putting it in"; mes "an inert state of hibernation?"; next; - input .@input$; - if (.@input$ == "Vaporize") { - mes "[Kellasus]"; - mes "Hmm, not bad. So you've"; - mes "been studying. Now, the second"; - mes "question. What is the item, whose name indicates a very early stage"; - mes "of Homunculus development, used for the Call Homunculus skill?"; - next; - input .@input$; - if (.@input$ == "Embryo") { - mes "[Kellasus]"; - mes "Huh. You got that one"; - mes "right too. Alright, third"; - mes "question. What is the"; - mes "name of the skill, mastered"; - mes "at Skill Level 5, which allows"; - mes "you to resurrect Homunculi?"; - next; - input .@input$; - if (.@input$ == "Homunculus Resurrection") { - mes "[Kellasus]"; - mes "So you have been putting"; - mes "a lot of effort in studying"; - mes "this. I really admire your"; - mes "dedication and it looks like"; - mes "you've got the potential to"; - mes "be a really great Alchemist."; - next; - mes "[Kellasus]"; - mes "Still, even though you're"; - mes "qualified to learn all the"; - mes "Homunculus skills, I choose"; - mes "not to teach them based on"; - mes "my own personal principles."; - mes "Nothing can change my mind."; - next; - mes "[Kellasus]"; - mes "I admit that I'm proud"; - mes "of the progress you've"; - mes "made, but I just can't"; - mes "bring myself to be a part"; - mes "of what I believe to be an"; - mes "abuse of the gift of life."; - next; - bioeth = 8; - mes "[Kellasus]"; - mes "There's just so much"; - mes "risk! I don't think I can"; - mes "bear to be responsible for"; - mes "any of the consequences that"; - mes "may come with the existence"; - mes "of artificially created life."; - close; - } - else { - mes "[Kellasus]"; - mes "I'm disappointed..."; - mes "I really thought you"; - mes "had learned everything"; - mes "you could about Homunculi,"; - mes "but it looks like there are a"; - mes "few gaps in your knowledge."; - close; - } - } - else { - mes "[Kellasus]"; - mes "Hmm... It looks like"; - mes "you still haven't learned"; - mes "enough about Homunculi."; - mes "Even if I wanted to teach"; - mes "you, it looks like you're"; - mes "not quite ready to learn..."; - close; - } - } - else { + input(.@input$); + if (.@input$ != "Vaporize") { mes "[Kellasus]"; mes "You'd be able to get"; mes "the first question right"; @@ -1524,6 +1449,75 @@ lhz_in01,224,140,3 script Kellasus#qsk_al 1_M_LIBRARYMASTER,{ mes "find a new alchemic interest."; close; } + mes "[Kellasus]"; + mes "Hmm, not bad. So you've"; + mes "been studying. Now, the second"; + mes "question. What is the item, whose name indicates a very early stage"; + mes "of Homunculus development, used for the Call Homunculus skill?"; + next; + input(.@input$); + if (.@input$ != "Embryo") { + mes "[Kellasus]"; + mes "Hmm... It looks like"; + mes "you still haven't learned"; + mes "enough about Homunculi."; + mes "Even if I wanted to teach"; + mes "you, it looks like you're"; + mes "not quite ready to learn..."; + close; + } + mes "[Kellasus]"; + mes "Huh. You got that one"; + mes "right too. Alright, third"; + mes "question. What is the"; + mes "name of the skill, mastered"; + mes "at Skill Level 5, which allows"; + mes "you to resurrect Homunculi?"; + next; + input(.@input$); + if (.@input$ != "Homunculus Resurrection") { + mes "[Kellasus]"; + mes "I'm disappointed..."; + mes "I really thought you"; + mes "had learned everything"; + mes "you could about Homunculi,"; + mes "but it looks like there are a"; + mes "few gaps in your knowledge."; + close; + } + mes "[Kellasus]"; + mes "So you have been putting"; + mes "a lot of effort in studying"; + mes "this. I really admire your"; + mes "dedication and it looks like"; + mes "you've got the potential to"; + mes "be a really great Alchemist."; + next; + mes "[Kellasus]"; + mes "Still, even though you're"; + mes "qualified to learn all the"; + mes "Homunculus skills, I choose"; + mes "not to teach them based on"; + mes "my own personal principles."; + mes "Nothing can change my mind."; + next; + mes "[Kellasus]"; + mes "I admit that I'm proud"; + mes "of the progress you've"; + mes "made, but I just can't"; + mes "bring myself to be a part"; + mes "of what I believe to be an"; + mes "abuse of the gift of life."; + next; + bioeth = 8; + mes "[Kellasus]"; + mes "There's just so much"; + mes "risk! I don't think I can"; + mes "bear to be responsible for"; + mes "any of the consequences that"; + mes "may come with the existence"; + mes "of artificially created life."; + close; } if (BaseJob == Job_Alchemist && bioeth > 3) { mes "[Kellasus]"; diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt index ea01a926d..787b7a3c4 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); if (.@input < 100 || .@input > 999) { mes "[Screen]"; mes "Number input"; @@ -1060,8 +1060,8 @@ tha_t04,195,195,0 script Rune Device#tt2 HIDDEN_NPC,3,3,{ } .@input100 = .@input / 100; .@input10 = (.@input % 100) / 10; - if (((.@input100 > 0) && (.@input10 > 0)) && (.@input % 10 > 0)) { - if (((.@input100 != .@input10) && (.@input100 != .@input % 10)) && (.@input10 != .@input % 10)) + if (.@input100 > 0 && .@input10 > 0 && .@input % 10 > 0) { + if (.@input100 != .@input10 && .@input100 != .@input % 10 && .@input10 != .@input % 10) break; mes "[Screen]"; mes "Violation of number"; @@ -1082,12 +1082,18 @@ tha_t04,195,195,0 script Rune Device#tt2 HIDDEN_NPC,3,3,{ next; .@strike = 0; .@ball = 0; - if (.@yagu100 == .@input100) .@strike += 1; - if (.@yagu10 == .@input10) .@strike += 1; - if (.@yagu1 == .@input % 10) .@strike += 1; - if ((.@yagu100 == .@input10) || (.@yagu100 == .@input % 10)) .@ball += 1; - if ((.@yagu10 == .@input100) || (.@yagu10 == .@input % 10)) .@ball += 1; - if ((.@yagu1 == .@input100) || (.@yagu1 == .@input10)) .@ball += 1; + if (.@yagu100 == .@input100) + .@strike += 1; + if (.@yagu10 == .@input10) + .@strike += 1; + if (.@yagu1 == .@input % 10) + .@strike += 1; + if (.@yagu100 == .@input10 || .@yagu100 == .@input % 10) + .@ball += 1; + if (.@yagu10 == .@input100 || .@yagu10 == .@input % 10) + .@ball += 1; + if (.@yagu1 == .@input100 || .@yagu1 == .@input10) + .@ball += 1; if (.@strike == 3) { mes "[Screen]"; mes "Input number accepted."; @@ -1193,8 +1199,8 @@ tha_t05,62,179,0 script Brilliant Statue#tt3 HIDDEN_NPC,3,3,{ mes "I'll try the left wing first."; mes "What key should I put in?"; next; - input .@inputstr$; - if ((.@inputstr$ != "Red Key") && (.@inputstr$ != "red key")) { + input(.@inputstr$); + if (.@inputstr$ != "Red Key" && .@inputstr$ != "red key") { mes "It doesn't fit into the crack."; close; } @@ -1204,8 +1210,8 @@ tha_t05,62,179,0 script Brilliant Statue#tt3 HIDDEN_NPC,3,3,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "Now the right side..."; next; - input .@inputstr$; - if ((.@inputstr$ != "Yellow Key") && (.@inputstr$ != "yellow key")) { + input(.@inputstr$); + if (.@inputstr$ != "Yellow Key" && .@inputstr$ != "yellow key") { mes "It doesn't fit into the crack."; close; } @@ -2143,7 +2149,7 @@ OnTouch: mes "There is a fragment missing from the crest of the Seal."; mes "Surely I saw a familiar fragment before..."; next; - input .@inputstr$; + input(.@inputstr$); .@exact_tt$ = "Fragment of "+.@j$; if (countitem(.@i[0]) > 0 && .@exact_tt$ == .@inputstr$) { mes "^3355FFYou insert the"; diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 4bf60993a..003972e62 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -2815,7 +2815,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{ mes "A-anyway, please tell me"; mes "what you think it might be."; next; - input .@input$; + input(.@input$); if (compare(.@input$,"red gemstone")) { mes "[Sir Jore]"; mes "What...! Huh."; @@ -2848,14 +2848,12 @@ aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{ mes ""+ strcharinfo(PC_NAME) +". Farewell~"; close; } - else { - mes "[Sir Jore]"; - mes "Err...?"; - mes "I don't think"; - mes "I quite understood"; - mes "you. What did you say?"; - close; - } + mes "[Sir Jore]"; + mes "Err...?"; + mes "I don't think"; + mes "I quite understood"; + mes "you. What did you say?"; + close; } else if (sign_q == 20) { mes "[Sir Jore]"; @@ -3673,7 +3671,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{ mes "a battle of minds."; mes "W-who are you...?"; next; - input .@input$; + input(.@input$); mes "[Jesqurienne]"; mes ""+.@input$+"..."; mes "I will remember that."; @@ -6947,7 +6945,7 @@ geffen_in,159,48,5 script Lonely-looking Woman 4_F_05,{ mes "W-wait!"; mes "I'm here to see..."; next; - input .@input$; + input(.@input$); if (.@input$ != "Engel Howard") { mes "[Brenda Howard]"; mes "Huh?"; @@ -6962,23 +6960,21 @@ geffen_in,159,48,5 script Lonely-looking Woman 4_F_05,{ emotion e_ho; close; } - else { - mes "[Brenda Howard]"; - mes "Ah... I see."; - mes "You're looking for my husband."; - mes "My husband, my daughter and"; - mes "I just moved to Geffen from"; - mes "Prontera a while ago."; - next; - mes "[Brenda Howard]"; - mes "We moved to Geffen for the sake of my husband's business. Apparently, this town is closest to something he really seems to need. Whatever it is, it must be really important to his smithing work."; - next; - mes "[Brenda Howard]"; - mes "Oh, and if you're going to look"; - mes "for my husband, please talk to my daughter before you go. I think she has something that she wants to give to her father..."; - sign_q = 55; - close; - } + mes "[Brenda Howard]"; + mes "Ah... I see."; + mes "You're looking for my husband."; + mes "My husband, my daughter and"; + mes "I just moved to Geffen from"; + mes "Prontera a while ago."; + next; + mes "[Brenda Howard]"; + mes "We moved to Geffen for the sake of my husband's business. Apparently, this town is closest to something he really seems to need. Whatever it is, it must be really important to his smithing work."; + next; + mes "[Brenda Howard]"; + mes "Oh, and if you're going to look"; + mes "for my husband, please talk to my daughter before you go. I think she has something that she wants to give to her father..."; + sign_q = 55; + close; } else if (sign_q < 57) { mes "Ho-ho~!"; @@ -7700,8 +7696,8 @@ gef_tower,118,36,4 script Annoyed Man 1_M_WIZARD,{ mes "What are you doing here?!"; emotion e_pif; next; - input .@input$; - if ((.@input$ == "Metz Brayde") || (.@input$ == "Sobbing Starlight")) { + input(.@input$); + if (.@input$ == "Metz Brayde" || .@input$ == "Sobbing Starlight") { mes "[Dhota]"; mes "Eh?"; if (.@input$ == "Metz Brayde") { @@ -7738,15 +7734,13 @@ gef_tower,118,36,4 script Annoyed Man 1_M_WIZARD,{ emotion e_pif; close; } - else { - mes "[Dhota]"; - mes "Say what...?"; - mes "I have no idea what"; - mes "you're talking about!"; - mes "If you've got nothing"; - mes "to say, then leave me alone!"; - close; - } + mes "[Dhota]"; + mes "Say what...?"; + mes "I have no idea what"; + mes "you're talking about!"; + mes "If you've got nothing"; + mes "to say, then leave me alone!"; + close; } else { mes "Hmmm..."; diff --git a/npc/re/cities/brasilis.txt b/npc/re/cities/brasilis.txt index eb30a3225..7c29265e0 100644 --- a/npc/re/cities/brasilis.txt +++ b/npc/re/cities/brasilis.txt @@ -133,22 +133,22 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Ice Cream Maker]"; mes "None?"; mes "Fine get outta the way, I have customers to serve."; close; } - else if ((.@input < 0) || (.@input > 5)) { + if (.@input > 5) { mes "[Ice Cream Maker]"; mes "Wow."; mes "You ordered too much."; mes "If you eat over 5 you might need to fight with a monster in your stomach. Calm down buddy."; next; + continue; } - else - break; + break; } .@icecream_hap = .@input*100; if (Zeny < .@icecream_hap) { diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt index d8bac5986..70e60a274 100644 --- a/npc/re/cities/dewata.txt +++ b/npc/re/cities/dewata.txt @@ -489,11 +489,12 @@ 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; - } else if (.@input <= 50000) + } + if (.@input <= 50000) .@good_luck = rand(1,10000); else .@good_luck = rand(1,5000); @@ -557,7 +558,7 @@ dewata,89,191,6 script Small Shrine#dew1 CLEAR_NPC,{ case 2: mes "What is your wish?"; next; - input .@wish$; + input(.@wish$); mes "You have made your wish for ^0000FF" + .@wish$ + "^000000 to the small shrine."; next; callsub L_Wish; diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt index a58ee4463..d3f5b6ed3 100644 --- a/npc/re/cities/mora.txt +++ b/npc/re/cities/mora.txt @@ -452,16 +452,18 @@ 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); if (.@input == 0) { mes "[Raffle Philosopher]"; mes "So you don't want to hear a quote, eh?"; close; - } else if (.@input < 100 || .@input > 1000000) { + } + if (.@input < 100 || .@input > 1000000) { mes "[Raffle Philosopher]"; mes "You can pay between ^FF0000100 and 1000000^000000."; close; - } else if (Zeny < .@input) { + } + if (Zeny < .@input) { mes "[Raffle Philosopher]"; mes "So you think this is what my time is worth?"; close; @@ -908,7 +910,7 @@ mora,140,186,3 script Raffle Philosopher 4_M_RAFLE_OLD,{ mes "I wonder what you think"; mes "about what I've told you."; next; - input .@inputstr$; + input(.@inputstr$); mes "[Raffle Philosopher]"; mes "So you think that "+.@inputstr$+"."; next; @@ -1146,7 +1148,7 @@ mora,43,127,3 script Innkeeper#mora_inn 4_M_RAFLE_OR,{ close; } case 3: - input .@inputstr$; + input(.@inputstr$); mes "["+strcharinfo(PC_NAME)+"]"; mes "I come from a place called "+.@inputstr$+"."; next; diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 44b5f1e61..ec0efeb53 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -2744,7 +2744,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{ close(); } mes("I exchange you a White Knight Card for ^0000FF3000 Coagulated Spell^000000 or ^FF000070 Contaminated Magic^000000."); - mes("<ITEMLINK>White Knight Card<INFO>4608</INFO></ITEMLINK>"); + mes(F_MesItemInfo(White_Knightage_Card)); next(); setarray(.@item[0], Coagulated_Spell, Corrupted_Charm); setarray(.@cost[0], 3000, 70); @@ -2777,7 +2777,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{ close(); } mes("I exchange you a Khalitzburg Knight Card for ^0000FF5000 Coagulated Spell^000000 or ^FF0000100 Contaminated Magic^000000."); - mes("<ITEMLINK>Khalitzburg Knight Card<INFO>4609</INFO></ITEMLINK>"); + mes(F_MesItemInfo(Khali_Knightage_Card)); next(); setarray(.@item[0], Coagulated_Spell, Corrupted_Charm); setarray(.@cost[0], 5000, 100); diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt index 3e708dc57..a291984db 100644 --- a/npc/re/instances/ghost_palace.txt +++ b/npc/re/instances/ghost_palace.txt @@ -601,7 +601,7 @@ OnInstanceInit: OnStart: stopnpctimer instance_npcname("#gp3control"); disablenpc(instance_npcname("#gp3control")); - killmonster(instance_mapname("1@spa"), "All"); + killmonster(instance_mapname("1@spa"), "all"); disablenpc(instance_npcname("#gp3warp")); enablenpc(instance_npcname("Lurid Royal Guard#gp5")); enablenpc(instance_npcname("Tiara Princess#gp5")); diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index 5c54a0114..f03dece93 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -120,7 +120,7 @@ que_ng,21,76,0 script Wall with a Drawing#ko CLEAR_NPC,{ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ if (MaxWeight - Weight < 1000 || checkweight("Knife",1) == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You don't need to carry so many things."; close; } @@ -128,8 +128,8 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ for (set .@i,5131; .@i<=5146; set .@i,.@i+1) if (questprogress(.@i)) erasequest .@i; set job_kagero,0; - mes "[Cougar]"; - mes "You are not in the Family of the Ninja."; + mes "[Kuuga Gai]"; + mes "You are not in the clan of the Ninja."; close2; warp "amatsu",147,136; end; @@ -156,28 +156,28 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "^1A95E6He keeps talking and doesn't stop to answer your question.^1A95E6"; next; mes "[Old Man]"; - mes "There once was a quiet family living in ancient Amatsu times that is never mentioned in history books or stories."; + mes "There once was a quiet clan living in ancient Amatsu times that is never mentioned in history books or stories."; next; mes "[Old Man]"; mes "They lived beneath shadows but always yearned for the bright sun, like a sunflower."; next; mes "[Old Man]"; - mes "A family that was loyal to their lord who they served as their bright sun."; + mes "A clan that was loyal to their lord who they served as their bright sun."; next; mes "[Old Man]"; - mes "...a very trustworthy family..."; + mes "...a very trustworthy clan..."; next; mes "[Old Man]"; mes "....loyal to their core..."; next; mes "[Old Man]"; - mes "...a family of integrity..."; + mes "...a clan of integrity..."; next; select("What happened to them?"); mes "^1A95E6The old man looks at you with a melancholy face.^1A95E6"; next; mes "[Old Man]"; - mes "Why are you interested in a family that was abandoned by their lord and disappeared from history itself?"; + mes "Why are you interested in a clan that was abandoned by their lord and disappeared from history itself?"; next; if(select("I'm a Ninja.", "I'm bored.") == 2) { mes "[Old Man]"; @@ -188,13 +188,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } cutin "job_ko02",2; mes "[Old Man]"; - mes "Ninja! There was a time when the family was called ninjas, too."; + mes "Ninja! There was a time when the clan was called ninjas, too."; next; erasequest 5131; setquest 5132; set job_kagero,2; mes "[Old Man]"; - mes "You'll have to lend me your ear for I have so much to tell you about the family story."; + mes "You'll have to lend me your ear for I have so much to tell you about the clan story."; close2; cutin "",255; end; @@ -206,13 +206,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "This goes way back to ancient times and nobody in Amatsu remembers about it."; next; mes "[Old Man]"; - mes "The family worked behind the scenes and basically lived their lives for their lord."; + mes "The clan worked behind the scenes and basically lived their lives for their lord."; next; mes "[Old Man]"; mes "They were very loyal doing whatever deed their lord asked for."; next; mes "[Old Man]"; - mes "Ninja, the family was known as the dark family but that doesn't mean they wanted to be hidden in the darkness."; + mes "Ninja, the clan was known as the dark clan but that doesn't mean they wanted to be hidden in the darkness."; next; mes "[Old Man]"; mes "They were loyal enough to be satisfied as the lord's servants but their loyalty became the problem."; @@ -222,13 +222,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "They are a secret organization that even the lord didn't know much about."; next; mes "[Old Man]"; - mes "The few that knew about the family's existence, tried to investigate them but nobody was able to reveal their true identity."; + mes "The few that knew about the clan's existence, tried to investigate them but nobody was able to reveal their true identity."; next; mes "[Old Man]"; - mes "That is why this family has grown from loyal servants to a group feared for its secrets."; + mes "That is why this clan has grown from loyal servants to a group feared for its secrets."; next; mes "[Old Man]"; - mes "The lord shunned the family and didn't call them for their service any more but they never betrayed him."; + mes "The lord shunned the clan and didn't call them for their service any more but they never betrayed him."; next; select("They were really loyal people."); cutin "job_ko03",2; @@ -245,20 +245,20 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } else if (job_kagero == 3) { cutin "job_ko03",2; mes "[Old Man]"; - mes "The family has been living in hiding for so long since the old days. The current lord didn't even know of their existence."; + mes "The clan has been living in hiding for so long since the old days. The current lord didn't even know of their existence."; next; select("........."); cutin "job_ko01",2; mes "[Old Man]"; - mes "I'm Guide Gion, the last of the dark ninja family."; + mes "I'm Leader Gion, the last of the dark ninja clan."; next; if(select("I think your time has ended.", "I need your teaching.") == 1) { cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Are you an assassin to end this old man's life?"; next; - mes "[Guide Gion]"; - mes "So that is why you've shown interest in my family. I won't give up easily."; + mes "[Leader Gion]"; + mes "So that is why you've shown interest in my clan. I won't give up easily."; next; percentheal -99,0; mes "Pow!!"; @@ -268,50 +268,50 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ end; } cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Teaching..."; mes "Been a long time since I last heard that word."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I guess this little visit was not by coincidence but a start of a connection."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Sorry I am not a teacher. But!"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I can help you on the path you've chosen, the ^33CC71"+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^000000 path."; next; - mes "^1A95E6You hear Guide Gion's voice faintly as you slip away.^1A95E6"; + mes "^1A95E6You hear Leader Gion's voice faintly as you slip away.^1A95E6"; next; erasequest 5133; setquest 5134; set job_kagero,4; - mes "[Guide Gion]"; - mes "If you are prepared to follow me, Guide Gion, on the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +" path, we will meet again."; + mes "[Leader Gion]"; + mes "If you are prepared to follow me, Leader Gion, on the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +" path, we will meet again."; close2; warp "amatsu",147,136; end; } else if (job_kagero == 4) { cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I thought you were afraid of the ^33CC71path of the "+ (Sex == SEX_MALE ? "Kagerou" : "Oboro") +"^33CC71 and wouldn't come back."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But from the look of your eyes, I guess I misjudged you."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will have to train your mind and body to walk steadily in the unknown world and never fall into temptation to stay on the path."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Our ancestors had 4 tests to train our people."; next; select("4 tests?"); cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Yes, there are 4 tests."; mes "My ancestors trained my people with 4 tests that involve ^087FF8knowledge^000000, ^087FF8survival^000000, ^087FF8weapons^000000, and ^087FF8battle^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I know you are curious what these tests are. Let me explain one by one."; next; while(1) { @@ -319,75 +319,75 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@test, .@test | (1<<(.@i-1)); switch (.@i) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "We need to be knowledgeable in order to assist the lord. This test is for this purpose."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You can pass the test if you successfully solve more than 9 out of 10 questions."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The test will be easy to pass if you've been steady in your studies. Now what other test are you curious about?"; next; } break; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Missions aren't always easy and safe. That is why survival instincts are vital to us."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My ancestors call this test the dice test. It is a test to advance forward depending on the dice results."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Think of it as the simple dice games people play."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But never let your guard down during the test because it isn't called the survival test for nothing."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There will be blocks that help you while there are blocks that will interrupt you."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "If you deal with various situations wisely, you will be able to pass the test. Now what other test are you curious about?"; next; } break; case 3: - mes "[Guide Gion]"; - mes "My family was famous for using unique weapons that we created."; + mes "[Leader Gion]"; + mes "My clan was famous for using unique weapons that we created."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You would be considered blessed if you created your own unique weapon."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Creating a weapon for yourself and refining it is the purpose of this test."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope you will be blessed and find the best weapon for yourself. Now what other test are you curious about?"; next; } break; case 4: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Missions are not always done alone. You will often work in teams of 2 or 3 for a common goal."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The battle test is only for those that pass that knowledge, survival and weapon tests. So! It is the very last test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Unlike the other three tests that are done alone, you will have to compete with others in this final test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There is only one target!!"; mes "And only the first to get to the target passes the test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You'll be lucky if you have no competitors during your test."; next; if (.@test != 15) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "A challenge is better than explaining it a hundred times. It's the actual experience that makes you better."; next; } @@ -396,13 +396,13 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ if (.@test == 15) break; } cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Seeing is believing, so go on and take the challenge."; next; erasequest 5134; setquest 5135; set job_kagero,5; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Let's start right away after you are done with preparations."; close2; cutin "",255; @@ -414,110 +414,110 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@ko_test, .@ko_test_01 + .@ko_test_02 + .@ko_test_03; if (.@ko_test == 0) { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It's been a while."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Since I felt happy like this. I feel young and energetic seeing young people like you challenge themselves with a new path."; next; - mes "[Guide Gion]"; - mes "We're done with explaining about the tests, now should I tell you my family story?"; + mes "[Leader Gion]"; + mes "We're done with explaining about the tests, now should I tell you my clan story?"; next; cutin "job_ko01",2; - mes "[Guide Gion]"; - mes "My family started from two warriors."; + mes "[Leader Gion]"; + mes "My clan started from two warriors."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Sun and the Moon."; mes "The sunlight that lights up the world and the moonlight that lights up the night. Both were very similar but different warriors."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There was a time there was an enmity between both warriors."; next; - mes "[Guide Gion]"; - mes "But it didn't take long for them to become one as a family."; + mes "[Leader Gion]"; + mes "But it didn't take long for them to become one as a clan."; next; select("How did it go afterwards?"); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. It is never fun to listen to the whole story all at once, no? Come back after passing a test and I'll continue my story."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Which test will you select as your first test?"; next; callsub L_StartTest,select("Test of Knowledge", "Test of Survival", "Test of Weaponry"),1; end; } else if (.@ko_test == 2) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; if (.@ko_test_01 == 2) { set .@menu$,":Test of Survival:Test of Weaponry"; mes "You've passed the Test of Knowledge."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My friend doesn't approve of others that easily but I guess he liked you."; next; } else if (.@ko_test_02 == 2) { set .@menu$,"Test of Knowledge::Test of Weaponry"; mes "You've passed the Test of Survival."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you went through hell with this test."; next; } else if (.@ko_test_03 == 2) { set .@menu$,"Test of Knowledge:Test of Survival:"; mes "You've passed the Test of Weaponry."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I wonder if Joe is satisfied with your performance."; next; } - select("Please continue with the family story."); + select("Please continue with the clan story."); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you are pretty eager to hear more. Where did I leave off... Ah! I remember."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Both warriors weren't close at first, because personality and everything else was completely opposite of each other."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The first place they met was the battlefield. And you know how enemies greet each other on a battlefield."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "They ended up injuring each other badly."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But what can you do? War is a war."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The friend you've laughed with yesterday is a foe that you have to fight with in a war today."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "So nobody can get along with anyone during a war."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'll continue the story after you pass another test."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Which test will you choose for the second test?"; next; callsub L_StartTest,select(.@menu$),2; end; } else if (.@ko_test == 4) { cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; if (.@ko_test_01 == 2 && .@ko_test_02 == 2) { set .@last_test,3; mes "You've passed the ^339CCCTests of Knowledge and Survival^000000!"; @@ -529,96 +529,96 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ mes "You've passed the ^339CCCTests of Survival and Weaponry^000000!"; } next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You are already done with two tests. Hope you've learned a lot from them."; next; cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Shall we continue with the story?"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I think I left off when the two warriors met at the battlefield as enemies."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The long war ended eventually but the wounds and pain of those that survived had just started."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "So these two warriors started to embrace and heal the war wounds together and became one."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There is a backstory of a man appearing in front of them and winning the loyalty from both warriors."; next; select("Who is this man?"); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "There isn't much known about this man. Only a short mentioning of the two warriors pledging their allegiance."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Maybe current generations like me are the ancestors of the current Amatsu lord? But this is only an assumption."; next; - mes "[Guide Gion]"; - mes "I'm almost at the end of my family story. Come back after you've passed the third test and I will tell you the rest."; + mes "[Leader Gion]"; + mes "I'm almost at the end of my clan story. Come back after you've passed the third test and I will tell you the rest."; next; callsub L_StartTest,.@last_test,3; end; } else if (.@ko_test == 6) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You've gone through three tests leaving only one to pass."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "As I've told you before, the last test is different because you have to compete against others."; next; select("Will you continue the story?"); cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. I will finish the story."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Kagerou, a warrior like the dancing flames of the sun."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Oboro, a warrior like the misty moonlight."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It is told that the man that earned the loyalty of the two warriors was a humorous person."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "He like the jokes and conversations better than quarrels and he liked women over men."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Hmm... I don't know why this part of the story was kept alive all these years but this man wanted to bring these two warriors together."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Both warriors did travel together after the war but kept an awkward distance from each other."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "They must have had their reasons but their lord would send them out to a difficult mission together, put them in a secret room together and all sorts of situations together."; next; select("Sounds like an odd person."); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Yes, he was. And his efforts didn't go in vain since the two warriors eventually got acquainted and married."; next; - mes "[Guide Gion]"; - mes "This is how the family started."; + mes "[Leader Gion]"; + mes "This is how the clan started."; next; select("What happened after?"); - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Sadly, the next part of story was purposely discontinued."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I think it's because someone wanted us to let go of the past and move forward."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "That's that. Now shouldn't you be preparing for the last test?"; next; set job_kagero,6; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But you must be tired from all the tests so far. Take a rest."; close2; cutin "",255; @@ -631,12 +631,12 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ set .@test_ko$, "Survival"; else if (.@ko_test_03 == 1) set .@test_ko$, "Weaponry"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Weren't you taking the Test of " + .@test_ko$ + " just now?"; next; switch(select("I want to go back to test site.", "Ah... no.")) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Test of " + .@test_ko$ + " site is over here."; close2; if (.@ko_test_01 == 1) @@ -647,7 +647,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ warp "job_ko",121,129; end; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The village is over here."; close2; warp "amatsu",147,136; @@ -656,39 +656,39 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } } else if (job_kagero == 6) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You've come back already? You could have rested more. Is there a reason to hurry?"; next; - input .@inputstr$; + input(.@inputstr$); cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Because of ^B24E59" + .@inputstr$ + "^000000?"; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I have to admit, I don't understand you now."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But since you've gone through much, I'm sure you will do good with the final test."; next; cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Now! No more small talk. I'll let you know what the target is for the Test of Battle."; next; - mes "[Guide Gion]"; - mes "The target is a monster called the ^FF0000Family Secret^000000."; + mes "[Leader Gion]"; + mes "The target is a monster called the ^FF0000Clan Secret^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will have to be careful because there are many similiar shaped and named monsters in test site."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "And if you are lucky, there will be others targeting the monster."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "May the blessings of '" + (Sex == SEX_MALE ? "Kagerou, dancing sun" : "Oboro, misty moonlight") + "' be with you."; next; setquest 5146; set job_kagero,7; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Then let's go to the battle test field."; close2; switch(rand(3)) { @@ -699,12 +699,12 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ end; } else if (job_kagero == 7 || job_kagero == 8) { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I see you are in the middle of the ^339CCCTest of Battle^000000. Will you go back to the test site?"; next; switch(select("Go back to the test site.", "Visit the village.")) { case 1: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The test site is over here."; close2; switch(rand(3)) { @@ -714,7 +714,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } end; case 2: - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The village is over here."; close2; cutin "",255; @@ -722,7 +722,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ } } else { cutin "job_ko03",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You should not be here. Leave!"; close2; warp "amatsu",147,136; @@ -737,14 +737,14 @@ L_StartTest: case 2: set .@str$,"You are taking the ^339CCCTest of %s^000000 as the second test? "; break; case 3: set .@str$,"Your third test is the ^339CCCTest of %s^000000! "; break; } - mes "[Guide Gion]"; + mes "[Leader Gion]"; switch (getarg(0)) { case 1: mes sprintf(.@str$ + "Then I will get to see a familiar face after so long...","Knowledge"); next; select("Familiar face?"); setquest 5136; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Ha ha ha. You'll know when we get there. The Test of Knowledge is taken over here."; close2; warp "job_ko",72,128; @@ -753,7 +753,7 @@ L_StartTest: mes sprintf(.@str$ + "It's a lonesome test that you have to face alone.","Survival"); next; setquest 5137; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But I believe you can handle it. The Test of Survival is taken over here."; close2; warp "job_ko",62,16; @@ -766,7 +766,7 @@ L_StartTest: getitem "Phracon", 1; mes "You receive 5 Iron Ore and 1 Phracon."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You will find these useful. The Test of Weaponry is taken over here."; close2; warp "job_ko",121,129; @@ -775,74 +775,74 @@ L_StartTest: } //== Test of Knowledge ===================================== -job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ +job_ko,81,124,4 script Kuuga Gai#ko 4_M_JOB_ASSASSIN,{ if (BaseJob != Job_Ninja) { for (set .@i,5131; .@i<=5146; set .@i,.@i+1) if (questprogress(.@i)) erasequest .@i; set job_kagero,0; - mes "[Cougar]"; - mes "Sorry, your family is not same as ours, is there something wrong?"; + mes "[Kuuga Gai]"; + mes "Sorry, your clan is not same as ours, is there something wrong?"; close2; warp "amatsu",147,136; end; } if (job_kagero == 5) { if (MaxWeight - Weight < 1000 || checkweight("Knife",1) == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "This is a test of knowledge, so why did you bring so many things?"; close; } set .@ko_test_01, questprogress(5136); set .@ko_test_01_1, questprogress(5139); if (.@ko_test_01 == 1 && .@ko_test_01_1 == 0) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "It's been a while."; next; select("Aren't you..."); - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I remember you from before looking for the way of the ninja."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You've grown this strong already?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Ha ha ha-"; mes "A truly determined youth! I like that."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Good! The test you are about to take is the ^339CCCTest of Knowledge^000000."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I hope you haven't been lazy with your studies while focusing on getting stronger?"; next; switch(select("Yes", "No")) { case 1: setquest 5139; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "That's a relief. Let me know when you are ready to start the test."; close; case 2: setquest 5139; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "So you were all talk? Well, let me know when you are ready then."; close; } } else if (.@ko_test_01 == 1 && .@ko_test_01_1 == 1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I'm ready at my end. Are you ready for the test?"; next; if(select("Yes", "No") == 2) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well, what can I do but wait for you."; close; } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "This isn't your first test, is it?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You only need to choose the correct answer to my questions."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Let's start."; next; @@ -862,9 +862,9 @@ job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ deletearray .@n[10],getarraysize(.@n) - .@questions; freeloop(0); - set @job_ko_cougar,0; + set @job_ko_kuuga,0; for (set .@i,1; .@i<=.@questions; set .@i,.@i+1) { - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes (.@i < .@questions)?"Question number "+.@i+":":"Last question:"; switch (.@n[.@i-1]) { case 1: callsub L_Question,"What is the DEX + LUK total for a Job Master?",2,"8:10:12:14"; break; @@ -918,67 +918,67 @@ job_ko,81,124,4 script Cougar#ko 4_M_JOB_ASSASSIN,{ case 49: callsub L_Question,"Which of the following blacksmiths do not create ninja items?",2,"Khaibara:Aiku:Tetsu:Toshu"; break; case 50: callsub L_Question,"What is the name of the suspicious man you can meet during the Ninja job change quest?",3,"Red Leopard Jack:Black Leopard Jack:Red Leopard Joe:Black Leopard Joe"; break; default: - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "An unknown error has occurred."; mes "Please contact customer service."; close; } } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You're through all 10 questions. Wasn't so bad! The important part starts now."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "... ... ..."; next; - if (@job_ko_cougar < 90) { - mes "[Cougar]"; + if (@job_ko_kuuga < 90) { + mes "[Kuuga Gai]"; mes "You fool!!"; mes "You couldn't even solve these?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Can't believe someone who is taking a new path can be so pathetic."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "I'll give you another chance."; mes "You will take the test again with new questions. Better pass it this time."; } else { - mes "[Cougar]"; - mes "Hmm. " + (@job_ko_cougar) + "?"; + mes "[Kuuga Gai]"; + mes "Hmm. " + (@job_ko_kuuga) + "?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well, looks like you weren't lazy with your studies."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "What? Proud of yourself for solving these questions?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "You still have a long way to go and this is only a small fraction of it."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Well... I'm curious how far your strong will can take you through other tests."; next; completequest 5136; erasequest 5139; - mes "[Cougar]"; - mes "I'll let you go now so go report back to Guide Gion with your results."; + mes "[Kuuga Gai]"; + mes "I'll let you go now so go report back to Leader Gion with your results."; close2; warp "job_ko",16,113; end; } - set @job_ko_cougar,0; + set @job_ko_kuuga,0; close; } else if (.@ko_test_01 == 2 && .@ko_test_01_1 == 0) { - mes "[Cougar]"; - mes "I'll let you go now so go report back to Guide Gion with your results."; + mes "[Kuuga Gai]"; + mes "I'll let you go now so go report back to Leader Gion with your results."; close2; warp "job_ko",16,113; end; } } - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "How did you get here?"; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "It's my duty to get rid of you."; mes "^000099(He's a short, silent man.)^000000"; mes "This will push you back!"; @@ -991,7 +991,7 @@ L_Question: mes getarg(0); next; if(select(getarg(2)) == getarg(1)) - set @job_ko_cougar, @job_ko_cougar + 10; + set @job_ko_kuuga, @job_ko_kuuga + 10; return; } @@ -1934,7 +1934,7 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ if (questprogress(.@i)) erasequest .@i; set job_kagero,0; mes "[Red Leopard Joe]"; - mes "Sorry, your family is not the same as ours, is there something wrong?"; + mes "Sorry, your clan is not the same as ours, is there something wrong?"; close2; warp "amatsu",147,136; end; @@ -1959,17 +1959,17 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ next; select("Long time indeed, Joe."); mes "[Red Leopard Joe]"; - mes "You aren't surprised I'm here. Did you meet ^0237FDCougar^000000 before coming here?"; + mes "You aren't surprised I'm here. Did you meet ^0237FDKuuga Gai^000000 before coming here?"; next; mes "[Red Leopard Joe]"; mes "Don't like it that I'm not the first one you visited but that is not important."; next; mes "[Red Leopard Joe]"; mes "Alright, " + strcharinfo(PC_NAME) + "!"; - mes "Welcome to the workshop where weapons are created for the family."; + mes "Welcome to the workshop where weapons are created for the clan."; next; mes "[Red Leopard Joe]"; - mes "Our family has been creating and using unique weapons to serve our secret missions since ancient times."; + mes "Our clan has been creating and using unique weapons to serve our secret missions since ancient times."; next; select("Really? At Einbroch?"); mes "[Red Leopard Joe]"; @@ -1979,7 +1979,7 @@ job_ko,127,125,4 script Red Leopard Joe#ko 4_M_JOB_ASSASSIN,{ mes "Yes. Einbroch is known as an industrial city, the city of great blacksmiths create new technology."; next; mes "[Red Leopard Joe]"; - mes "My mission is to analyze their technology and report back to the family."; + mes "My mission is to analyze their technology and report back to the clan."; next; mes "[Red Leopard Joe]"; mes "I spoke more than I intended to."; @@ -2503,44 +2503,44 @@ job_ko,127,121,0 duplicate(Refinement Tools#ko_01) Refinement Tools#ko_02 CLEAR_ //== Test of Battle ======================================== job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ if (MaxWeight - Weight < 2000 || checkweight("Knife",1) == 0) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You don't need so many things now!"; close; } if (job_kagero == 7) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you haven't taken care of the target yet."; next; - mes "[Guide Gion]"; - mes "I'll tell you once more. The target is the ^FF0000Family Secret^000000."; + mes "[Leader Gion]"; + mes "I'll tell you once more. The target is the ^FF0000Clan Secret^000000."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Of course the path will be difficult, so continue searching!"; close2; cutin "",255; end; } else if (job_kagero == 8) { cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Looks like you've taken care of the target. Hmm."; next; if (checkmount()) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "But please get down from your frog. Otherwise I can't continue!"; close2; cutin "",255; end; } if (BaseLevel < 99 || JobLevel < 70) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "How did you get weaker? Come back once you've regained your previous levels."; close2; cutin "",255; end; } if (SkillPoint != 0) { - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "Please come back after using all your Skill Points."; close2; cutin "",255; @@ -2548,38 +2548,38 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ } mapannounce "job_ko","[Gion] Interrupting the Test of Battle.",bc_map; cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "The Test of Battle will be put off for a while. Don't worry because this does not have affect to other tests."; next; mapannounce "job_ko","[Gion] My Friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!",bc_map; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "My friend " + strcharinfo(PC_NAME) + " made it to " + (Sex == SEX_MALE ? "Kagerou" : "Oboro") + " Path. Congratulations!!"; next; cutin "job_ko02",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "It is pleasant to meet a youth that is walking through a new path."; next; mes "[Someone's Voice]"; mes "Wait for a while, Gion."; next; - donpcevent "Cougar#ko2::OnEnable"; + donpcevent "Kuuga Gai#ko2::OnEnable"; donpcevent "Red Leopard Joe#ko2::OnEnable"; cutin "job_ko04",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'm sorry I almost forgot about you two. Do you have anything to share with " + strcharinfo(PC_NAME) + "?"; next; cutin "",255; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "Hmm... Embarrassing... to speak so suddenly..."; next; - mes "[Cougar]"; - mes strcharinfo(PC_NAME) + ", you are now a proud member of our family. Always hold your head high and..."; + mes "[Kuuga Gai]"; + mes strcharinfo(PC_NAME) + ", you are now a proud member of our clan. Always hold your head high and..."; next; - mes "[Cougar]"; + mes "[Kuuga Gai]"; mes "^777777(Gai's voice fades out.)^000000."; mes "I'm sorry I strangled you when we first met."; next; - donpcevent "Cougar#ko2::OnDisable"; + donpcevent "Kuuga Gai#ko2::OnDisable"; mes "[Red Leopard Joe]"; mes "Puhahaha! Gai is all talk. I know I was know valuable to you than that Gai."; next; @@ -2600,17 +2600,17 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ mes "I named your weapons on my own but I know you'll like the name."; next; mes "[Red Leopard Joe]"; - mes "Guide Gion, please continue."; + mes "Leader Gion, please continue."; next; cutin "job_ko01",2; donpcevent "Red Leopard Joe#ko2::OnDisable"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I don't have much to add because Gai and Joe said it all."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I'm just sorry that the environment of all these tests could have been better for our later generation."; next; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You only need to look forward and never turn back."; next; for (set .@i,5131; .@i<=5146; set .@i,.@i+1) @@ -2619,21 +2619,21 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ getnameditem .@item,strcharinfo(PC_NAME); jobchange(Sex == SEX_MALE ? Job_Kagerou : Job_Oboro); donpcevent "Summon Target#ko::OnEnable"; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead."; close2; warp "que_ng",21,71; end; } else if (job_kagero == 9) { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "I hope the blessings of Kagerou, dancing sun and Oboro, misty moonlight will be with you on your journey ahead."; close2; warp "que_ng",21,71; end; } else { cutin "job_ko01",2; - mes "[Guide Gion]"; + mes "[Leader Gion]"; mes "You should not be here. Please leave!"; close2; warp "amatsu",147,136; @@ -2641,16 +2641,16 @@ job_ko,148,46,4 script Guide Gion#ko2 4_M_KAGE_OLD,{ } } -job_ko,151,47,4 script Cougar#ko2 4_M_JOB_ASSASSIN,{ - mes "[Cougar]"; +job_ko,151,47,4 script Kuuga Gai#ko2 4_M_JOB_ASSASSIN,{ + mes "[Kuuga Gai]"; mes "Congratulation for choosing the road of development!"; close; OnInit: OnDisable: - disablenpc "Cougar#ko2"; + disablenpc "Kuuga Gai#ko2"; end; OnEnable: - enablenpc "Cougar#ko2"; + enablenpc "Kuuga Gai#ko2"; end; } @@ -2684,7 +2684,7 @@ OnEnable: case 6: set .@mob,1049; break; case 7: set .@mob,1050; break; } - areamonster "job_ko",120,30,160,70,"Family Secret",.@mob,1,"Summon Target#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan Secret",.@mob,1,"Summon Target#ko::OnMyMobDead"; end; OnDisable: initnpctimer; @@ -2706,25 +2706,25 @@ OnInit: donpcevent "Summon Fake#ko::OnEnable"; end; OnEnable: - areamonster "job_ko",120,30,160,70,"Family's Legacy",1002,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Legacy",1002,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Memory",1002,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Memory",1002,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Mistake",1031,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Memory",1113,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Memory",1113,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Past",1113,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Past",1113,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Legacy",1063,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Mistake",1010,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Mistake",1010,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Memory",1010,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Memory",1010,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Past",1049,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Past",1049,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Mistake",1049,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Mistake",1049,5,"Summon Fake#ko::OnMyMobDead"; - areamonster "job_ko",120,30,160,70,"Family's Memory",1050,5,"Summon Fake#ko::OnMyMobDead"; + areamonster "job_ko",120,30,160,70,"Clan's Memory",1050,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Oboro's Past",1050,5,"Summon Fake#ko::OnMyMobDead"; areamonster "job_ko",120,30,160,70,"Kagerou's Past",1050,5,"Summon Fake#ko::OnMyMobDead"; end; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index e59492ce5..90dadd8d1 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -243,7 +243,7 @@ umbala,139,227,3 script Priest#arch 1_M_PASTOR,{ mes "[" + strcharinfo(PC_NAME) + "]"; mes "Hmm, I wanted to tell you..."; next; - input .@inputstr$; + input(.@inputstr$); mes "[" + strcharinfo(PC_NAME) + "]"; mes "" + .@inputstr$ + ""; next; @@ -483,7 +483,7 @@ OnTouch: next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "Pain... What kind of faults have I had?"; - input .@inputstr$; + input(.@inputstr$); next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "I confess my guilt to the Almighty God Odin."; @@ -779,7 +779,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 4_F_VALKYRIE2,{ warp "odin_tem02",282,263; end; } - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1006,7 +1006,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { if (strnpcinfo(NPC_NAME) == "#arch_1_10") viewpoint 1,113,327,1,0xFF9900; .@randht = rand(1,10); @@ -1038,7 +1038,7 @@ OnTouch: if (countitem(ValkyrieA_Scroll)) { delitem ValkyrieA_Scroll,1; // fall through - } else if (getmercinfo(1) == 2037) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_A) { mapannounce "job3_arch02","Valkyrie's Nightmare: An incompetent illusion of Valkyrie came here with the assistance of humans. You wanna have that nightmare?",bc_map,"0xFF0000"; donpcevent "mob#arch_1::OnKill"; end; @@ -1113,7 +1113,7 @@ OnKill: } job3_arch02,113,327,5 script Valkyrie#arch_01 4_F_VALKYRIE2,{ - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Valkyrie]"; mes "If you want to talk with me, you have to ^3131FFcancel all contracts^000000 with any mercenaries you have."; close; @@ -1355,7 +1355,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { .@randht = rand(1,10); if (.@randht < 8) mapannounce "job3_arch02","Whispering of an impersonation: I can feel the devil's spirits. Can you hear? The sound of gathering in crowds.",bc_map,"0xFFCE00"; @@ -1400,7 +1400,7 @@ OnTouch: if (countitem(ValkyrieB_Scroll)) { delitem ValkyrieB_Scroll,1; // fall through - } else if (getmercinfo(1) == 2038) { + } else if (getmercinfo(MERCINFO_CLASS) == VALKYRIE_B) { mapannounce "job3_arch02","A shout of devil: You are so childish. I invite you a party of devil. I'll make you have a fun!",bc_map,"0xFF0000"; end; } diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 41e5b476f..166a1d42e 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -613,7 +613,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ mes "Don't hang around here doing nothing. This is my area!"; close; L_Start: - if (getmercinfo(1)) { + if (getmercinfo(MERCINFO_CLASS)) { mes "[Test Instructor, Teardrop]"; mes "Stop!"; next; @@ -1491,7 +1491,7 @@ job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{ setquest 8261; close; } - if (getmercinfo(1) == 2034) { + if (getmercinfo(MERCINFO_CLASS) == M_DESERT_WOLF_B) { erasequest 8261; mes "Good! Then I'll start the test right now!"; next; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index ad8ab8f74..6230746b1 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -962,7 +962,7 @@ job3_rune01,58,51,1 script Rune Furnace CLEAR_NPC,{ next; mes .@str$[1]; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == .@str$[0]) { mes "[Rune Knight Renoa]"; mes "Wow! This is great. The image of the rune stone in my head and the modeled rune stone match perfectly. It's well made."; diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 87cf554ad..8924d61dd 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); 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); 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); 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 9cdd3f732..3b6f6bcd0 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -327,7 +327,7 @@ s_atelier,65,123,5 script Manager#sc04_prt 4_M_KHKYEL,{ mes "Wow, you deciphered it?"; mes "So, what's the right answer?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "shadows atelier in prontera" || .@inputstr$ == "SHADOWS ATELIER IN PRONTERA") { mes "[Manager]"; mes "Good."; @@ -1118,7 +1118,7 @@ L_Code: mes "["+strcharinfo(PC_NAME)+"]"; mes "Paul said..."; next; - input .@inputstr$; + input(.@inputstr$); mes "["+strcharinfo(PC_NAME)+"]"; mes "Paul said..."; mes "'"+.@inputstr$+"' ."; @@ -1694,7 +1694,7 @@ tur_dun03,38,209,1 script Blue Flame#sc_f01 4_NFWISP,{ mes "A blue flame is roaring."; mes "The deciphered code means..."; next; - input .@inputstr$; + input(.@inputstr$); .@dap01$ = "blue fire in turtle island third floor"; .@dap02$ = "BLUE FIRE IN TURTLE ISLAND THIRD FLOOR"; if (.@inputstr$ != .@dap01$ && .@inputstr$ != .@dap02$) { @@ -1986,7 +1986,7 @@ job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{ mes " "; mes "And also letters. They are blinking as if waiting for a code to be input."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == .@Codes2$[.@i] || .@inputstr$ == strtolower(.@Codes2$[.@i])) { mes "When you put the correct answer in there,"; mes "the box is opened."; @@ -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); if (.@input == .@numbers[.@i]) { mes "You put 2 and "+(.@numbers[.@i]-20)+"."; mes "The box opens and you get one key."; @@ -2122,7 +2122,7 @@ job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{ mes "There's no code, so 1 should be A."; mes "And the answer is..."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "turn and shake" || .@inputstr$ == "TURN AND SHAKE") { mes "["+strcharinfo(PC_NAME)+"]"; mes "Turn... Turn... and"; diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 63e689acc..4e0108fd8 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -654,14 +654,14 @@ OnTimer305000: OnTimer315000: mapannounce "sword_2-1","Come on here.",bc_map; donpcevent "Buddy#job_shuaneh::OnDisable"; - donpcevent "#Sura_garajjom::OnEnable"; + // donpcevent "#Sura_garajjom::OnEnable"; // Commented to prevent #Sura_garajjom allowing player to success the test at any case (even when failing it). end; OnTimer320000: mapannounce "sword_2-1","I guess you're not ready to meet the master yet...",bc_map; mapwarp "sword_2-1","yuno_fild07",255,178; - donpcevent "#Sura_garajjom::OnDisable"; - donpcevent "Drawing Room::OnEnable"; + // donpcevent "#Sura_garajjom::OnDisable"; donpcevent "Buddy#Sura_Salon::OnDisable"; + donpcevent "Drawing Room::OnEnable"; end; } diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index 30449e2fa..e9c88032a 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -252,7 +252,7 @@ xmas,132,143,5 script Performance Manager#wnd 4_M_06,{ next; mes "[" + strcharinfo(PC_NAME) + "]"; mes "It's because..."; - input .@inputstr$; + input(.@inputstr$); mes "^3131FF" + .@inputstr$ + "^000000"; mes "......"; next; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 3b260d3db..567a28f25 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -4513,7 +4513,7 @@ iz_ac01,68,49,3 script General Store Owner#ac 4_F_03,{ } next(); input(.@input); - if (!.@input) { + if (.@input <= 0) { mes("[Querrie]"); mes("Well, you don't need to buy it now."); mes("Use it next time."); @@ -4525,7 +4525,7 @@ iz_ac01,68,49,3 script General Store Owner#ac 4_F_03,{ mes("You can buy up to 99 at once."); close(); } - set .@cost, .@input * (BaseLevel <= 20 ? 30 : 500); + .@cost = .@input * (BaseLevel <= 20 ? 30 : 500); mes("[Querrie]"); mesf("%d combination kits will cost you %d.... zeny.", .@input, .@cost); if (Zeny < .@cost) { @@ -5945,199 +5945,199 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("If you want to stop, say 0."); next(); input(.@style); - if (.@style > 19) { - mes("[Otter Samssoon]"); - mes("Oh my!!? Honey~ You can use a coupon for the hair style in here~"); - close(); - } else if (!.@style) { + if (.@style <= 0) { mes("[Otter Samssoon]"); mes("Did you decide? Which style??"); mes("I want to touch your hair with my hands~ Honey~"); close(); - } else { - callsub(L_cutin, .@style); + } + if (.@style > 19) { mes("[Otter Samssoon]"); - switch(.@style) { - case 1: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Play Dead' cut?"); - mes("This looks neat and relaxed.. So popular style."); - } else { - mes("Oh my!!? 'First Aid' cut?"); - mes("This is and adorable style."); - mes("I guess it looks good on you too!!"); - } - break; - case 2: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Two Handed Sword Mastery' cut?"); - mes("You... You know the famous D..? He has exactly the same style!"); - } else { - mes("Oh my!!? 'Bash' cut?"); - mes("This style gives strong curls on both side hair."); - } - break; - case 3: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Napalm Beat' cut?"); - mes("It has well arranges hair line that makes feel charisma."); - } else { - mes("Oh my!!? 'Frost Diver' cut?"); - mes("It is mysterious style that gives cold and warm feeling at the same time."); - } - break; - case 4: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Double Strafe' cut?"); - mes("Natural hair is shaking by wind.. Clean and good feeling."); - } else { - mes("Oh my!!? 'Arrow Shower' cut?"); - mes("Cool and nice shaggy cut makes good style."); - } - break; - case 5: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Angelus' cut?"); - mes("Calm and piety feeling.. Not boring style."); - } else { - mes("Oh my!!? 'Heal' cut?"); - mes("Feminine style give healing feeling."); - } - break; - case 6: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Push Cart' cut?"); - mes("Big Kar is motivated for this style with a romance of a man."); - } else { - mes("Oh my!!? 'Vending' cut?"); - mes("Royal ladies like this style. Make good money style."); - } - break; - case 7: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Envenom' cut?"); - mes("Tough style makes addicted."); - } else { - mes("Oh my!!? 'Double Attack' cut?"); - mes("Whoever will dash twice for this style."); - mes("Ponytail is important."); - } - break; - case 8: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Bowling Bash' cut?"); - mes("This style makes a nice guy to challenge."); - mes("Just a giving a glance can steal the heart."); - } else { - mes("Oh my!!? 'Gloria' cut?"); - mes("This style is ultimately gorgeous and graceful."); - } - break; - case 9: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Venom Dust' cut?"); - mes("This style has special ending line that looks fatal."); - } else { - mes("Oh my!!? 'SP Recovery' cut?"); - mes("This style has neat cutting that inspires."); - } - break; - case 10: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Turn Undead' cut?"); - mes("This style is like a cold city man who is strong enough to kill a monster."); - } else { - mes("Oh my!!? 'Prepare Potion' cut?"); - mes("This style has a liquid medicine motive so it makes feel cure."); - } - break; - case 11: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Dragonology' cut?"); - mes("This style is intelligent style of mysterious dragon."); - } else { - mes("Oh my!!? 'Grand Cross' cut?"); - mes("Well trimmed hair cut line gives trust."); - } - break; - case 12: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Mace Mastery' cut?"); - mes("Look fresh and look neat with wax treatment."); - } else { - mes("Oh my!!? 'Intimidate' cut?"); - mes("This style is very familiar."); - } - break; - case 13: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Thunder Storm' cut?"); - mes("This style has natural attractive perm which is like hitting by thunder storm."); - } else { - mes("Oh my!!? 'Spiritual Sphere"); - mes("Calm and a little bit looks like a boy cut draw attention."); - } - break; - case 14: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Encore' cut?"); - mes("Rocker's favorite style.. Even the name itself.."); - } else { - mes("Oh my!!? 'Gypsy's Kiss' cut?"); - mes("The hair.. Kind to everyone.. Neat and round hair line is very soft and charming."); - } - break; - case 15: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Grimtooth' cut?"); - mes("The style with edge."); - } else { - mes("Oh my!!? 'Counter Attack' cut?"); - mes("It is the style that looks cold and arrogant. Hard to talk to.."); - mes("But might be nice to boyfriend..?"); - } - break; - case 16: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Blitz Beat' cut?"); - mes("It is the style my senior invented after he broke up with his girlfriends 5 times."); - } else { - mes("Oh my!!? 'Anke Snare' cut?"); - mes("It is killing style.. No one can take eyes off!"); - } - break; - case 17: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Find Ore' cut?"); - mes("This style seems to bring encounter or find unexpected things while walking on the street."); - } else { - mes("Oh my!!? 'Hammer Fall' cut?"); - mes("Stunning hair with attraction."); - } - break; - case 18: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Fire Pillar' cut?"); - mes("Everyone used to have this hair style.. Which means that was a trend of an era."); - } else { - mes("Oh my!!? 'Jupitel Thunder'"); - mes("Fresh style by giving light waves on both side hairs."); - } - break; - case 19: - if (Sex == SEX_MALE) { - mes("Oh my!!? 'Guillotine Fist'"); - mes("It is like one-shot style.. Like a real man. Right?"); - } else { - mes("Oh my!!? 'Whirlwind' cut?"); - mes("It is cool style which flows with wind. Lah, lah, lah, lah ~"); - } - break; + mes("Oh my!!? Honey~ You can use a coupon for the hair style in here~"); + close(); + } + callsub(L_cutin, .@style); + mes("[Otter Samssoon]"); + switch(.@style) { + case 1: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Play Dead' cut?"); + mes("This looks neat and relaxed.. So popular style."); + } else { + mes("Oh my!!? 'First Aid' cut?"); + mes("This is and adorable style."); + mes("I guess it looks good on you too!!"); } - close2(); - cutin("", 255); - end; + break; + case 2: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Two Handed Sword Mastery' cut?"); + mes("You... You know the famous D..? He has exactly the same style!"); + } else { + mes("Oh my!!? 'Bash' cut?"); + mes("This style gives strong curls on both side hair."); + } + break; + case 3: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Napalm Beat' cut?"); + mes("It has well arranges hair line that makes feel charisma."); + } else { + mes("Oh my!!? 'Frost Diver' cut?"); + mes("It is mysterious style that gives cold and warm feeling at the same time."); + } + break; + case 4: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Double Strafe' cut?"); + mes("Natural hair is shaking by wind.. Clean and good feeling."); + } else { + mes("Oh my!!? 'Arrow Shower' cut?"); + mes("Cool and nice shaggy cut makes good style."); + } + break; + case 5: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Angelus' cut?"); + mes("Calm and piety feeling.. Not boring style."); + } else { + mes("Oh my!!? 'Heal' cut?"); + mes("Feminine style give healing feeling."); + } + break; + case 6: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Push Cart' cut?"); + mes("Big Kar is motivated for this style with a romance of a man."); + } else { + mes("Oh my!!? 'Vending' cut?"); + mes("Royal ladies like this style. Make good money style."); + } + break; + case 7: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Envenom' cut?"); + mes("Tough style makes addicted."); + } else { + mes("Oh my!!? 'Double Attack' cut?"); + mes("Whoever will dash twice for this style."); + mes("Ponytail is important."); + } + break; + case 8: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Bowling Bash' cut?"); + mes("This style makes a nice guy to challenge."); + mes("Just a giving a glance can steal the heart."); + } else { + mes("Oh my!!? 'Gloria' cut?"); + mes("This style is ultimately gorgeous and graceful."); + } + break; + case 9: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Venom Dust' cut?"); + mes("This style has special ending line that looks fatal."); + } else { + mes("Oh my!!? 'SP Recovery' cut?"); + mes("This style has neat cutting that inspires."); + } + break; + case 10: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Turn Undead' cut?"); + mes("This style is like a cold city man who is strong enough to kill a monster."); + } else { + mes("Oh my!!? 'Prepare Potion' cut?"); + mes("This style has a liquid medicine motive so it makes feel cure."); + } + break; + case 11: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Dragonology' cut?"); + mes("This style is intelligent style of mysterious dragon."); + } else { + mes("Oh my!!? 'Grand Cross' cut?"); + mes("Well trimmed hair cut line gives trust."); + } + break; + case 12: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Mace Mastery' cut?"); + mes("Look fresh and look neat with wax treatment."); + } else { + mes("Oh my!!? 'Intimidate' cut?"); + mes("This style is very familiar."); + } + break; + case 13: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Thunder Storm' cut?"); + mes("This style has natural attractive perm which is like hitting by thunder storm."); + } else { + mes("Oh my!!? 'Spiritual Sphere"); + mes("Calm and a little bit looks like a boy cut draw attention."); + } + break; + case 14: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Encore' cut?"); + mes("Rocker's favorite style.. Even the name itself.."); + } else { + mes("Oh my!!? 'Gypsy's Kiss' cut?"); + mes("The hair.. Kind to everyone.. Neat and round hair line is very soft and charming."); + } + break; + case 15: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Grimtooth' cut?"); + mes("The style with edge."); + } else { + mes("Oh my!!? 'Counter Attack' cut?"); + mes("It is the style that looks cold and arrogant. Hard to talk to.."); + mes("But might be nice to boyfriend..?"); + } + break; + case 16: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Blitz Beat' cut?"); + mes("It is the style my senior invented after he broke up with his girlfriends 5 times."); + } else { + mes("Oh my!!? 'Anke Snare' cut?"); + mes("It is killing style.. No one can take eyes off!"); + } + break; + case 17: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Find Ore' cut?"); + mes("This style seems to bring encounter or find unexpected things while walking on the street."); + } else { + mes("Oh my!!? 'Hammer Fall' cut?"); + mes("Stunning hair with attraction."); + } + break; + case 18: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Fire Pillar' cut?"); + mes("Everyone used to have this hair style.. Which means that was a trend of an era."); + } else { + mes("Oh my!!? 'Jupitel Thunder'"); + mes("Fresh style by giving light waves on both side hairs."); + } + break; + case 19: + if (Sex == SEX_MALE) { + mes("Oh my!!? 'Guillotine Fist'"); + mes("It is like one-shot style.. Like a real man. Right?"); + } else { + mes("Oh my!!? 'Whirlwind' cut?"); + mes("It is cool style which flows with wind. Lah, lah, lah, lah ~"); + } + break; } + close2(); + cutin("", 255); + end; close(); case 2: if (!countitem(Cryptura_Hair_Coupon)) { @@ -6152,15 +6152,17 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("Pick the style from page 1 to 19."); next(); input(.@style); - if (.@style > 19) { + if (.@style <= 0) { mes("[Otter Samssoon]"); - mes("Come on.. Honey~ You can use a coupon for the hair style in here~"); + mes("Oh my!!? You do not want to?"); close(); - } else if (!.@style) { + } + if (.@style > 19) { mes("[Otter Samssoon]"); - mes("Oh my!!? You do not want to?"); + mes("Come on.. Honey~ You can use a coupon for the hair style in here~"); close(); - } else if (getlook(1) == .@style) { + } + if (getlook(1) == .@style) { mes("[Otter Samssoon]"); mes("Come on.. Honey~ That is the same style you have."); mes("Do you want to try something new?"); @@ -13114,18 +13116,19 @@ izlude,145,122,7 script Tadde#iz 4_M_04,{ mes("How many would you like? Enter '0' if you want to end."); next(); while(true) { - input(.@amount, 0, 501); - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes("[Tadde]"); mes("Trade ended."); close(); - } else if (.@amount > 500) { + } + if (.@amount > 500) { mes("[Tadde]"); mes("Please reduce your quantity to 500 or less."); next(); - } else { - break; + continue; } + break; } .@sell = .@amount * 200; .@item_weight = .@amount * 200; @@ -13150,18 +13153,19 @@ izlude,145,122,7 script Tadde#iz 4_M_04,{ mes("How many would you like? Enter '0' if you want to end."); next(); while(true) { - input(.@amount, 0, 501); - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes("[Tadde]"); mes("Trade ended."); close(); - } else if (.@amount > 500) { + } + if (.@amount > 500) { mes("[Tadde]"); mes("Please reduce your quantity to 500 or less."); next(); - } else { - break; + continue; } + break; } .@sell = .@amount * 1000; .@item_weight = .@amount * 200; diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index dcf66a19f..ecfe34fba 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -72,8 +72,8 @@ mes "You can only buy a maximum of '"+.@max+"' ea."; mes "Enter '0' if you want to cancel."; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Poison Herb Merchant]"; mes "You've cancelled the trade."; close; @@ -133,8 +133,8 @@ 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; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Rune Merchant]"; mes "You're not buying? Please leave!"; close; @@ -199,8 +199,8 @@ 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; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Rare Poison Herb Collector]"; mes "You've cancelled the trade."; close; @@ -254,9 +254,9 @@ 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); mes "[Point Merchant]"; - if (.@amount == 0) { + if (.@amount <= 0) { mes "You've cancelled the trade."; close; } diff --git a/npc/re/merchants/alchemist.txt b/npc/re/merchants/alchemist.txt index 73344a75c..fc38ef23a 100644 --- a/npc/re/merchants/alchemist.txt +++ b/npc/re/merchants/alchemist.txt @@ -98,13 +98,13 @@ 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; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Craft Book Merchant]"; mes "Would you like to see some different books?"; close; } - if (.@amount < 1 || .@amount > 99 ){ + if (.@amount > 99 ){ mes "[Craft Book Merchant]"; mes "You cannot purchase more than 100 at a time."; close; diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt index f508014a1..11f122ace 100644 --- a/npc/re/merchants/catalog.txt +++ b/npc/re/merchants/catalog.txt @@ -72,19 +72,21 @@ 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); mes "[Catalog Magician]"; - if (.@input == 0) { + if (.@input <= 0) { mes "The trade has been stopped!"; mes "I don't know what to do next..."; mes "What should I do?"; emotion e_swt2,1; close; - } else if (.@input < 1 || .@input > 50) { + } + if (.@input > 50) { mes "It should be less than 50 pieces."; next; - } else - break; + continue; + } + break; } .@sell = .@ticket_cost * .@input; mes "The total number of catalog(s) that you're trying to purchase is " + .@input + " pieces."; diff --git a/npc/re/merchants/diamond.txt b/npc/re/merchants/diamond.txt index 665af5e6a..762e2d145 100644 --- a/npc/re/merchants/diamond.txt +++ b/npc/re/merchants/diamond.txt @@ -128,7 +128,7 @@ mes .@npc$; mes "Alright then, please sign here."; next; - input .@charname$; + input(.@charname$); if (.@charname$ == strcharinfo(PC_NAME)) { mes .@npc$; mes "Okay, good."; @@ -202,7 +202,7 @@ mes "The trade cannot be completed without your signature."; close; } - input .@charname$; + input(.@charname$); if (.@charname$ == strcharinfo(PC_NAME)) { mes .@npc$; mes "Your signature has been received."; @@ -218,12 +218,10 @@ Zeny += 499000000; close; } - else { - mes .@npc$; - mes "Is this really your signature?"; - mes "Will sign again to confirm?"; - next; - } + mes .@npc$; + mes "Is this really your signature?"; + mes "Will sign again to confirm?"; + next; } } } diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 46979c82b..d114a3b61 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -580,16 +580,16 @@ mora,152,97,5 script Guardian of Power#pa082 4_F_DOGTRAVELER,{ next; switch(.@job) { case 0: // Rune Knight - setarray .@items[0],2475,2476,2574,2575; - .@i = select("Cancel", "Ur's Greaves (Shoes)", "Peuz's Greaves (Shoes)", "Ur's Manteau (Garment)", "Peuz's Manteau (Garment)")-2; + setarray .@items[0],2475,2574,2883,15036,2575,2476,2884,15037; + .@i = select("Cancel", "Ur's Greaves (Shoes)", "Ur's Manteau (Garment)", "Ur's Seal (Accessory)", "Ur's Plate (Armor)", "Peuz's Greaves (Shoes)", "Peuz's Manteau (Garment)", "Peuz's Seal (Accessory)", "Peuz's Plate (Armor)" )-2; break; case 1: // Guillotine Cross - setarray .@items[0],2477,2478,2577,2578; - .@i = select("Cancel", "Sapha Shoes (Shoes)", "Nab Shoes (Shoes)", "Sapha Hood (Garment)", "Nab Hood (Garment)")-2; + setarray .@items[0],2477,2577,2886,15038,2478,2578,2887,15039; + .@i = select("Cancel", "Sapha Shoes (Shoes)", "Sapha Hood (Garment)", "Sapha Ring (Accessory)", "Sapha's Cloth (Armor)", "Nab Shoes (Shoes)", "Nab Hood (Garment)", "Nab Ring (Accessory)", "Nab's Cloth (Armor)" )-2; break; case 2: // Ranger - setarray .@items[0],2479,2480,2580,2581; - .@i = select("Cancel", "White Wing Boots (Shoes)", "Black Wing Boots (Shoes)", "White Wing Manteau (Garment)", "Black Wing Manteau (Garment)")-2; + setarray .@items[0],2479,2580,2890,15042,2480,2581,2891,15043; + .@i = select("Cancel", "White Wing Boots (Shoes)", "White Wing Manteau (Garment)", "White Wing Brooch (Accessory)", "White Wing Suit (Armor)", "Black Wing Boots (Shoes)","Black Wing Manteau (Garment)", "Black Wing Brooch (Accessory)", "Black Wing Suit (Armor)" )-2; break; } if (.@i == -1) { diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt index 17979642e..2dcc74bae 100644 --- a/npc/re/merchants/hd_refiner.txt +++ b/npc/re/merchants/hd_refiner.txt @@ -39,6 +39,17 @@ //== Blacksmith Mighty Hammer (+7~9) ======================= - script ::MightyHammer FAKE_NPC,{ + mes("[Blacksmith Mighty Hammer]"); + mes("I'm a blacksmith skilled in refining weapons and armors."); + mes("I can refine an item of your choice among the items you are equipped with."); + mes("Which item do you want to refine?"); + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + disable_items; mes "[Blacksmith Mighty Hammer]"; mes "Unlike others, I am a blacksmith who refines a very limited number of items."; diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt index 6356acfca..c0ec2131f 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -56,6 +56,17 @@ payon_in01,18,132,3 script Vestri#pay 4_M_DWARF,{ // On official servers, if an item is unsuccessfully refined it will break at a // 20% rate and downgrade at an 80% rate. function script refinenew { + mesf("[%s]", getarg(0)); + mes("I'm a blacksmith skilled in refining weapons and armors."); + mes("I can refine an item of your choice among the items you are equipped with."); + mes("Which item do you want to refine?"); + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + disable_items; mes "["+ getarg(0) +"]"; mes "I am the best Armsmith ever!"; @@ -247,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); .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part); if (.@refinecnt < 1 || .@refinecheck > 20) { mes "[" + getarg(0) + "]"; diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index ab6b3f9ac..30d9679b0 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -166,60 +166,125 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ close; } -//== Magic Gear Renter ===================================== +//== Mado Gear Renter :: madogear ===================================== - script ::mgm FAKE_NPC,{ - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) { mes "Welcome, Mechanic."; mes "Would you like to rent a Pushcart or"; - mes "ride a Magic Gear?"; + mes "ride a Mado Gear?"; next; - switch(select("Rent a Pushcart", "Ride a Magic Gear", "Cancel")) { + switch(select("Rent a Pushcart", "Ride a Mado Gear", "Buy Emergency Mado Gear", "Upgrade Cooling Device", "Cancel")) { case 1: if (checkcart()) { - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "I'm sorry, but you already"; mes "have a Pushcart."; close; } setcart; - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "There you go!"; close; case 2: if (checkmount() == MOUNT_MADO) { - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "I'm sorry, but you're already"; - mes "riding a Magic Gear."; + mes "riding a Mado Gear."; close; } else if (!getskilllv(NC_MADOLICENCE)) { - mes "[Magic Gear Master]"; - mes "Please learn the skill to get the Magic Gear License first."; + mes "[Mado Gear Armorer]"; + mes "Please learn the skill to get the Mado Gear License first."; close; } else if(hascashmount()) { - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "Please remove your cash mount."; close; } setmount(MOUNT_MADO); - mes "[Magic Gear Master]"; + mes "[Mado Gear Armorer]"; mes "Have fun, and please come again!"; close; case 3: + mes "[Mado Gear Armorer]"; + mes "Emergency Mado Gear is really useful for emergency situations and it is sold at 1,000,000 Zeny."; + next; + if (select("Purchase", "Cancel") == 2) { + mes "[Mado Gear Armorer]"; + mes "I see. Please feel free to ask me"; + mes "if you change your mind."; + close; + } + if (countitem(Mado_Box) > 0) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you already have an Emergency Mado Gear."; + close; + } + if (Zeny < 1000000) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you don't have enough Zeny to purchase the Emergency Mado Gear."; + close; + } + Zeny -= 1000000; + getitem Mado_Box, 1; + mes "[Mado Gear Armorer]"; + mes "There you go!"; + close; + case 4: + mes "[Mado Gear Armorer]"; + mes "Which device do you want to upgrade?"; + next; + if (select("Cooling Device", "High Quality Cooler") == 1) { + mes "[Mado Gear Armorer]"; + mes "Upgrading Cooling Device to High Quality Cooler needs 1 Cooling Device and 2,000,000 Zeny."; + next; + .@itemid = Cooling_Device; + .@cost = 2000000; + } else { + mes "[Mado Gear Armorer]"; + mes "Upgrading High Quality Cooler to Special Cooler needs 1 High Quality Cooler and 4,000,000 Zeny."; + next; + .@itemid = High_Quality_Cooler; + .@cost = 4000000; + } + if (select("Upgrade", "Cancel") == 2) { + mes "[Mado Gear Armorer]"; + mes "I see. Please feel free to ask me"; + mes "if you change your mind."; + close; + } + if (!countitem(.@itemid)) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you don't have the " + getitemname(.@itemid) + "."; + close; + } + if (Zeny < .@cost) { + mes "[Mado Gear Armorer]"; + mes "I'm sorry, but you don't have enough Zeny to upgrade the device."; + close; + } + Zeny -= .@cost; + delitem .@itemid, 1; + getitem (.@itemid == Cooling_Device ? High_Quality_Cooler : Special_Cooler), 1; + mes "[Mado Gear Armorer]"; + mes "Here you are! Your very own " + getitemname(.@itemid) + "."; + close; + case 5: close; } } mes "How may I help you?"; - mes "Magic Gears are only available for Mechanics."; + mes "Mado Gears are only available for Mechanics."; close; } -prontera,163,178,3 duplicate(mgm) Magic Gear Master#prt 8W_SOLDIER -geffen,103,55,5 duplicate(mgm) Magic Gear Master#gef 8W_SOLDIER -payon,166,106,5 duplicate(mgm) Magic Gear Master#pay 8W_SOLDIER -aldebaran,133,112,5 duplicate(mgm) Magic Gear Master#alde 8W_SOLDIER -yuno,167,187,3 duplicate(mgm) Magic Gear Master#yuno 8W_SOLDIER -rachel,106,134,5 duplicate(mgm) Magic Gear Master#ra 8W_SOLDIER -dicastes01,187,207,3 duplicate(mgm) Magic Gear Master#dic 8W_SOLDIER -manuk,273,212,5 duplicate(mgm) Magic Gear Master#man 8W_SOLDIER -splendide,180,174,5 duplicate(mgm) Magic Gear Master#spl 8W_SOLDIER -mid_camp,242,243,3 duplicate(mgm) Magic Gear Master#mid 8W_SOLDIER + +prontera,163,178,3 duplicate(mgm) Mado Gear Armorer#prt 8W_SOLDIER +geffen,103,55,5 duplicate(mgm) Mado Gear Armorer#gef 8W_SOLDIER +payon,166,106,5 duplicate(mgm) Mado Gear Armorer#pay 8W_SOLDIER +aldebaran,133,112,5 duplicate(mgm) Mado Gear Armorer#alde 8W_SOLDIER +yuno,167,187,3 duplicate(mgm) Mado Gear Armorer#yuno 8W_SOLDIER +rachel,106,134,5 duplicate(mgm) Mado Gear Armorer#ra 8W_SOLDIER +dicastes01,187,207,3 duplicate(mgm) Mado Gear Armorer#dic 8W_SOLDIER +manuk,273,212,5 duplicate(mgm) Mado Gear Armorer#man 8W_SOLDIER +splendide,180,174,5 duplicate(mgm) Mado Gear Armorer#spl 8W_SOLDIER +mid_camp,242,243,3 duplicate(mgm) Mado Gear Armorer#mid 8W_SOLDIER diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt index f03d348b2..db9668b6d 100644 --- a/npc/re/merchants/shadow_refiner.txt +++ b/npc/re/merchants/shadow_refiner.txt @@ -39,11 +39,17 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{ .@npc_name$ = "[Shadow Blacksmith]"; .@zeny_cost = 20000; // Amount of zeny to be charged for refining. - disable_items; mesf("%s", .@npc_name$); mes("Do you want to refine a Shadow item?"); mes("Please choose the part you want to refine."); - next; + + if (getbattleflag("features/replace_refine_npcs") == 1) { + if (openrefineryui()) + close(); + } + next(); + + disable_items; setarray(.@position$[0],"Armor","Weapon","Shield","Shoes","Earring","Pendant"); for (.@i=EQI_SHADOW_ARMOR; .@i <= EQI_SHADOW_ACC_L; .@i++){ .@menu$ = .@menu$ + (getequipisequiped(.@i) ? getequipname(.@i) : ("^8C8C8C" + .@position$[.@i-EQI_SHADOW_ARMOR] + " [Not Equipped]^000000" + ":")); diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 9085cad91..156ff1cc0 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -96,7 +96,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ case 1: mes "[Lime Evenor]"; mes "Aright. Excellent! Please write down your name here."; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "Are you done?"; @@ -113,7 +113,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ next; mes "[Lime Evenor]"; mes "Would you please write your name again? Please write it ^3131FFClearly^000000."; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "Ah~ ha. You are ^3131FF"+strcharinfo(PC_NAME)+"^000000."; @@ -148,7 +148,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ if(select("Yes, I want to register.", "No, I don't.") == 1) { mes "[Lime Evenor]"; mes "Alrigh. Please write down your name on it."; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "^3131FF"+strcharinfo(PC_NAME)+"^000000.. Is that your name?"; @@ -157,7 +157,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ mes "[Lime Evenor]"; mes "^3131FF"+strcharinfo(PC_NAME)+"^000000, tell me what you want to register. for"; mes "Which map should we go to?"; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "^3131FFMission Map: "+.@inputstr$+"^000000"; @@ -166,7 +166,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ mes "[Lime Evenor]"; mes "Please let me know what kind of missions your are lookng for."; mes "It should be briefly like 'Hunt 10 Porings.'"; - input .@input$; + input(.@input$); next; mes "[Lime Evenor]"; mes "Are you done?"; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index aae9a5566..3e5ae39fe 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); next; if (.@input < 1 || .@input > 10000) { mes "[Phelix]"; @@ -321,12 +321,13 @@ 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); if (.@input < 0 || .@input > 1) { mes "[Eve Natalia]"; mes "It is a 0 or 1, it can't be that difficult."; close; - } else if (.@input == 0) { + } + if (.@input == 0) { mes "[Eve Natalia]"; mes "It's best to be sure before trading, have a good day."; close; @@ -417,12 +418,13 @@ L_Exchange: mes "I can give you up to 60."; mes "Type 0 to cancel."; next; - input .@amount; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Trader Machine]"; mes "Cancelled."; close; - } else if (.@amount < 0 || .@amount > 60) { + } + if (.@amount > 60) { mes "[Trader Machine]"; mes "I said only 60 max."; close; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index a0f4fa922..6186fa018 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/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt index 902db7945..d544aeb0b 100644 --- a/npc/re/quests/eden/eden_tutorial.txt +++ b/npc/re/quests/eden/eden_tutorial.txt @@ -228,7 +228,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ close; } } else if (questprogress(9167) == 1) { - if (!getmercinfo(1)) { + if (!getmercinfo(MERCINFO_CLASS)) { mes "[Tutorial Instructor]"; mes "You haven't gotten a mercenary yet."; next; @@ -319,7 +319,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "if you really checked it?"; mes "Write down what material I asked you to get."; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "10 Jellopy") { mes "[Tutorial Instructor]"; mes "Good, you know."; diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 4a60fd2bb..91233dbb2 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -2231,449 +2231,400 @@ brasilis,180,249,5 script Daniel#bra 4_M_KID1,{ } bra_in01,149,184,3 script Door#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- A key is inserted in the locked door.-"; + mes "- A key is inserted in the locked door.-"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Turn the key.", "Ignore it.")) { + case 1: + mes "You start saying the first line of the magic words."; + input(.@input$); next; - switch(select("Turn the key.", "Ignore it.")) { + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother the door won't open!"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 2) { + mes "Mother the door won't open!"; + close; + } + mes "[Sobbing Voice]"; + mes "'^FF0000Turn the key as many times as there are colors in the rainbow.^000000'"; + next; + switch(select("Open the door", "Knock on the door.", "Turn the key.", "Take the key out.")) { case 1: - mes "You start saying the first line of the magic words."; - input .@input$; + mes "The door is locked."; + mes "So nothing happens."; + close; + case 2: + mes "How many times should I try to knock?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You knocked on the door "+.@input+" times."; next; - .@braspell$ = "Mother the door won't open!"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + mes "But, nothing happens."; + close; + case 3: + mes "How many times should I turn the key?"; + input(.@input, 0, 999); + next; + mes "You turned over the key "+.@input+" times."; + next; + if (.@input != 7) { + mes "But nothing doesn't happened."; close; } - else { - if (brazil_ghost == 2) { - mes "[Sobbing Voice]"; - mes "'^FF0000Turn the key as many times as there are colors in the rainbow.^000000'"; - next; - switch(select("Open the door", "Knock on the door.", "Turn the key.", "Take the key out.")) { - case 1: - mes "The door is locked."; - mes "So nothing happens."; - close; - case 2: - mes "How many times should I try to knock?"; - input .@input,0,999; - next; - mes "You knocked on the door "+.@input+" times."; - next; - mes "But, nothing happens."; - close; - case 3: - mes "How many times should I turn the key?"; - input .@input,0,999; - next; - if (.@input == 7) { - mes "You turn the key 7 times."; - next; - mes "Click! Click! Click!"; - mes "Click! Click! Click!"; - mes "Click...!"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - mes "You hear water flushing."; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the toilet."; - brazil_ghost = 3; - changequest 2208,60351; - close; - } - else { - mes "You turned over the key "+.@input+" times."; - next; - mes "But nothing doesn't happened."; - close; - } - case 4: - mes "How many times should I insert the key into the door?"; - input .@input,0,999; - next; - mes "You inserted the key "+.@input+" times."; - next; - mes "But nothing happened."; - close; - } - } - else { - mes "Mother the door won't open!"; - close; - } - } - case 2: - mes "You do nothing."; + mes "Click! Click! Click!"; + mes "Click! Click! Click!"; + mes "Click...!"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + mes "You hear water flushing."; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the toilet."; + brazil_ghost = 3; + changequest 2208,60351; + close; + case 4: + mes "How many times should I insert the key into the door?"; + input(.@input, 0, 999); + next; + mes "You inserted the key "+.@input+" times."; + next; + mes "But nothing happened."; close; } - } - else { - mes "- A key is inserted in the locked door.-"; + case 2: + mes "You do nothing."; close; } } bra_in01,144,187,3 script Toilet#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- Looks like an ordinary toilet -"; + mes "- Looks like an ordinary toilet -"; + if (brazil_ghost == 0) { + close; + } + next; + if (brazil_ghost > 6) { + switch(select("Flush the toilet.", "Doing nothing.")) { + case 1: + mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere."; + specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached()); + close2; + warp "bra_in01",206,102; + end; + case 2: + mes "The water in the toilet looks gross."; + close; + } + } + switch(select("Use the toilet", "Ignore.")) { + case 1: + mes "- What was the second line to that spell now? -"; + input(.@input$); next; - if (brazil_ghost > 6) { - switch(select("Flush the toilet.", "Doing nothing.")) { - case 1: - mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere."; - specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached()); - close2; - warp "bra_in01",206,102; - end; - case 2: - mes "The water in the toilet looks gross."; - close; - } + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother the water is flooding!"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; } - switch(select("Use the toilet", "Ignore.")) { + if (brazil_ghost != 3) { + mes "Nothing happens."; + close; + } + mes "[Sobbing Voice]"; + mes "^FF0000If the moon disappears 3 times... don't worry.....^000000"; + next; + switch(select("Flush the toilet.", "Close the lid.")) { case 1: - mes "- What was the second line to that spell now? -"; - input .@input$; + mes "How many times should I flush?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You flush the toilet "+.@input+" times."; next; - .@braspell$ = "Mother the water is flooding!"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + if (.@input != 3) { + mes "But nothing happens."; close; } - else { - if (brazil_ghost == 3) { - mes "[Sobbing Voice]"; - mes "^FF0000If the moon disappears 3 times... don't worry.....^000000"; - next; - switch(select("Flush the toilet.", "Close the lid.")) { - case 1: - mes "How many times should I flush?"; - input .@input,0,999; - next; - if (.@input == 3) { - mes "You flush the toilet 3 times."; - next; - mes "qwaaaaaaaaa!"; - mes "kwaaaaaaaaaa!"; - mes "kwaaaaaaaaaaaaaaaaaaa!"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - mes "Suddenly the sink sounds like water is flowing freely from it."; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the faucet."; - brazil_ghost = 4; - changequest 60351,60352; - close; - } - else { - mes "You flush the toilet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - } - case 2: - mes "You close the lid of the toilet."; - mes "Nothing seems to be happening."; - close; - } - } - else { - mes "Nothing happens."; - close; - } - } + mes "qwaaaaaaaaa!"; + mes "kwaaaaaaaaaa!"; + mes "kwaaaaaaaaaaaaaaaaaaa!"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + mes "Suddenly the sink sounds like water is flowing freely from it."; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the faucet."; + brazil_ghost = 4; + changequest 60351,60352; + close; case 2: - mes "You do nothing."; + mes "You close the lid of the toilet."; + mes "Nothing seems to be happening."; close; } - } - else { - mes "- Looks like an ordinary toilet -"; + case 2: + mes "You do nothing."; close; } } bra_in01,134,189,3 script Faucet#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- It seems like an ordinary faucet -"; + mes "- It seems like an ordinary faucet -"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Examine it.", "Ignore.")) { + case 1: + mes "- What was the next line to that spell now? -"; + input(.@input$); + next; + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother the drought has started!"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 4) { + mes "Nothing happens."; + close; + } + mes "[Sobbing Voice]"; + mes "^FF0000Don't worry... the waterfall will help it....^000000"; next; - switch(select("Examine it.", "Ignore.")) { + switch(select("Tap on the faucet.", "Turn on the water.")) { case 1: - mes "- What was the next line to that spell now? -"; - input .@input$; + mes "How many times will you tap the faucet?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You tap the faucet "+.@input+" times."; + next; + mes "But nothing happens."; + close; + case 2: + mes "How many times should I turn the water on?"; + input(.@input, 0, 999); next; - .@braspell$ = "Mother the drought has started!"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + if (.@input != 1) { + mes "You turn the faucet on "+.@input+" times."; + next; + mes "But nothing happens."; close; } - else { - if (brazil_ghost == 4) { - mes "[Sobbing Voice]"; - mes "^FF0000Don't worry... the waterfall will help it....^000000"; - next; - 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; - next; - mes "You tap the faucet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - case 2: - mes "How many times should I turn the water on?"; - input .@input,0,999; - next; - if (.@input == 1) { - mes "You turn the faucet on once."; - next; - mes "swwwaaaaaaa-"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - mes "You see the carpet move."; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the carpet."; - brazil_ghost = 5; - changequest 60352,60353; - close; - } - else { - mes "You turn the faucet on "+.@input+" times."; - next; - mes "But nothing happens."; - close; - } - } - } - else { - mes "Nothing happens."; - close; - } - } - case 2: - mes "You do nothing."; + mes "You turn the faucet on once."; + next; + mes "swwwaaaaaaa-"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + mes "You see the carpet move."; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the carpet."; + brazil_ghost = 5; + changequest 60352,60353; close; } - } - else { - mes "- It seems like an ordinary faucet -"; + case 2: + mes "You do nothing."; close; } } bra_in01,138,184,3 script Carpet#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- A carpet with an intricate pattern on it -"; + mes "- A carpet with an intricate pattern on it -"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Examine it.", "Ignore.")) { + case 1: + mes "- What was the next line to that spell now? -"; + input(.@input$); next; - switch(select("Examine it.", "Ignore.")) { + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Mother where are my friends?"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 5) { + mes "Nothing happens."; + close; + } + mes "[Sobbing Voice]"; + mes "^FF0000your 7 friends....are...sleeping... now it...'s time ....to wake them........^000000"; + next; + switch(select("Jump on the carpet.", "Lie on the carpet.", "Shake the carpet.")) { case 1: - mes "- What was the next line to that spell now? -"; - input .@input$; + mes "How many times should I jump?"; + input(.@input, 0, 999); next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; + mes "You jump on the carpet "+.@input+" times."; + next; + mes "But nothing happens."; + close; + case 2: + mes "How many times should I lie on the carpet?"; + input(.@input, 0, 999); + next; + mes "You lie on the carpet "+.@input+" times."; + next; + mes "But nothing happens."; + close; + case 3: + mes "How many times should I shake the carpet?"; + input(.@input, 0, 999); next; - .@braspell$ = "Mother where are my friends?"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; + mes "You shake the carpet "+.@input+" times."; + next; + if (.@input != 7) { + mes "But nothing happens."; close; } - else { - if (brazil_ghost == 5) { - mes "[Sobbing Voice]"; - mes "^FF0000your 7 friends....are...sleeping... now it...'s time ....to wake them........^000000"; - next; - 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; - next; - mes "You jump on the carpet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - case 2: - mes "How many times should I lie on the carpet?"; - input .@input,0,999; - next; - mes "You lie on the carpet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - case 3: - mes "How many times should I shake the carpet?"; - input .@input,0,999; - next; - if (.@input == 7) { - mes "You shake the carpet 7 times."; - next; - mes "- fly~ fly~ fly~ fly~ fly~ fly~ fly~ -"; - next; - mes "[Distant Sound]"; - mes "^FF0000kkkkhee- hihihihi!!!^000000"; - next; - specialeffect(EF_VENOMDUST, AREA, playerattached()); - mes "Faint laughing can be heard off in the direction of the mirror."; - brazil_ghost = 6; - changequest 60353,60354; - close; - } - else { - mes "You shake the carpet "+.@input+" times."; - next; - mes "But nothing happens."; - close; - } - } - } - else { - mes "Nothing happens."; - close; - } - } - case 2: - mes "You do nothing."; + mes "- fly~ fly~ fly~ fly~ fly~ fly~ fly~ -"; + next; + mes "[Distant Sound]"; + mes "^FF0000kkkkhee- hihihihi!!!^000000"; + next; + specialeffect(EF_VENOMDUST, AREA, playerattached()); + mes "Faint laughing can be heard off in the direction of the mirror."; + brazil_ghost = 6; + changequest 60353,60354; close; } - } - else { - mes "- A carpet with an intricate pattern on it -"; + case 2: + mes "You do nothing."; close; } } bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{ - if (brazil_ghost > 0) { - mes "- You can see a clean mirror without any marks or dust -"; + mes "- You can see a clean mirror without any marks or dust -"; + if (brazil_ghost == 0) { + close; + } + next; + switch(select("Examine it.", "Ignore.")) { + case 1: + mes "- What was the next line to that spell now? -"; + input(.@input$); + next; + mes "["+strcharinfo(PC_NAME)+"]"; + mes .@input$; + next; + .@braspell$ = "Where are you mom?"; + .@chkspell = compare(.@braspell$,.@input$); + if (!.@chkspell) { + mes "Seems like you said something wrong."; + close; + } + if (brazil_ghost != 6) { + mes "Nothing happens."; + close; + } + mes "[Distant Sound]"; + mes "^FF0000kihe! hit! hit! hit! hit!^000000"; + next; + mes "[Distant Sound]"; + mes "^FF0000kihe! hit! hit! hit! hit!^000000"; + mes "^FF0000kihe! hit! hit! hit! hit!^000000"; + next; + mes "[Distant Sound]"; + mes "Behind you..."; + enablenpc "Ghost#bra"; + next; + emotion e_omg,1; + mes "["+strcharinfo(PC_NAME)+"]"; + mes "The stories about the ghost are true~!"; + next; + mes "[Ghost]"; + mes "^FF0000my baby....^000000"; + next; + mes "[Ghost]"; + mes "^FF0000I can't see.... my eye....^000000"; + mes "^FF0000What's going on....?^000000"; next; - switch(select("Examine it.", "Ignore.")) { + mes "- You take a deep breath and then look at the Ghost and notice it has an eye patch -"; + next; + mes "[Ghost]"; + mes "^FF0000My eyes are so tight... can you take this off?^000000"; + next; + mes "You step carefully towards the ghost."; + next; + mes "His face was covered with dust making strange contortions with it's face."; + next; + mes "[Ghost]"; + mes "^FF0000Come on help mom.....^000000"; + next; + switch(select("Take the eye bandage off.", "Run away~.")) { case 1: - mes "- What was the next line to that spell now? -"; - input .@input$; - next; - mes "["+strcharinfo(PC_NAME)+"]"; - mes .@input$; - next; - .@braspell$ = "Where are you mom?"; - .@chkspell = compare(.@braspell$,.@input$); - if (!.@chkspell) { - mes "Seems like you said something wrong."; - close; + while(1) { + .@cpudice = rand(1,6); + .@pcdice = rand(1,6); + if (.@cpudice != .@pcdice) { + emotion (57+.@cpudice),0,"Ghost#bra"; + emotion (57+.@cpudice),1; + break; + } + } + if (.@cpudice > .@pcdice) { + specialeffect(EF_DEVIL, AREA, playerattached()); + mes "[Ghost]"; + mes "^FF0000Go away!^000000"; + brazil_ghost = 1; + changequest 60354,2208; + percentheal -50,-50; + close2; + disablenpc "Ghost#bra"; + warp "bra_in01",12,183; + end; } else { - if (brazil_ghost == 6) { - mes "[Distant Sound]"; - mes "^FF0000kihe! hit! hit! hit! hit!^000000"; - next; - mes "[Distant Sound]"; - mes "^FF0000kihe! hit! hit! hit! hit!^000000"; - mes "^FF0000kihe! hit! hit! hit! hit!^000000"; - next; - mes "[Distant Sound]"; - mes "Behind you..."; - enablenpc "Ghost#bra"; - next; - emotion e_omg,1; - mes "["+strcharinfo(PC_NAME)+"]"; - mes "The stories about the ghost are true~!"; - next; - mes "[Ghost]"; - mes "^FF0000my baby....^000000"; - next; - mes "[Ghost]"; - mes "^FF0000I can't see.... my eye....^000000"; - mes "^FF0000What's going on....?^000000"; - next; - mes "- You take a deep breath and then look at the Ghost and notice it has an eye patch -"; - next; - mes "[Ghost]"; - mes "^FF0000My eyes are so tight... can you take this off?^000000"; - next; - mes "You step carefully towards the ghost."; - next; - mes "His face was covered with dust making strange contortions with it's face."; - next; - mes "[Ghost]"; - mes "^FF0000Come on help mom.....^000000"; - next; - switch(select("Take the eye bandage off.", "Run away~.")) { - case 1: - while(1) { - .@cpudice = rand(1,6); - .@pcdice = rand(1,6); - if (.@cpudice != .@pcdice) { - emotion (57+.@cpudice),0,"Ghost#bra"; - emotion (57+.@cpudice),1; - break; - } - } - if (.@cpudice > .@pcdice) { - specialeffect(EF_DEVIL, AREA, playerattached()); - mes "[Ghost]"; - mes "^FF0000Go away!^000000"; - brazil_ghost = 1; - changequest 60354,2208; - percentheal -50,-50; - close2; - disablenpc "Ghost#bra"; - warp "bra_in01",12,183; - end; - } - else { - emotion e_bzz,1; - mes "[Ghost]"; - mes "^FF0000Ahh!^000000"; - mes "The Ghost disappeared into the toilet."; - brazil_ghost = 7; - changequest 60354,60355; - close2; - disablenpc "Ghost#bra"; - warp "bra_in01",206,100; - end; - } - case 2: - mes "You run away from the ghost."; - close2; - brazil_ghost = 1; - changequest 60354,2208; - warp "bra_in01",12,183; - disablenpc "Ghost#bra"; - end; - } - close; - } - else { - mes "Nothing happens."; - close; - } + emotion e_bzz,1; + mes "[Ghost]"; + mes "^FF0000Ahh!^000000"; + mes "The Ghost disappeared into the toilet."; + brazil_ghost = 7; + changequest 60354,60355; + close2; + disablenpc "Ghost#bra"; + warp "bra_in01",206,100; + end; } case 2: - mes "You do nothing."; - close; + mes "You run away from the ghost."; + close2; + brazil_ghost = 1; + changequest 60354,2208; + warp "bra_in01",12,183; + disablenpc "Ghost#bra"; + end; } - } - else { - mes "- You can see a clean mirror without any marks or dust -"; + close; + case 2: + mes "You do nothing."; close; } } diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index 1b57e4397..638938d53 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -1706,7 +1706,7 @@ dew_fild01,127,240,4 script Gatti#weapon 2_M_OLDBLSMITH,{ next; mes "- He seems to be asking for the Island name. -"; next; - input .@island_name$; + input(.@island_name$); next; mes "["+strcharinfo(PC_NAME)+"]"; mes "It's called "+ .@island_name$ +". What's wrong?"; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 817b4780d..2b10bc735 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); .@deal = 500 * .@input; if (.@deal == 0) { mes "[Curious Sapha]"; @@ -164,7 +164,7 @@ dic_dun01,266,113,5 script Curious Sapha#ep13_3_ 4_MAN_BENKUNI,{ mes "[Curious Sapha]"; mes "Do you have any useful information?"; mes "Please let me know!"; - input .@str$; + input(.@str$); next; mes "[Curious Sapha]"; mes "It says ^0000FF"+.@str$+"^000000."; @@ -4588,7 +4588,7 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ mes "- BK of the Cat Merchant group is being difficult."; mes "What did Shay tell you to do?-"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Shay's special drink will be delivered" || .@inputstr$ == "Shay's special drink will be delivered.") { mes "[" + strcharinfo(PC_NAME) + "]"; mes "Hmm. If you don't cooperate,"; @@ -7517,7 +7517,7 @@ moc_para01,44,19,3 script Cat Hand Agent#gekk 4_M_MERCAT2,{ mes "If you really mean it, then sign here."; mes "I'm collecting signs to get on Gyareuk's good side... never mind. I will let them know you are my sponsor!"; next; - input .@inputstr$; + input(.@inputstr$); mes "[Agent Geck]"; mes "" + strcharinfo(PC_NAME) + "? Human names are strange to me."; next; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index ac6717529..10515dee3 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -140,13 +140,13 @@ ecl_fild01,94,322,5 script Security Guard#ep14_2 4_M_FAIRYSOLDIER,{ mes "Please fill out your name, occupation, and level here."; next; mes "Write your name."; - input .@inputstr$; + input(.@inputstr$); next; mes "Write your occupation."; - input .@inputstr$; + input(.@inputstr$); next; mes "Write your level."; - input .@inputstr$; + input(.@inputstr$); next; mes "[Security Guard]"; mes "If you completed your forms, please submit them to the administrator over there."; @@ -624,7 +624,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ next; mes "[Fairy Carpenter]"; mes "Please write the number of pieces necessary for each length. If no pieces for that length are necessary, please write 0."; - input .@inputstr$; + input(.@inputstr$); next; if (.@inputstr$ != "002") { mes "[Fairy Carpenter]"; @@ -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); 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); if (.@input < 1 || .@input > 128) { mes "[Yube]"; mes "You aren't going to make them?"; @@ -10100,19 +10100,17 @@ ecl_in04,109,215,3 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{ mes "[Hiel]"; mes "Oh~ Someone referred you to me? Who was it? You better make sense, or I'll be sure to kick you out."; next; - input .@inputstr$; - if (.@inputstr$ == "Clever"){ - mes "[" + strcharinfo(PC_NAME) + "]"; - mes .@inputstr$ + " referred me(" + strcharinfo(PC_NAME) + ") to you."; - next; - } - else { + input(.@inputstr$); + if (.@inputstr$ != "Clever") { mes "[Hiel]"; mes "I don't know that person! Aren't you suspicious!"; close2; warp "eclage",152,91; end; } + mes "[" + strcharinfo(PC_NAME) + "]"; + mes .@inputstr$ + " referred me(" + strcharinfo(PC_NAME) + ") to you."; + next; mes "[Hiel]"; mes "Oh really? Give me a minute. I'm going to wrap up what I am doing and come back."; ep14_2_etran = 11; @@ -10923,13 +10921,8 @@ ecl_in02,133,115,7 script Prison Guard#pa0829 4_M_FAIRYSOLDIER2,{ mes "[Prison Guard]"; mes "I see, I don't think I ever saw you on our visitor's list. Who are you visiting?"; next; - input .@inputstr$; - if (.@inputstr$ == "Clever") { - mes "[Prison Guard]"; - mes "^000099" + .@inputstr$ + "^000000? ... That means..."; - next; - } - else { + input(.@inputstr$); + if (.@inputstr$ != "Clever") { mes "[Prison Guard]"; mes "Hmm? You want to visit ^000099" + .@inputstr$ + "^000000? I don't see that visitation on the list. Are you sure you made a formal request?"; next; @@ -10939,6 +10932,9 @@ ecl_in02,133,115,7 script Prison Guard#pa0829 4_M_FAIRYSOLDIER2,{ } close; } + mes "[Prison Guard]"; + mes "^000099" + .@inputstr$ + "^000000? ... That means..."; + next; mes "[Clever]"; mes "Huh? I've got a visitor? Yahoo! It's a visit! Yay~"; next; @@ -11753,12 +11749,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); 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 +13744,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); if (.@input != 1917) { mes "EEK!"; close; @@ -19129,7 +19125,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); 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 786aeccb1..f66d6ab76 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -185,12 +185,13 @@ 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; - if (.@input == 0) { + input(.@input); + if (.@input <= 0) { mes "[Investment Cat Helper]"; mes "Please invest next time~"; close; - } else if (.@input > 10) { + } + if (.@input > 10) { mes "[Investment Cat Helper]"; mes "You can get a maximum of 10 accounts~"; close; @@ -299,29 +300,29 @@ 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); 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."; close; - } else if (countitem(Malang_Sp_Can) < .@input) { // Malang_Sp_Can + } + if (countitem(Malang_Sp_Can) < .@input) { // Malang_Sp_Can mes "[Investment Cat Helper]"; mes "Hmm? You don't have enough cans."; close; - } else { - delitem Malang_Sp_Can,.@input; - mes "[Investment Cat Helper]"; - mes "Ohh! Thank you~"; - next; - mes "[Investment Cat Helper]"; - mes "Dear "+strcharinfo(PC_NAME)+" ~"; - mes "I have only Increase AGI"; - mes "and Blessing to give you."; - mes "Thank you."; - npcskill "AL_INCAGI",10,0,0; - npcskill "AL_BLESSING",10,0,0; - close; } + delitem Malang_Sp_Can,.@input; + mes "[Investment Cat Helper]"; + mes "Ohh! Thank you~"; + next; + mes "[Investment Cat Helper]"; + mes "Dear "+strcharinfo(PC_NAME)+" ~"; + mes "I have only Increase AGI"; + mes "and Blessing to give you."; + mes "Thank you."; + npcskill "AL_INCAGI",10,0,0; + npcskill "AL_BLESSING",10,0,0; + close; } } @@ -5556,7 +5557,7 @@ L_Viewpoint: break; } next; - input .@input; + input(.@input); 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"; @@ -7755,7 +7756,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5083; setquest 5084; @@ -7984,7 +7985,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5085; setquest 5086; @@ -8166,7 +8167,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5087; setquest 5088; @@ -8433,7 +8434,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ next; mes "What do you want to say?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ == "Come back") { erasequest 5089; setquest 5090; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 091d8527a..403818823 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -2088,13 +2088,14 @@ 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; - if (.@amount == 0) { + input(.@amount); + if (.@amount <= 0) { mes "[Pandoi]"; mes "Don't need Silver Crosses?"; mes "Well, I can take a rest then. Ha ha ha ha~"; close; - } else if (.@amount > 50) { + } + if (.@amount > 50) { mes "[Pandoi]"; mes "A maximum of 50 at a time!"; close; @@ -8317,7 +8318,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); if (.@input < 0 || .@input > 344) close; $malaya_pintados_00 = .@input; @@ -8326,7 +8327,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); if (.@input < 0 || .@input > 1000) close; $malaya_pintados_01 = .@input; @@ -8335,7 +8336,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); if (.@input < 0 || .@input > 1000) close; $malaya_pintados_02 = .@input; @@ -8344,7 +8345,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); if (.@input < 0 || .@input > 300) close; $malaya_pintados_03 = .@input; @@ -8577,7 +8578,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); if (.@amount < 1 || .@amount > 50) { mes "[Isco]"; mes "Sigh~ I'm lost! I can't count if the numbers are weird."; @@ -8609,7 +8610,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); if (.@amount < 1 || .@amount > 50) { mes "[Isco]"; mes "Sigh~ I told you I'm not good with numbers."; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 34293d200..46fdcbddd 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -3618,7 +3618,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ mes "You... I saw. Feeling. I saw. Feeling."; mes "You... Name?"; next; - input .@inputstr$; + input(.@inputstr$); mes "[Fishee]"; mes .@inputstr$+" do."; mes "No know. No remember.."; @@ -3756,7 +3756,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ } else if (questprogress(5017)) { mes "How will you bully the creature?"; next; - input .@inputstr$; + input(.@inputstr$); mes "You do ^0000FF"+.@inputstr$+"^000000 to bully the unidentified creature."; next; setquest 5029; @@ -4311,7 +4311,7 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 next; mes "What was the name of the unidentified creature?"; next; - input .@inputstr$; + input(.@inputstr$); if (.@inputstr$ != "Fishee") { mes "[???]"; mes "No Family. "+.@inputstr$+" No."; diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index 6a65a9c78..e42959aa7 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -151,18 +151,19 @@ function script F_Invest_Abyss { mes "Please choose between 1 to 200."; mes "Please enter 0 to cancel."; next; - input .@units; + input(.@units); if (.@units < 0 || .@units > 200) { mes getarg(1); mes "You've exceeded the amount per investment."; mes "Please try again."; close; - } else if (.@units == 0) { + } + if (.@units == 0) { mes getarg(1); mes "Canceled."; close; - } else - break; + } + break; case 5: mes getarg(1); mes "Canceled."; @@ -199,18 +200,19 @@ function script F_Invest_Abyss { mes "Please choose between 1 to 20."; mes "Please enter 0 to cancel."; next; - input .@tickets; + input(.@tickets); if (.@tickets < 0 || .@tickets > 20) { mes getarg(1); mes "You've exceeded the amount per investment."; mes "Please try again."; close; - } else if (.@tickets == 0) { + } + if (.@tickets == 0) { mes getarg(1); mes "Canceled."; close; - } else - break; + } + break; case 4: mes getarg(1); mes "Canceled."; diff --git a/npc/scripts.conf b/npc/scripts.conf index f03ac50f0..aa3cb23e8 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -226,6 +226,7 @@ "npc/other/turbo_track.txt", "npc/other/item_merge.txt", "npc/other/private_airship.txt", +"npc/other/inventory_expansion.txt", //================= Quests ================================================ // - Quests-Tutorials for basic classes (1st class quests) ------ diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index 14384fd17..a5aad9767 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -50,6 +50,7 @@ //"npc/custom/card_remover.txt", //"npc/custom/item_signer.txt", //"npc/custom/woe_controller.txt", +//"npc/custom/bartershop.txt", //================= Other Scripts ========================================= // -- MVP Arena diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index 5ac5b8e9a..a0db6402b 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -105,7 +105,8 @@ OnAgitBreak: // Show and log error if an unguilded player breaks the Emperium. (Should NEVER happen) if (.@GID <= 0) { .@notice$ = "Character "+strcharinfo(PC_NAME)+" ("+getcharid(CHAR_ID_CHAR)+") broke the Emperium in Castle: "+strnpcinfo(NPC_NAME_HIDDEN)+" while guildless. No data will be saved and Emperium respawned."; - logmes .@notice$; debugmes .@notice$; + logmes .@notice$; + consolemes(CONSOLEMES_NOTICE, .@notice$); donpcevent "Agit#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnStartArena"; end; } diff --git a/npc/woe-se/agit_main_se.txt b/npc/woe-se/agit_main_se.txt index 6fc319377..41430f6a1 100644 --- a/npc/woe-se/agit_main_se.txt +++ b/npc/woe-se/agit_main_se.txt @@ -222,50 +222,50 @@ OnTreasureDied: - script Steward#template FAKE_NPC,{ .@GID = getcastledata(strnpcinfo(NPC_MAP),1); if (!.@GID) { - mes "[ Steward ]"; - mes "I await for the master"; - mes "whom destiny will choose"; - mes "for me. Do you think you"; - mes "have to courage and strength"; - mes "to conquer this stronghold?"; + mes("[ Steward ]"); + mes("I await for the master"); + mes("whom destiny will choose"); + mes("for me. Do you think you"); + mes("have to courage and strength"); + mes("to conquer this stronghold?"); close; } if (getcharid(CHAR_ID_GUILD) != .@GID || strcharinfo(PC_NAME) != getguildmaster(.@GID)) { - mes "[ Steward ]"; - mes "Hmpf. Your threats don't"; - mes "scare me! Guardians, drive"; - mes "this infidel away from here!"; - mes "I will always be loyal to the"; - mes "master of this stronghold,"; - mes "the one and only ^FF0000"+getguildmaster(.@GID)+"^000000."; + mes("[ Steward ]"); + mes("Hmpf. Your threats don't"); + mes("scare me! Guardians, drive"); + mes("this infidel away from here!"); + mes("I will always be loyal to the"); + mes("master of this stronghold,"); + mesf("the one and only ^FF0000%s^000000.", getguildmaster(.@GID)); close; } - mes "[ Steward ]"; - mes "Ah, Master ^FF0000"+getguildmaster(.@GID)+"^000000..."; - mes "How shall I serve you today?"; - mes "Was there an aspect of this"; - mes "stronghold's maintenance"; - mes "you wanted to discuss?"; + mes("[ Steward ]"); + mesf("Ah, Master ^FF0000%s^000000...", getguildmaster(.@GID)); + mes("How shall I serve you today?"); + mes("Was there an aspect of this"); + mes("stronghold's maintenance"); + mes("you wanted to discuss?"); next; switch(select("Stronghold Briefing", "Invest in Commercial Growth", "Invest in Defense growth", "Hire/Fire Storage Staff", "Go to Master's room")) { case 1: - mes "[ Steward ]"; - mes "The Commercial Growth"; - mes "Level of the stronghold is ^0000ff"+getcastledata(strnpcinfo(NPC_MAP),2)+"."; + mes("[ Steward ]"); + mes("The Commercial Growth"); + mesf("Level of the stronghold is ^0000ff%d^000000.", getcastledata(strnpcinfo(NPC_MAP),2)); if (getcastledata(strnpcinfo(NPC_MAP),4) > 0) { - mes "Last time, you invested in"; - mes "Commercial Growth "+getcastledata(strnpcinfo(NPC_MAP),4)+"."; + mes("Last time, you invested in"); + mesf("Commercial Growth ^0000ff%d^000000.", getcastledata(strnpcinfo(NPC_MAP),4)); } next; - mes "[ Steward ]"; - mes "Our stronghold's"; - mes "safeguard level is "+getcastledata(strnpcinfo(NPC_MAP),3)+"."; + mes("[ Steward ]"); + mes("Our stronghold's"); + mesf("safeguard level is %d.", getcastledata(strnpcinfo(NPC_MAP),3)); if (getcastledata(strnpcinfo(NPC_MAP),5) > 0) { - mes "Last time, you invested"; - mes "in defense "+getcastledata(strnpcinfo(NPC_MAP),5)+" times."; + mes("Last time, you invested"); + mesf("in defense %d times.", getcastledata(strnpcinfo(NPC_MAP),5)); } - mes " "; - mes "That is all, master."; + mes(" "); + mes("That is all, master."); close; case 2: .@Economy = getcastledata(strnpcinfo(NPC_MAP),2); @@ -281,84 +281,84 @@ OnTreasureDied: // Quadruple the cost of investing if you've already invested once. if (getcastledata(strnpcinfo(NPC_MAP),4)) .@eco_invest *= 4; - mes "[ Steward ]"; - mes "Raising the stronghold's"; - mes "commercial growth will"; - mes "increase the quantity of"; - mes "goods produced for the guild."; - mes "Investing in commercial growth"; - mes "will help the guild's future."; + mes("[ Steward ]"); + mes("Raising the stronghold's"); + mes("commercial growth will"); + mes("increase the quantity of"); + mes("goods produced for the guild."); + mes("Investing in commercial growth"); + mes("will help the guild's future."); next; - mes "[ Steward ]"; - mes "You can make one investment"; - mes "each day, but if you can make"; - mes "two investments if you pay"; - mes "more Zeny: this will speed"; - mes "up commercial development,"; - mes "but can be quite expensive."; + mes("[ Steward ]"); + mes("You can make one investment"); + mes("each day, but if you can make"); + mes("two investments if you pay"); + mes("more Zeny: this will speed"); + mes("up commercial development,"); + mes("but can be quite expensive."); next; if (.@Economy == 100) { - mes "[ Steward ]"; - mes "However, our stronghold's"; - mes "commerical growth level is"; - mes "at 100%. It's not possible to"; - mes "develop commercial growth"; - mes "any further than that."; + mes("[ Steward ]"); + mes("However, our stronghold's"); + mes("commerical growth level is"); + mes("at 100%. It's not possible to"); + mes("develop commercial growth"); + mes("any further than that."); close; } if (getcastledata(strnpcinfo(NPC_MAP),4) >= 2) { - mes "[ Steward ]"; - mes "You've already made two"; - mes "investments today, so you'll"; - mes "have to wait until tomorrow"; - mes "to make another investment."; + mes("[ Steward ]"); + mes("You've already made two"); + mes("investments today, so you'll"); + mes("have to wait until tomorrow"); + mes("to make another investment."); close; } if (getcastledata(strnpcinfo(NPC_MAP),4) == 0) { - mes "[ Steward ]"; - mes "You must pay ^FF0000"+.@eco_invest+"^000000 Zeny"; - mes "to make an investment"; - mes "Will you invest in this"; - mes "stronghold's commerical"; - mes "development now?"; + mes("[ Steward ]"); + mesf("You must pay ^FF0000%d^000000 Zeny", .@eco_invest); + mes("to make an investment"); + mes("Will you invest in this"); + mes("stronghold's commerical"); + mes("development now?"); } else { - mes "[ Steward ]"; - mes "You must pay ^FF0000"+.@eco_invest+"^000000"; - mes "more Zeny to make a second"; - mes "investment today. Will you"; - mes "invest one more time?"; + mes("[ Steward ]"); + mesf("You must pay ^FF0000%d^000000", .@eco_invest); + mes("more Zeny to make a second"); + mes("investment today. Will you"); + mes("invest one more time?"); } next; switch(select("Invest in Commercial Growth", "Cancel")) { case 1: if (getcastledata(strnpcinfo(NPC_MAP),4) >= 2) { - mes "[ Steward ]"; - mes "You've already made two"; - mes "investments today, so you'll"; - mes "have to wait until tomorrow"; - mes "to make another investment."; + mes("[ Steward ]"); + mes("You've already made two"); + mes("investments today, so you'll"); + mes("have to wait until tomorrow"); + mes("to make another investment."); close; } if (Zeny < .@eco_invest) { - mes "[ Steward ]"; - mes "I'm sorry, Master, but"; - mes "you do not have enough"; - mes "Zeny to make an investment"; - mes "for the guild today."; + mes("[ Steward ]"); + mes("I'm sorry, Master, but"); + mes("you do not have enough"); + mes("Zeny to make an investment"); + mes("for the guild today."); close; } Zeny -= .@eco_invest; setcastledata strnpcinfo(NPC_MAP),4,getcastledata(strnpcinfo(NPC_MAP),4)+1; - mes "[ Steward ]"; - mes "A wise use of the guild's"; - mes "funds, Master. We can expect"; - mes "to see the results of this"; - mes "investment by tomorrow."; + mes("[ Steward ]"); + mes("A wise use of the guild's"); + mes("funds, Master. We can expect"); + mes("to see the results of this"); + mes("investment by tomorrow."); close; case 2: - mes "[ Steward ]"; - mes "As you command, Master."; + mes("[ Steward ]"); + mes("As you command, Master."); close; } case 3: @@ -375,220 +375,220 @@ OnTreasureDied: // Quadruple the cost of investing if you've already invested once. if (getcastledata(strnpcinfo(NPC_MAP),5)) .@def_invest *= 4; - mes "[ Steward ]"; - mes "Investing in our stronghold's"; - mes "defense will enhance the"; - mes "durability of our Guardians"; - mes "and the Emperium. We'll need"; - mes "every advantage to protect"; - mes "ourselves from our enemies."; + mes("[ Steward ]"); + mes("Investing in our stronghold's"); + mes("defense will enhance the"); + mes("durability of our Guardians"); + mes("and the Emperium. We'll need"); + mes("every advantage to protect"); + mes("ourselves from our enemies."); next; - mes "[ Steward ]"; - mes "You can invest in defense"; - mes "once per day, but if you pay"; - mes "more Zeny, you can invest"; - mes "a maximum of two times daily."; + mes("[ Steward ]"); + mes("You can invest in defense"); + mes("once per day, but if you pay"); + mes("more Zeny, you can invest"); + mes("a maximum of two times daily."); next; - mes "[ Steward ]"; + mes("[ Steward ]"); if (getcastledata(strnpcinfo(NPC_MAP),3) == 100) { - mes "The Defense Level of this"; - mes "stronghold is 100%, and"; - mes "cannot be increased further."; + mes("The Defense Level of this"); + mes("stronghold is 100%, and"); + mes("cannot be increased further."); close; } if (getcastledata(strnpcinfo(NPC_MAP),5) >= 2) { - mes "Master, you've already"; - mes "invested in Defense twice"; - mes "today. You'll need to wait"; - mes "until tomorrow if you really"; - mes "want to increase our defenses."; + mes("Master, you've already"); + mes("invested in Defense twice"); + mes("today. You'll need to wait"); + mes("until tomorrow if you really"); + mes("want to increase our defenses."); close; } if (getcastledata(strnpcinfo(NPC_MAP),5) == 0) { - mes "We need ^FF0000"+.@def_invest+"^000000"; - mes "Zeny to invest in our"; - mes "stronghold's defenses."; - mes "Will you invest now?"; + mesf("We need ^FF0000%d^000000", .@def_invest); + mes("Zeny to invest in our"); + mes("stronghold's defenses."); + mes("Will you invest now?"); } else { - mes "We need ^FF0000"+.@def_invest+"^000000"; - mes "Zeny to invest in our"; - mes "stronghold's defenses"; - mes "a second time today."; - mes "Will you invest now?"; + mesf("We need ^FF0000%d^000000", .@def_invest); + mes("Zeny to invest in our"); + mes("stronghold's defenses"); + mes("a second time today."); + mes("Will you invest now?"); } next; switch(select("Invest in Defense", "Cancel")) { case 1: if (getcastledata(strnpcinfo(NPC_MAP),5) >= 2) { - mes "[ Steward ]"; - mes "Master, you've already"; - mes "invested in Defense twice"; - mes "today. You'll need to wait"; - mes "until tomorrow if you really"; - mes "want to increase our defenses."; + mes("[ Steward ]"); + mes("Master, you've already"); + mes("invested in Defense twice"); + mes("today. You'll need to wait"); + mes("until tomorrow if you really"); + mes("want to increase our defenses."); close; } if (Zeny < .@def_invest) { - mes "[ Steward ]"; - mes "I'm sorry, Master, but"; - mes "you do not have enough"; - mes "Zeny to make an investment"; - mes "for the guild today."; + mes("[ Steward ]"); + mes("I'm sorry, Master, but"); + mes("you do not have enough"); + mes("Zeny to make an investment"); + mes("for the guild today."); close; } Zeny -= .@def_invest; setcastledata strnpcinfo(NPC_MAP),5,getcastledata(strnpcinfo(NPC_MAP),5)+1; - mes "[ Steward ]"; - mes "A wise use of the guild's"; - mes "funds, Master. Increasing"; - mes "the frequency of treasure"; - mes "procured by the guild will"; - mes "definitely help us all."; + mes("[ Steward ]"); + mes("A wise use of the guild's"); + mes("funds, Master. Increasing"); + mes("the frequency of treasure"); + mes("procured by the guild will"); + mes("definitely help us all."); close; case 2: - mes "[ Steward ]"; - mes "As you command, Master."; + mes("[ Steward ]"); + mes("As you command, Master."); close; } case 4: if (getcastledata(strnpcinfo(NPC_MAP),9) == 1) { - mes "[ Steward ]"; - mes "Do you wish to dismiss"; - mes "the Kafra Employee that"; - mes "we've hired for the guild?"; + mes("[ Steward ]"); + mes("Do you wish to dismiss"); + mes("the Kafra Employee that"); + mes("we've hired for the guild?"); next; switch(select("Dismiss", "Cancel")) { case 1: cutin "kafra_01",2; - mes "[ Hired Kafra Employee ]"; - mes "Master, please reconsider!"; - mes "I've been working very hard"; - mes "for the success of the guild!"; - mes "I'll try harder to serve the"; - mes "guild members of this"; - mes "stronghold, I promise!"; + mes("[ Hired Kafra Employee ]"); + mes("Master, please reconsider!"); + mes("I've been working very hard"); + mes("for the success of the guild!"); + mes("I'll try harder to serve the"); + mes("guild members of this"); + mes("stronghold, I promise!"); next; switch(select("Dismiss", "Cancel")) { case 1: - mes "[ Hired Kafra Employee ]"; - mes "Why?! What have I done"; - mes "to deserve this? Waaah~!"; + mes("[ Hired Kafra Employee ]"); + mes("Why?! What have I done"); + mes("to deserve this? Waaah~!"); next; cutin "kafra_01",255; break; case 2: - mes "[ Hired Kafra Employee ]"; - mes "Thank you, Master!"; - mes "I'll obey your every"; - mes "command as best I can!"; - mes "You won't regret this!"; + mes("[ Hired Kafra Employee ]"); + mes("Thank you, Master!"); + mes("I'll obey your every"); + mes("command as best I can!"); + mes("You won't regret this!"); close; } break; case 2: - mes "[ Steward ]"; - mes "She works very hard,"; - mes "in my opinion. It was in"; - mes "all of our best interests to"; - mes "allow her to stay with us."; + mes("[ Steward ]"); + mes("She works very hard,"); + mes("in my opinion. It was in"); + mes("all of our best interests to"); + mes("allow her to stay with us."); close; } disablenpc "Kafra Employee#"+strnpcinfo(NPC_NAME_HIDDEN); setcastledata strnpcinfo(NPC_MAP),9,0; - mes "[ Steward ]"; - mes "That Kafra Employee"; - mes "has been dismissed."; - mes "Were really dissatisfied"; - mes "by the quality of her service?"; + mes("[ Steward ]"); + mes("That Kafra Employee"); + mes("has been dismissed."); + mes("Were really dissatisfied"); + mes("by the quality of her service?"); close; } else { - mes "[ Steward ]"; - mes "Will you hire a"; - mes "Kafra Employee to serve"; - mes "our stronghold? You must"; - mes "pay ^FF000010,000 Zeny^000000 to hire one."; + mes("[ Steward ]"); + mes("Will you hire a"); + mes("Kafra Employee to serve"); + mes("our stronghold? You must"); + mes("pay ^FF000010,000 Zeny^000000 to hire one."); next; switch(select("Hire", "Cancel")) { case 1: if (getgdskilllv(.@GID,10001) == 0) { - mes "[ Steward ]"; - mes "Master, we cannot hire a"; - mes "Kafra Employee because"; - mes "you have not yet attained"; - mes "the ^FF0000Contract with Kafra^000000"; - mes "guild skill."; + mes("[ Steward ]"); + mes("Master, we cannot hire a"); + mes("Kafra Employee because"); + mes("you have not yet attained"); + mes("the ^FF0000Contract with Kafra^000000"); + mes("guild skill."); close; } if (Zeny < 10000) { - mes "[ Steward ]"; - mes "Master, we cannot hire a"; - mes "Kafra Employee because"; - mes "we do not have enough"; - mes "funds to pay the contract fee."; + mes("[ Steward ]"); + mes("Master, we cannot hire a"); + mes("Kafra Employee because"); + mes("we do not have enough"); + mes("funds to pay the contract fee."); close; } Zeny -= 10000; enablenpc "Kafra Employee#"+strnpcinfo(NPC_NAME_HIDDEN); setcastledata strnpcinfo(NPC_MAP),9,1; - mes "[ Steward ]"; - mes "Very well. We have formed"; - mes "a contract with the Kafra"; - mes "Head Office, and hired a"; - mes "Kafra Employee for our"; - mes "stronghold. Here she is~"; + mes("[ Steward ]"); + mes("Very well. We have formed"); + mes("a contract with the Kafra"); + mes("Head Office, and hired a"); + mes("Kafra Employee for our"); + mes("stronghold. Here she is~"); next; cutin "kafra_01",2; - mes "[ Hired Kafra Employee ]"; - mes "How do you do? I've"; - mes "been dispatched by the"; - mes "Kafra Head Office to"; - mes "serve your guild's needs."; - mes "I'll do my best to follow"; - mes "your every command, Master."; + mes("[ Hired Kafra Employee ]"); + mes("How do you do? I've"); + mes("been dispatched by the"); + mes("Kafra Head Office to"); + mes("serve your guild's needs."); + mes("I'll do my best to follow"); + mes("your every command, Master."); next; cutin "kafra_01",255; - mes "[ Steward ]"; - mes "Our contract will expire"; - mes "after one month, so we must"; - mes "pay additional fees to keep"; - mes "this Kafra Employee in"; - mes "the service of our guild."; + mes("[ Steward ]"); + mes("Our contract will expire"); + mes("after one month, so we must"); + mes("pay additional fees to keep"); + mes("this Kafra Employee in"); + mes("the service of our guild."); close; case 2: - mes "[ Steward ]"; - mes "As you command, Master."; - mes "However, I suggest hiring"; - mes "a Kafra Employee as soon"; - mes "as possible since our guild"; - mes "would greatly benefit from"; - mes "the convenient Kafra services."; + mes("[ Steward ]"); + mes("As you command, Master."); + mes("However, I suggest hiring"); + mes("a Kafra Employee as soon"); + mes("as possible since our guild"); + mes("would greatly benefit from"); + mes("the convenient Kafra services."); close; } } case 5: - mes "[ Steward ]"; - mes "Do you wish to enter the"; - mes "Guild Treasure Room?"; - mes "Only you, the Guild Master,"; - mes "are permitted to enter."; + mes("[ Steward ]"); + mes("Do you wish to enter the"); + mes("Guild Treasure Room?"); + mes("Only you, the Guild Master,"); + mes("are permitted to enter."); next; - mes "[ Steward ]"; - mes "Please remember to open"; - mes "the Treasure Boxes at the"; - mes "proper time. Otherwise, the"; - mes "treasure may disappear if"; - mes "something unexpected happens."; + mes("[ Steward ]"); + mes("Please remember to open"); + mes("the Treasure Boxes at the"); + mes("proper time. Otherwise, the"); + mes("treasure may disappear if"); + mes("something unexpected happens."); next; switch(select("Go to Treasure Room", "Cancel")) { case 1: - mes "[ Steward ]"; - mes "Allow me to guide you"; - mes "on the secret path to"; - mes "the Treasure Room."; - mes "Press the secret switch"; - mes "when you wish to return here."; + mes("[ Steward ]"); + mes("Allow me to guide you"); + mes("on the secret path to"); + mes("the Treasure Room."); + mes("Press the secret switch"); + mes("when you wish to return here."); close2; if (compare(strnpcinfo(NPC_MAP),"arug")) { if (strnpcinfo(NPC_MAP) == "arug_cas01") setarray .@i[0],250,363; @@ -603,13 +603,13 @@ OnTreasureDied: warp strnpcinfo(NPC_MAP),.@i[0],.@i[1]; end; case 2: - mes "[ Steward ]"; - mes "Items in the Treasure Room"; - mes "are produced once each day."; - mes "Therefore, you must obtain"; - mes "the treasure items everyday."; - mes "For the sake of the guild,"; - mes "prioritize treasure harvesting!"; + mes("[ Steward ]"); + mes("Items in the Treasure Room"); + mes("are produced once each day."); + mes("Therefore, you must obtain"); + mes("the treasure items everyday."); + mes("For the sake of the guild,"); + mes("prioritize treasure harvesting!"); close; } } @@ -656,154 +656,154 @@ OnStartArena: .@GID = getcastledata(strnpcinfo(NPC_MAP),1); .@n$ = "["+strnpcinfo(NPC_NAME_VISIBLE)+"]"; if (!.@GID) { - mes .@n$; - mes "Great job. Now, all you"; - mes "need to do is destroy this"; - mes "Emperium to gain ownership"; - mes "over this stronghold."; + mes(.@n$); + mes("Great job. Now, all you"); + mes("need to do is destroy this"); + mes("Emperium to gain ownership"); + mes("over this stronghold."); close; } if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { - mes .@n$; - mes "As guardian of this"; - mes "stronghold, I answer only"; - mes "to the master of the guild"; - mes "that controls this place."; + mes(.@n$); + mes("As guardian of this"); + mes("stronghold, I answer only"); + mes("to the master of the guild"); + mes("that controls this place."); close; } else { if (!agitcheck2()) { - mes .@n$; - mes "I am "+strnpcinfo(NPC_NAME_VISIBLE)+", guardian of"; - mes "this stronghold. For now,"; - mes "all is quiet in this place."; + mes(.@n$); + mesf("I am %s, guardian of", strnpcinfo(NPC_NAME_VISIBLE)); + mes("this stronghold. For now,"); + mes("all is quiet in this place."); next; switch(select("Converse", "Cancel")) { case 1: - mes .@n$; - mes "Do you have any questions"; - mes "about this stronghold?"; + mes(.@n$); + mes("Do you have any questions"); + mes("about this stronghold?"); next; switch(select("Guardian Stones", "Fortress Gates", "Link Flags", "Battle Strategy", "Cancel")) { case 1: - mes .@n$; - mes "There is one Emperium"; - mes "and two Guardian Stones in"; - mes "each fortress. These stones"; - mes "are the first line of defense,"; - mes "and must be destroyed before"; - mes "enemies can even enter."; + mes(.@n$); + mes("There is one Emperium"); + mes("and two Guardian Stones in"); + mes("each fortress. These stones"); + mes("are the first line of defense,"); + mes("and must be destroyed before"); + mes("enemies can even enter."); next; - mes .@n$; - mes "The stones are located in"; - mes "^4D4DFFGate Houses^000000 which must be"; - mes "protected to prevent enemies"; - mes "from reaching the Emperium."; - mes "Guardian Stones can ^4D4DFFrecall"; - mes "your Guardians^000000 for protection."; + mes(.@n$); + mes("The stones are located in"); + mes("^4D4DFFGate Houses^000000 which must be"); + mes("protected to prevent enemies"); + mes("from reaching the Emperium."); + mes("Guardian Stones can ^4D4DFFrecall"); + mes("your Guardians^000000 for protection."); next; - mes .@n$; - mes "Fortresses with higher levels"; - mes "of defense can summon more"; - mes "Guardians: this is why it is"; - mes "so important for guilds to"; - mes "invest in Defense Growth."; + mes(.@n$); + mes("Fortresses with higher levels"); + mes("of defense can summon more"); + mes("Guardians: this is why it is"); + mes("so important for guilds to"); + mes("invest in Defense Growth."); next; - mes .@n$; - mes "Guardian Stones that have"; - mes "been destroyed can be revived"; - mes "after a certain time, but one of the guild members must give"; - mes "me the order. I can also report the status of the Guardian Stones."; + mes(.@n$); + mes("Guardian Stones that have"); + mes("been destroyed can be revived"); + mes("after a certain time, but one of the guild members must give"); + mes("me the order. I can also report the status of the Guardian Stones."); close; case 2: - mes .@n$; - mes "^4D4DFFFortress Gates^000000 are the second line of guild stronghold defense,"; - mes "and are protected by extra barricades activated by the Guardian Stones."; - mes "These gates are located in three different parts of the fortress."; + mes(.@n$); + mes("^4D4DFFFortress Gates^000000 are the second line of guild stronghold defense,"); + mes("and are protected by extra barricades activated by the Guardian Stones."); + mes("These gates are located in three different parts of the fortress."); next; - mes .@n$; - mes "Barricades are protected by"; - mes "Guardian Stones, and are"; - mes "restored when the Guardian"; - mes "Stones are retrieved. However,"; - mes "it is not as easy to restore"; - mes "destroyed Fortress Gates."; + mes(.@n$); + mes("Barricades are protected by"); + mes("Guardian Stones, and are"); + mes("restored when the Guardian"); + mes("Stones are retrieved. However,"); + mes("it is not as easy to restore"); + mes("destroyed Fortress Gates."); next; - mes .@n$; - mes "Fortress Gates can only be"; - mes "restored when the ^4D4DFFguild"; - mes "master of a stronghold"; - mes "changes^000000, or if ^4D4DFFrestoration"; - mes "is requested by the guild"; - mes "master of the stronghold^000000."; + mes(.@n$); + mes("Fortress Gates can only be"); + mes("restored when the ^4D4DFFguild"); + mes("master of a stronghold"); + mes("changes^000000, or if ^4D4DFFrestoration"); + mes("is requested by the guild"); + mes("master of the stronghold^000000."); close; case 3: - mes .@n$; - mes "Strongholds have many"; - mes "Link Flags that allow you"; - mes "to access vital areas within"; - mes "restrictions placed by the"; - mes "Barricades. Usually, ^4D4DFFFlag 1"; - mes "links to the Gate House^000000."; + mes(.@n$); + mes("Strongholds have many"); + mes("Link Flags that allow you"); + mes("to access vital areas within"); + mes("restrictions placed by the"); + mes("Barricades. Usually, ^4D4DFFFlag 1"); + mes("links to the Gate House^000000."); next; - mes .@n$; - mes "Many flags link directly to"; - mes "the flag near the Emperium."; - mes "The final numbered flag is"; - mes "linked to the Convenience"; - mes "Facility of the stronghold's"; - mes "owner. Keep this in mind."; + mes(.@n$); + mes("Many flags link directly to"); + mes("the flag near the Emperium."); + mes("The final numbered flag is"); + mes("linked to the Convenience"); + mes("Facility of the stronghold's"); + mes("owner. Keep this in mind."); close; case 4: - mes .@n$; - mes "Strategy? It would be better"; - mes "to develop your battle plan to"; - mes "exploit your guild's advantages"; - mes "and your enemies' weaknesses."; - mes "Use the Gate Houses and Barricades, and rebuild as quickly as you can!"; + mes(.@n$); + mes("Strategy? It would be better"); + mes("to develop your battle plan to"); + mes("exploit your guild's advantages"); + mes("and your enemies' weaknesses."); + mes("Use the Gate Houses and Barricades, and rebuild as quickly as you can!"); close; case 5: - mes .@n$; - mes "You have no questions"; - mes "to ask of me? Well, I'm"; - mes "here to serve your needs."; + mes(.@n$); + mes("You have no questions"); + mes("to ask of me? Well, I'm"); + mes("here to serve your needs."); close; } case 2: - mes .@n$; - mes "I'm always here, so"; - mes "feel free to request my"; - mes "assistance whenever"; - mes "the need arises."; + mes(.@n$); + mes("I'm always here, so"); + mes("feel free to request my"); + mes("assistance whenever"); + mes("the need arises."); close; } } else { - mes .@n$; - mes "Greetings, "+strcharinfo(PC_NAME)+"."; - mes "What are your orders?"; + mes(.@n$); + mesf("Greetings, %s.", strcharinfo(PC_NAME)); + mes("What are your orders?"); next; switch(select("Increase Stronghold Defense", "Situational Briefing", "Cancel")) { case 1: if (!getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[5]")) { if (getgdskilllv(.@GID,10002) == 0) { - mes .@n$; - mes "I'm sorry, but the Guardian"; - mes "Stones aren't powerful enough"; - mes "to summon Guardians yet. We"; - mes "need to accumulate more"; - mes "knowledge before they can"; - mes "summon any Guardians."; + mes(.@n$); + mes("I'm sorry, but the Guardian"); + mes("Stones aren't powerful enough"); + mes("to summon Guardians yet. We"); + mes("need to accumulate more"); + mes("knowledge before they can"); + mes("summon any Guardians."); close; } else { - mes .@n$; - mes "I shall endeavor to summon"; - mes "a Guardian through a Guardian"; - mes "Stone. However, keep in mind"; - mes "that this will not work if the"; - mes "Guardian Stone is destroyed."; + mes(.@n$); + mes("I shall endeavor to summon"); + mes("a Guardian through a Guardian"); + mes("Stone. However, keep in mind"); + mes("that this will not work if the"); + mes("Guardian Stone is destroyed."); setd "$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[5]",1; if (!getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[0]")) donpcevent "gard1#"+strnpcinfo(NPC_MAP)+"::OnEnable"; @@ -813,35 +813,35 @@ OnStartArena: } } else { - mes .@n$; - mes "You've already commanded"; - mes "me to summon a Guardian"; - mes "to defend the stronghold."; + mes(.@n$); + mes("You've already commanded"); + mes("me to summon a Guardian"); + mes("to defend the stronghold."); close; } case 2: - mes .@n$; - mes "Our defense status is..."; + mes(.@n$); + mes("Our defense status is..."); setarray .@status$[0],"^4D4DFFOperational","^FF0000Destroyed","^008000Repairing"; - mes "1st Guardian Stone: "+.@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[0]")]+"^000000"; - mes "2nd Guardian Stone: "+.@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[1]")]+"^000000"; - mes "1st Fortress Gate: "+.@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[2]")]+"^000000"; - mes "2nd Fortress Gate: "+.@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[3]")]+"^000000"; - mes "3rd Fortress Gate: "+.@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[4]")]+"^000000"; + mesf("1st Guardian Stone: %s^000000", .@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[0]")]); + mesf("2nd Guardian Stone: %s^000000", .@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[1]")]); + mesf("1st Fortress Gate: %s^000000", .@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[2]")]); + mesf("2nd Fortress Gate: %s^000000", .@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[3]")]); + mesf("3rd Fortress Gate: %s^000000", .@status$[getd("$agit_"+strnpcinfo(NPC_NAME_HIDDEN)+"[4]")]); close; case 3: - mes .@n$; - mes "I'll be standing by,"; - mes "awaiting your orders."; + mes(.@n$); + mes("I'll be standing by,"); + mes("awaiting your orders."); close; } } } } else { - mes .@n$; - mes "Who are you? Scoundrel!"; - mes "Leave this stronghold now!"; + mes(.@n$); + mes("Who are you? Scoundrel!"); + mes("Leave this stronghold now!"); close; } @@ -855,35 +855,35 @@ OnInit: cutin "kafra_01",2; .@GID = getcastledata(strnpcinfo(NPC_MAP),1); if (getcharid(CHAR_ID_GUILD) == .@GID && getgdskilllv(.@GID,10001)) { - mes "[Kafra Employee]"; - mes "Welcome, proud member"; - mes "of the ^FF0000"+getguildname(.@GID)+"^000000 Guild!"; - mes "The Kafra Corporation is ready"; - mes "to assist you wherever you go!"; + mes("[Kafra Employee]"); + mes("Welcome, proud member"); + mesf("of the ^FF0000%s^000000 Guild!", getguildname(.@GID)); + mes("The Kafra Corporation is ready"); + mes("to assist you wherever you go!"); next; switch(select("Use Storage", "Use Warp Service", "Rent Pushcart", "Cancel")) { case 1: if (basicskillcheck() && getskilllv("NV_BASIC") < 6) { - mes "[Kafra Employee]"; - mes "I'm so sorry, but you must"; - mes "have at least Novice Skill"; - mes "Lv.6 to use the Storage."; + mes("[Kafra Employee]"); + mes("I'm so sorry, but you must"); + mes("have at least Novice Skill"); + mes("Lv.6 to use the Storage."); } else openstorage; break; case 2: - mes "[Kafra Employee]"; - mes "Please tell me your"; - mes "Warp destination."; + mes("[Kafra Employee]"); + mes("Please tell me your"); + mes("Warp destination."); next; switch(select("Rachel -> 200 z", "Cancel")) { case 1: if (Zeny < 200) { - mes "[Kafra Employee]"; - mes "I'm sorry, but you don't"; - mes "have enough Zeny to pay"; - mes "the warp fee. Would you"; - mes "please check your funds again?"; + mes("[Kafra Employee]"); + mes("I'm sorry, but you don't"); + mes("have enough Zeny to pay"); + mes("the warp fee. Would you"); + mes("please check your funds again?"); close2; cutin "kafra_01",255; end; @@ -898,30 +898,30 @@ OnInit: break; case 3: if (BaseClass != Job_Merchant) { - mes "[Kafra Employee]"; - mes "I'm sorry, but the Pushcart"; - mes "rental service can only be"; - mes "used by Merchant, Blacksmith,"; - mes "and Alchemist class characters."; + mes("[Kafra Employee]"); + mes("I'm sorry, but the Pushcart"); + mes("rental service can only be"); + mes("used by Merchant, Blacksmith,"); + mes("and Alchemist class characters."); } else if (checkcart() == 1) { - mes "[Kafra Employee]"; - mes "Hm? You've already"; - mes "rented a Pushcart."; + mes("[Kafra Employee]"); + mes("Hm? You've already"); + mes("rented a Pushcart."); } else { - mes "[Kafra Employee]"; - mes "The Pushcart rental fee"; - mes "is 800 Zeny. Would you"; - mes "like to rent a Pushcart?"; + mes("[Kafra Employee]"); + mes("The Pushcart rental fee"); + mes("is 800 Zeny. Would you"); + mes("like to rent a Pushcart?"); next; switch(select("Rent Pushcart", "Cancel")) { case 1: if (Zeny < 800) { - mes "[Kafra Employee]"; - mes "I'm sorry, but you don't"; - mes "have enough Zeny to rent"; - mes "one of our Pushcarts."; + mes("[Kafra Employee]"); + mes("I'm sorry, but you don't"); + mes("have enough Zeny to rent"); + mes("one of our Pushcarts."); close2; cutin "kafra_01",255; end; @@ -935,11 +935,11 @@ OnInit: } break; case 4: - mes "[Kafra Employee]"; - mes "Thank you for using the"; - mes "Kafra Service. Wherever"; - mes "you go, Kafra will be"; - mes "there to support you!"; + mes("[Kafra Employee]"); + mes("Thank you for using the"); + mes("Kafra Service. Wherever"); + mes("you go, Kafra will be"); + mes("there to support you!"); close2; cutin "kafra_01",255; end; @@ -949,13 +949,13 @@ OnInit: end; } else { - mes "[Kafra Employee]"; - mes "I'm sorry, but I've been"; - mes "exclusively contracted"; - mes "to the members of the"; - mes "^FF0000"+getguildname(.@GID)+"^000000 Guild."; - mes "You'll have to ask another"; - mes "Kafra Employee to help you..."; + mes("[Kafra Employee]"); + mes("I'm sorry, but I've been"); + mes("exclusively contracted"); + mes("to the members of the"); + mesf("^FF0000%s^000000 Guild.", getguildname(.@GID)); + mes("You'll have to ask another"); + mes("Kafra Employee to help you..."); close2; cutin "kafra_01",255; end; @@ -968,54 +968,54 @@ OnInit: .@num = atoi(charat(strnpcinfo(NPC_NAME_VISIBLE),0)); .@var$ = "$agit_"+strnpcinfo(NPC_NAME_HIDDEN); if (getcharid(CHAR_ID_GUILD) == .@GID) { - mes "^3355FFYou will need the"; - mes "following materials to"; - mes "rebuild a destroyed"; - mes "Guardian Stone.^000000"; + mes("^3355FFYou will need the"); + mes("following materials to"); + mes("rebuild a destroyed"); + mes("Guardian Stone.^000000"); next; - mes "1 Oridecon"; - mes "1 Elunium"; - mes "30 Stones"; - mes "5 Blue Gemstones"; - mes "5 Yellow Gemstones"; - mes "5 Red Gemstones"; + mes("1 Oridecon"); + mes("1 Elunium"); + mes("30 Stones"); + mes("5 Blue Gemstones"); + mes("5 Yellow Gemstones"); + mes("5 Red Gemstones"); next; - mes "^3355FFDo you want to continue?^000000"; + mes("^3355FFDo you want to continue?^000000"); next; if(select("No", "Continue") == 1) { - mes "^3355FFWork canceled.^000000"; + mes("^3355FFWork canceled.^000000"); close; } if ((countitem(Oridecon) > 0) && (countitem(Elunium) > 0) && (countitem(Stone) > 29) && (countitem(Blue_Gemstone) > 4) && (countitem(Yellow_Gemstone) > 4) && (countitem(Red_Gemstone) > 4)) { - mes "^3355FFArrange Stones, Elunium, and"; - mes "Oridecon, in that order, in the"; - mes "center. Then you must arrange"; - mes "the enchanted Gemstones to"; - mes "rebuild the Guardian Stone.^000000"; + mes("^3355FFArrange Stones, Elunium, and"); + mes("Oridecon, in that order, in the"); + mes("center. Then you must arrange"); + mes("the enchanted Gemstones to"); + mes("rebuild the Guardian Stone.^000000"); next; setarray .@stone$[0],"Elunium","Oridecon","Stones"; .@i = select("Elunium", "Oridecon", "Stone")-1; if (.@i == 2) .@nice += 10; - mes "^3355FF"+.@stone$[.@i]+" has been"; - mes "placed in the center.^000000"; + mesf("^3355FF%s has been", .@stone$[.@i]); + mes("placed in the center.^000000"); next; .@i = select("Elunium", "Oridecon", "Stone")-1; if (.@i == 0) .@nice += 10; - mes "^3355FFYou have lined the"; - mes "outside of the center"; - mes "with some "+.@stone$[.@i]+".^000000"; + mes("^3355FFYou have lined the"); + mes("outside of the center"); + mesf("with some %s.^000000", .@stone$[.@i]); next; .@i = select("Elunium", "Oridecon", "Stone")-1; if (.@i == 1) .@nice += 10; - mes "^3355FFYou covered the"; - mes "rest of the materials"; - mes "with some "+.@stone$[.@i]+".^000000"; + mes("^3355FFYou covered the"); + mes("rest of the materials"); + mesf("with some %s.^000000", .@stone$[.@i]); next; - mes "^3355FFNow you need to arrange"; - mes "the enchanted Gemstones"; - mes "accordingly. You can identify"; - mes "their Magic properties by"; - mes "their casting effect.^000000"; + mes("^3355FFNow you need to arrange"); + mes("the enchanted Gemstones"); + mes("accordingly. You can identify"); + mes("their Magic properties by"); + mes("their casting effect.^000000"); next; setarray .@effect[0],56,54,225; setarray .@color$[0],"Red","Yellow","Blue"; @@ -1023,17 +1023,17 @@ OnInit: if (.@roof0 > 7) break; .@i = rand(3); specialeffect .@effect[.@i]; - mes "^3355FFThe Gemstones must"; - mes "be arranged in the correct"; - mes "order according to their"; - mes "magic properties and power.^000000"; + mes("^3355FFThe Gemstones must"); + mes("be arranged in the correct"); + mes("order according to their"); + mes("magic properties and power.^000000"); next; .@j = select("Red Gemstone", "Yellow Gemstone", "Blue Gemstone")-1; - mes "^3355FFYou placed the "+.@color$[.@j]+" Gemstone.^000000"; + mesf("^3355FFYou placed the %s Gemstone.^000000", .@color$[.@j]); if (.@i == .@j) { - mes "^3355FFHowever, the Guardian Stone"; - mes "Repair System failed because"; - mes "of a magic power conflict.^000000"; + mes("^3355FFHowever, the Guardian Stone"); + mes("Repair System failed because"); + mes("of a magic power conflict.^000000"); close; } .@nice += 10; @@ -1043,23 +1043,23 @@ OnInit: } if (.@nice > 90) { if (!getd(.@var$+"["+(.@num-1)+"]")) { - mes "^3355FFThe Guardian Stone"; - mes "Repair System has"; - mes "already completed.^000000"; + mes("^3355FFThe Guardian Stone"); + mes("Repair System has"); + mes("already completed.^000000"); close; } else { if (!agitcheck2()) { - mes "^3355FFIt is impossible to"; - mes "rebuild the Guardian"; - mes "Stone because the"; - mes "Emperium is not present.^000000"; + mes("^3355FFIt is impossible to"); + mes("rebuild the Guardian"); + mes("Stone because the"); + mes("Emperium is not present.^000000"); close; } else { - mes "^3355FFThe Gemstones have been"; - mes "arranged, and the Guardian"; - mes "Stone is successfully repaired.^000000"; + mes("^3355FFThe Gemstones have been"); + mes("arranged, and the Guardian"); + mes("Stone is successfully repaired.^000000"); delitem Oridecon,1; delitem Elunium,1; delitem Stone,30; @@ -1084,10 +1084,10 @@ OnInit: } } else { - mes "^3355FFAfter all of that work..."; - mes "It looks like you failed"; - mes "to fix the Guardian Stone,"; - mes "and lost some materials.^000000"; + mes("^3355FFAfter all of that work..."); + mes("It looks like you failed"); + mes("to fix the Guardian Stone,"); + mes("and lost some materials.^000000"); delitem Stone,10; delitem Blue_Gemstone,2; delitem Yellow_Gemstone,2; @@ -1096,9 +1096,9 @@ OnInit: } } else { - mes "^3355FFYou don't have enough"; - mes "materials to repair"; - mes "the Guardian Stone.^000000"; + mes("^3355FFYou don't have enough"); + mes("materials to repair"); + mes("the Guardian Stone.^000000"); close; } } @@ -1123,24 +1123,24 @@ OnEnable: if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (getd(.@var$+"["+(.@num+1)+"]") == 2) { - mes "^3355FFDemolished Fortress"; - mes "Gates can be repaired,"; - mes "but you will need to gather"; - mes "the following materials.^000000"; + mes("^3355FFDemolished Fortress"); + mes("Gates can be repaired,"); + mes("but you will need to gather"); + mes("the following materials.^000000"); next; - mes "^4D4DFF10 Steel^000000,"; - mes "^4D4DFF30 Trunks^000000,"; - mes "^4D4DFF5 Oridecon^000000, and"; - mes "^4D4DFF10 Emveretarcon^000000."; + mes("^4D4DFF10 Steel^000000,"); + mes("^4D4DFF30 Trunks^000000,"); + mes("^4D4DFF5 Oridecon^000000, and"); + mes("^4D4DFF10 Emveretarcon^000000."); next; select("Continue"); if ((countitem(Wooden_Block) > 29) && (countitem(Steel) > 9) && (countitem(Emveretarcon) > 9) && (countitem(Oridecon) > 4)) { - mes "^3355FFYou will need Trunks to"; - mes "repair the support frame,"; - mes "Oridecon to enhance the"; - mes "gate's endurance, and"; - mes "Emveretarcon to basically"; - mes "hold everything together.^000000"; + mes("^3355FFYou will need Trunks to"); + mes("repair the support frame,"); + mes("Oridecon to enhance the"); + mes("gate's endurance, and"); + mes("Emveretarcon to basically"); + mes("hold everything together.^000000"); next; .@ro_of01 = rand(10,15); while(1) { @@ -1148,68 +1148,68 @@ OnEnable: else { switch(rand(1,4)) { case 1: - mes "^3355FFThe support frame"; - mes "is badly damaged:"; - mes "fixing this part"; - mes "is a top priority.^000000"; + mes("^3355FFThe support frame"); + mes("is badly damaged:"); + mes("fixing this part"); + mes("is a top priority.^000000"); next; switch(select("Trunk", "Steel", "Emveretarcon", "Oridecon")) { case 1: - mes "^3355FFThe frame has been"; - mes "reinforced with wood.^000000"; + mes("^3355FFThe frame has been"); + mes("reinforced with wood.^000000"); ++.@rp_temp; ++.@ro_of02; specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); next; break; case 2: - mes "^3355FFYou tried using steel,"; - mes "but it's not working very"; - mes "well. You'll have to try"; - mes "something else.^000000"; + mes("^3355FFYou tried using steel,"); + mes("but it's not working very"); + mes("well. You'll have to try"); + mes("something else.^000000"); close; case 3: - mes "^3355FFYou tried using emveretarcon"; - mes "to reinforce the gate, but it's"; - mes "not working well at all."; - mes "You'll have to start over.^000000"; + mes("^3355FFYou tried using emveretarcon"); + mes("to reinforce the gate, but it's"); + mes("not working well at all."); + mes("You'll have to start over.^000000"); close; case 4: - mes "^3355FFYou tried using oridecon,"; - mes "but it's not working very"; - mes "well. You'll have to try"; - mes "something else.^000000"; + mes("^3355FFYou tried using oridecon,"); + mes("but it's not working very"); + mes("well. You'll have to try"); + mes("something else.^000000"); close; } break; case 2: - mes "^3355FFIt looks like the gate's"; - mes "overall endurance needs to"; - mes "be reinforced with something.^000000"; + mes("^3355FFIt looks like the gate's"); + mes("overall endurance needs to"); + mes("be reinforced with something.^000000"); next; switch(select("Trunk", "Steel", "Emveretarcon", "Oridecon")) { case 1: - mes "^3355FFYou tried using wood"; - mes "to reinforce the gate.^000000"; + mes("^3355FFYou tried using wood"); + mes("to reinforce the gate.^000000"); ++.@ro_of02; next; break; case 2: - mes "^3355FFYou tried using steel"; - mes "to reinforce the gate, but"; - mes "it's not working well at all."; - mes "You'll have to start over.^000000"; + mes("^3355FFYou tried using steel"); + mes("to reinforce the gate, but"); + mes("it's not working well at all."); + mes("You'll have to start over.^000000"); close; case 3: - mes "^3355FFYou tried using emveretarcon"; - mes "to reinforce the gate, but it's"; - mes "not working well at all."; - mes "You'll have to start over.^000000"; + mes("^3355FFYou tried using emveretarcon"); + mes("to reinforce the gate, but it's"); + mes("not working well at all."); + mes("You'll have to start over.^000000"); close; case 4: - mes "^3355FFYou hammered the"; - mes "oridecon: it looks"; - mes "like this will work.^000000"; + mes("^3355FFYou hammered the"); + mes("oridecon: it looks"); + mes("like this will work.^000000"); ++.@rp_temp; ++.@ro_of02; specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); @@ -1218,92 +1218,92 @@ OnEnable: } break; case 3: - mes "^3355FFThe damage to the gate"; - mes "has caused all these"; - mes "cracks. You'll have to"; - mes "weld them solid somehow.^000000"; + mes("^3355FFThe damage to the gate"); + mes("has caused all these"); + mes("cracks. You'll have to"); + mes("weld them solid somehow.^000000"); next; switch(select("Trunk", "Steel", "Emveretarcon", "Oridecon")) { case 1: - mes "^3355FFYou tried using wood to fix"; - mes "this problem, but it seems"; - mes "to have made it worse."; - mes "You'll have to start all over.^000000"; + mes("^3355FFYou tried using wood to fix"); + mes("this problem, but it seems"); + mes("to have made it worse."); + mes("You'll have to start all over.^000000"); close; case 2: - mes "^3355FFYou used steel to weld"; - mes "all the cracks: the gate is"; - mes "is starting to look more solid.^000000"; + mes("^3355FFYou used steel to weld"); + mes("all the cracks: the gate is"); + mes("is starting to look more solid.^000000"); ++.@rp_temp; ++.@ro_of02; specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); next; break; case 3: - mes "^3355FFYou tried using emveretarcon"; - mes "to reinforce the gate, but it's"; - mes "not working well at all."; - mes "You'll have to start over.^000000"; + mes("^3355FFYou tried using emveretarcon"); + mes("to reinforce the gate, but it's"); + mes("not working well at all."); + mes("You'll have to start over.^000000"); close; case 4: - mes "^3355FFYou tried using oridecon,"; - mes "but it's not working very"; - mes "well. You'll have to try"; - mes "something else.^000000"; + mes("^3355FFYou tried using oridecon,"); + mes("but it's not working very"); + mes("well. You'll have to try"); + mes("something else.^000000"); close; } break; case 4: - mes "^3355FFNow you need to make"; - mes "sure that the gate is held"; - mes "together pretty solidly.^000000"; + mes("^3355FFNow you need to make"); + mes("sure that the gate is held"); + mes("together pretty solidly.^000000"); next; switch(select("Trunk", "Steel", "Emveretarcon", "Oridecon")) { case 1: - mes "^3355FFYou tried using wood to fix"; - mes "this problem, but it seems"; - mes "to have made it worse."; - mes "You'll have to start all over.^000000"; + mes("^3355FFYou tried using wood to fix"); + mes("this problem, but it seems"); + mes("to have made it worse."); + mes("You'll have to start all over.^000000"); close; case 2: - mes "^3355FFYou tried using steel,"; - mes "but it's not working very"; - mes "well. You'll have to try"; - mes "something else.^000000"; + mes("^3355FFYou tried using steel,"); + mes("but it's not working very"); + mes("well. You'll have to try"); + mes("something else.^000000"); close; case 3: - mes "^3355FFYou successfully used"; - mes "the emveretarcon to repair"; - mes "much of the gate's damage.^000000"; + mes("^3355FFYou successfully used"); + mes("the emveretarcon to repair"); + mes("much of the gate's damage.^000000"); ++.@rp_temp; ++.@ro_of02; specialeffect(EF_REPAIRWEAPON, AREA, playerattached()); next; break; case 4: - mes "^3355FFYou tried using oridecon,"; - mes "but it's not working very"; - mes "well. You'll have to try"; - mes "something else.^000000"; + mes("^3355FFYou tried using oridecon,"); + mes("but it's not working very"); + mes("well. You'll have to try"); + mes("something else.^000000"); close; } } } } - mes "^3355FFWell, it looks like"; - mes "you're just about done"; - mes "with repairing the gate.^000000"; + mes("^3355FFWell, it looks like"); + mes("you're just about done"); + mes("with repairing the gate.^000000"); next; if (!agitcheck2()) { - mes "^3355FFUnfortunately, the Fortress"; - mes "Gate can't be reconstructed:"; - mes "the Emperium is no longer here.^000000"; + mes("^3355FFUnfortunately, the Fortress"); + mes("Gate can't be reconstructed:"); + mes("the Emperium is no longer here.^000000"); close; } else { if (.@rp_temp == .@ro_of01) { - mes "^3355FFThe Fortress Gate has"; - mes "been successfully repaired!^000000"; + mes("^3355FFThe Fortress Gate has"); + mes("been successfully repaired!^000000"); delitem Wooden_Block,30; delitem Steel,10; delitem Emveretarcon,10; @@ -1323,11 +1323,11 @@ OnEnable: end; } else { - mes "^3355FFThe wall has been breached,"; - mes "and the attempt to repair the"; - mes "Fortress Gate has failed."; - mes "You lost some of your"; - mes "repair resources...^000000"; + mes("^3355FFThe wall has been breached,"); + mes("and the attempt to repair the"); + mes("Fortress Gate has failed."); + mes("You lost some of your"); + mes("repair resources...^000000"); delitem Oridecon,2; delitem Steel,4; delitem Wooden_Block,14; @@ -1337,9 +1337,9 @@ OnEnable: } } else { - mes "^3355FFYou can't attempt to repair"; - mes "the Fortress Gate if you don't"; - mes "have all the needed materials.^000000"; + mes("^3355FFYou can't attempt to repair"); + mes("the Fortress Gate if you don't"); + mes("have all the needed materials.^000000"); close; } } @@ -1738,28 +1738,28 @@ OnDisable: function script LinkFlag { if (!getcharid(CHAR_ID_GUILD) || getcharid(CHAR_ID_GUILD) != getcastledata(strnpcinfo(NPC_MAP),1)) end; if (getarg(0) == "Convenience Facility") { - mes "^3355FFThis is the Stronghold"; - mes "Teleport Service. Would"; - mes "you like to teleport to the"; - mes "Convenience Facility for"; - mes "guild members?^000000"; + mes("^3355FFThis is the Stronghold"); + mes("Teleport Service. Would"); + mes("you like to teleport to the"); + mes("Convenience Facility for"); + mes("guild members?^000000"); if(select("Go to Convenience Facility", "Cancel") == 1) warp strnpcinfo(NPC_MAP),getarg(1),getarg(2); close; } if (getarg(0) == "Emperium Center") { - mes "^3355FFThis is the Stronghold"; - mes "Teleport Service. Would"; - mes "you like to teleport to"; - mes "the Emperium Center?^000000"; + mes("^3355FFThis is the Stronghold"); + mes("Teleport Service. Would"); + mes("you like to teleport to"); + mes("the Emperium Center?^000000"); if(select("Teleport", "Cancel") == 1) warp strnpcinfo(NPC_MAP),getarg(1),getarg(2); close; } - mes "^3355FFThis is the Stronghold"; - mes "Teleport Service. Please"; - mes "choose a destination"; - mes "within the stronghold.^000000"; + mes("^3355FFThis is the Stronghold"); + mes("Teleport Service. Please"); + mes("choose a destination"); + mes("within the stronghold.^000000"); for (.@i = 0; .@i<getargcount(); .@i += 3) .@menu$ += getarg(.@i)+":"; .@menu$ += "Cancel"; @@ -1774,20 +1774,20 @@ function script ReturnFlag { .@str$ = (compare(strnpcinfo(NPC_MAP),"aru"))?"Arunafeltz":"Schwaltzvalt"; .@GID = getcastledata(getarg(0),1); if (!.@GID) { - mes "[ "+.@str$+" Royal Edict ]"; - mes "The Holy Kingdom of"; - mes .@str$+" declares that"; - mes "one has yet to claim lordship"; - mes "over this stronghold. The one"; - mes "that breaks the Emperium will"; - mes "be recognized as its new owner."; + mesf("[ %s Royal Edict ]", .@str$); + mes("The Holy Kingdom of"); + mesf("%s declares that", .@str$); + mes("one has yet to claim lordship"); + mes("over this stronghold. The one"); + mes("that breaks the Emperium will"); + mes("be recognized as its new owner."); close; } if (getcharid(CHAR_ID_GUILD) == .@GID && getarg(1,0)) { - mes "[ Ringing Voice ]"; - mes "Courageous one,"; - mes "do you wish to return"; - mes "to your stronghold?"; + mes("[ Ringing Voice ]"); + mes("Courageous one,"); + mes("do you wish to return"); + mes("to your stronghold?"); next; if(select("Return to the Stronghold", "Cancel") == 1 && getcharid(CHAR_ID_GUILD) == getcastledata(getarg(0),1)) { if (compare(getarg(0),"arug")) { @@ -1804,27 +1804,27 @@ function script ReturnFlag { } close; } - mes "[ "+.@str$+" Royal Edict ]"; - mes "The Holy Kingdom of"; - mes .@str$+" decrees that"; - mes "this stronghold is owned"; - mes "by the ^FF0000"+getguildname(.@GID)+"^000000 Guild."; + mesf("[ %s Royal Edict ]", .@str$); + mes("The Holy Kingdom of"); + mesf("%s decrees that", .@str$); + mes("this stronghold is owned"); + mesf("by the ^FF0000%s^000000 Guild.", getguildname(.@GID)); next; - mes "[ "+.@str$+" Royal Edict ]"; - mes "^FF0000"+getguildmaster(.@GID)+"^000000 is"; - mes "Guild Master of ^FF0000"+getguildname(.@GID)+"^000000."; - mes "Any that object must claim this"; - mes "stronghold through strength of"; - mes "steel and magic during the"; - mes "appointed Guild Siege times."; + mesf("[ %s Royal Edict ]", .@str$); + mesf("^FF0000%s^000000 is", getguildmaster(.@GID)); + mesf("Guild Master of ^FF0000%s^000000.", getguildname(.@GID)); + mes("Any that object must claim this"); + mes("stronghold through strength of"); + mes("steel and magic during the"); + mes("appointed Guild Siege times."); close; } //== Treasure Room Switches ================================ - script Switch#template FAKE_NPC,{ - mes " "; - mes "^3355FFWill you pull"; - mes "this small lever?^000000"; + mes(" "); + mes("^3355FFWill you pull"); + mes("this small lever?^000000"); next; if(select("Pull Lever", "Cancel") == 2) close; if (compare(strnpcinfo(NPC_MAP),"arug")) { @@ -1844,7 +1844,7 @@ function script ReturnFlag { //== Guild Dungeon Warps =================================== - script Sunflower#template FAKE_NPC,{ if (getcharid(CHAR_ID_GUILD) == getcastledata(strnpcinfo(NPC_MAP),1)) { - mes "- It's an amazingly huge sunflower; as big as a human! ... You feel something mysterious emanating from the flower. -"; + mes("- It's an amazingly huge sunflower; as big as a human! ... You feel something mysterious emanating from the flower. -"); next; switch(select("Hold the stem.", "Do nothing.")) { case 1: @@ -1862,7 +1862,7 @@ function script ReturnFlag { warp .@map$,.@mapx[.@i],.@mapy[.@i]; close; case 2: - mes "It's too scary to touch unknown things."; + mes("It's too scary to touch unknown things."); close; } } |