diff options
Diffstat (limited to 'npc/quests')
31 files changed, 828 insertions, 898 deletions
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 55f5c319c..69c0ad902 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -1494,13 +1494,13 @@ sec_in02,15,15,4 script boss::boss_aru_monas 1_M_SIGNMONK,{ mes ""+aru_monas; close; case 2: - input .@input,0,1000; + input(.@input, 0, 1000); aru_monas = .@input; mes " "; mes ""+aru_monas; close; case 3: - input .@input,0,1000; + input(.@input, 0, 1000); prt_curse = .@input; mes " "; mes ""+prt_curse; @@ -3873,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."; @@ -3917,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"; @@ -6884,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?!"; @@ -7387,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?"; @@ -7401,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."; @@ -7434,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."; @@ -7626,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?"; @@ -7640,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."; @@ -7668,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."; @@ -8559,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*"; @@ -8571,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*"; @@ -8581,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*"; @@ -10169,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"; 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 b2fefb3cf..f2743233b 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -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.*"; @@ -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$+"*"; diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt index 1cc002d80..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"; @@ -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..."; |