diff options
Diffstat (limited to 'npc/re')
27 files changed, 682 insertions, 722 deletions
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/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt index 5818bb4fd..f03dece93 100644 --- a/npc/re/jobs/2e/kagerou_oboro.txt +++ b/npc/re/jobs/2e/kagerou_oboro.txt @@ -659,7 +659,7 @@ job_ko,25,115,4 script Old Man#ko 4_M_KAGE_OLD,{ 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 "[Leader Gion]"; mes "Because of ^B24E59" + .@inputstr$ + "^000000?"; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index e37087857..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."; 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/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/refine.txt b/npc/re/merchants/refine.txt index 879e9a5f1..c0ec2131f 100644 --- a/npc/re/merchants/refine.txt +++ b/npc/re/merchants/refine.txt @@ -258,7 +258,7 @@ function script refinenew { mes "[" + getarg(0) + "]"; mes "How many times would you like me to refine your item?"; next; - input .@refinecnt; + input(.@refinecnt); .@refinecheck = .@refinecnt + getequiprefinerycnt(.@part); if (.@refinecnt < 1 || .@refinecheck > 20) { mes "[" + getarg(0) + "]"; 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 188bc514a..d544aeb0b 100644 --- a/npc/re/quests/eden/eden_tutorial.txt +++ b/npc/re/quests/eden/eden_tutorial.txt @@ -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."; |