From bf9e067bf1e5c6bc15d313e0a197fd8f4b2ec131 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 19 Oct 2014 00:47:39 +0200 Subject: Removed use of 'menu' from official (non-custom) scripts - Some scripts were partly refactored/rewritten to use a more modern coding style (and to fix some issues) - Note: the 'menu' command will be deprecated soon in favor of 'select' and 'prompt'. Signed-off-by: Haru --- npc/cities/aldebaran.txt | 296 +++++++++------------------ npc/events/christmas_2005.txt | 2 +- npc/events/dumplingfestival.txt | 72 +++---- npc/events/event_skill_reset.txt | 93 +++++---- npc/events/halloween_2008.txt | 338 ++++++++++++++++--------------- npc/events/nguild/nguild_managers.txt | 121 +++++------ npc/events/twintowers.txt | 79 ++++---- npc/events/whiteday.txt | 181 +++++++++-------- npc/events/xmas.txt | 10 +- npc/quests/ninja_quests.txt | 371 +++++++++++++++++----------------- 10 files changed, 720 insertions(+), 843 deletions(-) (limited to 'npc') diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 33acb60c2..f4b3662fc 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -1058,180 +1058,77 @@ aldeba_in,79,161,6 script Kafra#04 4_F_KAFRA3,{ next; mes "[Kafra]"; mes "The amount of special reserve points that you have is: ^FF0000"+RESRVPTS+"^000000 pts. Please make a choice based on your point total."; -M_Menu: - next; - menu "100- Potato 7 ea",M_1a, "200- Potato 15 ea",M_1b, "300- Potato 25 ea",M_1c, "400- Potato 35 ea",M_1d, - "500- Potato 50 ea",M_1e, "600- Potato 60 ea",M_1f, "700- Potato 75 ea",M_1g, "800- Potato 85 ea",M_1h, - "900- Potato 100 ea",M_1i, "1000- 1st Lottery Chance!",M_1j, "Next items",M_2, "Cancel",M_End; - - M_1a: - if(RESRVPTS < 100) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 7; - set RESRVPTS, RESRVPTS - 100; - close; - M_1b: - if(RESRVPTS < 200) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 15; - set RESRVPTS, RESRVPTS - 200; - close; - M_1c: - if(RESRVPTS < 300) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 25; - set RESRVPTS, RESRVPTS - 300; - close; - M_1d: - if(RESRVPTS < 400) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 35; - set RESRVPTS, RESRVPTS - 400; - close; - M_1e: - if(RESRVPTS < 500) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 50; - set RESRVPTS, RESRVPTS - 500; - close; - M_1f: - if(RESRVPTS < 600) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 60; - set RESRVPTS, RESRVPTS - 600; - close; - M_1g: - if(RESRVPTS < 700) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 75; - set RESRVPTS, RESRVPTS - 700; - close; - M_1h: - if(RESRVPTS < 800) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 85; - set RESRVPTS, RESRVPTS - 800; - close; - M_1i: - if(RESRVPTS < 900) goto sL_LowPts1; - mes "[Kafra]"; - mes "Here you are."; - getitem 516, 100; - set RESRVPTS, RESRVPTS - 900; - close; - M_1j: - if(RESRVPTS < 1000) goto sL_LowPts1; - set RESRVPTS, RESRVPTS - 1000; - mes "[Kafra]"; - mes "^0000FF1st Lottery Opportunity!!^000000"; - set @Lotto, 1; + .@page = 1; + while (true) { + if (.@page == 1) { + // Points, Item ID, amount + setarray .@choices, 100, Sweet_Potato, 7, + 200, Sweet_Potato, 15, + 300, Sweet_Potato, 25, + 400, Sweet_Potato, 35, + 500, Sweet_Potato, 50, + 600, Sweet_Potato, 60, + 700, Sweet_Potato, 75, + 800, Sweet_Potato, 85, + 900, Sweet_Potato, 100, + 1000, null, 0; + .@ordinal$ = "1st"; + .@changepage$ = "Next items"; + } else { // .@page == 2 + setarray .@choices, 1100, Sweet_Potato, 7, + 1300, Sweet_Potato, 15, + 1500, Sweet_Potato, 25, + 1700, Sweet_Potato, 35, + 1900, Sweet_Potato, 50, + 2100, Sweet_Potato, 60, + 2300, Sweet_Potato, 75, + 2500, Sweet_Potato, 85, + 2800, Sweet_Potato, 100, + 3000, null, 0; + .@ordinal$ = "2nd"; + .@changepage$ = "Previous List"; + } + .@list$ = ""; + .@numitemchoices = 0; + for (.@i = 0; .@i < getarraysize(.@choices) - 3; .@i += 3) { // Skip the last entry as it's handled separately + .@list$ += .@choices[i] + "- " + getitemname(.@choices[.@i+1]) + " " + .@choices[.@i+2] + " ea:"; + ++.@numitemchoices; + } + .@list$ += .@choices[.@i] + "- " + .@ordinal$ + " Lottery Chance!:" + .@changepage$ +":Cancel"; next; - callfunc "F_Lottery"; - goto M_End; - - sL_LowPts1: - mes "[Kafra]"; - mes "I'm sorry but you do not have enough reserve points for that selection."; - goto M_Menu; - - M_2: - menu "1100- Red Potion 7 ea",M_2a, "1300- Red Potion 15 ea",M_2b, "1500- Red Potion 25 ea",M_2c, - "1700- Red Potion 35 ea",M_2d, "1900- Red Potion 50 ea",M_2e, "2100- Red Potion 60 ea",M_2f, - "2300- Red Potion 75 ea",M_2g, "2500- Red Potion 85 ea",M_2h, "2800- Red Potion 100 ea",M_2i, - "3000- 2nd Lotery Chance!",M_2j, "Previous List",M_Menu, "Cancel",M_End; - - M_2a: - if(RESRVPTS < 1100) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 7; - set RESRVPTS, RESRVPTS - 1100; - close; - M_2b: - if(RESRVPTS < 1300) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 15; - set RESRVPTS, RESRVPTS - 1300; - close; - M_2c: - if(RESRVPTS < 1500) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 25; - set RESRVPTS, RESRVPTS - 1500; - close; - M_2d: - if(RESRVPTS < 1700) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 35; - set RESRVPTS, RESRVPTS - 1700; - close; - M_2e: - if(RESRVPTS < 1900) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 50; - set RESRVPTS, RESRVPTS - 1900; - close; - M_2f: - if(RESRVPTS < 2100) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 60; - set RESRVPTS, RESRVPTS - 2100; - close; - M_2g: - if(RESRVPTS < 2300) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 75; - set RESRVPTS, RESRVPTS - 2300; - close; - M_2h: - if(RESRVPTS < 2500) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 85; - set RESRVPTS, RESRVPTS - 2500; - close; - M_2i: - if(RESRVPTS < 2800) goto sL_LowPts2; - mes "[Kafra]"; - mes "Here you are."; - getitem 501, 100; - set RESRVPTS, RESRVPTS - 2800; - close; - M_2j: - if(RESRVPTS < 3000) goto sL_LowPts2; - set RESRVPTS, RESRVPTS - 3000; - mes "[Kafra]"; - mes "^0000FF2nd Lottery Opportunity!!^000000"; - set @Lotto, 2; + .@chosen = select(.@list$) - 1; + if (.@chosen <= .@numitemchoices) { + if (RESRVPTS < .@choices[.@chosen*3]) { + mes "[Kafra]"; + mes "I'm sorry but you do not have enough reserve points for that selection."; + continue; + } + RESRVPTS -= .@choices[.@chosen * 3]; + if (.@chosen < .@numitemchances) { + // Item + mes "[Kafra]"; + mes "Here you are."; + getitem .@choices[.@chosen*3 + 1], .@choices[.@chosen*3 + 2]; + close; + } + // Lottery chance + mes "^0000FF"+ .@ordinal$ + " Lottery Opportunity!!^000000"; + @Lotto = .@page; next; callfunc "F_Lottery"; - goto M_End; - - sL_LowPts2: - mes "[Kafra]"; - mes "I'm sorry but you do not have enough reserve points for that selection."; - next; - goto M_2; + break; + } else if (.@chosen == .@numitemchoices + 1) { // next/previous items + .@page = (.@page == 1 ? 2 : 1); + continue; + } else { // Cancel + break; + } + } - M_End: - mes "[Kafra]"; - mes "Please come back anytime when you have more reserve points."; - cutin "",255; - close; + mes "[Kafra]"; + mes "Please come back anytime when you have more reserve points."; + cutin "",255; + close; } // Special Reserve 2 ---------------------------------------------- @@ -1244,44 +1141,45 @@ aldeba_in,88,161,3 script Kafra#05 4_F_KAFRA3,{ mes "[Kafra]"; mes "Would you like to use your points?"; next; - menu "Yes I would.",-, "Maybe next time.",M_End; - + if (select("Yes I would.","Maybe next time.") == 1) { mes "[Kafra]"; mes "You have the following amount of special reserve points: ^5544FF"+RESRVPTS+"^000000."; mes "Make a choice and test your luck!"; next; - menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End; - - sM_1st: - if(RESRVPTS < 5000) goto sL_NotEnuf; - set RESRVPTS, RESRVPTS - 5000; - set @Lotto, 3; - callfunc "F_Lottery"; - goto M_End; - sM_2nd: - if(RESRVPTS < 7000) goto sL_NotEnuf; - set RESRVPTS, RESRVPTS - 7000; - set @Lotto, 4; - callfunc "F_Lottery"; - goto M_End; - sM_3rd: - if(RESRVPTS < 10000) goto sL_NotEnuf; - set RESRVPTS, RESRVPTS - 10000; - set @Lotto, 5; - callfunc "F_Lottery"; - goto M_End; + switch (select("5000pts = 1st Lottery Chance!","7000pts = 2nd Lottery Chance!","10000pts = 3rd Lottery Chance!","Cancel")) { + case 1: // 5000 + .@points = 5000; + @Lotto = 3; + break; + case 2: // 7000 + .@points = 7000; + @Lotto = 4; + break; + case 3: // 10000 + .@points = 10000; + @Lotto = 5; + break; + case 4: // Cancel + .@points = 0; + break; + } - sL_NotEnuf: + if (.@points) { + if (RESRVPTS < .@points) { mes "[Kafra]"; mes "I'm sorry dear but you do not have enough points for this selection."; cutin "",255; close; - M_End: - mes "[Kafra]"; - mes "No problem. Collect more and more special reserve points by using the Kafra Services found throughout Rune Midgard."; - mes "Thank you for using Kafra Corp. services."; - cutin "",255; - close; + } + RESRVPTS -= .@points; + callfunc "F_Lottery"; + } + } + mes "[Kafra]"; + mes "No problem. Collect more and more special reserve points by using the Kafra Services found throughout Rune Midgard."; + mes "Thank you for using Kafra Corp. services."; + cutin "",255; + close; } // Function F_Lottery ------------------------------------------------------------------------------------------ diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index 5236e5a54..eb80e6be1 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -1026,7 +1026,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "I feel so sad for disappointed"; mes "kids who didn't hear the carols."; next; - menu "...can I help you?",-; + select("...can I help you?"); mes "[Oholy]"; mes "Good gracious! Are you for real?"; mes "Oh? Shee... Can you hear it?"; diff --git a/npc/events/dumplingfestival.txt b/npc/events/dumplingfestival.txt index 6c5a3b6b5..23a085eb8 100644 --- a/npc/events/dumplingfestival.txt +++ b/npc/events/dumplingfestival.txt @@ -21,60 +21,48 @@ payon,93,81,4 script Exorcist Master Fahae 4_M_BUDDHIST,{ mes "I feel it is time I let another warrior try to complete"; mes "my quest. I have some items to assist you in my quest."; next; - menu "I wish to buy",-, "No thanks",M_FIN; - + if (select("I wish to buy","No thanks") != 1) { + mes "[Exorcist Master Fahae]"; + mes "The path of fully venquishing evil is far, help me in the way of God."; + close; + } mes "[Exorcist Master Fahae]"; mes "I have 2 items which might become useful to you."; next; - menu "Realgar Wine",-, "Exorcize Herb",M_HERB; - + switch (select("Realgar Wine","Exorcize Herb")) { + case 1: + .@itemid = Realgar_Wine; // 682 + .@price = 20000; + break; + case 2: + .@itemid = Exorcize_Herb; // 683 + .@price = 10000; + break; + } mes "[Exorcist Master Fahae]"; mes "How many do you require?"; mes "You may only buy 5 at one time."; - mes "Each costs 20000z."; + mes "Each costs "+ .@price +"z."; mes "(Type in 0 to cancel)"; next; input @input; - if(@input==0) close; - if(@input>5) goto L_SORRY; - if(Zeny< @input*20000) goto L_NoZeny; - Zeny -= 20000*@input; - getitem 682,@input; + if (@input == 0) + close; + if (@input > 5) { + mes "[Exorcist Master Fahae]"; + mes "You must not be stingy, it is the path of God to be honest."; + close; + } + if (Zeny < @input * .@price) { + mes "[Exorcist Master Fahae]"; + mes "Money doesn't bring joy to everyone, but we need it to support the temple and myself. Please, try to kill some monsters and take their drops."; + close; + } + Zeny -= @input * .@price; + getitem .@itemid, @input; mes "[Exorcist Master Fahae]"; mes "Here you go, I hope you may succeed in my quest."; close; - -L_SORRY: - mes "[Exorcist Master Fahae]"; - mes "You must not be stingy, it is the path of God to be honest."; - close; - -M_FIN: - mes "[Exorcist Master Fahae]"; - mes "The path of fully venquishing evil is far, help me in the way of God."; - close; - -M_HERB: - mes "[Exorcist Master Fahae]"; - mes "How many do you require?"; - mes "You may only buy 5 at one time."; - mes "Each costs 10000z."; - mes "(Type in 0 to cancel)"; - next; - input @input; - if(@input==0) close; - if(@input>5) goto L_SORRY; - if(Zeny< @input*10000) goto L_NoZeny; - Zeny -= 10000*@input; - getitem 683,@input; - mes "[Exorcist Master Fahae]"; - mes "Here you go, I hope you may succeed in my quest."; - close; - -L_NoZeny: - mes "[Exorcist Master Fahae]"; - mes "Money doesn't bring joy to everyone, but we need it to support the temple and myself. Please, try to kill some monsters and take their drops."; - close; } // Monsters diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 718fe2e0e..15d781bff 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -54,54 +54,53 @@ yuno,138,187,4 script Hypnotist Teacher 4_F_TELEPORTER,{ mes "Your name is ^0080FF"+strcharinfo(0)+"^000000."; mes "How can I help you?"; next; - menu "^009500Information about Reset skills.^000000",L_Info,"^00B6FFReset skills.^000000",L_Reset,"^000088Nevermind^000000",-; - - mes @npcname$; - mes "You know where to find me,"; - mes "if you ever want a reset!!"; - close; - -L_Info: - mes @npcname$; - mes "This skill reset is not FREE OF CHARGE!!"; - mes "Expense for the reset of skill is ^D5A50020000 Zeny x BaseLv^000000."; - mes "Yeah ...each One BaseLv costs 20000 Zeny to reset skill."; - next; - mes @npcname$; - mes "Oh yeah, one more thing!"; - mes "Any carts, falcons or pecos you have equiped"; - mes "will be removed if you reset your skills."; - next; - mes @npcname$; - mes "Just one time does again to shake the skill point"; - mes "Careful with your skills from here on."; - close; - -L_Reset: - mes @npcname$; - mes "Before skill reset in starting."; - mes "You shall have to first tell me your Base Level."; - next; - mes "^D5A500[" + strcharinfo(0) + "]^000000"; - mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000"; - next; - set @zeny,BaseLevel*20000; - mes @npcname$; - mes "Total zeny to the reset of skill amount ^529DFF" + @zeny + "Zeny^000000 for the skill reset service."; - next; - if(Zeny < @zeny) { + switch (select("^009500Information about Reset skills.^000000","^00B6FFReset skills.^000000","^000088Nevermind^000000")) { + case 1: // Information mes @npcname$; - mes "It seems that you don't have enough money."; - mes "In addition we wait for the opportunity."; - emotion e_hmm; + mes "This skill reset is not FREE OF CHARGE!!"; + mes "Expense for the reset of skill is ^D5A50020000 Zeny x BaseLv^000000."; + mes "Yeah ...each One BaseLv costs 20000 Zeny to reset skill."; + next; + mes @npcname$; + mes "Oh yeah, one more thing!"; + mes "Any carts, falcons or pecos you have equiped"; + mes "will be removed if you reset your skills."; + next; + mes @npcname$; + mes "Just one time does again to shake the skill point"; + mes "Careful with your skills from here on."; + close; + case 2: // Reset + mes @npcname$; + mes "Before skill reset in starting."; + mes "You shall have to first tell me your Base Level."; + next; + mes "^D5A500[" + strcharinfo(0) + "]^000000"; + mes "My Base level is ^AA00AALevel " + BaseLevel + "BaseLv.^000000"; + next; + @zeny = BaseLevel*20000; + mes @npcname$; + mes "Total zeny to the reset of skill amount ^529DFF" + @zeny + "Zeny^000000 for the skill reset service."; + next; + if (Zeny < @zeny) { + mes @npcname$; + mes "It seems that you don't have enough money."; + mes "In addition we wait for the opportunity."; + emotion e_hmm; + close; + } + Zeny -= @zeny; + MISC_QUEST |= 1024; + resetskill; + mes @npcname$; + mes "Thank you."; + emotion e_thx; + logmes "SKILL RESET EVENT"; + close; + case 3: // Nevermind + mes @npcname$; + mes "You know where to find me,"; + mes "if you ever want a reset!!"; close; } - Zeny -= @zeny; - set MISC_QUEST,MISC_QUEST | 1024; - resetskill; - mes @npcname$; - mes "Thank you."; - emotion e_thx; - logmes "SKILL RESET EVENT"; - close; } diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index 6aad72358..aa2780716 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -27,7 +27,8 @@ payon,162,176,4 script Halloween Magician#iRO08 4_M_BIBI,{ mes "If you collect enough tickets you can get good prizes!"; mes "So what do you say?"; next; - goto MainMenu; + callsub(S_MainMenu); + end; } if (Hallow08Kill == 1) { mes "[Halloween Magician]"; @@ -35,11 +36,13 @@ payon,162,176,4 script Halloween Magician#iRO08 4_M_BIBI,{ mes "You know you want to try again..."; mes "Do you know the rules?"; next; - set Hallow08Kill,0; + Hallow08Kill = 0; if(select("Yes, I know.:No, I don't know.") == 2) { - goto Rules; + callsub(S_Rules); + callsub(S_MainMenu); + end; } - goto Participate; + callsub(S_Participate); } if (Hallow08Kill == 2) { mes "[Halloween Magician]"; @@ -49,8 +52,8 @@ payon,162,176,4 script Halloween Magician#iRO08 4_M_BIBI,{ mes "Ha!"; mes "Kkkkkkk."; next; - getitem 7941,1; - set Hallow08Kill,0; + getitem Halloween_Ticket, 1; + Hallow08Kill = 0; mes "[Halloween Magician]"; mes "As I promised"; mes "You can get Halloween tickets for cool items."; @@ -60,182 +63,183 @@ payon,162,176,4 script Halloween Magician#iRO08 4_M_BIBI,{ mes "[Halloween Magician]"; mes "Well, do you want to hear the rules again or, just get back to it..."; next; - goto MainMenu2; - } - - Rules: - mes "[Halloween Magician]"; - mes "This village is like a virtual Payon."; - mes "There are zombies and ghouls roaming around and three southern exits, but only one works."; - mes "That's up to you to find out."; - next; - mes "[Halloween Magician]"; - mes "You can't use any skills to kill the ghouls or zombies."; - mes "And one more thing..."; - mes "you shouldn't forget..."; - next; - mes "[Halloween Magician]"; - mes "All participants should be wearing nothing."; - mes "Put all belongings in your storage and come back here when your weight is '0'."; - next; - mes "[Halloween Magician]"; - mes "Oh and one more thing!"; - mes "You can't be riding a PecoPeco or have a Cart."; - mes "If you are, then I will remove them before you enter."; - mes "Got it?"; - next; - mes "[Halloween Magician]"; - mes "Remember, there are three exits but only one works randomly, the zombies and ghouls roaming around there can't be killed and you can't be wearing anything."; - next; - if (Hallow08 > 0) { - mes "[Halloween Magician]"; - mes "Hey..."; - mes "Come back once you're ready."; - close; - } else { - goto MainMenu; - } - - Participate: - mes "[Halloween Magician]"; - mes "Ok, you are ready."; - mes "Let me check your weight."; - next; - if (Weight > 0) { - mes "[Halloween Magician]"; - mes "Gosh!"; - mes "There's always a black sheep anywhere."; - next; - mes "[Halloween Magician]"; - mes "You think I wouldn't notice that your weight is above '0'?"; - mes "You're overweight..."; - close; - } else { - mes "[Halloween Magician]"; - mes "You seem good to go, and your weight is just right."; - next; - mes "[Halloween Magician]"; - mes "I was quite swamped with my work, so I'm exhausted."; - next; - mes "[Halloween Magician]"; - mes "I sometimes forget to send you there..."; - next; - mes "[Halloween Magician]"; - mes "I hope you come back well."; - close2; - if (Hallow08 < 1) { - set Hallow08,1; - } - set Hallow08Kill,1; - set @Hallow08Warp, rand(1,3); - percentheal -98,0; - setriding 0; - setcart 0; - warp "evt_zombie",155,246; + while (true) { + switch (select("Get me back there now!","Please, tell me the rules","I want to exchange tickets for prizes.","I'll come back next time.")) { + case 1: // Participate + callsub(S_Participate); + case 2: // Rules + callsub(S_Rules); + continue; + case 3: // TicketExchange + callsub(S_TicketExchange); + continue; + default: // NextTime + callsub(S_NextTime); end; } + } + } - TicketExchange: - mes "[Halloween Magician]"; - mes "You want to exchange tickets for prizes?"; - mes "Good job! Kkkkkk!"; - next; - mes "[Halloween Magician]"; - mes "Lemme tell you what items you can exchange for."; - next; - mes "[Halloween Magician]"; - mes "5 tickets for Pumpkin Pie."; - mes "20 tickets for Pumpkin-Head."; - mes "50 tickets for Old Blue Box."; - mes "70 tickets for Old Purple Box."; - mes "200 tickets for Old Card Album."; - next; - mes "[Halloween Magician]"; - mes "What would you like to exchange for?"; - next; - switch(select("Pumpkin Pie:Pumpkin-Head:Old Blue Box:Old Purple Box:Old Card Album")) { - case 1: - if (countitem(7941) < 5) { - goto NotEnough; - } else { - delitem 7941,5; - getitem 12192,1; - goto Enough; - } - break; - case 2: - if (countitem(7941) < 20) { - goto NotEnough; - } else { - delitem 7941,20; - getitem 5134,1; - goto Enough; - } - break; - case 3: - if (countitem(7941) < 50) { - goto NotEnough; - } else { - delitem 7941,50; - getitem 603,1; - goto Enough; - } - break; - case 4: - if (countitem(7941) < 70) { - goto NotEnough; - } else { - delitem 7941,70; - getitem 617,1; - goto Enough; - } - break; - case 5: - if (countitem(7941) < 200) { - goto NotEnough; - } else { - delitem 7941,200; - getitem 616,1; - goto Enough; - } - } + callsub(S_Rules); + callsub(S_MainMenu); + end; - NextTime: - mes "[Halloween Magician]"; - mes "Ok, see you then."; - mes "Kkkkkkkk."; - close; +S_MainMenu: + while (true) { + switch (select("Explain it to me.","I want to participate.","I want to exchange tickets for prizes.","I'll come back next time.")) { + case 1: // Rules + callsub(S_Rules); + continue; + case 2: // Participate + callsub(S_Participate); + case 3: // TicketExchange + callsub(S_TicketExchange); + continue; + default: // NextTime + callsub(S_NextTime); + end; + } + } - MainMenu: - menu "Explain it to me.",Rules,"I want to participate.",Participate,"I want to exchange tickets for prizes.",TicketExchange,"I'll come back next time.",NextTime; +S_Participate: + mes "[Halloween Magician]"; + mes "Ok, you are ready."; + mes "Let me check your weight."; + next; + if (Weight > 0) { + mes "[Halloween Magician]"; + mes "Gosh!"; + mes "There's always a black sheep anywhere."; + next; + mes "[Halloween Magician]"; + mes "You think I wouldn't notice that your weight is above '0'?"; + mes "You're overweight..."; + close; + } + mes "[Halloween Magician]"; + mes "You seem good to go, and your weight is just right."; + next; + mes "[Halloween Magician]"; + mes "I was quite swamped with my work, so I'm exhausted."; + next; + mes "[Halloween Magician]"; + mes "I sometimes forget to send you there..."; + next; + mes "[Halloween Magician]"; + mes "I hope you come back well."; + close2; + if (Hallow08 < 1) { + Hallow08 = 1; + } + Hallow08Kill = 1; + @Hallow08Warp = rand(1,3); + percentheal -98,0; + setriding 0; + setcart 0; + warp "evt_zombie",155,246; + end; + +S_Rules: + mes "[Halloween Magician]"; + mes "This village is like a virtual Payon."; + mes "There are zombies and ghouls roaming around and three southern exits, but only one works."; + mes "That's up to you to find out."; + next; + mes "[Halloween Magician]"; + mes "You can't use any skills to kill the ghouls or zombies."; + mes "And one more thing..."; + mes "you shouldn't forget..."; + next; + mes "[Halloween Magician]"; + mes "All participants should be wearing nothing."; + mes "Put all belongings in your storage and come back here when your weight is '0'."; + next; + mes "[Halloween Magician]"; + mes "Oh and one more thing!"; + mes "You can't be riding a PecoPeco or have a Cart."; + mes "If you are, then I will remove them before you enter."; + mes "Got it?"; + next; + mes "[Halloween Magician]"; + mes "Remember, there are three exits but only one works randomly, the zombies and ghouls roaming around there can't be killed and you can't be wearing anything."; + next; + if (Hallow08 > 0) { + mes "[Halloween Magician]"; + mes "Hey..."; + mes "Come back once you're ready."; + close; + } + return; - MainMenu2: - menu "Get me back there now!",Participate,"Please, tell me the rules",Rules,"I want to exchange tickets for prizes.",TicketExchange,"I'll come back next time.",NextTime; +S_NextTime: + mes "[Halloween Magician]"; + mes "Ok, see you then."; + mes "Kkkkkkkk."; + close; - NotEnough: +S_TicketExchange: + mes "[Halloween Magician]"; + mes "You want to exchange tickets for prizes?"; + mes "Good job! Kkkkkk!"; + next; + mes "[Halloween Magician]"; + mes "Lemme tell you what items you can exchange for."; + next; + mes "[Halloween Magician]"; + mes "5 tickets for Pumpkin Pie."; + mes "20 tickets for Pumpkin-Head."; + mes "50 tickets for Old Blue Box."; + mes "70 tickets for Old Purple Box."; + mes "200 tickets for Old Card Album."; + next; + mes "[Halloween Magician]"; + mes "What would you like to exchange for?"; + next; + .@item_id = null; + .@amount = 0; + switch(select("Pumpkin Pie:Pumpkin-Head:Old Blue Box:Old Purple Box:Old Card Album")) { + case 1: + .@amount = 5; + .@item_id = Pumpkin_Pie; + break; + case 2: + .@amount = 20; + .@item_id = Pumpkin_Hat; + break; + case 3: + .@amount = 50; + .@item_id = Old_Blue_Box; + break; + case 4: + .@amount = 70; + .@item_id = Old_Violet_Box; + break; + case 5: + .@amount = 200; + .@amount = Old_Card_Album; + break; + } + if (countitem(Halloween_Ticket) < .@amount) { mes "[Halloween Magician]"; mes "You don't have enough tickets!"; mes "Can't you even count?"; mes "Please come here with the right number of tickets."; close; - - Enough: - mes "[Halloween Magician]"; - mes "Here it is."; - mes "Do you need..."; - mes "anything else?"; - next; - if (Hallow08 == 1) { - goto MainMenu2; - } else { - goto MainMenu; - } + } + delitem Halloween_Ticket, .@amount; + getitem .@item_id, 1; + mes "[Halloween Magician]"; + mes "Here it is."; + mes "Do you need..."; + mes "anything else?"; + next; + return; } evt_zombie,16,142,1 script zombiewarp001 WARPNPC,2,2,{ OnTouch: if (@Hallow08Warp == 1) { - set Hallow08Kill,2; + Hallow08Kill = 2; specialeffect EF_BASH; warp "payon",28,142; } @@ -245,7 +249,7 @@ OnTouch: evt_zombie,122,27,1 script zombiewarp002 WARPNPC,2,2,{ OnTouch: if (@Hallow08Warp == 2) { - set Hallow08Kill,2; + Hallow08Kill = 2; specialeffect EF_BASH; warp "payon",121,40; } @@ -255,7 +259,7 @@ OnTouch: evt_zombie,267,89,1 script zombiewarp003 WARPNPC,2,2,{ OnTouch: if (@Hallow08Warp == 3) { - set Hallow08Kill,2; + Hallow08Kill = 2; specialeffect EF_BASH; warp "payon",253,95; } diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index d6ecfbf2f..039ba9ee1 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -42,11 +42,8 @@ function script F_GldManager { mes "Welcome Master ^5533FF" + getguildmaster(@GID) + "^000000 ! I will assist you in any way I can!"; next; - menu "Kafra Staff Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End; - - //=========================== - M_Kaf: - //====== + switch (select("Kafra Staff Employment / Dismissal","Enter Treasure Room","Cancel")) { + case 1: // Employment / Dismissal mes "[ "+getarg(0)+" ]"; if (getcastledata(getarg(1),9) == 1) goto L_Dismiss; if (getgdskilllv(@GID,10001) == 0){ @@ -58,90 +55,78 @@ function script F_GldManager { L_Hire: mes "Would you like to employ the services of a Kafra? You will need ^5533FF10,000 Zeny^000000 to do so... "; next; - menu "Employ Kafra.",-,"Cancel",sM_KafEnd; - - mes "[ "+getarg(0)+" ]"; - if (Zeny < 10000){ - mes "Master, you do not have enough money to employ a Kafra. Employment has been cancelled."; - return; - } - Zeny -= 10000; - enablenpc "Kafra Staff#"+getarg(4); - setcastledata getarg(1),9,1; - mes "You have created a contract with the Kafra Staff Company."; - next; - cutin "kafra_01",2; - mes "[ Kafra Staff ]"; - mes "How do you do? I'm here to provide you with helpful service! I'll do the best I can to serve you."; - next; - cutin "kafra_01",255; - mes "[ "+getarg(0)+" ]"; - //mes "Your employment contract lasts ^5533FF1 month^000000. After this term is over you will have to create a new contract."; - mes "I think the Kafra Staff will benefit our guild members."; - return; - - sM_KafEnd: + if (select("Employ Kafra.","Cancel") != 1) { mes "[ "+getarg(0)+" ]"; mes "As you wish Master. But I suggest we get a Kafra as soon as possible!"; return; - + } + mes "[ "+getarg(0)+" ]"; + if (Zeny < 10000) { + mes "Master, you do not have enough money to employ a Kafra. Employment has been cancelled."; + return; + } + Zeny -= 10000; + enablenpc "Kafra Staff#"+getarg(4); + setcastledata getarg(1),9,1; + mes "You have created a contract with the Kafra Staff Company."; + next; + cutin "kafra_01",2; + mes "[ Kafra Staff ]"; + mes "How do you do? I'm here to provide you with helpful service! I'll do the best I can to serve you."; + next; + cutin "kafra_01",255; + mes "[ "+getarg(0)+" ]"; + //mes "Your employment contract lasts ^5533FF1 month^000000. After this term is over you will have to create a new contract."; + mes "I think the Kafra Staff will benefit our guild members."; + return; L_Dismiss: mes "Would you like to dismiss the current Kafra?"; next; - menu "Dismissal",-,"Cancel",sM_KafEnd2; - - cutin "kafra_01",2; - mes "[ Kafra Staff ]"; - mes "Have I done anything wrong? If I did, will you please forgive me?"; - next; - menu "Dismiss",-,"Cancel",ssM_KafEnd2; - - mes "[ Kafra Staff ]"; - mes "It's unfortunate that I won't be able to serve your guild anymore...."; - next; - disablenpc "Kafra Staff#"+getarg(4); - setcastledata getarg(1),9,0; - cutin "kafra_01",255; - mes "[ "+getarg(0)+" ]"; - mes "The Kafra has been dismissed. But... we should really get a Kafra as soon as possible!"; - return; - ssM_KafEnd2: - mes "[ Kafra Staff ]"; - mes "Thank you master, I'll do my best! ^^."; - cutin "kafra_01",255; - return; - sM_KafEnd2: + if (select("Dismissal","Cancel") != 1) { mes "[ "+getarg(0)+" ]"; mes "Master, I think you should keep the current Kafra Staff because she is already trying her best to serve us"; return; - - //========================= - M_Treas: - //======== + } + cutin "kafra_01",2; + mes "[ Kafra Staff ]"; + mes "Have I done anything wrong? If I did, will you please forgive me?"; + next; + if (select("Dismiss","Cancel") != 1) { + mes "[ Kafra Staff ]"; + mes "Thank you master, I'll do my best! ^^."; + cutin "kafra_01",255; + return; + } + mes "[ Kafra Staff ]"; + mes "It's unfortunate that I won't be able to serve your guild anymore...."; + next; + disablenpc "Kafra Staff#"+getarg(4); + setcastledata getarg(1),9,0; + cutin "kafra_01",255; + mes "[ "+getarg(0)+" ]"; + mes "The Kafra has been dismissed. But... we should really get a Kafra as soon as possible!"; + return; + case 2: // Enter Treasure Room mes "[ "+getarg(0)+" ]"; mes "Would you to go to our Treasure Room? Only you, the Guild Master, are allowed to enter this room."; next; - menu "Enter Treasure room.",-,"Cancel",sM_TresEnd; - + if (select("Enter Treasure room.","Cancel") == 1) { mes "[ "+getarg(0)+" ]"; mes "Please follow me through the secret passage way."; mes "You must pull down on the secret switch in order to get out."; next; warp getarg(1),getarg(2),getarg(3); return; - sM_TresEnd: - mes "[ "+getarg(0)+" ]"; - mes "The goods are produced everyday."; - mes "You should get them whenever you can because they might dissapear if you take them at the wrong time."; - return; - - - //========================== - M_End: - //======= + } + mes "[ "+getarg(0)+" ]"; + mes "The goods are produced everyday."; + mes "You should get them whenever you can because they might dissapear if you take them at the wrong time."; + return; + default: // Cancel mes "[ "+getarg(0)+" ]"; mes "As you wish, master."; return; + } } // Castle 1 ================================================================================== diff --git a/npc/events/twintowers.txt b/npc/events/twintowers.txt index 524351661..8013b85b7 100644 --- a/npc/events/twintowers.txt +++ b/npc/events/twintowers.txt @@ -29,24 +29,22 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers TW_TOWER,{ mes "For this reason, we are here at your service with our special magic."; mes "Kindly let us know."; next; - menu "I shall accept your offer.",YES,"I'll ask for your service next time.",NO; - - NO: - mes "[Twin Towers]"; - mes "Er, what a pity. Traveling by yourself is still the best evidence of adventure."; - mes "Isn't this proving that you are still young?"; - mes "We respect brave hearts like this"; - next; - mes "[Twin Towers]"; - mes "There are good and bad times in life, moreover, adventure isn't an easy task in the first place."; - mes "Isn't this true?"; - mes "Feel free to come to us when you have time, we will always be there to serve you."; - next; - mes "[Twin Towers]"; - mes "Forget all your troubles, and create a splendid legend in this wonderful world."; - mes "This is such a wonderful world, and you'll always be a great adventurer!"; - close; - YES: + if (select("I shall accept your offer.","I'll ask for your service next time.") != 1) { + mes "[Twin Towers]"; + mes "Er, what a pity. Traveling by yourself is still the best evidence of adventure."; + mes "Isn't this proving that you are still young?"; + mes "We respect brave hearts like this"; + next; + mes "[Twin Towers]"; + mes "There are good and bad times in life, moreover, adventure isn't an easy task in the first place."; + mes "Isn't this true?"; + mes "Feel free to come to us when you have time, we will always be there to serve you."; + next; + mes "[Twin Towers]"; + mes "Forget all your troubles, and create a splendid legend in this wonderful world."; + mes "This is such a wonderful world, and you'll always be a great adventurer!"; + close; + } mes "[Twin Towers]"; mes "The flaming passion of an adventurer,"; mes "The desire to explore the unknown realms,"; @@ -60,28 +58,29 @@ prontera,146,92,4 script Twin Towers#tt1::Twin-Towers TW_TOWER,{ mes "[Twin Towers]"; mes "Come on! Where do you wish to go?"; mes "Just let us know you desired destination and we will send your there!"; - menu "Hidden Temple", HiddenTemple,"Orc Dungeon",OrcDungeon,"Ant Hell",AntHell,"Mjolnir Waste Pit",MjolnirWastePit,"Sphinx",Sphinx,"Glast Heim",GlastHeim,"Comodo",Comodo; - HiddenTemple: - warp "prt_fild01",136,368; - close; - OrcDungeon: - warp "gef_fild10",67,334; - close; - AntHell: - warp "moc_fild04",210,329; - close; - MjolnirWastePit: - warp "mjolnir_02",79,361; - close; - Sphinx: - warp "moc_fild19",105,99; - close; - GlastHeim: - warp "gef_fild06",45,304; - close; - Comodo: - warp "cmd_fild01",30,317; - close; + switch (select("Hidden Temple","Orc Dungeon","Ant Hell","Mjolnir Waste Pit","Sphinx","Glast Heim","Comodo")) { + case 1: // HiddenTemple + warp "prt_fild01",136,368; + close; + case 2: // OrcDungeon + warp "gef_fild10",67,334; + close; + case 3: // AntHell + warp "moc_fild04",210,329; + close; + case 4: // MjolnirWastePit + warp "mjolnir_02",79,361; + close; + case 5: // Sphinx + warp "moc_fild19",105,99; + close; + case 6: // GlastHeim + warp "gef_fild06",45,304; + close; + case 7: // Comodo + warp "cmd_fild01",30,317; + close; + } } morocc,160,97,4 duplicate(Twin-Towers) Twin Towers#tt2 TW_TOWER diff --git a/npc/events/whiteday.txt b/npc/events/whiteday.txt index ac76c52a5..d90f7c491 100644 --- a/npc/events/whiteday.txt +++ b/npc/events/whiteday.txt @@ -12,10 +12,6 @@ //============================================================ alberta,188,64,4 script Sugar 4_F_02,{ - set @maplenum,0; - set @mapleItemID,0; - set @maplePrice,0; - set @maplePriceT,0; mes "[Sugar]"; mes "Welcome!"; mes "How delicious are sweets?"; @@ -29,51 +25,102 @@ alberta,188,64,4 script Sugar 4_F_02,{ mes "heartfelt like"; mes "the sweetness of the present some how."; next; - menu "Please give me!",-,"I don't need it.",M_End,"The teacher.",M_L1; - - mes "[Sugar]"; - mes "Yes!"; - mes "Select from menu here."; - mes "Since there is a limitation in numbers"; - mes "Not more than ^ff0000 5 pieces^000000."; - mes "are allowed to carry out?"; - next; - menu "Candy",-,"Candy Cane",L0_2,"Well baked cookie",L0_3; - - set @maplePrice,3000; - set @mapleItemID,529; - mes "[Sugar]"; - mes "It is a candy, and the price is"; - mes "3000 Zeny each."; - mes "How many do you like to purchase?"; - next; - goto L_INPUT; -L0_2: - set @maplePrice,4000; - set @mapleItemID,530; - mes "[Sugar]"; - mes "It is a candy cane, and the price is"; - mes "4000 Zeny each."; - mes "How many do you like to purchase?"; - next; - goto L_INPUT; -L0_3: - set @maplePrice,2000; - set @mapleItemID,538; + switch (select("Please give me!","I don't need it.","The teacher.")) { + case 1: // Please give me + mes "[Sugar]"; + mes "Yes!"; + mes "Select from menu here."; + mes "Since there is a limitation in numbers"; + mes "Not more than ^ff0000 5 pieces^000000."; + mes "are allowed to carry out?"; + next; + switch (select("Candy","Candy Cane","Well baked cookie")) { + case 1: // Candy + mes "[Sugar]"; + mes "It is a candy, and the price is"; + mes "3000 Zeny each."; + mes "How many do you like to purchase?"; + next; + callsub(S_Purchase, 3000, Candy); + break; + case 2: // Candy Cane + mes "[Sugar]"; + mes "It is a candy cane, and the price is"; + mes "4000 Zeny each."; + mes "How many do you like to purchase?"; + next; + callsub(S_Purchase, 4000, Candy_Striper); + break; + case 3: // Well baked cookie + mes "[Sugar]"; + mes "It is a well baked cookie, and the price is"; + mes "2000 Zeny each."; + mes "How many do you like to purchase?"; + next; + callsub(S_Purchase, 2000, Well_Baked_Cookie); + break; + } + break; + case 3: // The teacher + mes "[Sugar]"; + mes "Yes"; + mes "The teacher of mine"; + mes "is Mr. Kuberu, a sweets craftsman."; + mes "Making sweets under two persons."; + mes "which is allowed to self-train."; + next; + mes "[Sugar]"; + mes "Although selling is seemingly to carried out ...."; + mes "Where he is now?"; + mes "Which I don't know."; + close; + case 2: // I don't need it + break; + } mes "[Sugar]"; - mes "It is a well baked cookie, and the price is"; - mes "2000 Zeny each."; - mes "How many do you like to purchase?"; - next; + mes "Really .... You might regret it.."; + mes "If you change your mind."; + mes "I am just here ok."; + mes "Have a nice day!"; + close; -L_INPUT: - input @maplenum; - if (@maplenum > 5) goto L_ERROR; - if (@maplenum == 0) goto M_End; - set @maplePriceT,@maplePrice*@maplenum; - if (Zeny < @maplePriceT) goto L_ERROR2; - Zeny -= @maplePriceT; - getitem @mapleItemID,@maplenum; +/** + * Attempts to purchase an item, after asking the desired quantity. + * + * Arguments: + * 0 : price + * 1 : item ID + * + * Returns on user cancel. Closes on successful purchase or error. + */ +S_Purchase: + .@price = getarg(0); + .@item_id = getarg(1); + while (true) { + input .@amount; + if (.@amount <= 5) + break; + mes "[Sugar]"; + mes "???"; + mes "You seem to have a failure on hearing."; + mes "I will tell you once again?"; + mes "You can only purchase"; + mes "^ff0000 5 pieces^000000 at once."; + next; + } + if (.@amount == 0) // Cancel + return; + .@totalPrice = .@price * .@amount; + if (Zeny < .@totalPrice) { + mes "[Sugar]"; + mes "???"; + mes "Hmmm it seems you don't have enough money"; + mes "to make that purchase."; + mes "I will ask you to check your money first."; + close; + } + Zeny -= .@totalPrice; + getitem .@item_id, .@amount; mes "[Sugar]"; mes "Thank you!!!"; mes "These sweets are really delicious."; @@ -82,44 +129,4 @@ L_INPUT: mes "don't eat so much or you'll grow fat."; mes "Please take care!!!"; close; - -M_L1: - mes "[Sugar]"; - mes "Yes"; - mes "The teacher of mine"; - mes "is Mr. Kuberu, a sweets craftsman."; - mes "Making sweets under two persons."; - mes "which is allowed to self-train."; - next; - mes "[Sugar]"; - mes "Although selling is seemingly to carried out ...."; - mes "Where he is now?"; - mes "Which I don't know."; - close; - -L_ERROR: - mes "[Sugar]"; - mes "???"; - mes "You seem to have a failure on hearing."; - mes "I will tell you once again?"; - mes "You can only purchase"; - mes "^ff0000 5 pieces^000000 at once."; - next; - goto L_INPUT; - -L_ERROR2: - mes "[Sugar]"; - mes "???"; - mes "Hmmm it seems you don't have enough money"; - mes "to make that purchase."; - mes "I will ask you to check your money first."; - close; - -M_End: - mes "[Sugar]"; - mes "Really .... You might regret it.."; - mes "If you change your mind."; - mes "I am just here ok."; - mes "Have a nice day!"; - close; } diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt index d8423dda7..72048985d 100644 --- a/npc/events/xmas.txt +++ b/npc/events/xmas.txt @@ -35,9 +35,8 @@ L_Start: mes "I'm having a bit of a problem..."; mes "Do you care to listen?"; next; - menu "Listen to Santa Claus.",M_0, "Give Santa Claus proof.",M_1, "Cancel.",M_End; - - M_0: + switch (select("Listen to Santa Claus.","Give Santa Claus proof.","Cancel.")) { + case 1: // Listen mes "[Santa Claus]"; mes "My problem is this."; mes "There seems to be a man out there"; @@ -76,7 +75,7 @@ L_Start: mes "lab. It spits out random presents"; mes "and saves me a ton of work."; close; - M_1: + case 2: // Give proof mes "[Santa Claus]"; if(countitem(7034) < 3) goto L_NotEnuf; delitem 7034,3; @@ -97,11 +96,12 @@ L_Start: mes "Go take down those evil Santas"; mes "and get more for me and I'll reward you."; close; - M_End: + default: // Cancel mes "[Santa Claus]"; mes "I see. Well, at the very least"; mes "we shall meet again on Christmas morning."; close; + } OnInit: disablenpc "Santa Claus"; diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt index dfcc7d172..6e7531e0e 100644 --- a/npc/quests/ninja_quests.txt +++ b/npc/quests/ninja_quests.txt @@ -1148,217 +1148,214 @@ que_ng,22,62,3 script Tetsu 4_M_SEAMAN,{ mes "I may not look it, but if it's about any items related to Fuuma, there's none who come close to my craftsmenship."; mes "Well, look around, look around."; next; - menu "Fuuma Shuriken Beneki",M_BENEKI,"Fuuma Shuriken Daisharin",M_DAIS, - "Fuuma Shuriken Daisharin[4]",M_DAIS4,"Fuuma Shuriken Rekka",M_REKKA,"Cancel",M_CANCEL; - -//=====================BENEKI======================== -M_BENEKI: - mes "[Tetsu]"; - mes "Hmm~ You've chose the ^ff0000Fuuma Beneki^000000."; - mes "In order to make the Fuuma Beneki, I need"; - mes "50 Steel, 20 Harpy Feather"; - mes "5 Oridecon, and 90,000 Zeny."; - mes "Do you want me to create this item for you?"; - next; - menu "Well .. erm .. it's kind of pricey.",M_NOPE,"Yes! Make it for me!",-; - - if(countitem(999)<50 || countitem(7115)<20 || countitem(984)<5){ + switch (select("Fuuma Shuriken Beneki","Fuuma Shuriken Daisharin","Fuuma Shuriken Daisharin[4]","Fuuma Shuriken Rekka","Cancel")) { + case 1: // Beneki mes "[Tetsu]"; - mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Beneki."; + mes "Hmm~ You've chose the ^ff0000Fuuma Beneki^000000."; + mes "In order to make the Fuuma Beneki, I need"; + mes "50 Steel, 20 Harpy Feather"; + mes "5 Oridecon, and 90,000 Zeny."; + mes "Do you want me to create this item for you?"; next; + if (select("Well .. erm .. it's kind of pricey.","Yes! Make it for me!") != 2) { + break; + } + + if(countitem(999)<50 || countitem(7115)<20 || countitem(984)<5){ + mes "[Tetsu]"; + mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Beneki."; + next; + mes "[Tetsu]"; + mes "In order to create a Fuuma shuriken Beneki, I require..."; + mes "^ff000050 Steel,^000000"; + mes "^ff000020 Harpy Feathers^000000,"; + mes "^ff00005 Oridecons^000000,"; + mes "and ^ff000090,000 Zeny^000000."; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + if(Zeny < 90000){ + mes "[Tetsu]"; + mes "Hmm.. You brought plenty of materials, but you're short on zeny."; + next; + mes "[Tetsu]"; + mes "In order to create a Fuuma Shuriken Beneki, I require..."; + mes "^ff000050 Steel,^000000"; + mes "^ff000020 Harpy Feathers^000000,"; + mes "^ff00005 Oridecons^000000,"; + mes "and ^ff000090,000 Zeny^000000."; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + delitem 999,50; + delitem 7115,20; + delitem 984,5; + Zeny -= 90000; + getitem 13300,1; mes "[Tetsu]"; - mes "In order to create a Fuuma shuriken Beneki, I require..."; - mes "^ff000050 Steel,^000000"; - mes "^ff000020 Harpy Feathers^000000,"; - mes "^ff00005 Oridecons^000000,"; - mes "and ^ff000090,000 Zeny^000000."; - mes "Remember these needed materials, and come back after you're positive you have them all."; + mes "Hmm, very well."; + mes "Looks like you've brought me the correct amount of materials and Zeny"; + mes "Here is your completed Fuuma Shuriken Beneki"; close; - } - if(Zeny < 90000){ + case 2: // Daisharin mes "[Tetsu]"; - mes "Hmm.. You brought plenty of materials, but you're short on zeny."; + mes "Hmm~ I see you've chose the ^ff0000Fuuma Shuriken Daisharin^000000."; + mes "In order to create Fuuma Shuriken Daisharin, I require..."; + mes "30 Steel, 100 Tassels"; + mes "2 Oridecons, and 40,000 Zeny."; + mes "Do you want me to create this item for you?"; next; - mes "[Tetsu]"; - mes "In order to create a Fuuma Shuriken Beneki, I require..."; - mes "^ff000050 Steel,^000000"; - mes "^ff000020 Harpy Feathers^000000,"; - mes "^ff00005 Oridecons^000000,"; - mes "and ^ff000090,000 Zeny^000000."; - mes "Remember these needed materials, and come back after you're positive you have them all."; - close; - } - delitem 999,50; - delitem 7115,20; - delitem 984,5; - Zeny -= 90000; - getitem 13300,1; - mes "[Tetsu]"; - mes "Hmm, very well."; - mes "Looks like you've brought me the correct amount of materials and Zeny"; - mes "Here is your completed Fuuma Shuriken Beneki"; - close; - -//=====================DAISHARIN======================== -M_DAIS: - mes "[Tetsu]"; - mes "Hmm~ I see you've chose the ^ff0000Fuuma Shuriken Daisharin^000000."; - mes "Fuuma Shuriken Daisharin In order to create Fuuma Shuriken Daisharin, I require..."; - mes "30 Steel, 100 Tassels"; - mes "2 Oridecons, and 40,000 Zeny."; - mes "Do you want me to create this item for you?"; - next; - menu "Well .. erm .. it's kind of pricey.",M_NOPE,"Yes! Make it for me!",-; + if (select("Well .. erm .. it's kind of pricey.","Yes! Make it for me!") != 2) { + break; + } - if(countitem(999)<30 || countitem(7301)<100 || countitem(984)<2){ - mes "[Tetsu]"; - mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Daisharin."; - next; + if(countitem(999)<30 || countitem(7301)<100 || countitem(984)<2){ + mes "[Tetsu]"; + mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Daisharin."; + next; + mes "[Tetsu]"; + mes "Fuuma Shuriken Daisharin, I require..."; + mes "^ff000030 Steel^000000, "; + mes "^ff0000100 Tassels^000000,"; + mes "^ff00002 Oridecons^000000,"; + mes "and ^ff000040,000 Zeny^000000."; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + if(Zeny < 40000){ + mes "[Tetsu]"; + mes "Hmm.. You brought plenty of materials, but you're short on zeny."; + next; + mes "[Tetsu]"; + mes "Fuuma Shuriken Daisharin, I require..."; + mes "^ff000030 Steel^000000, "; + mes "^ff0000100 Tassels^000000,"; + mes "^ff00002 Oridecons^000000,"; + mes "and ^ff000040,000 Zeny^000000."; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + delitem 999,30; + delitem 7301,100; + delitem 984,2; + Zeny -= 40000; + getitem 13301,1; mes "[Tetsu]"; - mes "Fuuma Shuriken Daisharin, I require..."; - mes "^ff000030 Steel^000000, "; - mes "^ff0000100 Tassels^000000,"; - mes "^ff00002 Oridecons^000000,"; - mes "and ^ff000040,000 Zeny^000000."; - mes "Remember these needed materials, and come back after you're positive you have them all."; + mes "Hmm, very well."; + mes "Looks like you've brought me the correct amount of materials and Zeny"; + mes "Here is your completed Fuuma Shuriken Daisharin"; close; - } - if(Zeny < 40000){ + case 3: // Daisharin[4] mes "[Tetsu]"; - mes "Hmm.. You brought plenty of materials, but you're short on zeny."; + mes "Hmm~ I see you've chose the ^ff0000Fuuma Shuriken Daisharin[4]^000000."; + mes "In order to create Fuuma Shuriken Daisharin[4], I require..."; + mes "20 Cracked Diamonds, 1 Fuuma Shuriken Daisharin"; + mes "3 Oridecons, and 40,000 Zeny."; + mes "Do you want me to create this item for you?"; next; mes "[Tetsu]"; - mes "Fuuma Shuriken Daisharin, I require..."; - mes "^ff000030 Steel^000000, "; - mes "^ff0000100 Tassels^000000,"; - mes "^ff00002 Oridecons^000000,"; - mes "and ^ff000040,000 Zeny^000000."; - mes "Remember these needed materials, and come back after you're positive you have them all."; - close; - } - delitem 999,30; - delitem 7301,100; - delitem 984,2; - Zeny -= 40000; - getitem 13301,1; - mes "[Tetsu]"; - mes "Hmm, very well."; - mes "Looks like you've brought me the correct amount of materials and Zeny"; - mes "Here is your completed Fuuma Shuriken Daisharin"; - close; - -//=====================DAISHARIN4======================== -M_DAIS4: - mes "[Tetsu]"; - mes "Hmm~ I see you've chose the ^ff0000Fuuma Shuriken Daisharin[4]^000000."; - mes "In order to create Fuuma Shuriken Daisharin[4], I require..."; - mes "20 Cracked Diamonds, 1 Fuuma Shuriken Daisharin"; - mes "3 Oridecons, and 40,000 Zeny."; - mes "Do you want me to create this item for you?"; - next; - mes "[Tetsu]"; - mes "And in case you don't know..."; - mes "In the process of slotting a weapon, your weapon will lose any refine points and slotted cards, if any."; - mes "Think this over with caution, and then decide if you really want to do this or not."; - next; - menu "No thanks.. It's a little pricey..",M_NOPE,"Yes! Make it for me!",-; - - if(countitem(733)<20 || countitem(13301)<1 || countitem(984)<3){ - mes "[Tetsu]"; - mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Daisharin[4]."; + mes "And in case you don't know..."; + mes "In the process of slotting a weapon, your weapon will lose any refine points and slotted cards, if any."; + mes "Think this over with caution, and then decide if you really want to do this or not."; next; + if (select("No thanks.. It's a little pricey..","Yes! Make it for me!") != 2) { + break; + } + + if(countitem(733)<20 || countitem(13301)<1 || countitem(984)<3){ + mes "[Tetsu]"; + mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Daisharin[4]."; + next; + mes "[Tetsu]"; + mes "In order to create a Fuuma Shuriken Daisharin[4], I require..."; + mes "^ff000020 Cracked Diamonds^000000,"; + mes "^ff00003 Oridecons^000000,"; + mes "1 Fuuma Shuriken Daisharin, and"; + mes "^ff000040,000 Zeny^000000."; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + if(Zeny < 40000){ + mes "[Tetsu]"; + mes "Hmm.. You brought plenty of materials, but you're short on zeny."; + next; + mes "[Tetsu]"; + mes "In order to create a Fuuma Shuriken Daisharin[4], I require..."; + mes "^ff000020 Cracked Diamonds^000000,"; + mes "^ff00003 Oridecons^000000,"; + mes "1 Fuuma Shuriken Daisharin, and"; + mes "^ff000040,000 Zeny^000000."; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + delitem 733,20; + delitem 984,3; + Zeny -= 40000; + delitem 13301,1; + getitem 13302,1; mes "[Tetsu]"; - mes "In order to create a Fuuma Shuriken Daisharin[4], I require..."; - mes "^ff000020 Cracked Diamonds^000000,"; - mes "^ff00003 Oridecons^000000,"; - mes "1 Fuuma Shuriken Daisharin, and"; - mes "^ff000040,000 Zeny^000000."; - mes "Remember these needed materials, and come back after you're positive you have them all."; + mes "Hmm, very well."; + mes "Looks like you've brought me the correct amount of materials and Zeny"; + mes "Here is your completed Fuuma Shuriken Daisharin[4]."; close; - } - if(Zeny < 40000){ - mes "[Tetsu]"; - mes "Hmm.. You brought plenty of materials, but you're short on zeny."; - next; + case 4: // Rekka mes "[Tetsu]"; - mes "In order to create a Fuuma Shuriken Daisharin[4], I require..."; - mes "^ff000020 Cracked Diamonds^000000,"; - mes "^ff00003 Oridecons^000000,"; - mes "1 Fuuma Shuriken Daisharin, and"; - mes "^ff000040,000 Zeny^000000."; - mes "Remember these needed materials, and come back after you're positive you have them all."; - close; - } - delitem 733,20; - delitem 984,3; - Zeny -= 40000; - delitem 13301,1; - getitem 13302,1; - mes "[Tetsu]"; - mes "Hmm, very well."; - mes "Looks like you've brought me the correct amount of materials and Zeny"; - mes "Here is your completed Fuuma Shuriken Daisharin[4]."; - close; - -//=====================REKKA======================== -M_REKKA: - mes "[Tetsu]"; - mes "Hmm~ I see you've chose the ^ff0000Fuuma Shuriken Rekka^000000."; - mes "In order to create a Fuuma Shuriken Rekka, I require"; - mes "50 Steel, 100 Live Coal"; - mes "100 Burning Hearts, 50 Burning Stones"; - mes "and 78,000 Zeny."; - mes "Do you want me to create this item for you?"; - next; - menu "Well .. erm .. it's kind of pricey",M_NOPE,"Yes! Make it for me!",-; + mes "Hmm~ I see you've chose the ^ff0000Fuuma Shuriken Rekka^000000."; + mes "In order to create a Fuuma Shuriken Rekka, I require"; + mes "50 Steel, 100 Live Coal"; + mes "100 Burning Hearts, 50 Burning Stones"; + mes "and 78,000 Zeny."; + mes "Do you want me to create this item for you?"; + next; + if (select("Well .. erm .. it's kind of pricey","Yes! Make it for me!") != 2) { + break; + } - if(countitem(999)<50 || countitem(7098)<100 || countitem(7097)<100 || countitem(7521)<50){ - mes "[Tetsu]"; - mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Rekka."; - next; + if(countitem(999)<50 || countitem(7098)<100 || countitem(7097)<100 || countitem(7521)<50){ + mes "[Tetsu]"; + mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Rekka."; + next; + mes "[Tetsu]"; + mes "In order to create a Fuuma Shuriken Rekka, I require..."; + mes "^ff000050 Steel^000000,^ff000050 Burning Stones^000000,"; + mes "^ff0000100 Burning Hearts^000000,^ff0000100 Live Coal^000000,"; + mes "and ^ff000078,000 Zeny^000000"; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + if(Zeny < 78000){ + mes "[Tetsu]"; + mes "Hmm.. You brought plenty of materials, but you're short on zeny."; + next; + mes "[Tetsu]"; + mes "In order to create a Fuuma Shuriken Rekka, I require..."; + mes "^ff000050 Steel^000000,^ff000050 Burning Stones^000000,"; + mes "^ff0000100 Burning Hearts^000000,^ff0000100 Live Coal^000000,"; + mes "and ^ff000078,000 Zeny^000000"; + mes "Remember these needed materials, and come back after you're positive you have them all."; + close; + } + delitem 999,50; + delitem 7098,100; + delitem 7097,100; + delitem 7521,50; + Zeny -= 78000; + getitem 13303,1; mes "[Tetsu]"; - mes "In order to create a Fuuma Shuriken Rekka, I require..."; - mes "^ff000050 Steel^000000,^ff000050 Burning Stones^000000,"; - mes "^ff0000100 Burning Hearts^000000,^ff0000100 Live Coal^000000,"; - mes "and ^ff000078,000 Zeny^000000"; - mes "Remember these needed materials, and come back after you're positive you have them all."; + mes "Hmm, very well."; + mes "Looks like you've brought me the correct amount of materials and Zeny"; + mes "Here is your completed Fuuma Shuriken Rekka."; close; - } - if(Zeny < 78000){ + default: // Cancel mes "[Tetsu]"; - mes "Hmm.. You brought plenty of materials, but you're short on zeny."; - next; - mes "[Tetsu]"; - mes "In order to create a Fuuma Shuriken Rekka, I require..."; - mes "^ff000050 Steel^000000,^ff000050 Burning Stones^000000,"; - mes "^ff0000100 Burning Hearts^000000,^ff0000100 Live Coal^000000,"; - mes "and ^ff000078,000 Zeny^000000"; - mes "Remember these needed materials, and come back after you're positive you have them all."; + mes "What a shame."; + mes "I wanted to show you the weapons I put my heart and soul into making them."; + mes "If you ever have second thoughts, it's never too late to come back and ask."; close; } - delitem 999,50; - delitem 7098,100; - delitem 7097,100; - delitem 7521,50; - Zeny -= 78000; - getitem 13303,1; - mes "[Tetsu]"; - mes "Hmm, very well."; - mes "Looks like you've brought me the correct amount of materials and Zeny"; - mes "Here is your completed Fuuma Shuriken Rekka."; - close; - -//=====================I'M SORRY======================== -M_NOPE: + // It's kind of pricey mes "[Tetsu]"; mes "Hmm. The cost to create this item is kind of expensive..."; mes "All right. If you do gather all the required materials one day, come back and see me."; close; - -M_CANCEL: - mes "[Tetsu]"; - mes "What a shame."; - mes "I wanted to show you the weapons I put my heart and soul into making them."; - mes "If you ever have second thoughts, it's never too late to come back and ask."; - close; } -- cgit v1.2.3-70-g09d2 From 32169c383f2658192b6b8cb02d7f818a361dda03 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 20 Oct 2014 04:20:29 +0200 Subject: Removed use of 'checkquest' from scripts (common folder) Signed-off-by: Haru --- npc/battleground/flavius/flavius01.txt | 4 +- npc/battleground/flavius/flavius02.txt | 8 +- npc/battleground/flavius/flavius_enter.txt | 292 +++++++++++++---------------- npc/battleground/kvm/kvm_enter.txt | 16 +- npc/battleground/tierra/tierra01.txt | 10 +- npc/battleground/tierra/tierra02.txt | 10 +- npc/battleground/tierra/tierra_enter.txt | 292 +++++++++++++---------------- npc/custom/battleground/bg_common.txt | 84 ++++----- npc/custom/bgqueue/flavius.txt | 4 +- npc/events/RWC_2011.txt | 4 +- npc/events/easter_2010.txt | 160 ++++++++-------- npc/events/gdevent_aru.txt | 19 +- npc/events/gdevent_sch.txt | 19 +- npc/instances/EndlessTower.txt | 10 +- npc/instances/NydhoggsNest.txt | 14 +- npc/instances/OrcsMemory.txt | 8 +- npc/instances/SealedShrine.txt | 42 ++--- npc/jobs/2-1/assassin.txt | 2 +- npc/jobs/2-1/blacksmith.txt | 26 +-- npc/jobs/2-1/hunter.txt | 14 +- npc/jobs/2-1/knight.txt | 10 +- npc/jobs/2-1/priest.txt | 6 +- npc/jobs/2-1/wizard.txt | 2 +- npc/jobs/2-2/alchemist.txt | 12 +- npc/jobs/2-2/bard.txt | 2 +- npc/jobs/2-2/crusader.txt | 8 +- npc/jobs/2-2/dancer.txt | 4 +- npc/jobs/2-2/rogue.txt | 12 +- npc/jobs/2-2/sage.txt | 28 +-- npc/jobs/2-2e/SoulLinker.txt | 6 +- npc/jobs/valkyrie.txt | 2 +- npc/quests/newgears/2008_headgears.txt | 4 +- npc/quests/quests_13_1.txt | 42 ++--- npc/quests/quests_13_2.txt | 58 +++--- npc/quests/quests_alberta.txt | 11 +- npc/quests/quests_ayothaya.txt | 4 +- npc/quests/quests_hugel.txt | 15 +- npc/quests/quests_lighthalzen.txt | 4 +- npc/quests/quests_louyang.txt | 4 +- npc/quests/quests_morocc.txt | 216 ++++++--------------- npc/re/cities/malangdo.txt | 2 +- npc/re/cities/malaya.txt | 2 +- 42 files changed, 657 insertions(+), 835 deletions(-) (limited to 'npc') diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index 18f153d87..a02752d52 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -377,14 +377,14 @@ OnTouch: bat_b01,87,76,0 script A_CODE#bat_b01 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) + if (!questprogress(2070)) setquest 2070; end; } bat_b01,312,224,0 script B_CODE#bat_b01 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) + if (!questprogress(2070)) setquest 2070; end; } diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt index 0a88b9919..79b7b5168 100644 --- a/npc/battleground/flavius/flavius02.txt +++ b/npc/battleground/flavius/flavius02.txt @@ -378,15 +378,15 @@ OnTouch: bat_b02,87,76,0 script A_CODE#bat_b02 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) - //setquest 2070; + //if (!questprogress(2070)) + // setquest 2070; end; } bat_b02,312,224,0 script B_CODE#bat_b02 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) - //setquest 2070; + //if (!questprogress(2070)) + // setquest 2070; end; } diff --git a/npc/battleground/flavius/flavius_enter.txt b/npc/battleground/flavius/flavius_enter.txt index d63130007..315eff2cb 100644 --- a/npc/battleground/flavius/flavius_enter.txt +++ b/npc/battleground/flavius/flavius_enter.txt @@ -30,48 +30,41 @@ bat_room,133,178,5 script Flavius Officer#01a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b01"); - if (.@mapcount2 > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG1 > 0) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",85,223; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070, PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b01") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG1 > 0) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",85,223; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -97,48 +90,41 @@ bat_room,133,121,1 script Flavius Officer#01b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b01"); - if (.@mapcount2 > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG1 > 0) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",85,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b01") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG1 > 0) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",85,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; @@ -254,48 +240,41 @@ bat_room,148,178,5 script Flavius Officer#02a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b02"); - if (.@mapcount2 > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG2 > 0) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",141,224; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070, PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b02") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG2 > 0) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",141,224; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -321,48 +300,41 @@ bat_room,148,121,1 script Flavius Officer#02b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2070,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2070; - set .@mapcount2,getmapusers("bat_b02"); - if (.@mapcount2 > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@FlaviusBG2 > 0) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",141,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2070,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2070; + if (getmapusers("bat_b02") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@FlaviusBG2 > 0) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",141,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; diff --git a/npc/battleground/kvm/kvm_enter.txt b/npc/battleground/kvm/kvm_enter.txt index 1b5e9062c..8f9f40e2b 100644 --- a/npc/battleground/kvm/kvm_enter.txt +++ b/npc/battleground/kvm/kvm_enter.txt @@ -19,16 +19,16 @@ //============================================================ bat_room,164,178,5 script KVM Mercenary Officer#1 4_M_KY_KNT,{ /* - set .@kvm,checkquest(6026,PLAYTIME); - if ((.@kvm == 0) || (.@kvm == 1)) { + .@kvm = questprogress(6026,PLAYTIME); + if (.@kvm == 1) { mes "[Croix Mercenary Officer]"; mes "I know that you've already signed with the Croix. Go back and join their team. We will not accept traitors to fight for us."; close; } else if (.@kvm == 2) erasequest 6026; */ - set .@permit,checkquest(6025,PLAYTIME); - if ((.@permit == 0) || (.@permit == 1)) { + .@permit = questprogress(6025,PLAYTIME); + if (.@permit == 1) { mes "[Guillaume Mercenary Officer]"; mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again."; close; @@ -119,16 +119,16 @@ bat_room,167,178,5 script Guillaume Knight#kvm 4_M_KY_SOLD,{ //============================================================ bat_room,164,121,1 script KVM Mercenary Officer#2 4_M_CRU_KNT,{ /* - set .@kvm,checkquest(6025,PLAYTIME); - if ((.@kvm == 0) || (.@kvm == 1)) { + .@kvm = questprogress(6025,PLAYTIME); + if (.@kvm == 1) { mes "[Croix Mercenary Officer]"; mes "I know that you've already signed with the Guillaume. Go back and join their team. We will not accept traitors to fight for us."; close; } else if (.@kvm == 2) erasequest 6025; */ - set .@permit,checkquest(6025,PLAYTIME); - if ((.@permit == 0) || (.@permit == 1)) { + .@permit = questprogress(6025,PLAYTIME); + if (.@permit == 1) { mes "[Croix Mercenary Officer]"; mes "It seems you have recently participated in a KVM battle. You must wait 5 minutes before signing up again."; close; diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index 10e2bfc85..2a6d5991a 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -73,7 +73,7 @@ bat_a01,352,342,0 script #bat_a01_quest_a -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -82,7 +82,7 @@ bat_a01,353,52,0 script #bat_a01_quest_b -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -634,16 +634,14 @@ OnTouch: bat_a01,352,342,0 script A_CODE#bat_a01 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } bat_a01,353,52,0 script B_CODE#bat_a01 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index 0e7cc773d..129d0ee3e 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -72,7 +72,7 @@ bat_a02,352,342,0 script #bat_a02_quest_a -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -81,7 +81,7 @@ bat_a02,353,52,0 script #bat_a02_quest_b -1,5,5,{ end; OnTouch: - if (checkquest(2069) < 0) + if (!questprogress(2069)) setquest 2069; end; } @@ -633,16 +633,14 @@ OnTouch: bat_a02,352,342,0 script A_CODE#bat_a02 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } bat_a02,353,52,0 script B_CODE#bat_a02 -1,5,5,{ OnTouch: - set .@chk_bfquest,checkquest(2069); - if ((.@chk_bfquest == 0) || (.@chk_bfquest == 1)) + if (questprogress(2069) == 1) setquest 2069; end; } diff --git a/npc/battleground/tierra/tierra_enter.txt b/npc/battleground/tierra/tierra_enter.txt index e68058247..19ceb732e 100644 --- a/npc/battleground/tierra/tierra_enter.txt +++ b/npc/battleground/tierra/tierra_enter.txt @@ -31,48 +31,41 @@ bat_room,124,178,5 script Tierra Gorge Officer#01a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a01"); - if (.@mapcount > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG1) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",57,223; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a01") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG1) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",57,223; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -98,48 +91,41 @@ bat_room,140,178,5 script Tierra Gorge Officer#02a 4_M_KY_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Guillaume Army Officer]"; mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Guillaume Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if (.@chk_urtime == 1) { - mes "[Guillaume Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a02"); - if (.@mapcount > 0) { - mes "[Guillaume Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG2) { - mes "[Guillaume Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Guillaume Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Croixs what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",114,223; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Guillaume Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Guillaume Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a02") > 0) { + mes "[Guillaume Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Croixs already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG2) { + mes "[Guillaume Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Guillaume Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Croixs what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",114,223; + end; case 2: mes "[Guillaume Army Officer]"; mes "Today, we shall be victorious!"; @@ -263,48 +249,41 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a02"); - if (.@mapcount > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG1) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",57,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a02") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG1) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",57,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; @@ -330,48 +309,41 @@ bat_room,140,121,1 script Tierra Gorge Officer#02b 4_M_CRU_KNT,{ if ((Class == Job_Novice) || (BaseClass == Job_SuperNovice)) { mes "[Croix Army Officer]"; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - else { - if (BaseLevel < 80) { - mes "[Croix Army Officer]"; - mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; - } - else { - set .@chk_urtime,checkquest(2069,PLAYTIME); - if (.@chk_urtime == 1) { - mes "[Croix Army Officer]"; - mes "You seem to have just returned from the battlefield."; - mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; - } - else { - if (.@chk_urtime == 2) - erasequest 2069; - set .@mapcount,getmapusers("bat_a02"); - if (.@mapcount > 0) { - mes "[Croix Army Officer]"; - mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - if ($@TierraBG2) { - mes "[Croix Army Officer]"; - mes "An elite corps is already standing by to be dispatched to the battlefield."; - mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; - } - else { - mes "[Croix Army Officer]"; - mes "You definitely seem to be ready for battle!"; - mes "Go show the Guillaumes what fear truly means!"; - mes "Today, our cry of victory shall echo all over the battlefield!"; - close2; - warp "bat_room",114,207; - end; - } - } - } - } + if (BaseLevel < 80) { + mes "[Croix Army Officer]"; + mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; + break; } - break; + .@chk_urtime = questprogress(2069,PLAYTIME); + if (.@chk_urtime == 1) { + mes "[Croix Army Officer]"; + mes "You seem to have just returned from the battlefield."; + mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; + break; + } + if (.@chk_urtime == 2) + erasequest 2069; + if (getmapusers("bat_a02") > 0) { + mes "[Croix Army Officer]"; + mes "I've received a report informing me that an elite corps has been dispatched to the battlefield fighting the Guillaume already."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + if ($@TierraBG2) { + mes "[Croix Army Officer]"; + mes "An elite corps is already standing by to be dispatched to the battlefield."; + mes "Why don't you go wait for a while? I suggest you sharpen your weapons and prepare your supplies until then."; + break; + } + mes "[Croix Army Officer]"; + mes "You definitely seem to be ready for battle!"; + mes "Go show the Guillaumes what fear truly means!"; + mes "Today, our cry of victory shall echo all over the battlefield!"; + close2; + warp "bat_room",114,207; + end; case 2: mes "[Croix Army Officer]"; mes "Today, we shall be victorious!"; diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt index 895191961..8b99deb39 100644 --- a/npc/custom/battleground/bg_common.txt +++ b/npc/custom/battleground/bg_common.txt @@ -217,9 +217,9 @@ bat_room,156,178,5 script Tierra Valley Officer#1 4_M_KY_KNT,{ close; } - if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069; - if( checkquest(2069,PLAYTIME) != -1 ) - { + if (questprogress(2069,PLAYTIME) == 2) + erasequest 2069; + if (questprogress(2069,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Tierra Officer]"; @@ -287,9 +287,9 @@ bat_room,156,121,1 script Tierra Valley Officer#2 4_M_CRU_KNT,{ close; } - if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069; - if( checkquest(2069,PLAYTIME) != -1 ) - { + if (questprogress(2069,PLAYTIME) == 2) + erasequest 2069; + if (questprogress(2069,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Tierra Officer]"; @@ -357,9 +357,9 @@ bat_room,164,178,5 script Tierra Valley Officer#3 4_M_KY_KNT,{ close; } - if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069; - if( checkquest(2069,PLAYTIME) != -1 ) - { + if (questprogress(2069,PLAYTIME) == 2) + erasequest 2069; + if (questprogress(2069,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Tierra Officer]"; @@ -427,9 +427,9 @@ bat_room,164,121,1 script Tierra Valley Officer#4 4_M_CRU_KNT,{ close; } - if( checkquest(2069,PLAYTIME) == 2 ) erasequest 2069; - if( checkquest(2069,PLAYTIME) != -1 ) - { + if (questprogress(2069,PLAYTIME) == 2) + erasequest 2069; + if (questprogress(2069,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Tierra Gorge. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Tierra Officer]"; @@ -498,9 +498,9 @@ bat_room,172,178,5 script Flavius Officer#1 4_M_KY_KNT,{ close; } - if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070; - if( checkquest(2070,PLAYTIME) != -1 ) - { + if (questprogress(2070,PLAYTIME) == 2) + erasequest 2070; + if (questprogress(2070,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Flavius Officer]"; @@ -569,9 +569,9 @@ bat_room,172,121,1 script Flavius Officer#2 4_M_CRU_KNT,{ close; } - if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070; - if( checkquest(2070,PLAYTIME) != -1 ) - { + if (questprogress(2070,PLAYTIME) == 2) + erasequest 2070; + if (questprogress(2070,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Flavius Officer]"; @@ -640,9 +640,9 @@ bat_room,148,178,5 script Flavius Officer#3 4_M_KY_KNT,{ close; } - if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070; - if( checkquest(2070,PLAYTIME) != -1 ) - { + if (questprogress(2070,PLAYTIME) == 2) + erasequest 2070; + if (questprogress(2070,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Flavius Officer]"; @@ -711,9 +711,9 @@ bat_room,148,121,1 script Flavius Officer#4 4_M_CRU_KNT,{ close; } - if( checkquest(2070,PLAYTIME) == 2 ) erasequest 2070; - if( checkquest(2070,PLAYTIME) != -1 ) - { + if (questprogress(2070,PLAYTIME) == 2) + erasequest 2070; + if (questprogress(2070,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at Flavius. I can't let you participate in any other battles until the indicator goes off."; next; mes "[Flavius Officer]"; @@ -779,9 +779,9 @@ bat_room,140,178,5 script KVM [80-99] Officer#1 4_M_KY_KNT,{ close; } - if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025; - if( checkquest(6025,PLAYTIME) != -1 ) - { + if (questprogress(6025,PLAYTIME) == 2) + erasequest 6025; + if (questprogress(6025,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off."; next; mes "[KVM Officer]"; @@ -847,9 +847,9 @@ bat_room,140,121,1 script KVM [80-99] Officer#2 4_M_CRU_KNT,{ close; } - if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025; - if( checkquest(6025,PLAYTIME) != -1 ) - { + if (questprogress(6025,PLAYTIME) == 2) + erasequest 6025; + if (questprogress(6025,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off."; next; mes "[KVM Officer]"; @@ -915,9 +915,9 @@ bat_room,132,178,5 script KVM [60-79] Officer#1 4_M_KY_KNT,{ close; } - if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025; - if( checkquest(6025,PLAYTIME) != -1 ) - { + if (questprogress(6025,PLAYTIME) == 2) + erasequest 6025; + if (questprogress(6025,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off."; next; mes "[KVM Officer]"; @@ -983,9 +983,9 @@ bat_room,132,121,1 script KVM [60-79] Officer#2 4_M_CRU_KNT,{ close; } - if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025; - if( checkquest(6025,PLAYTIME) != -1 ) - { + if (questprogress(6025,PLAYTIME) == 2) + erasequest 6025; + if (questprogress(6025,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off."; next; mes "[KVM Officer]"; @@ -1051,9 +1051,9 @@ bat_room,124,178,5 script KVM [1-59] Officer#1 4_M_KY_KNT,{ close; } - if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025; - if( checkquest(6025,PLAYTIME) != -1 ) - { + if (questprogress(6025,PLAYTIME) == 2) + erasequest 6025; + if (questprogress(6025,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off."; next; mes "[KVM Officer]"; @@ -1119,9 +1119,9 @@ bat_room,124,121,1 script KVM [1-59] Officer#2 4_M_CRU_KNT,{ close; } - if( checkquest(6025,PLAYTIME) == 2 ) erasequest 6025; - if( checkquest(6025,PLAYTIME) != -1 ) - { + if (questprogress(6025,PLAYTIME) == 2) + erasequest 6025; + if (questprogress(6025,PLAYTIME)) { mes "You have received an indicator showing that you've participated in the Battle at KvM. I can't let you participate in any other battles until the indicator goes off."; next; mes "[KVM Officer]"; diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt index 36e02e86d..8112be12e 100644 --- a/npc/custom/bgqueue/flavius.txt +++ b/npc/custom/bgqueue/flavius.txt @@ -426,14 +426,14 @@ OnTouch: bat_b01,87,76,0 script A_CODE#bat_b01 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) + if (!questprogress(2070)) setquest 2070; end; } bat_b01,312,224,0 script B_CODE#bat_b01 -1,5,5,{ OnTouch: - if (checkquest(2070) < 0) + if (!questprogress(2070)) setquest 2070; end; } diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt index 992bd7bd3..4f0a05b86 100644 --- a/npc/events/RWC_2011.txt +++ b/npc/events/RWC_2011.txt @@ -207,8 +207,8 @@ prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ close; } } else if (oversea_event == 2) { - set .@playtime, checkquest(13001,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(13001,PLAYTIME); + if (.@playtime == 1) { mes "[RWC2011 Agent]"; mes "First, I will start attaching cards you found... I'll take the rest of cards tomorrow."; mes "Please come back tomorrow."; diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt index 292b91948..8276e0774 100644 --- a/npc/events/easter_2010.txt +++ b/npc/events/easter_2010.txt @@ -36,8 +36,8 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ mes "Take care~!"; close; } - set .@quest1, checkquest(9117); - if (.@quest1 == -1) { + .@quest1 = questprogress(9117); + if (!.@quest1) { playbgm "30.mp3"; // One Step Closer mes "[Rina]"; mes "Hi~!"; @@ -96,7 +96,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ mes "Let me know when you are ready."; setquest 9117; close; - } else if (.@quest1 == 0 || .@quest1 == 1) { + } else if (.@quest1 == 1) { L_HuntingInfo: mes "[Rina]"; mes "What you need to do is"; @@ -123,8 +123,8 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ npcskill "AL_BLESSING",1,0,0; end; } else if (.@quest1 == 2) { - if (checkquest(9118) < 2 || checkquest(9119) < 2 || checkquest(9120) < 2 || checkquest(9121) < 2) { - if (checkquest(9118,HUNTING) == 2 || checkquest(9119,HUNTING) == 2 || checkquest(9120,HUNTING) == 2 || checkquest(9121,HUNTING) == 2) { + if (questprogress(9118) != 2 || questprogress(9119) != 2 || questprogress(9120) != 2 || questprogress(9121) != 2) { + if (questprogress(9118,HUNTING) == 2 || questprogress(9119,HUNTING) == 2 || questprogress(9120,HUNTING) == 2 || questprogress(9121,HUNTING) == 2) { mes "[Rina]"; mes "You did it."; mes "I can feel that my body is recovering."; @@ -144,8 +144,7 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ end; } } - set .@quest2, checkquest(9122); - if (.@quest2 == 0 || .@quest2 == 1) { + if (questprogress(9122) == 1) { mes "[Rina]"; mes "I will check one thing."; mes "For this task,"; @@ -215,87 +214,84 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ close2; emotion e_sigh; end; - } else { - set .@quest3, checkquest(9123); - if (.@quest3 == 0 || .@quest3 == 1) { - emotion e_kis; + } + if (questprogress(9123) == 1) { + emotion e_kis; + mes "[Rina]"; + mes "You're back~!"; + mes "My curse has been released."; + mes "Thank you so much."; + next; + if (checkweight(5852,1) == 0) { mes "[Rina]"; - mes "You're back~!"; - mes "My curse has been released."; - mes "Thank you so much."; - next; - if (checkweight(5852,1) == 0) { - mes "[Rina]"; - mes "Your bag is too full."; - mes "I have a present for you"; - mes "so make your bag lighter."; - mes "I'll wait for you."; - close; - } - completequest 9123; - getitem 5852,1; //Easter_Egg_Shell - set .@BaseExp, (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2); - if (ADVJOB == 0) { - if (BaseLevel < 40) set .@nBaseExp, .@BaseExp; - else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel); - else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20)); - else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); - else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); - else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); - else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); - else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2); - - set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2; - } else { - if (BaseLevel < 30) set .@nBaseExp, .@BaseExp; - else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10); - else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2); - else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); - else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); - else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); - else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); - else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel); - else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2); + mes "Your bag is too full."; + mes "I have a present for you"; + mes "so make your bag lighter."; + mes "I'll wait for you."; + close; + } + completequest 9123; + getitem 5852,1; //Easter_Egg_Shell + .@BaseExp = (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2); + if (ADVJOB == 0) { + if (BaseLevel < 40) set .@nBaseExp, .@BaseExp; + else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel); + else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20)); + else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); + else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); + else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); + else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); + else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2); - set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3; - } - getexp .@nBaseExp,.@nJobExp; - mes "[Rina]"; - mes "This is the present for you."; - mes "It's not a big one"; - mes "but please take it"; - mes "as a token of my gratitude."; - next; - mes "[Rina]"; - mes "I'll take a rest for a few days"; - mes "and then I'll go on an adventure."; - mes "See you again."; - close2; - consumeitem 607; //Yggdrasilberry - consumeitem 12068; //Luk_Dish03 - consumeitem 12063; //Dex_Dish03 - consumeitem 12053; //Vit_Dish03 - npcskill "AL_INCAGI",1,0,0; - npcskill "AL_BLESSING",1,0,0; - end; + set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2; } else { - mes "[Rina]"; - mes "Thank you for releasing my curse."; - mes "I'll take a rest for a few days"; - mes "and then go on an adventure again."; - mes "Have a happy day~!"; - close2; - consumeitem 607; //Yggdrasilberry - npcskill "AL_INCAGI",1,0,0; - npcskill "AL_BLESSING",1,0,0; - end; + if (BaseLevel < 30) set .@nBaseExp, .@BaseExp; + else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10); + else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2); + else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); + else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); + else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); + else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); + else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel); + else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2); + + set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3; } + getexp .@nBaseExp,.@nJobExp; + mes "[Rina]"; + mes "This is the present for you."; + mes "It's not a big one"; + mes "but please take it"; + mes "as a token of my gratitude."; + next; + mes "[Rina]"; + mes "I'll take a rest for a few days"; + mes "and then I'll go on an adventure."; + mes "See you again."; + close2; + consumeitem 607; //Yggdrasilberry + consumeitem 12068; //Luk_Dish03 + consumeitem 12063; //Dex_Dish03 + consumeitem 12053; //Vit_Dish03 + npcskill "AL_INCAGI",1,0,0; + npcskill "AL_BLESSING",1,0,0; + end; } + mes "[Rina]"; + mes "Thank you for releasing my curse."; + mes "I'll take a rest for a few days"; + mes "and then go on an adventure again."; + mes "Have a happy day~!"; + close2; + consumeitem 607; //Yggdrasilberry + npcskill "AL_INCAGI",1,0,0; + npcskill "AL_BLESSING",1,0,0; + end; } geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{ if (oversea_event2 > 519) { - OnRelease: +OnRelease: specialeffect EF_PATTACK; mes "- I found ^0000FFthe strange mark^000000. -"; next; @@ -304,7 +300,7 @@ geffen,207,114,4 script #Hiddne01Easter CLEAR_NPC,{ mes "- ^0000FFRina^000000 has been released"; mes "- from the curse."; mes "- ^006400Let's go back to Rina!^000000"; - if (checkquest(9122) < 2) { + if (questprogress(9122) != 2) { completequest 9122; setquest 9123; } @@ -333,7 +329,7 @@ rachel,36,132,4 script #Hiddne04Easter CLEAR_NPC,{ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{ disable_items; - if (checkquest(9117) == -1) { + if (!questprogress(9117)) { emotion e_swt2; mes "[Rina's Little Friend]"; mes "......."; @@ -341,7 +337,7 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{ mes "^787878( No response. )^000000"; close; } - if (checkquest(9123) == 2) { + if (questprogress(9123) == 2) { emotion e_meh; mes "[Rina's Little Friend]"; mes "Hi."; diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 22d30e12c..1a69fea76 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -63,8 +63,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "Hey did you see an ugly Goblin come by? He stole something from me!"; close; } - set .@chk_urquest,checkquest(2143,PLAYTIME); - set .@chk_yourgdname$,getguildname(getcharid(2)); + .@chk_urquest = questprogress(2143,PLAYTIME); + .@chk_yourgdname$ = getguildname(getcharid(2)); if ($@gdeventv_a1 == 0) { if ($@gdevents_a$ == "") { set $@gdeventv_a1,1; @@ -178,8 +178,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ } } else if ($@gdevents_a$ == .@chk_yourgdname$) { - set .@chk_urquest1,checkquest(2144); - if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) { + if (questprogress(2144) == 1) { mes "[Morestone]"; mes "I, Morestone, have made an alliance with the "+$@gdevents_a$+" guild."; mes "Oh, you are a member."; @@ -321,8 +320,7 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ } else { if ($@gdevents_a$ == .@chk_yourgdname$) { - set .@chk_urquest1,checkquest(2144); - if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) { + if (questprogress(2144) == 1) { mes "[Morestone]"; mes "[Morestone]"; mes "I, Morestone, have made an alliance with the "+$@gdevents_a$+" guild."; @@ -504,8 +502,8 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ } if (strcharinfo(0) == getguildmaster(getcharid(2))) { if ($@gdeventv_a2 == 0) { - set .@que_2143,checkquest(2143,PLAYTIME); - if (.@que_2143 == -1) { + set .@que_2143,questprogress(2143,PLAYTIME); + if (!.@que_2143) { setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT; mes "A lonely clown is juggling."; next; @@ -589,7 +587,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ donpcevent "Gergath#aru_gd::OnEnable"; close; } - else if ((.@que_2143 == 0) || (.@que_2143 == 1)) { + else if (.@que_2143 == 1) { mes "[Pierrot Pier]"; mes "Let's talk after I finished reading my master's message. Beep beep."; close; @@ -767,8 +765,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ } } else if ($@gdeventv_a2 == 3) { - set .@que_2143,checkquest(2143); - if (.@que_2143 == 3) { + if (questprogress(2143) == 2) { erasequest 2143; } mes "[Pierrot Pier]"; diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 31537763e..a6df13889 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -63,8 +63,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ mes "Hey did you see an ugly Goblin come by? He stole something from me!"; close; } - set .@chk_urquest,checkquest(2143,PLAYTIME); - set .@chk_yourgdname$,getguildname(getcharid(2)); + .@chk_urquest = questprogress(2143,PLAYTIME); + .@chk_yourgdname$ = getguildname(getcharid(2)); if ($@gdeventv_s1 == 0) { if ($@gdevents_s$ == "") { set $@gdeventv_s1,1; @@ -178,8 +178,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } } else if ($@gdevents_s$ == .@chk_yourgdname$) { - set .@chk_urquest1,checkquest(2144); - if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) { + if (questprogress(2144) == 1) { mes "[Morestone]"; mes "I, Morestone, have made an alliance with the "+$@gdevents_s$+" guild."; mes "Oh, you are a member."; @@ -321,8 +320,7 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } else { if ($@gdevents_s$ == .@chk_yourgdname$) { - set .@chk_urquest1,checkquest(2144); - if ((.@chk_urquest1 == 0) || (.@chk_urquest1 == 1)) { + if (questprogress(2144) == 1) { mes "[Morestone]"; mes "I, Morestone, have made an alliance with the "+$@gdevents_s$+" guild."; mes "Oh, you are a member."; @@ -503,8 +501,8 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ } if (strcharinfo(0) == getguildmaster(getcharid(2))) { if ($@gdeventv_s2 == 0) { - set .@que_2143,checkquest(2143,PLAYTIME); - if (.@que_2143 == -1) { + .@que_2143 = questprogress(2143,PLAYTIME); + if (!.@que_2143) { setnpcdisplay "Pierrot Pier#sch_gd", 4_M_PIERROT; mes "A lonely clown is juggling."; next; @@ -588,7 +586,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ donpcevent "Gergath#sch_gd::OnEnable"; close; } - else if ((.@que_2143 == 0) || (.@que_2143 == 1)) { + else if (.@que_2143 == 1) { mes "[Pierrot Pier]"; mes "Let's talk after I finished reading my master's message. Beep beep."; close; @@ -766,8 +764,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ } } else if ($@gdeventv_s2 == 3) { - set .@que_2143,checkquest(2143); - if (.@que_2143 == 3) { + if (questprogress(2143) == 2) { erasequest 2143; } mes "[Pierrot Pier]"; diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 2da7c8719..8da1d93c7 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -213,14 +213,14 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{ set .@p_name$,getpartyname(.@party_id); set .@md_name$,"Endless Tower"; - set .@etower_timer,checkquest(60200,PLAYTIME); // 1 week - set .@etower_timer2,checkquest(60201,PLAYTIME); // 4 hours + .@etower_timer = questprogress(60200,PLAYTIME); // 1 week + .@etower_timer2 = questprogress(60201,PLAYTIME); // 4 hours if (!instance_check_party(.@party_id,2)) { mes "Make or join a party with more than 1 member and try again."; close; } - if (.@etower_timer == -1) { + if (!.@etower_timer) { if (getcharid(0) == getpartyleader(.@party_id,2)) { mes "Confirmed the party has been made. Would you like to reserve entrance to the Endless Tower?"; next; @@ -267,7 +267,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{ case 3: end; } - } else if ((.@etower_timer >= 0) && (.@etower_timer2 < 2)) { + } else if (.@etower_timer == 1) { mes "If you have the dungeon generated already, you can enter it. "; next; switch(select("Enter the "+.@md_name$+":Return to Alberta:Cancel")) { @@ -282,7 +282,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{ break; } close; - } else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) { + } else if (.@etower_timer == 1 && .@etower_timer2 == 2) { set .@dun_lim_time,etower_timer+604800; // 1 week set .@dun_lim_time2,etower_timer+14400; // 4 hours diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index 9ccdade10..ada2bde55 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -92,12 +92,12 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{ set .@party_id,getcharid(1); set .@md_name$,"Nidhoggur's Nest"; - set .@ins_nyd_check,checkquest(3135,PLAYTIME); // 3 Day cooldown - set .@ins_nyd_check2,checkquest(3136,PLAYTIME); // 4 Hour play limit + .@ins_nyd_check = questprogress(3135,PLAYTIME); // 3 Day cooldown + .@ins_nyd_check2 = questprogress(3136,PLAYTIME); // 4 Hour play limit mes "As I put my hands on the stone gate, a voice sounded from the depth of my heart."; next; - if (.@ins_nyd_check == -1 && .@ins_nyd_check2 == -1) { + if (!.@ins_nyd_check && !.@ins_nyd_check2) { if (!instance_check_party(.@party_id,2,70)) { mes "[Yggdrasil Gatekeeper]"; mes "Where are the other servants, so you can work together? Each servant cannot be admitted here individually..."; @@ -150,7 +150,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{ close; goto L_Enter; } else { - if (.@ins_nyd_check == 0 || .@ins_nyd_check == 1) { + if (.@ins_nyd_check == 1) { if ('ins_nyd2 == 3 || 'ins_nyd2 == 4) { mes "[Yggdrasil Gatekeeper]"; mes "With the defeat of Nidhoggur's Shadow, the roots of the World Tree Yggdrasil are also affected."; @@ -166,7 +166,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{ close; goto L_Enter; } else if (.@ins_nyd_check == 2) { - if (.@ins_nyd_check2 == 0 || .@ins_nyd_check2 == 1) { + if (.@ins_nyd_check2 == 1) { mes "[Yggdrasil Gatekeeper]"; mes "The time limit to enter the dungeon has expired. You must wait for the World Tree to stabilize its power before trying to re-enter."; close; @@ -210,8 +210,8 @@ L_Enter: close; } else { mapannounce "nyd_dun02", getpartyname(getcharid(1))+"'s party member "+strcharinfo(0)+" has entered Nidhoggur's Nest.",bc_map,"0x00ff99"; - if (checkquest(3135) == -1) setquest 3135; - if (checkquest(3136) == -1) setquest 3136; + if (!questprogress(3135)) setquest 3135; + if (!questprogress(3136)) setquest 3136; warp "1@nyd",32,37; close; } diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index 55f88f99d..4ed546b1e 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -51,8 +51,8 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{ close; } - set .@orctime,checkquest(12059,PLAYTIME); - if (.@orctime == -1) { + .@orctime = questprogress(12059,PLAYTIME); + if (!.@orctime) { if (getcharid(0) == getpartyleader(.@party_id,2)) { mes "Party status confirmed. Would you like to book entrance to the "+.@md_name$+"?"; next; @@ -87,7 +87,7 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{ if(select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2) end; callsub L_Enter,1; - } else if (.@orctime == 0 || .@orctime == 1) { + } else if (.@orctime == 1) { mes "You can enter the Dungeon if it has been generated."; next; if(select("Enter the Dungeon "+.@md_name$+":Cancel") == 2) @@ -110,7 +110,7 @@ L_Enter: close; } else { mapannounce "gef_fild10", .@p_leader$ + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99"; - if (checkquest(12059)== -1) setquest 12059; + if (!questprogress(12059)) setquest 12059; warp "1@orcs",179,15; end; } diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index 215ceffeb..d85e8a4e4 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -106,11 +106,11 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ next; // 12 hour cooldown - set .@ins_bapho_check,checkquest(3040,PLAYTIME); + .@ins_bapho_check = questprogress(3040,PLAYTIME); // Two hour play limit - //set .@ins_bapho_check2,checkquest(3045,PLAYTIME); + //.@ins_bapho_check2 = questprogress(3045,PLAYTIME); - if (.@ins_bapho_check == -1) { + if (!.@ins_bapho_check) { if (getpartyleader(.@party_id,2) == getcharid(0) && instance_check_party(.@party_id,2,75)) { mes "[Friar Patrick]"; mes "Party name is "+getpartyname(.@party_id)+"..."; @@ -158,7 +158,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ mes "Once the party leader is permitted, the rest of the party can enter. This is a rule of this monastery, so please understand."; } } - else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) { + else if (.@ins_bapho_check == 1) { mes "[Friar Patrick]"; mes "It seems you have entered this shrine recently... You cannot reenter because Baphomet's Curse still remains. Baphomet's Curse disappears only after a certain amount of time has passed."; } @@ -170,8 +170,8 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ mes "Haaaaaaap... Hocus Pocus Wingardium Abracadabra!!!!!"; next; erasequest 3040; - if (checkquest(3041)>=0) erasequest 3041; - if (checkquest(3045)>=0) erasequest 3045; + if (questprogress(3041)) erasequest 3041; + if (questprogress(3045)) erasequest 3045; mes "[Friar Patrick]"; mes "Huu... It's over. Now that I've released Baphomet's Curse, you can enter again."; } @@ -224,11 +224,11 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{ close; // 12 hour cooldown - set .@ins_bapho_check,checkquest(3040,PLAYTIME); + .@ins_bapho_check = questprogress(3040,PLAYTIME); // Two hour play limit - //set .@ins_bapho_check2,checkquest(3045,PLAYTIME); + //.@ins_bapho_check2 = questprogress(3045,PLAYTIME); - if (.@ins_bapho_check == -1) { + if (!.@ins_bapho_check) { if (has_instance("1@cata") == "") { mes "It's cold to the touch. It doesn't respond."; close; @@ -238,7 +238,7 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{ warp "1@cata",100,224; end; } - } else if (.@ins_bapho_check == 0 || .@ins_bapho_check == 1) { + } else if (.@ins_bapho_check == 1) { mes "[Friar Patrick]"; mes "It seems you have entered this shrine recently... You cannot reenter because the curse of Baphomet still remains."; mes "The curse of Baphomet disappears after a certain amount of time after you entered."; @@ -251,8 +251,8 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{ mes "Haaaaaaap... Wingardium Leviosa Expecto Patronum !!!!!"; specialeffect2 EF_HOLYHIT; erasequest 3040; - if (checkquest(3041)>=0) erasequest 3041; - if (checkquest(3045)>=0) erasequest 3045; + if (questprogress(3041)) erasequest 3041; + if (questprogress(3045)) erasequest 3045; next; mes "[Friar Patrick]"; mes "Huu... It's over. Now I released all of the curses on you. You can enter again."; @@ -261,14 +261,14 @@ monk_test,306,151,3 script Grave of Baphomet#edq HIDDEN_NPC,{ } prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ - set .@new_maje,checkquest(3043); + .@new_maje = questprogress(3043); mes "[Rust Blackhand]"; mes "Who are you? What do you want me for?"; next; mes "[Rust Blackhand]"; mes "You're not a monk, then what do you want?"; next; - if (.@new_maje == 0 || .@new_maje == 1) { + if (.@new_maje == 1) { mes "[Rust Blackhand]"; mes "Did you bring all of the ingredients?"; next; @@ -311,7 +311,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ close; } } - else if ((.@new_maje == -1) && (countitem(6004) > 0)) { + else if (!.@new_maje && countitem(6004) > 0) { switch(select("About the Cursed Baphomet Doll:Stop talking.")) { case 1: mes "[Rust Blackhand]"; @@ -364,12 +364,12 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ close; } } - else if ((.@new_maje == -1) && (countitem(6004) == 0)) { + else if (!.@new_maje && countitem(6004) == 0) { mes "[Rust Blackhand]"; mes "If you don't have business with me, go away! As you see, I make equipment for the Brothers at the monastery, not for adventurers like you. Do you understand?"; close; } - else if ((.@new_maje == 2) && (countitem(6004) > 0)) { + else if (.@new_maje == 2 && countitem(6004) > 0) { switch(select("About the Cursed Baphomet Doll:Stop talking.")) { case 1: mes "[Rust Blackhand]"; @@ -420,7 +420,7 @@ prt_monk,261,91,3 script Rust Blackhand#edq 4_M_DWARF,{ close; } } - else if ((.@new_maje == 2) && (countitem(6004) == 0)) { + else if (.@new_maje == 2 && countitem(6004) == 0) { mes "[Rust Blackhand]"; mes "Why are you hanging around here? If you don't want a ^4d4dffGigantic Magestic Goat^000000, go away."; close; @@ -1084,8 +1084,8 @@ OnTouch: // Magical Seals //============================================================ - script Magical Seal#SS -1,{ - set .@seal_check,checkquest(3041,PLAYTIME); - if (.@seal_check == 0 || .@seal_check == 1) { + .@seal_check = questprogress(3041,PLAYTIME); + if (.@seal_check == 1) { specialeffect2 EF_SILENCEATTACK; percentheal -50,0; sc_start Eff_Stone,30000,0; @@ -1149,7 +1149,7 @@ OnInstanceInit: 2@cata,80,63,4 script Ancient Hero's Soul#2F 4_M_CHAMPSOUL,{ cutin "ins_cata_champ_s",2; - if (checkquest(3041)>=0) erasequest 3041; + if (questprogress(3041)) erasequest 3041; mes "[Ancient Hero's Soul]"; mes "Good job, my descendants... You've finished the long-cherished task that me and my bretheren could not complete."; next; diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index d778d789a..4292e86b8 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -254,7 +254,7 @@ in_moc_16,19,33,1 script Guildsman#asn 1_M_JOBTESTER,{ mes "you to the office."; close2; set ASSIN_Q,0; - if (checkquest(8000) != -1) { + if (questprogress(8000)) { changequest 8000,8001; } else { setquest 8001; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index c466925e1..b05c9c897 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -1,4 +1,4 @@ -//===== HerculesScript ======================================= +//===== Hercules Script ======================================= //= Blacksmith Job Quest //===== By: ================================================== //= EREMES THE CANIVALIZER(Aegis) @@ -248,7 +248,7 @@ ein_in01,18,28,4 script Guildsman#BLS 4_M_JOB_BLACKSMITH,{ else if (BSMITH_Q == 17 && countitem(1005) > 0 && JobLevel > 39) { mes "[Altiregen]"; mes "Excellent, I can tell by the twinkle in your eye that you were successful. I can now bestow upon you the gift of the smithing, the art of the Blacksmith."; - if (checkquest(2015) != -1) { + if (questprogress(2015)) { changequest 2015,2016; } next; @@ -483,7 +483,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ mes "Let's see...your score is..." + .@black_q + " points."; if (.@black_q == 100) { set BSMITH_Q,3; - if (checkquest(2001) != -1) { + if (questprogress(2001)) { changequest 2001,2002; } else { changequest 2000,2002; @@ -500,7 +500,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ close; } set BSMITH_Q,2; - if (checkquest(2001) == -1) { + if (!questprogress(2001)) { changequest 2000,2001; } mes "............."; @@ -653,7 +653,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ case 9: mes "Okay, now take this to ^8E6B23Baisulist^000000 in Geffen of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt."; getitem 1610,1; //Arc_Wand - if (checkquest(2003) != -1) { + if (questprogress(2003)) { changequest 2003,2008; } next; @@ -678,7 +678,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ case 10: mes "Okay, now take this to ^8E6B23Wickebine^000000 in Morroc of Rune-Midgarts Kingdom. Simply deliver it and bring me the receipt."; getitem 1219,1; //Gladius - if (checkquest(2004) != -1) { + if (questprogress(2004)) { changequest 2004,2009; } next; @@ -703,7 +703,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ case 11: mes "Okay, now take this to ^8E6B23Krongast^000000 in Lighthalzen. Simply deliver it and bring me the receipt."; getitem 1119,1; //Tsurugi - if (checkquest(2005) != -1) { + if (questprogress(2005)) { changequest 2005,2010; } next; @@ -729,7 +729,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ case 12: mes "Okay, now take this to ^8E6B23Talpiz^000000 in Payon of Rune-Midgarts Kingdom. Simply deliver this and bring me the receipt."; getitem 1713,1; //Arbalest - if (checkquest(2006) != -1) { + if (questprogress(2006)) { changequest 2006,2011; } next; @@ -753,7 +753,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ case 13: mes "Okay, now take this to ^8E6B23Bismarc^000000 in Hugel. Simply deliver this and bring back the receipt."; getitem 1122,1; //Ring_Pommel_Saber - if (checkquest(2007) != -1) { + if (questprogress(2007)) { changequest 2007,2012; } next; @@ -850,16 +850,16 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ if (countitem(1073) > 0) { set BSMITH_Q,15; delitem 1073,1; //Merchant_Voucher_1 - if (checkquest(2008) != -1) { + if (questprogress(2008)) { changequest 2008,2013; } - else if (checkquest(2009) != -1) { + else if (questprogress(2009)) { changequest 2009,2013; } - else if (checkquest(2010) != -1) { + else if (questprogress(2010)) { changequest 2010,2013; } - else if (checkquest(2011) != -1) { + else if (questprogress(2011)) { changequest 2011,2013; } else { diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index b1f1f518b..ab163860f 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -223,7 +223,7 @@ hu_in01,386,373,4 script Hunter Guildsman#hnt 4_F_JOB_HUNTER,{ mes "shall we begin?"; next; if (select("Yes~ Let's start now.:No, I'll be back later.") == 1) { - if(checkquest(4000) == -1) { + if (!questprogress(4000)) { setquest 4000; } mes "[Hunter Sherin]"; @@ -556,22 +556,22 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{ mes "[Demon Hunter]"; mes "You brought all of the necessary materials... You can get directions to the testing area from our Guildmaster who is currently in the Payon Central Palace."; set HNTR_Q,.@items[6]; - if(checkquest(4002) != -1) { + if (questprogress(4002)) { changequest 4002,4009; } - else if(checkquest(4003) != -1) { + else if (questprogress(4003)) { changequest 4003,4009; } - else if(checkquest(4004) != -1) { + else if (questprogress(4004)) { changequest 4004,4009; } - else if(checkquest(4005) != -1) { + else if (questprogress(4005)) { changequest 4005,4009; } - else if(checkquest(4006) != -1) { + else if (questprogress(4006)) { changequest 4006,4010; } - else if(checkquest(4007) != -1) { + else if (questprogress(4007)) { changequest 4007,4010; } else { diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index da1d8a8e4..62fd03aaf 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -1109,7 +1109,7 @@ prt_in,79,94,4 script Sir Windsor#knt 4_M_JOB_KNIGHT1,{ mes "..."; next; set KNIGHT_Q,7; - if (checkquest(9004) != -1) { + if (questprogress(9004)) { changequest 9004,9005; } mes "[Sir Windsor]"; @@ -1126,7 +1126,8 @@ prt_in,79,94,4 script Sir Windsor#knt 4_M_JOB_KNIGHT1,{ mes "...This way."; } close2; - if(checkquest(9006) == -1) changequest 9005,9006; + if (!questprogress(9006)) + changequest 9005,9006; warp "job_knt",89,101; end; } @@ -1416,7 +1417,7 @@ OnMyMobDead: mes "Amy Beatrice now."; close2; set KNIGHT_Q,8; - if(checkquest(9007) == -1) { + if (!questprogress(9007)) { changequest 9006,9007; } warp "prt_in",80,100; @@ -1544,7 +1545,8 @@ prt_in,69,107,6 script Lady Amy#knt 4_F_JOB_KNIGHT,{ mes "come to Amy?"; next; if (select("Sir Windsor told me to--:Oh, nothing.") == 1) { - if(checkquest(9008) == -1) changequest 9007,9008; + if (!questprogress(9008)) + changequest 9007,9008; mes "[Lady Amy]"; mes "Oh!"; mes "No need to say"; diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index 57f6a2647..76fb03cad 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -690,7 +690,7 @@ prt_church,27,24,1 script Sister Cecilia 1_F_PRIEST,{ } else if (PRIEST_Q == 7 || PRIEST_Q == 8) { if (PRIEST_Q == 7) { - if(checkquest(8014) == -1) { + if (!questprogress(8014)) { changequest 8013,8014; } mes "Welcome! I'm so glad to see you've come back! Now, there is one last trial left for you to complete."; @@ -990,7 +990,7 @@ job_prist,24,187,4 script Peter S. Alberto 4_M_MINISTER,{ mes "Kill those"; mes "misbegotten creatures!"; close2; - if(checkquest(8012) == -1) { + if (!questprogress(8012)) { changequest 8011,8012; } warp "job_prist",24,44; @@ -1712,7 +1712,7 @@ OnTouch: } else if (BaseClass == Job_Acolyte) { set PRIEST_Q,7; - if(checkquest(8012) != -1) { + if (questprogress(8012)) { changequest 8012,8013; } warp "prt_church",16,37; diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt index b62685c6b..86c245f94 100644 --- a/npc/jobs/2-1/wizard.txt +++ b/npc/jobs/2-1/wizard.txt @@ -547,7 +547,7 @@ gef_tower,102,24,2 script Gloomy Wizard 4_M_JOB_WIZARD,{ mes "[Raulel]"; mes "I'll give you 10 questions so give me the right answers."; mes "If you get something wrong, I won't tell you what it is!"; - if(checkquest(9016) == -1) { + if (!questprogress(9016)) { changequest 9015,9016; } next; diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index 7e5ca7e33..b30defc48 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -234,10 +234,10 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{ mes "Okay, now you need to learn"; mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines."; set ALCH_Q,4; - if(checkquest(2028) != -1) { + if (questprogress(2028)) { changequest 2028,2031; } - else if(checkquest(2029) != -1) { + else if (questprogress(2029)) { changequest 2029,2031; } else { @@ -267,10 +267,10 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{ mes "Okay, now you need to learn"; mes "the basics to being an Alchemist and learn the procedures for mixing chemicals and medicines."; set ALCH_Q,4; - if(checkquest(2028) != -1) { + if (questprogress(2028)) { changequest 2028,2031; } - else if(checkquest(2029) != -1) { + else if (questprogress(2029)) { changequest 2029,2031; } else { @@ -1687,10 +1687,10 @@ alde_alche,101,184,4 script Master Alchemist#am 2_M_DYEINGER,{ cutin "",255; end; } - if(checkquest(2039) != -1) { + if (questprogress(2039)) { changequest 2039,2040; } - if(checkquest(2034) != -1) { + if (questprogress(2034)) { changequest 2034,2040; } mes "Ah, well done."; diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt index 24d49cbce..55b7401a1 100644 --- a/npc/jobs/2-2/bard.txt +++ b/npc/jobs/2-2/bard.txt @@ -433,7 +433,7 @@ comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{ mes "Then, do you want to try singing...?"; mes "I'll sing a short melody..."; mes "and you try after."; - if(checkquest(3003) == -1) { + if (!questprogress(3003)) { changequest 3002,3003; } next; diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt index d5bcd70ea..232e6c85e 100644 --- a/npc/jobs/2-2/crusader.txt +++ b/npc/jobs/2-2/crusader.txt @@ -245,10 +245,10 @@ prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{ delitem .@item3, 10; delitem .@item4, 10; set CRUS_Q, 4; - if(checkquest(3006) != -1) { + if (questprogress(3006)) { changequest 3006,3009; } - else if(checkquest(3007) != -1) { + else if (questprogress(3007)) { changequest 3007,3009; } else { @@ -759,7 +759,7 @@ prt_church,95,127,3 script Crusader 4_F_CRU,{ close; } set CRUS_Q,7; - if(checkquest(3011) != -1) { + if (questprogress(3011)) { changequest 3011,3012; } mes "Hmmm... What a pity."; @@ -866,7 +866,7 @@ prt_castle,35,151,5 script Patron Knight 4_M_CRU,{ mes "[Bliant Piyord]"; mes "To take the battle test, bring"; mes "1 ^3355FFHoly Water^000000. This will be used to purify you prior to taking the test."; - if(checkquest(3013) != -1) { + if (questprogress(3013)) { changequest 3013,3014; } next; diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt index 6b4ddf5b0..a34bf0540 100644 --- a/npc/jobs/2-2/dancer.txt +++ b/npc/jobs/2-2/dancer.txt @@ -320,10 +320,10 @@ job_duncer,43,93,4 script Aile#da 4_F_07,{ mes "[Aile]"; mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you."; set DANC_Q,5; - if(checkquest(7001) != -1) { + if (questprogress(7001)) { changequest 7001,7004; } - else if(checkquest(7002) != -1) { + else if (questprogress(7002)) { changequest 7002,7004; } else { diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index cf20d5203..d0b2ba95f 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -757,10 +757,10 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ switch(rand(1,3)) { case 1: set ROGUE_Q,9; - if(checkquest(2018) != -1) { + if (questprogress(2018)) { changequest 2018,2022; } - else if(checkquest(2019) != -1) { + else if (questprogress(2019)) { changequest 2019,2022; } else { @@ -794,10 +794,10 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ close; case 2: set ROGUE_Q,10; - if(checkquest(2018) != -1) { + if (questprogress(2018)) { changequest 2018,2023; } - else if(checkquest(2019) != -1) { + else if (questprogress(2019)) { changequest 2019,2023; } else { @@ -830,10 +830,10 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ close; case 3: set ROGUE_Q,11; - if(checkquest(2018) != -1) { + if (questprogress(2018)) { changequest 2018,2024; } - else if(checkquest(2019) != -1) { + else if (questprogress(2019)) { changequest 2019,2024; } else { diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 72bacfaf1..4f0db7888 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -595,13 +595,13 @@ yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{ mes "Ah yes, everything is in readiness."; mes "Next, you will take an entrance test."; set SAGE_Q,4; - if(checkquest(2043) != -1) { + if (questprogress(2043)) { changequest 2043,2041; } - else if(checkquest(2044) != -1) { + else if (questprogress(2044)) { changequest 2044,2041; } - else if(checkquest(2045) != -1) { + else if (questprogress(2045)) { changequest 2045,2041; } else { @@ -1881,10 +1881,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{ switch(rand(1,4)) { case 1: set SAGE_Q2,4; - if(checkquest(2053) != -1) { + if (questprogress(2053)) { changequest 2053,2056; } - else if(checkquest(2054) != -1) { + else if (questprogress(2054)) { changequest 2054,2056; } else { @@ -1896,10 +1896,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{ break; case 2: set SAGE_Q2,5; - if(checkquest(2053) != -1) { + if (questprogress(2053)) { changequest 2053,2057; } - else if(checkquest(2054) != -1) { + else if (questprogress(2054)) { changequest 2054,2057; } else { @@ -1911,10 +1911,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{ break; case 3: set SAGE_Q2,6; - if(checkquest(2053) != -1) { + if (questprogress(2053)) { changequest 2053,2058; } - else if(checkquest(2054) != -1) { + else if (questprogress(2054)) { changequest 2054,2058; } else { @@ -1926,10 +1926,10 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{ break; case 4: set SAGE_Q2,7; - if(checkquest(2053) != -1) { + if (questprogress(2053)) { changequest 2053,2059; } - else if(checkquest(2054) != -1) { + else if (questprogress(2054)) { changequest 2054,2059; } else { @@ -2002,13 +2002,13 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{ next; set SAGE_Q2,0; set SAGE_Q,12; - if(checkquest(2056) != -1) { + if (questprogress(2056)) { changequest 2056,2051; } - else if(checkquest(2057) != -1) { + else if (questprogress(2057)) { changequest 2057,2051; } - else if(checkquest(2058) != -1) { + else if (questprogress(2058)) { changequest 2058,2051; } else { diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt index 49fdcffd4..597407909 100644 --- a/npc/jobs/2-2e/SoulLinker.txt +++ b/npc/jobs/2-2e/SoulLinker.txt @@ -520,7 +520,7 @@ job_soul,30,35,6 script Monk Spirit#link4 4_M_GRANDMONK,{ mes "possibly have to do this."; next; set SOUL_Q,4; - if(checkquest(6008) == -1) { + if (!questprogress(6008)) { changequest 6007,6008; } mes "[Monk Spirit]"; @@ -569,7 +569,7 @@ job_soul,30,25,7 script Sage Spirit#link5 4_M_SAGE_A,{ mes "require your help. I beg you,"; mes "let me become your spirit ally."; set SOUL_Q,4; - if(checkquest(6008) == -1) { + if (!questprogress(6008)) { changequest 6007,6008; } next; @@ -613,7 +613,7 @@ job_soul,25,30,5 script Alchemist Spirit#link7 4_F_ALCHE,{ mes "on to the next world until I've"; mes "passed on my techniques..."; set SOUL_Q,4; - if(checkquest(6008) == -1) { + if (!questprogress(6008)) { changequest 6007,6008; } next; diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index 0aa4c4e3f..ad6d5f795 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -325,7 +325,7 @@ yuno_in02,93,207,1 script Book of Ymir HIDDEN_NPC,{ mes "can confirm that Valkyrie and Valhalla actually exist..."; next; set valkyrie_Q,2; - if(checkquest(1000) == -1) { + if(!questprogress(1000)) { setquest 1000; } mes "[The Book of Ymir]"; diff --git a/npc/quests/newgears/2008_headgears.txt b/npc/quests/newgears/2008_headgears.txt index f45664f3b..e215b982a 100644 --- a/npc/quests/newgears/2008_headgears.txt +++ b/npc/quests/newgears/2008_headgears.txt @@ -103,7 +103,7 @@ gef_fild05,80,149,3 script Myu#08_hat 4_F_YUNYANG,{ } } } else if(hatcat2008 == 1) { - if(checkquest(7055,HUNTING) == 2) { + if (questprogress(7055,HUNTING) == 2) { mes "[Myu]"; mes "Did you think I didn't know what you have done?"; mes "Huh?"; @@ -120,7 +120,7 @@ gef_fild05,80,149,3 script Myu#08_hat 4_F_YUNYANG,{ erasequest 7054; erasequest 7055; close; - } else if(checkquest(7054,HUNTING) == 2) { + } else if (questprogress(7054,HUNTING) == 2) { mes "[Myu]"; mes "Oh..wow unbelievable!"; mes "Now, those Kobolds should have learned a lesson, haven't they?"; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 16860ddf2..a66038181 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -4145,7 +4145,7 @@ mid_camp,188,254,3 script Monster Scholar#ep13 4_M_ALCHE_D,{ close; } else if (ep13_animal == 14) { - if (checkquest(2157,HUNTING) == 2) { + if (questprogress(2157,HUNTING) == 2) { mes "[Rumis Block]"; mes "Welcome back. Did you find out about them?"; next; @@ -4498,7 +4498,7 @@ mid_camp,240,270,3 script Botanist#ep13 4_M_ALCHE_C,{ close; } else if (ep13_animal == 5) { - if (checkquest(2150,HUNTING) == 2) { + if (questprogress(2150,HUNTING) == 2) { mes "[Botanist]"; mes "Welcome back! How was it?"; mes "It was amazing, wasn't it?"; @@ -4561,7 +4561,7 @@ mid_camp,240,270,3 script Botanist#ep13 4_M_ALCHE_C,{ } } else if (ep13_animal == 6) { - if (checkquest(2151,HUNTING) == 2) { + if (questprogress(2151,HUNTING) == 2) { mes "[Botanist]"; mes "Hopefully the Cornuses have learned their lesson, and won't touch my special environmental meters anymore."; next; @@ -4843,7 +4843,7 @@ man_fild01,92,230,3 script Frozen Tree#evt_lumis HIDDEN_NPC,1,1,{ //============================================================ spl_fild02,34,223,5 script Small Fairy#spl 4_M_FAIRYKID,{ if (BaseLevel > 69) { - if (checkquest(2158) == -1) { + if (!questprogress(2158)) { mes "You find a little creature flying in the bushes."; mes "It has tiny wings on the back..."; mes "It's a fairy!"; @@ -4881,7 +4881,7 @@ spl_fild02,34,223,5 script Small Fairy#spl 4_M_FAIRYKID,{ man_fild03,236,105,3 script Tree Giant#man 4_MAN_PIOM,{ if (BaseLevel > 69) { - if (checkquest(2159) == -1) { + if (!questprogress(2159)) { mes "You have found something moving between dry branches."; mes "It appears to be a tree at first glance, but it turns out to be a giant that is half tree and half man."; next; @@ -4923,14 +4923,14 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 4_M_EIN_SOLDIER,{ mes "working for United Midgard."; mes "How may I help you?"; next; - if ((checkquest(2158) == 2) && (checkquest(2159) == 2)) { + if (questprogress(2158) == 2 && questprogress(2159) == 2) { mes "["+strcharinfo(0)+"]"; mes "Oh, nothing."; mes "Sorry to bother you."; close; } else { - if (checkquest(2158) == 1) { + if (questprogress(2158) == 1) { mes "- You report your encounter with a small fairy in the Splandid area to the guard captain. -"; next; mes "[Captain]"; @@ -4944,14 +4944,14 @@ mid_camp,212,237,5 script Camp Guard Captain#man1 4_M_EIN_SOLDIER,{ getexp (checkre(3))?90000:900000,0; close; } - else if (checkquest(2158) == -1) { + else if (!questprogress(2158)) { mes "["+strcharinfo(0)+"]"; mes "Oh, nothing."; mes "Sorry to bother you."; close; } else { - if (checkquest(2159) == 1) { + if (questprogress(2159) == 1) { mes "- You report your encounter with a tree giant in the Manuk area to the guard captain. -"; next; mes "[Captain]"; @@ -7393,8 +7393,8 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ } } else if (ep13_alba == 6) { - set .@alba_check,checkquest(7047,PLAYTIME); - if (.@alba_check == -1) { + .@alba_check = questprogress(7047,PLAYTIME); + if (!.@alba_check) { mes "[Taab]"; mes "Thank you for"; mes "helping me last time."; @@ -7406,7 +7406,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ set ep13_alba,0; close; } - else if ((.@alba_check == 0) || (.@alba_check == 1)) { + else if (.@alba_check == 1) { mes "[Taab]"; mes "I've got enough feed"; mes "and supplies to last a while."; @@ -8084,7 +8084,7 @@ mid_camp,72,94,4 script Fluffy Gyaruk 4_M_BOSSCAT,{ } mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{ - if (checkquest(12060,PLAYTIME) == -1) { + if (!questprogress(12060,PLAYTIME)) { if (ep13_yong1 < 4) { mes "[Ferocious Gorurug]"; mes "Grrr...."; @@ -8233,7 +8233,7 @@ mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{ close; } } - else if ((checkquest(12060,PLAYTIME) == 0) || (checkquest(12060,PLAYTIME) == 1)) { + else if (questprogress(12060,PLAYTIME) == 1) { mes "[Ferocious Gorurug]"; mes "*Yawn*"; mes "I'm sorry, but I'm off-duty."; @@ -8252,7 +8252,7 @@ mid_camp,69,144,0 script Ferocious Gorurug 4_M_BOSSCAT,{ } spl_fild02,314,165,0 script School of Fish#1::Fishinghole CLEAR_NPC,{ - if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) { + if (!questprogress(12060,PLAYTIME) && countitem(6039) < 20) { specialeffect2 EF_BUBBLE; specialeffect2 EF_INVENOM; set .@fcast,15; @@ -8368,7 +8368,7 @@ mid_camp,66,122,55 script Henry Clifford 4_M_05,{ } mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{ - if (checkquest(12062,PLAYTIME) == -1) { + if (!questprogress(12062,PLAYTIME) == -1) { if ((countitem(6048) > 2) && (ep13_yong1 > 9)) { mes "[Cat Hand Mining Agent]"; mes "Oh, wow~"; @@ -8403,7 +8403,7 @@ mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{ close; } } - else if ((checkquest(12062,PLAYTIME) == 0) || (checkquest(12062,PLAYTIME) == 1)) { + else if (questprogress(12062,PLAYTIME) == 1) { mes "[Cat Hand Mining Agent]"; mes "I hope you'll bring me minerals again tomorrow..."; mes "If you can. It's much better to wait for you to do it than go there on my own."; @@ -8419,7 +8419,7 @@ mid_camp,88,100,55 script Cat Hand Mining Agent 4_CAT,{ } - script Mysterious Rock#0::manukrock -1,{ - if ((countitem(6048) < 3) && (checkquest(12062,PLAYTIME) == -1)) { + if (countitem(6048) < 3 && !questprogress(12062,PLAYTIME)) { specialeffect2 EF_REPAIRWEAPON; progressbar "ffff00",10; set .@rhea_ran,rand(1,20); @@ -10078,7 +10078,7 @@ man_fild01,315,95,3 script Expedition Scout#1 4_M_MOC_SOLDIER,{ next; mes "[Expedition Scout]"; mes "I've been ordered by Instructor Igrid to conduct a search for something."; - set .@playtime,checkquest(3091,PLAYTIME); + .@playtime = questprogress(3091,PLAYTIME); next; switch(select("Ask about search results.:Chitchat.:Quit.")) { case 1: @@ -10086,7 +10086,7 @@ man_fild01,315,95,3 script Expedition Scout#1 4_M_MOC_SOLDIER,{ mes "[Expedition Scout]"; mes "Oh, you must be"+strcharinfo(0)+". I heard that you'll be delivering the report."; next; - if (.@playtime == 0 || .@playtime == 1) { + if (.@playtime == 1) { mes "[Expedition Scout]"; mes "Searching for lost pages was tougher then I expected. Please come back later when I'm finished making one round."; close; @@ -10116,7 +10116,7 @@ man_fild01,315,95,3 script Expedition Scout#1 4_M_MOC_SOLDIER,{ mes "I'm doing my best, but I haven't found any pages yet."; next; } - if (.@playtime == -1) { + if (!.@playtime) { changequest 3090,3091; erasequest 3090; } else diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index f024c5285..45a35b73e 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -416,7 +416,7 @@ function Catwarp { man_fild02,132,47,4 duplicate(Cat Hand Agent#spl) Cat Hand Agent#man 4_M_BOSSCAT - script Mysterious Rock#30::manukrock2 -1,{ - if ((countitem(6048) < 3) && (checkquest(12062,PLAYTIME) == -1)) { + if (countitem(6048) < 3 && !questprogress(12062,PLAYTIME)) { specialeffect2 EF_REPAIRWEAPON; progressbar "ffff00",10; set .@rhea_ran,rand(1,20); @@ -456,7 +456,7 @@ man_fild02,358,174,0 duplicate(manukrock2) Mysterious Rock#39 CLEAR_NPC man_fild02,241,227,0 duplicate(manukrock2) Mysterious Rock#40 CLEAR_NPC spl_fild03,226,151,0 script School of Fish#5::FishingHole_spl3 CLEAR_NPC,{ - if ((checkquest(12060,PLAYTIME) == -1) && (countitem(6039) < 20)) { + if (!questprogress(12060,PLAYTIME) && countitem(6039) < 20) { specialeffect2 EF_BUBBLE; specialeffect2 EF_INVENOM; set .@fcast,15; @@ -2767,9 +2767,7 @@ manuk,252,116,3 script Manuk Galtun#ep13_2day 4_MAN_GALTUN,{ } } else if (ep13_2_days01 == 1) { - set .@qst_cpl01,checkquest(7074,HUNTING); - set .@qst_cpl02,checkquest(7075,HUNTING); - if ((.@qst_cpl01 == 2) & (.@qst_cpl02 == 2)) { + if (questprogress(7074,HUNTING) == 2 && questprogress(7075,HUNTING) == 2) { mes "[Strom]"; mes "Sure enough... I, the Sapha Galtun, Strom, apologize to you. I should not have been so quick to despise you."; mes "I admit that you are a brave soldier, please feel free to visit Manuk."; @@ -2829,10 +2827,8 @@ man_in01,378,276,3 script Manuk Engineer#ep13_2 4_MAN_NITT,{ close; } if ((isequipped(2782) == 1) && (ep13_2_rhea > 99)) { - set .@alba,checkquest(7080); - if ((.@alba == 0) || (.@alba == 1)) { - set .@time_chek,checkquest(7080,PLAYTIME); - if (.@time_chek != 2) { + if (questprogress(7080) == 1) { + if (questprogress(7080,PLAYTIME) != 2) { mes "[Manuk Engineer]"; mes "Thank you for collecting the Enriched Bradium for me, it was very helpful."; mes "We've got more than enough for now though."; @@ -2847,8 +2843,7 @@ man_in01,378,276,3 script Manuk Engineer#ep13_2 4_MAN_NITT,{ } } else { - set .@alba2,checkquest(7079); - if ((.@alba2 == 0) || (.@alba2 == 1)) { + if (questprogress(7079) == 1) { if (countitem(6090) > 19) { mes "[Manuk Engineer]"; mes "Oh, that will do very well."; @@ -2937,10 +2932,8 @@ spl_in01,97,313,3 script Laphine Craftsman#ep13 4_M_FAIRYKID5,{ } if ((isequipped(2782) == 1) && (ep13_2_rhea > 99)) { if (ep13_mdrama > 5) { - set .@alba,checkquest(7082); - if (.@alba == 1) { - set .@time_chek,checkquest(7082,PLAYTIME); - if ((.@time_chek == 0) || (.@time_chek == 1)) { + if (questprogress(7082) == 1) { + if (questprogress(7082,PLAYTIME) == 1) { mes "[Laphine craftsman]"; mes "Thank you for collecting those items for me."; mes "That should be sufficient for the time being."; @@ -2952,8 +2945,7 @@ spl_in01,97,313,3 script Laphine Craftsman#ep13 4_M_FAIRYKID5,{ erasequest 7082; close; } - set .@alba2,checkquest(7081); - if ((.@alba2 == 0) || (.@alba2 == 1)) { + if (questprogress(7081) == 1) { if ((countitem(7326) > 14) && (countitem(6075) > 14)) { mes "[Laphine craftsman]"; mes "Oh, fantastic."; @@ -3102,7 +3094,7 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 4_F_SCIENCE,{ next; if (select("Notice for criminal report:Cute pet investigation.") == 1) { if (ep13_2_wanted == 1) { - if (checkquest(7076,HUNTING) == 2) { + if (questprogress(7076,HUNTING) == 2) { mes "[Pinedel]"; mes "Have you hunted the Runaway Dandelion?"; mes "Ok, I accept you."; @@ -3165,14 +3157,14 @@ mid_camp,146,306,3 script Pet Breeder#ep13_eden01 4_F_SCIENCE,{ mes "[Pinedel]"; mes "Those eggs are about to hatch now."; mes "I will investigate those back home."; - set .@alba_check,checkquest(7078,PLAYTIME); - if (.@alba_check == -1) { + .@alba_check = questprogress(7078,PLAYTIME); + if (!.@alba_check) { close2; erasequest 7078; set ep13_2_dayegg,3; end; } - else if ((.@alba_check == 0) || (.@alba_check == 1)) { + else if (.@alba_check == 1) { mes "For now I still need more time."; next; mes "[Pinedel]"; @@ -3638,8 +3630,7 @@ mid_camp,197,237,3 script Schwartzvalt Mechanic#1 4_M_LGTMAN,{ close; } else if (ep13_2_rhea == 12) { - set .@trs_time01,checkquest(8253,PLAYTIME); - if (.@trs_time01 == 2) { + if (questprogress(8253,PLAYTIME) == 2) { mes "[Mechanic Engineer Dorance]"; mes "Sigh, What should I do now?!"; next; @@ -3814,9 +3805,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ mes "[Linguist Dictionary]"; mes "Have you met the other world's people by any chance?"; next; - set .@check_splque00,checkquest(2158); - set .@check_manque00,checkquest(2159); - if ((.@check_splque00 == 0) && (.@check_manque00 == 0)) { + if (!questprogress(2158) && !questprogress(2159)) { // custom translation mes "[Linguist Dictionary]"; mes "Looks like you haven't encountered them yet."; @@ -3871,9 +3860,7 @@ mid_campin,168,82,3 script Arunafeltz Linguist#1 4_M_TRAINEE,{ } } else if (ep13_2_rhea == 2) { - set .@check_splque00,checkquest(2158); - set .@check_manque00,checkquest(2159); - if ((.@check_splque00 > 0) && (.@check_manque00 > 0)) { + if (questprogress(2158) && questprogress(2159)) { mes "[Linguist Dictionary]"; mes "You are back!"; next; @@ -4256,9 +4243,7 @@ mid_camp,147,256,3 script Rune Midgarts Magician#1 4_M_JOB_WIZARD,{ close; } else if (ep13_2_rhea == 5) { - set .@check_spljew00,checkquest(8241); - set .@check_manjew00,checkquest(8242); - if ((.@check_spljew00 > 0) && (.@check_manjew00 > 0)) { + if (questprogress(8241) && questprogress(8242)) { if (countitem(7575) > 0) && (countitem(7576) > 0) { mes "[Magician Whisper]"; mes "Wow, You are back already!"; @@ -4475,7 +4460,7 @@ function script jewel_13_2 { close; } else if (ep13_2_rhea == 5) { - if (checkquest(8240+getarg(1)) == -1) { + if (!questprogress(8240+getarg(1))) { mes "- Under a round pile of earth, -"; mes "- there's a "+getarg(0)+" Gem -"; mes "- half-buried. -"; @@ -4716,8 +4701,7 @@ man_in01,372,221,5 script Scientist#lifeguard 4_MAN_BENKUNI,{ mes "Why not put some of your items in storage and come back?"; close; } - set .@dayq_chk,checkquest(2182,PLAYTIME); - if ((.@dayq_chk == 0) || (.@dayq_chk == 1)) { + if (questprogress(2182,PLAYTIME) == 1) { mes "The future of the Sapha is up to you."; mes "I do not have any need of your help right now."; close; @@ -5465,8 +5449,8 @@ spl_in01,30,324,3 script High Laphine#grenouille 4_M_FAIRYKID5,{ mes "Why not put some of your items in storage and come back?"; close; } - set .@dayq_chk,checkquest(2186,PLAYTIME); - if ((.@dayq_chk == -1) || (.@dayq_chk == 2)) { + .@dayq_chk = questprogress(2186,PLAYTIME); + if (!.@dayq_chk || .@dayq_chk == 2) { if ((ep13_2_tre1 < 1) || (ep13_2_tre1 == 6)) { erasequest 2186; set ep13_2_tre1,0; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index 1d2e61da3..a26c9c5f0 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -2493,8 +2493,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{ close; } if (ep13_2_hiki == 10) { - set .@cooltime,checkquest(10087,PLAYTIME); - if (.@cooltime == 2) { + if (questprogress(10087,PLAYTIME) == 2) { mes "[Iromo]"; mes "...You really are annoying..."; mes "What exactly do you want from me...?"; @@ -2581,8 +2580,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{ close; } if ((ep13_2_hiki == 8) || (ep13_2_hiki == 9)) { - set .@cooltime,checkquest(10085,PLAYTIME); - if (.@cooltime == 2) { + if (questprogress(10085,PLAYTIME) == 2) { mes "[Iromo]"; mes "You never give up, don't you?"; mes "What are you trying to say?"; @@ -2620,8 +2618,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{ close; } if (ep13_2_hiki == 7) { - set .@goyang,checkquest(10084,HUNTING); - if (.@goyang == 2) { + if (questprogress(10084,HUNTING) == 2) { mes "[Iromo]"; mes "Oh, you made the furious cat"; mes "go away from the village?"; @@ -2831,7 +2828,7 @@ alberta_in,120,93,3 script Iromo's Mother#ep3_2 1_M_INNKEEPER,{ mes "But, somehow..."; mes "he doesn't go out anymore."; next; - if (BaseLevel > 40 && checkquest(10079) == -1) { + if (BaseLevel > 40 && !questprogress(10079)) { set ep13_2_hiki,1; setquest 10079; } diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index 5a30866f7..2c3225ce2 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -160,7 +160,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 4_F_THAIAYO,2,2,{ mes "my ring. I'll be waiting"; mes "here for the good news."; mes "Oho ho ho ho ho~!"; - if (checkquest(12029) == -1) + if (!questprogress(12029)) setquest 12029; close; } @@ -386,7 +386,7 @@ ayothaya,233,105,3 script Powerful-Looking Woman 4_F_THAIAYO,2,2,{ next; mes "[Shuda]"; mes "So go and look under the water! There's no water current, so I'm sure it's still there! What are you waiting for, it's should be an easy swim for you! Oho ho ho ho ho!"; - if (checkquest(12029) == -1) + if (!questprogress(12029)) setquest 12029; set thai_find,1; close; diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index 453a0e8fc..bab833ac0 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -5781,8 +5781,8 @@ hu_in01,15,372,3 script Cellette Lavit 1_F_MERCHANT_02,{ mes "is your Fish Cake Soup. Thank"; mes "you so much for your help~"; set hg_odeng,0; - for(set .@i,8072; .@i<= 8075; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + for (.@i = 8072; .@i <= 8075; ++.@i) { + if (questprogress(.@i)) erasequest .@i; } getitem 584,3; //Fish_Ball_Soup @@ -5833,8 +5833,8 @@ hugel,76,134,3 script Neha 4W_F_01,{ mes "^FF00001 Whip^000000 so that I can spank you"; mes "for your impertinence, girl!"; } - for(set .@i,8064; .@i<= 8067; set .@i,.@i+1) { - if (checkquest(.@i) > -1 && checkquest(.@i) < 2) + for (.@i = 8064; .@i <= 8067; ++.@i) { + if (questprogress(.@i) && questprogress(.@i) != 2) completequest .@i; } setquest 8068; @@ -7499,7 +7499,8 @@ hugel,72,101,0 script Burupu's Instructions HIDDEN_NPC,{ break; } close2; - if (checkquest(12042) > -1) erasequest 12042; + if (questprogress(12042)) + erasequest 12042; end; } @@ -8710,8 +8711,8 @@ hu_in01,14,11,4 script Laura 1_F_GYPSY,{ next; select("Yeah, yeah, whatever.:Sure thing.:I s-s-s-suppose...!:Yes, Ma'am!"); set hg_odin,17; - for(set .@i,11002; .@i<=11005; set .@i,.@i+1) { - if (checkquest(.@i) > -1 && checkquest(.@i) < 2) + for(.@i = 11002; .@i <= 11005; ++.@i) { + if (questprogress(.@i) && questprogress(.@i) != 2) completequest .@i; } setquest 11006; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 6f9a4c0d2..6ed364ed5 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -8491,8 +8491,8 @@ L_Mission: mes "[Karl]"; mes "........."; mes "............"; - for(set .@i,12015; .@i<=12028; set .@i,.@i+1) { - if (checkquest(.@i) > 0 && checkquest(.@i) < 2) + for (.@i = 12015; .@i <= 12028; ++.@i) { + if (questprogress(.@i) && questprogress(.@i) != 2) completequest .@i; } close; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index d928aefd6..e15780c5e 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -2126,8 +2126,8 @@ lou_in02,156,38,0 script Studying Officer#lou 4_M_CHNMAN,{ mes "Here it is. A few days ago, someone asked me for the same document,"; mes "so I was able to find it again pretty easily. I hope it's useful to you."; set ch_par,15; - for(set .@i,11051; .@i<=11054; set .@i,.@i+1) { - if (checkquest(.@i) > -1 && checkquest(.@i < 2)) + for (.@i = 11051; .@i <= 11054; ++.@i) { + if (questprogress(.@i) && questprogress(.@i) != 2) completequest .@i; } setquest 11055; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 45ed535f8..b4e788568 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -4453,7 +4453,7 @@ prontera,153,353,4 script Messenger#prince1 8W_SOLDIER,{ } prt_castle,117,163,5 script Inspector#prince 4_M_SAGE_C,{ - if (checkquest(10004) == 0 || checkquest(10004) == 1) { + if (questprogress(10004) == 1) { mes "[Inspector]"; mes "Judge!"; mes "How goes it? I don't think it is easy to meet seven candidates and appraise them."; @@ -5243,7 +5243,7 @@ prt_castle,117,163,5 script Inspector#prince 4_M_SAGE_C,{ mes "How is it going?"; mes "Grading someone is not a piece of cake. It's real hard work indeed. You do the hard work for our country."; next; - if ((nkprince_eisen == 15) && (checkquest(10025) == 0 || checkquest(10025) == 1)) { + if (nkprince_eisen == 15 && questprogress(10025) == 1) { mes "-I tell him about the Ahrum and Ernst accident.-"; next; mes "[Inspector]"; @@ -5308,14 +5308,8 @@ prt_castle,117,163,5 script Inspector#prince 4_M_SAGE_C,{ next; switch(select("Yes.:No.")) { case 1: - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { mes "[Inspector]"; mes "Very well."; mes "I like hearing about the princes."; @@ -5328,14 +5322,8 @@ prt_castle,117,163,5 script Inspector#prince 4_M_SAGE_C,{ } close; case 2: - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if (.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7 == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { mes "[Inspector]"; mes "Don't be coy. I'm sure you have done it already."; completequest 10004; @@ -5355,13 +5343,13 @@ prt_castle,272,375,4 script Prince 4_M_SITDOWN,{ mes "lock and key.-"; close; } - if (checkquest(10020) == 2) { + if (questprogress(10020) == 2) { mes "[Erich]"; mes "...What bad luck I have!"; mes "But he insists me to be corrupted, knowing how it would be..."; close; } - else if (checkquest(10020) == 0 || checkquest(10020) == 1) { + else if (questprogress(10020) == 1) { mes "[Erich]"; mes "These days, I have bad luck... Only harrassments happen to me..."; close; @@ -5394,14 +5382,8 @@ prt_castle,272,375,4 script Prince 4_M_SITDOWN,{ mes "You can ask information about me to my servant. I will take a rest."; set nk_prince,6; completequest 10011; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -5417,7 +5399,7 @@ prt_castle,272,375,4 script Prince 4_M_SITDOWN,{ } prt_castle,274,372,4 script Servant#hans 1_M_02,{ - if (checkquest(10020) == 2) { + if (questprogress(10020) == 2) { mes "[Hans]"; mes "Ahh... mmm... I..."; mes "I... am so, sorry!"; @@ -5427,7 +5409,7 @@ prt_castle,274,372,4 script Servant#hans 1_M_02,{ mes "My prince didn't do anything wrong but, anyways, I apologize for anything to you!"; close; } - else if (checkquest(10020) == 0 || checkquest(10020) == 1) { + else if (questprogress(10020) == 1) { mes "Incessantly...-"; mes "-He has jitters whenever I react to him. His actions give me a feeling of pity.-"; close; @@ -5507,7 +5489,7 @@ prt_castle,339,202,3 script Prince#urgen 4_M_4THPRIN1,{ mes "It discomforts me..."; close; } - if (checkquest(10021) == 2) { + if (questprogress(10021) == 2) { mes "[Urugen]"; mes " feel very much displeased. Hey, what are you looking at? Get out!"; next; @@ -5515,7 +5497,7 @@ prt_castle,339,202,3 script Prince#urgen 4_M_4THPRIN1,{ mes "My beautiful body isn't in perfect condition right now. I don't want to show it to anyone today."; close; } - else if (checkquest(10021) == 0 || checkquest(10021) == 1) { + else if (questprogress(10021) == 1) { mes "[Urugen]"; mes "...What? What did you..."; mes "just say to me?... Huh?"; @@ -5587,14 +5569,8 @@ prt_castle,339,202,3 script Prince#urgen 4_M_4THPRIN1,{ completequest 10009; } completequest 10011; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -5609,14 +5585,14 @@ prt_castle,289,201,3 script Prince#helmut 4_M_5THPRIN1,{ mes "Such an idiot. I should have killed him earlier. Now I feel relieved."; close; } - if (checkquest(10022) == 2) { + if (questprogress(10022) == 2) { mes "[Helmut]"; mes "Damn... Damn it!"; mes "Novice of Walter!!"; mes "How can I deal with this stress? Damn! Hell!"; close; } - else if (checkquest(10022) == 0 || checkquest(10022) == 1) { + else if (questprogress(10022) == 1) { mes "-He is so blushed,"; mes "evidently shown on his face.-"; close; @@ -5668,14 +5644,8 @@ prt_castle,289,201,3 script Prince#helmut 4_M_5THPRIN1,{ mes "[" + strcharinfo(0) + "]"; mes "......"; completequest 10010; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -5713,14 +5683,8 @@ prt_castle,289,201,3 script Prince#helmut 4_M_5THPRIN1,{ mes "[" + strcharinfo(0) + "]"; mes "......"; completequest 10010; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -5758,14 +5722,8 @@ prt_castle,289,201,3 script Prince#helmut 4_M_5THPRIN1,{ mes "[" + strcharinfo(0) + "]"; mes "......"; completequest 10010; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -5806,12 +5764,12 @@ prt_castle,391,205,3 script Prince#poe 4_M_6THPRIN1,{ mes "Whatever the condition is, he is just a loser in the match of life."; close; } - if (checkquest(10018) == 2) { + if (questprogress(10018) == 2) { mes "[Poe]"; mes "He gave up without any challenge. That's not what the man has to do. He is not as good as me. But okay. I am disappointed in him. Eigen Ahrum."; close; } - else if (checkquest(10018) == 0 || checkquest(10018) == 1) { + else if (questprogress(10018) == 1) { mes "[Poe]"; mes "......"; close; @@ -6008,14 +5966,8 @@ prt_castle,391,205,3 script Prince#poe 4_M_6THPRIN1,{ if (.@p_a + .@p_b + .@p_c == 3) { completequest 10007; } - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -6032,7 +5984,7 @@ prt_castle,364,375,4 script Prince#peter 4_M_3RDPRIN1,{ next; switch(select("Yes, I saw her for you.:No, I don't want to.")) { case 1: - if (checkquest(10014) == 0 || checkquest(10014) == 1) { + if (questprogress(10014) == 1) { mes "[Peter]"; mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her."; next; @@ -6046,7 +5998,7 @@ prt_castle,364,375,4 script Prince#peter 4_M_3RDPRIN1,{ mes "Thinking about the little girl calms me. I still can't believe my eyes. My prince Ahrum who just passed away...~"; close; case 2: - if (checkquest(10014) == 0 || checkquest(10014) == 1) { + if (questprogress(10014) == 1) { mes "[Peter]"; mes "As you said."; mes "I've heard that her life is like a flower when I lost it."; @@ -6064,25 +6016,25 @@ prt_castle,364,375,4 script Prince#peter 4_M_3RDPRIN1,{ close; } } - if (checkquest(10019) == 2) { + if (questprogress(10019) == 2) { mes "[Peter]"; mes "Child... What the heck happened to you?..."; close; } - else if (checkquest(10019) == 0 || checkquest(10019) == 1) { + else if (questprogress(10019) == 1) { mes "[Peter]"; mes "......"; close; } - if (checkquest(10008) == 2) { - set .@quest, checkquest(10014); + if (questprogress(10008) == 2) { + .@quest = questprogress(10014); if (.@quest == 2) { mes "[Peter]"; mes "I really appreciate it."; mes "You are so kind."; close; } - else if (.@quest == 0 || .@quest == 1) { + else if (.@quest == 1) { mes "[Peter]"; mes "I am glad that the girl liked it. Once I got cured, I wanted to go meet with her."; next; @@ -6172,14 +6124,8 @@ prt_castle,364,375,4 script Prince#peter 4_M_3RDPRIN1,{ mes "Please take care."; getitem 744,1; //Bunch_Of_Flowers setquest 10013; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -6189,14 +6135,8 @@ prt_castle,364,375,4 script Prince#peter 4_M_3RDPRIN1,{ mes "I know you have your"; mes "own business."; setquest 10013; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -6208,7 +6148,7 @@ prt_castle,364,375,4 script Prince#peter 4_M_3RDPRIN1,{ } aldebaran,132,184,3 script Girl#prince 4W_KID,{ - if (checkquest(10013) == 0 || checkquest(10013) == 1) { + if (questprogress(10013) == 1) { if (countitem(744) > 0) { mes "[Girl]"; mes "Wooah, Uncle Peter sent these flowers"; @@ -6681,14 +6621,8 @@ prt_castle,314,373,4 script Prince#eisen 4_M_1STPRIN1,{ set nkprince_eisen,1; } completequest 10005; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -6698,14 +6632,14 @@ prt_castle,314,373,4 script Prince#eisen 4_M_1STPRIN1,{ } prt_castle,368,312,4 script Prince#ern 4_M_2NDPRIN1,{ - if (checkquest(10024) == 2) { + if (questprogress(10024) == 2) { mes "[Ernst]"; mes "...brother, if you want..."; mes "...Ah, please leave here."; mes "I don't want to see anyone."; close; } - else if (checkquest(10024) == 0 || checkquest(10024) == 1) { + else if (questprogress(10024) == 1) { mes "[Ernst]"; mes "...Brother Ahrum..."; close; @@ -6874,14 +6808,8 @@ prt_castle,368,312,4 script Prince#ern 4_M_2NDPRIN1,{ set nkprince_eisen,2; } completequest 10006; - set .@prin1,checkquest(10005); - set .@prin2,checkquest(10006); - set .@prin3,checkquest(10007); - set .@prin4,checkquest(10008); - set .@prin5,checkquest(10009); - set .@prin6,checkquest(10010); - set .@prin7,checkquest(10011); - if ((.@prin1 + .@prin2 + .@prin3 + .@prin4 + .@prin5 + .@prin6 + .@prin7) == 14) { + if (questprogress(10005) == 2 && questprogress(10006) == 2 && questprogress(10007) == 2 && questprogress(10008) == 2 + && questprogress(10009) == 2 && questprogress(10010) == 2 && questprogress(10011) == 2) { setquest 10012; } close; @@ -7290,12 +7218,8 @@ prt_castle,272,372,1 script Prince#eisen1 4_M_1STPRIN1,{ mes "[Erich]"; mes "...Nuts."; completequest 10020; - set .@er1,checkquest(10018); - set .@er2,checkquest(10019); - set .@er3,checkquest(10020); - set .@er4,checkquest(10021); - set .@er5,checkquest(10022); - if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) { + if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2 + && questprogress(10021) == 2 && questprogress(10022) == 2) { setquest 10023; set nkprince_eisen,11; } @@ -7348,12 +7272,8 @@ prt_castle,336,202,7 script Prince#eisen2 4_M_1STPRIN1,{ mes "[Urugen]"; mes "...You are so low. I misjudged you. You are not of the few that have an artistic view. I totally saw you the wrong way."; completequest 10021; - set .@er1,checkquest(10018); - set .@er2,checkquest(10019); - set .@er3,checkquest(10020); - set .@er4,checkquest(10021); - set .@er5,checkquest(10022); - if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) { + if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2 + && questprogress(10021) == 2 && questprogress(10022) == 2) { setquest 10023; set nkprince_eisen,11; } @@ -7403,12 +7323,8 @@ prt_castle,286,201,7 script Prince#eisen3 4_M_1STPRIN1,{ mes "[Helmut]"; mes "That is... such a villain!!!"; completequest 10022; - set .@er1,checkquest(10018); - set .@er2,checkquest(10019); - set .@er3,checkquest(10020); - set .@er4,checkquest(10021); - set .@er5,checkquest(10022); - if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) { + if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2 + && questprogress(10021) == 2 && questprogress(10022) == 2) { setquest 10023; set nkprince_eisen,11; } @@ -7467,12 +7383,8 @@ prt_castle,388,205,6 script Prince#eisen4 4_M_1STPRIN1,{ mes "What... What. It's not fun."; mes "I totally couldn't get him."; completequest 10018; - set .@er1,checkquest(10018); - set .@er2,checkquest(10019); - set .@er3,checkquest(10020); - set .@er4,checkquest(10021); - set .@er5,checkquest(10022); - if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) { + if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2 + && questprogress(10021) == 2 && questprogress(10022) == 2) { setquest 10023; set nkprince_eisen,11; } @@ -7531,12 +7443,8 @@ prt_castle,364,372,1 script Prince#eisen5 4_M_1STPRIN1,{ mes "[Peter]"; mes "......"; completequest 10019; - set .@er1,checkquest(10018); - set .@er2,checkquest(10019); - set .@er3,checkquest(10020); - set .@er4,checkquest(10021); - set .@er5,checkquest(10022); - if ((.@er1 + .@er2 + .@er3 + .@er4 + .@er5) == 10) { + if (questprogress(10018) == 2 && questprogress(10019) == 2 && questprogress(10020) == 2 + && questprogress(10021) == 2 && questprogress(10022) == 2) { setquest 10023; set nkprince_eisen,11; } @@ -7737,7 +7645,7 @@ OnTouch: prt_castle,336,276,0 script #ern WARPNPC,1,1,{ OnTouch: - if (checkquest(10023) == 0 || checkquest(10023) == 1) { + if (questprogress(10023) == 1) { donpcevent "Prince#eisen6::OnEnable"; } warp "prt_castle",368,308; @@ -7746,7 +7654,7 @@ OnTouch: prt_castle,300,276,0 script #erich WARPNPC,1,1,{ OnTouch: - if (checkquest(10020) == 0 || checkquest(10020) == 1) { + if (questprogress(10020) == 1) { donpcevent "Prince#eisen1::OnEnable"; } warp "prt_castle",274,368; @@ -7755,7 +7663,7 @@ OnTouch: prt_castle,330,271,0 script #helmut WARPNPC,1,1,{ OnTouch: - if (checkquest(10022) == 0 || checkquest(10022) == 1) { + if (questprogress(10022) == 1) { donpcevent "Prince#eisen3::OnEnable"; } warp "prt_castle",290,208; @@ -7764,7 +7672,7 @@ OnTouch: prt_castle,348,271,0 script #poe WARPNPC,1,1,{ OnTouch: - if (checkquest(10018) == 0 || checkquest(10018) == 1) { + if (questprogress(10018) == 1) { donpcevent "Prince#eisen4::OnEnable"; } warp "prt_castle",390,208; @@ -7773,7 +7681,7 @@ OnTouch: prt_castle,354,276,0 script #peter WARPNPC,1,1,{ OnTouch: - if (checkquest(10019) == 0 || checkquest(10019) == 1) { + if (questprogress(10019) == 1) { donpcevent "Prince#eisen5::OnEnable"; } warp "prt_castle",366,368; @@ -7782,7 +7690,7 @@ OnTouch: prt_castle,310,271,0 script #urgen WARPNPC,1,1,{ OnTouch: - if (checkquest(10021) == 0 || checkquest(10021) == 1) { + if (questprogress(10021) == 1) { donpcevent "Prince#eisen2::OnEnable"; } warp "prt_castle",340,208; diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt index e8cfdb615..5a651c090 100644 --- a/npc/re/cities/malangdo.txt +++ b/npc/re/cities/malangdo.txt @@ -19,7 +19,7 @@ // Malangdo Transportation :: malangdo_go //============================================================ - script Dolangmal -1,{ - if (checkquest(5091) == -1) { + if (!questprogress(5091)) { mes "[Dolangmal]"; mes "Hey~! Hi human~ This is Mr. Dolangmal. kakaka~"; next; diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index da19e67c5..54064d8a5 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -222,7 +222,7 @@ OnTouch: if (getcharid(0) == getpartyleader(getcharid(1),2)) set .@pass,1; } else if (.@i%4 == 3) { - if (checkquest(4229,PLAYTIME) > -1 && checkquest(9223,PLAYTIME) > -1 && checkquest(12278,PLAYTIME) > -1) + if (questprogress(4229,PLAYTIME) && questprogress(9223,PLAYTIME) && questprogress(12278,PLAYTIME)) set .@pass,1; } else if (.@i%4 == 0) { if (rand(1,100)%10 == 7) -- cgit v1.2.3-70-g09d2 From 88929e74e284e649eb32b2a923f819c35ecccbf6 Mon Sep 17 00:00:00 2001 From: Haru Date: Mon, 20 Oct 2014 04:33:58 +0200 Subject: Removed use of 'checkquest' from scripts (pre-re folder) Signed-off-by: Haru --- npc/pre-re/jobs/1-1/acolyte.txt | 4 ++-- npc/pre-re/jobs/1-1/mage.txt | 6 +++--- npc/pre-re/jobs/1-1/merchant.txt | 6 +++--- npc/pre-re/quests/collection/quest_alligator.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_caramel.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_coco.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_creamy.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_demonpungus.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_disguiseloliruri.txt | 8 ++++---- npc/pre-re/quests/collection/quest_dokebi.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_dryad.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_fabre.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_frilldora.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_goat.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_golem.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_hode.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_leafcat.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_mantis.txt | 4 ++-- npc/pre-re/quests/collection/quest_pecopeco.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_pupa.txt | 12 ++++++------ npc/pre-re/quests/collection/quest_zhupolong.txt | 4 ++-- 21 files changed, 106 insertions(+), 106 deletions(-) (limited to 'npc') diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt index 2faef7c87..49bb33c9b 100644 --- a/npc/pre-re/jobs/1-1/acolyte.txt +++ b/npc/pre-re/jobs/1-1/acolyte.txt @@ -182,10 +182,10 @@ prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{ skill 143,0,0; callfunc "Job_Change",Job_Acolyte; callfunc "F_ClearJobVar"; - if(checkquest(1001) != -1) { + if (questprogress(1001)) { completequest 1001; } - else if(checkquest(1002) != -1) { + else if (questprogress(1002)) { completequest 1002; } else { diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt index 2e03ce410..b2c6b346d 100644 --- a/npc/pre-re/jobs/1-1/mage.txt +++ b/npc/pre-re/jobs/1-1/mage.txt @@ -208,13 +208,13 @@ geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{ callfunc "Job_Change",Job_Mage; callfunc "F_ClearJobVar"; Zeny += 50; - if(checkquest(1005) != -1) { + if (questprogress(1005)) { completequest 1005; } - else if(checkquest(1006) != -1) { + else if (questprogress(1006)) { completequest 1006; } - else if(checkquest(1007) != -1) { + else if (questprogress(1007)) { completequest 1007; } else { diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt index 47c1e3242..4162bf0b1 100644 --- a/npc/pre-re/jobs/1-1/merchant.txt +++ b/npc/pre-re/jobs/1-1/merchant.txt @@ -151,13 +151,13 @@ alberta_in,53,43,6 script Merchant#mer 4_M_04,{ mes "Congratulations!"; callfunc "Job_Change",Job_Merchant; callfunc "F_ClearJobVar"; - if(checkquest(1009) != -1) { + if (questprogress(1009)) { completequest 1009; } - else if(checkquest(1010) != -1) { + else if (questprogress(1010)) { completequest 1010; } - else if(checkquest(1011) != -1) { + else if (questprogress(1011)) { completequest 1011; } else { diff --git a/npc/pre-re/quests/collection/quest_alligator.txt b/npc/pre-re/quests/collection/quest_alligator.txt index 79c121ba5..327216667 100644 --- a/npc/pre-re/quests/collection/quest_alligator.txt +++ b/npc/pre-re/quests/collection/quest_alligator.txt @@ -13,8 +13,8 @@ //============================================================ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ - if (checkquest(60119) != -1) { - if (checkquest(60119,HUNTING) != 2 ) { + if (questprogress(60119)) { + if (questprogress(60119,HUNTING) != 2) { mes "[Cuir]"; mes "Have you finished hunting the 50 Alligators?"; next; @@ -53,8 +53,8 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ close; } } - if (checkquest(60120) != -1) { - if (checkquest(60120,HUNTING) != 2 ) { + if (questprogress(60120)) { + if (questprogress(60120,HUNTING) != 2) { mes "[Cuir]"; mes "Have you finished hunting the 50 Alligators?"; next; @@ -94,8 +94,8 @@ cmd_fild01,362,256,3 script Cuir#Gator_Hunt 1_M_MOC_LORD,{ close; } } - if (checkquest(60121) != -1) { - if (checkquest(60121,HUNTING) != 2 ) { + if (questprogress(60121)) { + if (questprogress(60121,HUNTING)) { mes "[Cuir]"; mes "Have you finished hunting the 150 Alligators?"; next; diff --git a/npc/pre-re/quests/collection/quest_caramel.txt b/npc/pre-re/quests/collection/quest_caramel.txt index 6815c62e1..5474939ff 100644 --- a/npc/pre-re/quests/collection/quest_caramel.txt +++ b/npc/pre-re/quests/collection/quest_caramel.txt @@ -13,8 +13,8 @@ //============================================================ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ - if (checkquest(60116) != -1) { - if (checkquest(60116,HUNTING) != 2 ) { + if (questprogress(60116)) { + if (questprogress(60116,HUNTING) != 2) { mes "[Yullo]"; mes "Have you finished hunting the 50 Caramels?"; next; @@ -53,8 +53,8 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ close; } } - if (checkquest(60117) != -1) { - if (checkquest(60117,HUNTING) != 2 ) { + if (questprogress(60117)) { + if (questprogress(60117,HUNTING) != 2) { mes "[Yullo]"; mes "Have you finished hunting the 50 Caramels?"; next; @@ -94,8 +94,8 @@ mjolnir_01,296,29,6 script Yullo#Caramel_Hunt 4_F_SISTER,{ close; } } - if (checkquest(60118) != -1) { - if (checkquest(60118,HUNTING) != 2 ) { + if (questprogress(60118)) { + if (questprogress(60118,HUNTING) != 2) { mes "[Yullo]"; mes "Have you finished hunting the 150 Caramels?"; next; diff --git a/npc/pre-re/quests/collection/quest_coco.txt b/npc/pre-re/quests/collection/quest_coco.txt index 7ba4cab02..541259954 100644 --- a/npc/pre-re/quests/collection/quest_coco.txt +++ b/npc/pre-re/quests/collection/quest_coco.txt @@ -13,8 +13,8 @@ //============================================================ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ - if (checkquest(60113) != -1) { - if (checkquest(60113,HUNTING) != 2 ) { + if (questprogress(60113)) { + if (questprogress(60113,HUNTING) != 2) { mes "[Nutters]"; mes "Have you finished hunting the 50 Cocos?"; next; @@ -53,8 +53,8 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ close; } } - if (checkquest(60114) != -1) { - if (checkquest(60114,HUNTING) != 2 ) { + if (questprogress(60114)) { + if (questprogress(60114,HUNTING) != 2) { mes "[Nutters]"; mes "Have you finished hunting the 50 Cocos?"; next; @@ -94,8 +94,8 @@ mjolnir_01,293,20,3 script Nutters#Coco_Hunt 4_M_YOYOROGUE,{ close; } } - if (checkquest(60115) != -1) { - if (checkquest(60115,HUNTING) != 2 ) { + if (questprogress(60115)) { + if (questprogress(60115,HUNTING) != 2) { mes "[Nutters]"; mes "Have you finished hunting the 150 Cocos?"; next; diff --git a/npc/pre-re/quests/collection/quest_creamy.txt b/npc/pre-re/quests/collection/quest_creamy.txt index ecdb6b0fb..7de8c7cf9 100644 --- a/npc/pre-re/quests/collection/quest_creamy.txt +++ b/npc/pre-re/quests/collection/quest_creamy.txt @@ -13,8 +13,8 @@ //============================================================ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ - if (checkquest(60122) != -1) { - if (checkquest(60122,HUNTING) != 2 ) { + if (questprogress(60122)) { + if (questprogress(60122,HUNTING) != 2) { mes "[Laertes]"; mes "Have you finished hunting the 50 Creamys?"; next; @@ -53,8 +53,8 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ close; } } - if (checkquest(60123) != -1) { - if (checkquest(60123,HUNTING) != 2 ) { + if (questprogress(60123)) { + if (questprogress(60123,HUNTING) != 2) { mes "[Laertes]"; mes "Have you finished hunting the 50 Creamys?"; next; @@ -94,8 +94,8 @@ prt_fild04,356,148,3 script Laertes#Creamy_Hunt 4_M_NFMAN,{ close; } } - if (checkquest(60124) != -1) { - if (checkquest(60124,HUNTING) != 2 ) { + if (questprogress(60124)) { + if (questprogress(60124,HUNTING) != 2) { mes "[Laertes]"; mes "Have you finished hunting the 150 Creamys?"; next; diff --git a/npc/pre-re/quests/collection/quest_demonpungus.txt b/npc/pre-re/quests/collection/quest_demonpungus.txt index 242e7bca2..d72e3f816 100644 --- a/npc/pre-re/quests/collection/quest_demonpungus.txt +++ b/npc/pre-re/quests/collection/quest_demonpungus.txt @@ -13,8 +13,8 @@ //============================================================ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ - if (checkquest(60125) != -1) { - if (checkquest(60125,HUNTING) != 2 ) { + if (questprogress(60125)) { + if (questprogress(60125,HUNTING) != 2) { mes "[Local Villager]"; mes "Have you finished hunting the 50 Demon Pungus?"; next; @@ -53,8 +53,8 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ close; } } - if (checkquest(60126) != -1) { - if (checkquest(60126,HUNTING) != 2 ) { + if (questprogress(60126)) { + if (questprogress(60126,HUNTING) != 2) { mes "[Local Villager]"; mes "Have you finished hunting the 50 Demon Pungus?"; next; @@ -94,8 +94,8 @@ ein_fild01,43,249,0 script Local Villager#hunt 4_M_HUMAN_01,{ close; } } - if (checkquest(60127) != -1) { - if (checkquest(60127,HUNTING) != 2 ) { + if (questprogress(60127)) { + if (questprogress(60127,HUNTING) != 2) { mes "[Local Villager]"; mes "Have you finished hunting the 150 Demon Pungus?"; next; diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt index 35d48aef7..8ff2ebce3 100644 --- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt +++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt @@ -13,8 +13,8 @@ nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{ - if (checkquest(60173) != -1) { - if (checkquest(60173,HUNTING) != 2 ) { + if (questprogress(60173)) { + if (questprogress(60173,HUNTING) != 2) { mes "[Deadman]"; mes "Have you finished hunting the 50 Disguise?"; next; @@ -51,8 +51,8 @@ nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{ erasequest 60173; close; } - if (checkquest(60176) != -1) { - if (checkquest(60176,HUNTING) != 2 ) { + if (questprogress(60176)) { + if (questprogress(60176,HUNTING) != 2) { mes "[Deadman]"; mes "Have you finished hunting the 50 Loli Ruri?"; next; diff --git a/npc/pre-re/quests/collection/quest_dokebi.txt b/npc/pre-re/quests/collection/quest_dokebi.txt index 62f0ed45d..898c353cb 100644 --- a/npc/pre-re/quests/collection/quest_dokebi.txt +++ b/npc/pre-re/quests/collection/quest_dokebi.txt @@ -13,8 +13,8 @@ //============================================================ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ - if (checkquest(60128) != -1) { - if (checkquest(60128,HUNTING) != 2 ) { + if (questprogress(60128)) { + if (questprogress(60128,HUNTING) != 2) { mes "[Li]"; mes "Have you finished hunting the 50 Dokebis?"; next; @@ -53,8 +53,8 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ close; } } - if (checkquest(60129) != -1) { - if (checkquest(60129,HUNTING) != 2 ) { + if (questprogress(60129)) { + if (questprogress(60129,HUNTING) != 2) { mes "[Li]"; mes "Have you finished hunting the 50 Dokebis?"; next; @@ -94,8 +94,8 @@ pay_fild10,108,357,5 script Li#Dokebi_Hunt 4_F_01,{ close; } } - if (checkquest(60130) != -1) { - if (checkquest(60130,HUNTING) != 2 ) { + if (questprogress(60130)) { + if (questprogress(60130,HUNTING) != 2) { mes "[Li]"; mes "Have you finished hunting the 150 Dokebis?"; next; diff --git a/npc/pre-re/quests/collection/quest_dryad.txt b/npc/pre-re/quests/collection/quest_dryad.txt index 552a1096f..1b14307de 100644 --- a/npc/pre-re/quests/collection/quest_dryad.txt +++ b/npc/pre-re/quests/collection/quest_dryad.txt @@ -13,8 +13,8 @@ //============================================================ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ - if (checkquest(60131) != -1) { - if (checkquest(60131,HUNTING) != 2 ) { + if (questprogress(60131)) { + if (questprogress(60131,HUNTING) != 2) { mes "[Lilla]"; mes "Have you finished hunting the 50 Dryads?"; next; @@ -53,8 +53,8 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ close; } } - if (checkquest(60132) != -1) { - if (checkquest(60132,HUNTING) != 2 ) { + if (questprogress(60132)) { + if (questprogress(60132,HUNTING) != 2) { mes "[Lilla]"; mes "Have you finished hunting the 50 Dryads?"; next; @@ -94,8 +94,8 @@ um_fild01,34,281,5 script Lilla#Dryad_Hunt 4_F_07,{ close; } } - if (checkquest(60133) != -1) { - if (checkquest(60133,HUNTING) != 2 ) { + if (questprogress(60133)) { + if (questprogress(60133,HUNTING) != 2) { mes "[Lilla]"; mes "Have you finished hunting the 150 Dryads?"; next; diff --git a/npc/pre-re/quests/collection/quest_fabre.txt b/npc/pre-re/quests/collection/quest_fabre.txt index bd11cf8ae..5de7e74fd 100644 --- a/npc/pre-re/quests/collection/quest_fabre.txt +++ b/npc/pre-re/quests/collection/quest_fabre.txt @@ -13,8 +13,8 @@ //============================================================ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ - if (checkquest(60107) != -1) { - if (checkquest(60107,HUNTING) != 2 ) { + if (questprogress(60107)) { + if (questprogress(60107,HUNTING) != 2) { mes "[Langry]"; mes "Have you finished hunting the 50 Fabres?"; next; @@ -53,8 +53,8 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ close; } } - if (checkquest(60108) != -1) { - if (checkquest(60108,HUNTING) != 2 ) { + if (questprogress(60108)) { + if (questprogress(60108,HUNTING) != 2) { mes "[Langry]"; mes "Have you finished hunting the 50 Fabres?"; next; @@ -94,8 +94,8 @@ gef_fild07,321,193,4 script Langry#Fabre_Hunt 4_M_SAGE_A,{ close; } } - if (checkquest(60109) != -1) { - if (checkquest(60109,HUNTING) != 2 ) { + if (questprogress(60109)) { + if (questprogress(60109,HUNTING) != 2) { mes "[Langry]"; mes "Have you finished hunting the 150 Fabres?"; next; diff --git a/npc/pre-re/quests/collection/quest_frilldora.txt b/npc/pre-re/quests/collection/quest_frilldora.txt index 5c9321aa6..95ee22d3c 100644 --- a/npc/pre-re/quests/collection/quest_frilldora.txt +++ b/npc/pre-re/quests/collection/quest_frilldora.txt @@ -13,8 +13,8 @@ //============================================================ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ - if (checkquest(60134) != -1) { - if (checkquest(60134,HUNTING) != 2 ) { + if (questprogress(60134)) { + if (questprogress(60134,HUNTING) != 2) { mes "[Lemly]"; mes "Have you finished hunting the 50 Frilldora?"; next; @@ -53,8 +53,8 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ close; } } - if (checkquest(60135) != -1) { - if (checkquest(60135,HUNTING) != 2 ) { + if (questprogress(60135)) { + if (questprogress(60135,HUNTING) != 2) { mes "[Lemly]"; mes "Have you finished hunting the 50 Frilldora?"; next; @@ -94,8 +94,8 @@ moc_fild17,66,273,5 script Lemly#Frilldora_Hunt 4_F_JOB_ASSASSIN,{ close; } } - if (checkquest(60136) != -1) { - if (checkquest(60136,HUNTING) != 2 ) { + if (questprogress(60136)) { + if (questprogress(60136,HUNTING) != 2) { mes "[Lemly]"; mes "Have you finished hunting the 150 Frilldora?"; next; diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt index 292a38459..ee5c33f54 100644 --- a/npc/pre-re/quests/collection/quest_goat.txt +++ b/npc/pre-re/quests/collection/quest_goat.txt @@ -13,8 +13,8 @@ //============================================================ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ - if (checkquest(60137) != -1) { - if (checkquest(60137,HUNTING) != 2 ) { + if (questprogress(60137)) { + if (questprogress(60137,HUNTING) != 2) { mes "[Vegetable Farmer]"; mes "Have you finished hunting the 50 Goats?"; next; @@ -53,8 +53,8 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ close; } } - if (checkquest(60138) != -1) { - if (checkquest(60138,HUNTING) != 2) { + if (questprogress(60138)) { + if (questprogress(60138,HUNTING) != 2) { mes "[Vegetable Farmer]"; mes "Have you finished hunting the 100 Goats?"; next; @@ -94,8 +94,8 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ close; } } - if (checkquest(60139) != -1) { - if (checkquest(60139,HUNTING) != 2) { + if (questprogress(60139)) { + if (questprogress(60139,HUNTING) != 2) { mes "[Vegetable Farmer]"; mes "Have you finished hunting the 150 Goats?"; next; diff --git a/npc/pre-re/quests/collection/quest_golem.txt b/npc/pre-re/quests/collection/quest_golem.txt index 2c927ea40..8ad2d47b2 100644 --- a/npc/pre-re/quests/collection/quest_golem.txt +++ b/npc/pre-re/quests/collection/quest_golem.txt @@ -13,8 +13,8 @@ //============================================================ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ - if (checkquest(60140) != -1) { - if (checkquest(60140,HUNTING) != 2 ) { + if (questprogress(60140)) { + if (questprogress(60140,HUNTING) != 2) { mes "[Private Jeremy]"; mes "Have you finished hunting the 50 Golems?"; next; @@ -53,8 +53,8 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ close; } } - if (checkquest(60141) != -1) { - if (checkquest(60141,HUNTING) != 2 ) { + if (questprogress(60141)) { + if (questprogress(60141,HUNTING) != 2) { mes "[Private Jeremy]"; mes "Have you finished hunting the 50 Golems?"; next; @@ -94,8 +94,8 @@ moc_fild11,57,138,0 script Private Jeremy#hunt 4_M_MOC_SOLDIER,{ close; } } - if (checkquest(60142) != -1) { - if (checkquest(60142,HUNTING) != 2 ) { + if (questprogress(60142)) { + if (questprogress(60142,HUNTING) != 2) { mes "[Private Jeremy]"; mes "Have you finished hunting the 150 Golems?"; next; diff --git a/npc/pre-re/quests/collection/quest_hode.txt b/npc/pre-re/quests/collection/quest_hode.txt index c534448d4..050387859 100644 --- a/npc/pre-re/quests/collection/quest_hode.txt +++ b/npc/pre-re/quests/collection/quest_hode.txt @@ -13,8 +13,8 @@ //============================================================ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ - if (checkquest(60104) != -1) { - if (checkquest(60104,HUNTING) != 2 ) { + if (questprogress(60104)) { + if (questprogress(60104,HUNTING) != 2) { mes "[Shone]"; mes "Have you finished hunting the 50 Hodes?"; next; @@ -53,8 +53,8 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ close; } } - if (checkquest(60105) != -1) { - if (checkquest(60105,HUNTING) != 2 ) { + if (questprogress(60105)) { + if (questprogress(60105,HUNTING) != 2) { mes "[Shone]"; mes "Have you finished hunting the 50 Hodes?"; next; @@ -94,8 +94,8 @@ moc_fild17,208,346,5 script Shone#Hode_Hunt 4_M_MOC_SOLDIER,{ close; } } - if (checkquest(60106) != -1) { - if (checkquest(60106,HUNTING) != 2 ) { + if (questprogress(60106)) { + if (questprogress(60106,HUNTING) != 2) { mes "[Shone]"; mes "Have you finished hunting the 150 Hodes?"; next; diff --git a/npc/pre-re/quests/collection/quest_leafcat.txt b/npc/pre-re/quests/collection/quest_leafcat.txt index 185ff2067..04b816322 100644 --- a/npc/pre-re/quests/collection/quest_leafcat.txt +++ b/npc/pre-re/quests/collection/quest_leafcat.txt @@ -13,8 +13,8 @@ //============================================================ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ - if (checkquest(60143) != -1) { - if (checkquest(60143,HUNTING) != 2 ) { + if (questprogress(60143)) { + if (questprogress(60143,HUNTING) != 2) { mes "[Lella]"; mes "Have you finished hunting the 50 Leaf Cats?"; next; @@ -53,8 +53,8 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ close; } } - if (checkquest(60144) != -1) { - if (checkquest(60144,HUNTING) != 2 ) { + if (questprogress(60144)) { + if (questprogress(60144,HUNTING) != 2) { mes "[Lella]"; mes "Have you finished hunting the 50 Leaf Cats?"; next; @@ -94,8 +94,8 @@ ayo_fild01,44,241,5 script Lella#LeafCat_Hunt 4_F_YUNYANG,{ close; } } - if (checkquest(60145) != -1) { - if (checkquest(60145,HUNTING) != 2 ) { + if (questprogress(60145)) { + if (questprogress(60145,HUNTING) != 2) { mes "[Lella]"; mes "Have you finished hunting the 150 Leaf Cats?"; next; diff --git a/npc/pre-re/quests/collection/quest_mantis.txt b/npc/pre-re/quests/collection/quest_mantis.txt index 3eb18ca4f..622f49538 100644 --- a/npc/pre-re/quests/collection/quest_mantis.txt +++ b/npc/pre-re/quests/collection/quest_mantis.txt @@ -13,8 +13,8 @@ lou_fild01,240,354,4 script Mantis Researcher 4_M_OILMAN,{ - if (checkquest(60179) != -1) { - if (checkquest(60179,HUNTING) != 2 ) { + if (questprogress(60179)) { + if (questprogress(60179,HUNTING) != 2) { mes "[Mantis Researcher]"; mes "Have you finished hunting the 50 Mantis?"; next; diff --git a/npc/pre-re/quests/collection/quest_pecopeco.txt b/npc/pre-re/quests/collection/quest_pecopeco.txt index 3460320ce..60f888f00 100644 --- a/npc/pre-re/quests/collection/quest_pecopeco.txt +++ b/npc/pre-re/quests/collection/quest_pecopeco.txt @@ -13,8 +13,8 @@ //============================================================ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ - if (checkquest(60101) != -1) { - if (checkquest(60101,HUNTING) != 2 ) { + if (questprogress(60101)) { + if (questprogress(60101,HUNTING) != 2) { mes "[Gregor]"; mes "Have you finished hunting the 50 Peco Pecos?"; next; @@ -54,8 +54,8 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ close; } } - if (checkquest(60102) != -1) { - if (checkquest(60102,HUNTING) != 2 ) { + if (questprogress(60102)) { + if (questprogress(60102,HUNTING) != 2) { mes "[Gregor]"; mes "Have you finished hunting the 50 Peco Pecos?"; next; @@ -96,8 +96,8 @@ moc_fild02,74,329,3 script Gregor#PecoPeco_Hunt 4W_M_01,{ close; } } - if (checkquest(60103) != -1) { - if (checkquest(60103,HUNTING) != 2 ) { + if (questprogress(60103)) { + if (questprogress(60103,HUNTING) != 2) { mes "[Gregor]"; mes "Have you finished hunting the 150 Peco Pecos?"; next; diff --git a/npc/pre-re/quests/collection/quest_pupa.txt b/npc/pre-re/quests/collection/quest_pupa.txt index 64aafe42f..ec38c275a 100644 --- a/npc/pre-re/quests/collection/quest_pupa.txt +++ b/npc/pre-re/quests/collection/quest_pupa.txt @@ -13,8 +13,8 @@ //============================================================ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ - if (checkquest(60110) != -1) { - if (checkquest(60110,HUNTING) != 2 ) { + if (questprogress(60110)) { + if (questprogress(60110,HUNTING) != 2) { mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; @@ -54,8 +54,8 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ close; } } - if (checkquest(60111) != -1) { - if (checkquest(60111,HUNTING) != 2 ) { + if (questprogress(60111)) { + if (questprogress(60111,HUNTING) != 2) { mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; @@ -96,8 +96,8 @@ gef_fild04,191,54,3 script Halgus#Pupa_Hunt 2_F_MAGICMASTER,{ close; } } - if (checkquest(60112) != -1) { - if (checkquest(60112,HUNTING) != 2 ) { + if (questprogress(60112)) { + if (questprogress(60112,HUNTING) != 2) { mes "[Halgus]"; mes "Have you gotten rid of the Pupa?"; next; diff --git a/npc/pre-re/quests/collection/quest_zhupolong.txt b/npc/pre-re/quests/collection/quest_zhupolong.txt index a167ec3e5..3d908c398 100644 --- a/npc/pre-re/quests/collection/quest_zhupolong.txt +++ b/npc/pre-re/quests/collection/quest_zhupolong.txt @@ -13,8 +13,8 @@ lou_dun02,161,264,4 script Dragon Hunter 4_M_JOB_HUNTER,{ - if (checkquest(60182) != -1) { - if (checkquest(60182,HUNTING) != 2 ) { + if (questprogress(60182)) { + if (questprogress(60182,HUNTING) != 2) { mes "[Dragon Hunter]"; mes "Have you finished hunting the 50 Zhu Po Long?"; next; -- cgit v1.2.3-70-g09d2 From bba3e690de390f1576d70f227f76b4721ac3a010 Mon Sep 17 00:00:00 2001 From: Haru Date: Tue, 21 Oct 2014 21:03:46 +0200 Subject: Removed use of 'checkquest' from scripts (re folder) Signed-off-by: Haru --- npc/re/guild/invest_main.txt | 4 +- npc/re/instances/BakonawaLake.txt | 12 +- npc/re/instances/BangungotHospital.txt | 39 +++-- npc/re/instances/BuwayaCave.txt | 12 +- npc/re/instances/HazyForest.txt | 17 +-- npc/re/instances/MalangdoCulvert.txt | 24 +-- npc/re/instances/OctopusCave.txt | 8 +- npc/re/instances/OldGlastHeim.txt | 16 +- npc/re/instances/WolfchevLaboratory.txt | 18 +-- npc/re/jobs/3-1/guillotine_cross.txt | 93 ++++++------ npc/re/jobs/3-1/ranger.txt | 25 ++-- npc/re/jobs/3-1/rune_knight.txt | 10 +- npc/re/jobs/3-2/genetic.txt | 62 ++++---- npc/re/jobs/3-2/minstrel.txt | 2 +- npc/re/jobs/3-2/shadow_chaser.txt | 12 +- npc/re/jobs/3-2/sura.txt | 2 +- npc/re/jobs/3-2/wanderer.txt | 6 +- npc/re/jobs/novice/novice.txt | 40 ++--- npc/re/jobs/novice/supernovice_ex.txt | 20 +-- npc/re/jobs/repair.txt | 8 +- npc/re/quests/eden/11-25.txt | 20 +-- npc/re/quests/eden/26-40.txt | 16 +- npc/re/quests/eden/41-55.txt | 9 +- npc/re/quests/eden/56-70.txt | 10 +- npc/re/quests/eden/71-85.txt | 21 +-- npc/re/quests/eden/86-90.txt | 16 +- npc/re/quests/eden/91-99.txt | 16 +- npc/re/quests/eden/eden_quests.txt | 60 ++++---- npc/re/quests/eden/eden_tutorial.txt | 52 +++---- npc/re/quests/homun_s.txt | 28 ++-- npc/re/quests/magic_books.txt | 20 +-- npc/re/quests/quests_brasilis.txt | 37 ++--- npc/re/quests/quests_dewata.txt | 32 ++-- npc/re/quests/quests_dicastes.txt | 135 ++++++++--------- npc/re/quests/quests_eclage.txt | 22 +-- npc/re/quests/quests_malangdo.txt | 250 ++++++++++++++++---------------- npc/re/quests/quests_malaya.txt | 212 ++++++++++++++------------- npc/re/quests/quests_mora.txt | 168 ++++++++++----------- npc/re/quests/quests_morocc.txt | 20 +-- 39 files changed, 790 insertions(+), 784 deletions(-) (limited to 'npc') diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt index 50a4e7d35..6661de45f 100644 --- a/npc/re/guild/invest_main.txt +++ b/npc/re/guild/invest_main.txt @@ -561,8 +561,8 @@ prt_gld,164,98,3 script Revoting Manager#Invest2 4_M_BOSSCAT,{ disablenpc "Revoting Manager#Invest2"; end; } - set .@playtime, checkquest(7349,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7349,PLAYTIME); + if (.@playtime == 1) { mes "[Revoting Manager]"; mes "You've already participated in the vote."; mes "Please relax and wait for the results."; diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt index 89ce64ac4..584044b13 100644 --- a/npc/re/instances/BakonawaLake.txt +++ b/npc/re/instances/BakonawaLake.txt @@ -39,16 +39,16 @@ ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{ set .@party_id,getcharid(1); set .@md_name$, "Bakonawa Lake"; - set .@baku_time, checkquest(12278,PLAYTIME); - if (.@baku_time == -1) { - if (checkquest(12279) == -1) setquest 12279; + .@baku_time = questprogress(12278,PLAYTIME); + if (!.@baku_time) { + if (!questprogress(12279)) setquest 12279; } if (!.@party_id) { mes "[Taho]"; mes "Isn't there any company who can go with you? Or even if you wanna go alone, come after organizing a party."; close; } - if (.@baku_time == -1) { + if (!.@baku_time) { if (getcharid(0) == getpartyleader(.@party_id,2)) { mes "[Taho]"; mes "Are you the leader of the Bakonawa slayers? The road is not well so we have to go down the cliff with a rope, is that OK?"; @@ -92,7 +92,7 @@ ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{ case 3: close; } - } else if (.@baku_time == 0 || .@baku_time == 1) { + } else if (.@baku_time == 1) { mes "[Taho]"; mes "The rope used for getting to the Lake is already broken. We are now cleaning up the surroundings so come back after some time."; close; @@ -469,7 +469,7 @@ OnMobSpawn: mes "It seems you are already carrying items of too much weight. Please try again after reducing the weight."; close; } - if (checkquest(12279,HUNTING) == 2) { + if (questprogress(12279,HUNTING) == 2) { erasequest 12279; mes "[Taho]"; mes "This was found from Bakonawa's corpse. It would be better if you take this."; diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index b995092a1..d4ac3f9b0 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -23,9 +23,9 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ set .@party_id,getcharid(1); cutin "malaya_nurseB",2; - if (checkquest(9223) == -1) { - set .@quest, checkquest(9222); - if (.@quest == -1) { + if (!questprogress(9223)) { + .@quest = questprogress(9222); + if (!.@quest) { if (!.@party_id) { if (malaya_bang == 30) callsub L_Closed,1; @@ -34,9 +34,9 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ else goto L_NoParty; } - if (checkquest(11309,HUNTING) < 2) { - set .@playtime, checkquest(9224,PLAYTIME); - if (.@playtime == -1) { + if (questprogress(11309,HUNTING) != 2) { + .@playtime = questprogress(9224,PLAYTIME); + if (!.@playtime) { if (malaya_bang == 30) callsub L_Closed,1; else if (malaya_bang == 31) @@ -50,8 +50,8 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ cutin "",255; end; } - } else if (.@playtime == 0 || .@playtime == 1) { - if (checkquest(11309) == -1) { + } else if (.@playtime == 1) { + if (!questprogress(11309)) { mes "[Nurse Maenne]"; mes "This is a fatal situation."; close2; @@ -73,10 +73,10 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ end; } } else { - set .@quest2, checkquest(11309); - if (.@quest2 == -1) { + .@quest2 = questprogress(11309); + if (!.@quest2) { callsub L_Closed,0; - } else if (.@quest2 == 0 || .@quest2 == 1) { + } else if (.@quest2 == 1) { callsub L_Complete; completequest 9224; erasequest 9224; @@ -105,13 +105,12 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ cutin "",255; end; } - } else if (.@quest == 0 || .@quest == 1) { + } else if (.@quest == 1) { if (!.@party_id) goto L_NoParty; if (malaya_bang > 39) { - set .@hunting, checkquest(9222,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { - set .@playtime, checkquest(9224,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + if (questprogress(9222,HUNTING) == 1) { + .@playtime = questprogress(9224,PLAYTIME); + if (.@playtime == 1) { mes "[Nurse Maenne]"; mes "Do you want go up to the second floor again?"; next; @@ -190,7 +189,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ end; } } else { - if (checkquest(9223,PLAYTIME) == 0 || checkquest(9223,PLAYTIME) == 1) { + if (questprogress(9223,PLAYTIME) == 1) { callsub L_Complete; close2; cutin "",255; @@ -297,13 +296,13 @@ L_Enter: } else { mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member entered "+.@md_name$+".",bc_map,"0x00ff99"; if (getarg(1)) { - if (checkquest(9223) > -1) { + if (questprogress(9223)) { completequest 9223; erasequest 9223; } - if (checkquest(9222) > -1) + if (questprogress(9222)) erasequest 9222; - if (checkquest(9224) > -1) + if (questprogress(9224)) erasequest 9224; setquest 9222; } diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 0a26dab9c..a24a0ae27 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -60,10 +60,10 @@ ma_fild02,312,317,5 script Guard#buwaya_cave 4_MAL_SOLDIER,{ next; break; case 2: - set .@playtime, checkquest(4229,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(4229,PLAYTIME); + if (!.@playtime) { // fall through - } else if (.@playtime == 0 || .@playtime == 1) { + } else if (.@playtime == 1) { mes "[Guard]"; mes "Buwaya is still hiding."; mes "Even if you enter now, Buwaya will not come out. "; @@ -118,10 +118,10 @@ OnTouch: mes "This place is dangerous. Please go back."; close; } - set .@playtime, checkquest(4229,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(4229,PLAYTIME); + if (!.@playtime) { // fall through - } else if (.@playtime == 0 || .@playtime == 1) { + } else if (.@playtime == 1) { mes "[Guard]"; mes "Buwaya is still hiding."; mes "Even if you enter now, Buwaya will not come out."; diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index 0c32c73c6..0467f612b 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -32,9 +32,9 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ mes "Why don't you at least organize a party?"; close; } - set .@playtime, checkquest(7211,PLAYTIME); + .@playtime = questprogress(7211,PLAYTIME); if (getcharid(0) == getpartyleader(.@party_id,2)) { - if (.@playtime == 0 || .@playtime == 1) { + if (.@playtime == 1) { mes "[Laphine Soldier]"; mes "...Are you sure you're not doing too much?"; mes "I think you'd better get some rest."; @@ -89,7 +89,7 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ mes "Hmm..."; next; mes "[Laphine Soldier]"; - if (.@playtime == -1) + if (!.@playtime) mes "It's dangerous in the forest."; else mes "The atmosphere is somewhat tense in the forest."; @@ -117,7 +117,7 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ case 2: mes "[Laphine Soldier]"; mes "Well, you've made the right decision."; - if (.@playtime == -1) + if (!.@playtime) mes "That's what's good for you."; close; } @@ -147,9 +147,8 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{ next; if(select("Enter the tunnel.:Give up.") == 2) close; - set .@playtime, checkquest(7211,PLAYTIME); if (has_instance("1@mist") == "") { - if (.@playtime == 0 || .@playtime == 1) { + if (questprogress(7211,PLAYTIME) == 1) { mes "You try to crawl into the log, but some mysterious power pushes you back with a gush of wind."; mes "It seems like you can't force your way into the forest."; close; @@ -158,8 +157,8 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{ mes "Your instinct is screaming that this forest is dangerous."; close; } else { - if (checkquest(7211,PLAYTIME) == 2) erasequest 7211; - if (checkquest(7211,PLAYTIME) == -1) setquest 7211; + if (questprogress(7211,PLAYTIME) == 2) erasequest 7211; + if (!questprogress(7211,PLAYTIME)) setquest 7211; mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 warp "1@mist",89,29; close; @@ -1025,7 +1024,7 @@ bif_fild01,38,374,0 script Mysterious Flower#ep14_1 CLEAR_NPC,{ 1@mist,109,70,0 script a1_a2 WARPNPC,1,1,{ end; OnTouch: - if (checkquest(7211,PLAYTIME) == -1) + if (!questprogress(7211,PLAYTIME)) setquest 7211; warp instance_mapname("1@mist"),116,40; end; diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index f209f409b..ef2af8512 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -44,7 +44,7 @@ mal_in01,172,28,2 script Albo#mal 4_CAT_SAILOR5,{ "General Culvert Weekly Service","^990000Hard Culvert Weekly Service^000000"; set .@menu$,"Why are doing this job?:"; for(set .@i,0; .@i<4; set .@i,.@i+1) { - if (checkquest(.@quests[.@i],PLAYTIME) > -1) { + if (questprogress(.@quests[.@i],PLAYTIME)) { set .@status[.@i],2; set .@menu$, .@menu$+"^aaaaaa- There is no new task -^000000:"; } else if (.@i%2 && BaseLevel < 140) { @@ -192,7 +192,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ specialeffect2 EF_STEAL; switch(.@i) { case 1: // General Culvert Daily Service - if (checkquest(12271,PLAYTIME) == 2) + if (questprogress(12271,PLAYTIME) == 2) callsub L_EraseQuest,12255,12256,12257,12258,12259,12260,12271; else { // Reward: 2x B Grade Coin @@ -205,7 +205,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ } break; case 2: // Hard Culvert Daily Service - if (checkquest(12272,PLAYTIME) == 2) + if (questprogress(12272,PLAYTIME) == 2) callsub L_EraseQuest,12261,12262,12263,12264,12265,12266,12272; else { // Reward: 1x A Grade Coin @@ -218,7 +218,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ } break; case 3: // General Culvert Weekly Service - if (checkquest(12273,PLAYTIME) == 2) + if (questprogress(12273,PLAYTIME) == 2) callsub L_EraseQuest,12267,12268,12273; else { // Reward: 1x Sea God's Wrath @@ -227,7 +227,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ } break; case 4: // Hard Culvert Weekly Service - if (checkquest(12274,PLAYTIME) == 2) + if (questprogress(12274,PLAYTIME) == 2) callsub L_EraseQuest,12269,12270,12274; else { // Reward: 5x Sea God's Wrath @@ -246,7 +246,7 @@ mal_in01,172,26,2 script Madeca#mal 4_CAT_SAILOR1,{ L_EraseQuest: for(set .@j,0; .@j -1) + if (questprogress(getarg(.@j))) erasequest getarg(.@j); } mes "[Madeca]"; @@ -255,7 +255,7 @@ L_EraseQuest: // callsub L_CheckQuest,,,,; L_CheckQuest: - if (checkquest(getarg(0),HUNTING) == 2) { + if (questprogress(getarg(0),HUNTING) == 2) { mes "[Madeca]"; mes "You've punished ^0000ff"+getarg(1)+"^000000!"; mes "Here's your pay!"; @@ -392,8 +392,8 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ mes "of the party and come back.^000000"; close; } - set .@playtime, checkquest(12254,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12254,PLAYTIME); + if (!.@playtime) { if (getcharid(0) == getpartyleader(.@party_id,2)) { mes "[Missing, the Cleaner]"; mes "Ummm? What's up? Tell me the password if you're the leader!"; @@ -430,7 +430,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ if(select("Enter Culvert:Cancel") == 2) end; callsub L_Enter,1; - } else if (.@playtime == 0 || .@playtime == 1) { + } else if (.@playtime == 1) { mes "You can enter the Culvert if the gate is open."; next; if(select("Enter Culvert:Cancel") == 2) @@ -444,7 +444,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ end; L_Enter: if (has_instance("1@pump") == "") { - if (checkquest(12254,PLAYTIME) == 0 || checkquest(12254,PLAYTIME) == 1) { + if (questprogress(12254,PLAYTIME) == 1) { mes "The gate to the Culvert is still closed."; mes "You must wait until you are able to enter or find a party leader who can create the instance."; close; @@ -454,7 +454,7 @@ L_Enter: close; } mapannounce "mal_in01", strcharinfo(0)+" of the party "+getpartyname(.@party_id)+" is entering the Culvert.",bc_map,"0x00ff99"; - if (checkquest(12254) == -1) setquest 12254; + if (!questprogress(12254)) setquest 12254; warp "1@pump",63,98; end; } diff --git a/npc/re/instances/OctopusCave.txt b/npc/re/instances/OctopusCave.txt index 43c2ac66f..cbf45e5f1 100644 --- a/npc/re/instances/OctopusCave.txt +++ b/npc/re/instances/OctopusCave.txt @@ -76,8 +76,8 @@ mal_dun01,151,235,5 script Starfish 4_ASTER,{ next; break; case 2: - set .@playtime, checkquest(4197,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(4197,PLAYTIME); + if (.@playtime == 1) { mes "[Starfish]"; mes "Octopus is not around now, hehe."; mes "Please come back later."; @@ -130,7 +130,7 @@ mal_dun01,153,237,5 script Weird Entrance CLEAR_NPC,{ case 1: if (countitem(6442)) { if (has_instance("1@cash") == "") { - if (checkquest(4197,PLAYTIME) == 0 || checkquest(4197,PLAYTIME) == 1) { + if (questprogress(4197,PLAYTIME) == 1) { mes "[Starfish]"; mes "Ah, now is not the time..."; mes "Would you come back later? Hehe."; @@ -143,7 +143,7 @@ mal_dun01,153,237,5 script Weird Entrance CLEAR_NPC,{ close; } mapannounce "mal_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(0)+" member started to hunt the Octopus!",bc_map,"0x00ff99"; - if (checkquest(4197) == -1) setquest 4197; + if (!questprogress(4197)) setquest 4197; warp "1@cash",199,99; end; } diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 4be3133bc..48f2d6493 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -20,8 +20,8 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ mes "[Hugin]"; mes "Huh? You feel like you have seen me in different places? I see. What can I say?"; next; - set .@ghins_time, checkquest(12317,PLAYTIME); - if (.@ghins_time == -1) { + .@ghins_time = questprogress(12317,PLAYTIME); + if (!.@ghins_time) { set .@party_id,getcharid(1); set .@p_name$,getpartyname(.@party_id); @@ -72,7 +72,7 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ case 3: close; } - } else if (.@ghins_time == 0 || .@ghins_time == 1) { + } else if (.@ghins_time == 1) { mes "[Hugin]"; mes "Oh, geez."; mes "Your body is still under the effects of time travel. In this state, you will not be able to travel again."; @@ -83,8 +83,8 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ } else { mes "^0000ffOld Glast Heim access trail has been cleared. It is now possible to talk to Hugin.^000000"; erasequest 12317; - if (checkquest(12318) > -1) erasequest 12318; - if (checkquest(12319) > -1) erasequest 12319; + if (questprogress(12318)) erasequest 12318; + if (questprogress(12319)) erasequest 12319; close; } } @@ -1259,8 +1259,8 @@ OnTalk6: } 1@gl_k,156,259,3 script Varmunt#ghinstance3 4_M_BARMUND,{ - if (checkquest(12318,HUNTING) == 2) { - if (checkquest(12319,HUNTING) == -1) { + if (questprogress(12318,HUNTING) == 2) { + if (!questprogress(12319,HUNTING)) { mes "[Varmunt]"; mes "There's something unusual about this thing's aura. Maybe someday we will be able to understand what is behind all of this."; cutin "gl_barmund1",2; @@ -1998,7 +1998,7 @@ OnTimer80000: } 2@gl_k,158,241,1 script Hugin#ghinstance1 4_M_SAGE_C,{ - if (checkquest(12319,HUNTING) == 2) { + if (questprogress(12319,HUNTING) == 2) { mes "[Hugin]"; mes "Well, you are pretty ridiculous. Beginners shouldn't get the loot Amdarias drops."; erasequest 12318; diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index dc625dca1..dcf726ed3 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1690,10 +1690,9 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000"; close; } - .@quest_time = checkquest(5112, PLAYTIME); .@killed_bosses = true; for(.@quest_id = 5113; .@quest_id <= 5125; .@quest_id++) { - if(checkquest(.@quest_id, HUNTING) <= 1) + if(questprogress(.@quest_id, HUNTING) != 2) .@killed_bosses = false; } if (lght_duk01 < 6) { @@ -1780,14 +1779,15 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "And just so you know, please do not touch random things out of curiosity. I don't want you to get hurt."; close; case 2: - if (.@quest_time == 0) { + .@quest_time = questprogress(5112, PLAYTIME); + if (!.@quest_time) { mes "[Wolfchev]"; mes "I'm sorry, but it seems you still cannot enter to the laboratory yet. Will you come back later? The system is kind of tricky you know."; close; } else { //if (.@quest_time == 2) //recall_completequest 5112; - if (.@quest_time >= 0) + if (.@quest_time) erasequest 5112; if (!.@killed_bosses) { if (lght_duk01 == 9) { @@ -1908,13 +1908,13 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ mes "^FF0000You cannot continue the process due to possessing too many belongings.^000000"; close; } - .@lhz_time = checkquest(5112, PLAYTIME); + .@lhz_time = questprogress(5112, PLAYTIME); if (lght_duk01 < 7) { mes "It says,"; mes "'^0000FF****'s laboratory member only^000000'"; close; } - if (.@lhz_time == -1) { + if (!.@lhz_time) { mes "This is an entrance towards Wolfchev's laboratory. Something is howling over the entrance."; next; if(select("Go inside", "Think one more time") == 2) { @@ -1938,7 +1938,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ warp "1@lhz.gat", 45, 148; close; } - } else if (.@lhz_time == 0) { + } else if (.@lhz_time == 1) { mes "Di Rit- Di- Di- Dit-"; next; mes ""+ strcharinfo(PC_NAME) +". . ."; @@ -1946,7 +1946,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ next; mes "The system denied your entrance."; close; - } else if (.@lhz_time >= 1) { + } else if (.@lhz_time == 2) { mes "Di Rit- Di- Di- Dit-"; next; //if (.@lhz_time == 2) @@ -3113,7 +3113,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ } .@all_quests_complete = true; for(.@i = 5113; .@i <= 5125; .@i++) { - if(checkquest(.@i, HUNTING) != 2) + if(questprogress(.@i, HUNTING) != 2) .@all_quests_complete = false; } if (.@all_quests_complete) { diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 7bafa8562..63d1b6106 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -156,13 +156,13 @@ function script func_3rdgc { mes .@n$; mes "Let me collect all the information..."; set .@i,0; - if (checkquest(7112) == 1) { mes "Madelle saw a person who looked like a priest from Rachel late at night."; set .@i,.@i+1; } - if (checkquest(7113) == 1) { mes "Crave said that there was a girl who bought lots of things day and night."; set .@i,.@i+1; } - if (checkquest(7114) == 1) { mes "Trovan said that there was a guy who could be seen often but is not a hotel guest, so he is suspicious."; set .@i,.@i+1; } + if (questprogress(7112) == 1) { mes "Madelle saw a person who looked like a priest from Rachel late at night."; set .@i,.@i+1; } + if (questprogress(7113) == 1) { mes "Crave said that there was a girl who bought lots of things day and night."; set .@i,.@i+1; } + if (questprogress(7114) == 1) { mes "Trovan said that there was a guy who could be seen often but is not a hotel guest, so he is suspicious."; set .@i,.@i+1; } if (!getarg(0)) { set .@i,.@i-2; - if (checkquest(7115) == 1) { mes "A peddler wears shabby clothes, but she buys fresh and expensive things every single day."; set .@i,.@i+1; } - if (checkquest(7116) == 1) { mes "The old man in village said that there was a girl who showed up in same place at the same time, so maybe moved here."; set .@i,.@i+1; } + if (questprogress(7115) == 1) { mes "A peddler wears shabby clothes, but she buys fresh and expensive things every single day."; set .@i,.@i+1; } + if (questprogress(7116) == 1) { mes "The old man in village said that there was a girl who showed up in same place at the same time, so maybe moved here."; set .@i,.@i+1; } } next; if (.@i == 3) { @@ -398,7 +398,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ set job_3rd_gc, 6; close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { + if (questprogress(7091) == 1) { mes "You hope that there will be something in the glass?"; mes "Information can't come out of empty glasses."; close; @@ -453,7 +453,8 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ next; switch(select("Figure out based on information.:Stop the stage.")) { case 1: - if (checkquest(7091) == 1) set .@j,1; + if (questprogress(7091) == 1) + .@j = 1; callfunc "func_3rdgc",.@j; close; case 2: @@ -461,7 +462,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; } } else if (job_3rd_gc == 8) { - if (checkquest(7092) == 1) { + if (questprogress(7092) == 1) { mes "Wait in an alley where she usually shows up to find her, and you will be able to pursue the question."; next; mes "[Daora]"; @@ -531,7 +532,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; } } else if (job_3rd_gc == 9) { - if (checkquest(7093) == 1) { + if (questprogress(7093) == 1) { mes "So, go to the east of village, you can see a narrow alley directed to the north."; next; mes "[Daora]"; @@ -575,7 +576,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ mes "I sent a girl named Estillda to her home."; mes "Why do we handle worthless things like it?"; next; - if (checkquest(7094) == 1) { + if (questprogress(7094) == 1) { mes "[Daora]"; mes "I'm not sure if he still lives..."; mes "Anyway, he is a key artisan in Rachel,"; @@ -639,7 +640,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 4_F_DESERT,{ close; } } else if (job_3rd_gc == 15) { - if (checkquest(7095) == 1) { + if (questprogress(7095) == 1) { mes "The field northwest of Veins."; mes "You can find that easily with a map."; mes "There are lots of wolves, so be careful."; @@ -957,9 +958,11 @@ job3_guil01,16,20,4 script Mayshell#3rdgc03 4_F_KHELLISIA,{ mes "At least you came back alive."; } next; - set .@all_wine,0; - for(set .@i,0; .@i<5; set .@i,.@i+1) - if (checkquest(7091+.@i) == 1) set .@all_wine, .@all_wine+1; + .@all_wine = 0; + for(.@i = 0; .@i < 5; ++.@i) + if (questprogress(7091+.@i) == 1) { + ++.@all_wine; + } mes "[Mayshell]"; if (.@all_wine < 2) { mes "You did the job by yourself"; @@ -1037,13 +1040,13 @@ job3_guil01,16,20,4 script Mayshell#3rdgc03 4_F_KHELLISIA,{ erasequest 7091; erasequest 7092; erasequest 7093; - if (checkquest(7094) > -1) erasequest 7094; - if (checkquest(7095) > -1) erasequest 7095; + if (questprogress(7094)) erasequest 7094; + if (questprogress(7095)) erasequest 7095; erasequest 7112; erasequest 7113; erasequest 7114; - if (checkquest(7115) > -1) erasequest 7115; - if (checkquest(7116) > -1) erasequest 7116; + if (questprogress(7115)) erasequest 7115; + if (questprogress(7116)) erasequest 7116; changequest 7111,.@quest; next; mes "[Mayshell]"; @@ -1104,8 +1107,8 @@ ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{ mes "Visit and take a rest~"; close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { - if (checkquest(7112) == 1) { + if (questprogress(7091) == 1) { + if (questprogress(7112) == 1) { mes "That's all the information that I know."; mes "After that, I can't remember anything else."; next; @@ -1194,7 +1197,7 @@ ve_in,228,108,3 script Waitress#3rdgc04 1_F_PUBGIRL,{ } } } else { - if (checkquest(7112) == 1) { + if (questprogress(7112) == 1) { mes "That's all the information that I know."; mes "I haven't seen them since."; next; @@ -1338,8 +1341,8 @@ ve_in,246,303,3 script Young Merchant#3rdgc05 4_M_RACHMAN2,{ close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { - if (checkquest(7113) == 1) { + if (questprogress(7091) == 1) { + if (questprogress(7113) == 1) { mes "[Crave]"; mes "I already gave you all the information I have."; mes "I'm quick in visual learning."; @@ -1413,7 +1416,7 @@ ve_in,246,303,3 script Young Merchant#3rdgc05 4_M_RACHMAN2,{ } } } else { - if (checkquest(7113) == 1) { + if (questprogress(7113) == 1) { mes "[Crave]"; mes "I already gave you all the information I have."; mes "I'm quick in visual learning."; @@ -1534,8 +1537,8 @@ veins,291,215,3 script Vigilante#3rdgc06 4_DST_SOLDIER,{ close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { - if (checkquest(7114) == 1) { + if (questprogress(7091) == 1) { + if (questprogress(7114) == 1) { mes "[Trovan]"; mes "I already gave you all the information I have."; mes "He's the only suspicious person that's been seen."; @@ -1616,7 +1619,7 @@ veins,291,215,3 script Vigilante#3rdgc06 4_DST_SOLDIER,{ } } } else { - if (checkquest(7114) == 1) { + if (questprogress(7114) == 1) { mes "[Trovan]"; mes "I already gave you all the information I have."; mes "He's the only suspicious person that's been seen."; @@ -1698,12 +1701,12 @@ veins,187,143,5 script Peddler#3rdgc07 4_F_HUGRANMA,{ close; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { + if (questprogress(7091) == 1) { mes "What a huge sandstorm."; mes "Are you ok?"; close; } else { - if (checkquest(7115) == 1) { + if (questprogress(7115) == 1) { mes "So, did you find that girl?"; mes "If you do, let her know that she has to come and visit me."; next; @@ -1799,11 +1802,11 @@ veins,235,126,3 script Old Man#3rdgc07 4_M_DST_GRAND,{ mes "Haha... I can remember my past when I see a young adventurer like you..."; close2; } else if (job_3rd_gc == 6) { - if (checkquest(7091) == 1) { + if (questprogress(7091) == 1) { mes "Haha... I can remember my past when I see a young adventurer like you..."; close; } else { - if (checkquest(7116) == 1) { + if (questprogress(7116) == 1) { mes "Thanks for talking to me."; next; mes "- I can't get anymore information from the Old Man. What information have I collected? -"; @@ -2075,12 +2078,12 @@ veins,337,284,0 script #ghostestilla_3rdgc HIDDEN_WARP_NPC,3,3,{ end; OnTouch: if (job_3rd_gc == 9) { - if ((checkquest(7104,PLAYTIME) == 1) || (checkquest(7105,PLAYTIME) == 1)) { + if ((questprogress(7104,PLAYTIME) == 1) || (questprogress(7105,PLAYTIME) == 1)) { mes ".....?"; mes "There's a sign of somebody present."; mes "You still have time."; close; - } else if ((checkquest(7104,PLAYTIME) == 2) || (checkquest(7105,PLAYTIME) == 2)) { + } else if ((questprogress(7104,PLAYTIME) == 2) || (questprogress(7105,PLAYTIME) == 2)) { mes "The blind alley that Melissa told me about must be this street."; next; mes "There's a sign of somebody present."; @@ -2158,8 +2161,8 @@ OnTouch: next; mes "- I demand that she walks as usual and tell her how to get to Daora's pub. -"; donpcevent "Estillda#3rdgc10::OnDisable"; - if (checkquest(7104) > -1) erasequest 7104; - if (checkquest(7105) > -1) erasequest 7105; + if (questprogress(7104)) erasequest 7104; + if (questprogress(7105)) erasequest 7105; set job_3rd_gc, 10; setquest 7106; next; @@ -2168,8 +2171,8 @@ OnTouch: } else { mes "- I tried to take her by the wrist, but she already knew and ran away screaming. -"; donpcevent "Estillda#3rdgc10::OnDisable"; - if (checkquest(7104) > -1) erasequest 7104; - if (checkquest(7105) > -1) erasequest 7105; + if (questprogress(7104)) erasequest 7104; + if (questprogress(7105)) erasequest 7105; setquest 7105; next; mes "You couldn't catch Estillda."; @@ -2320,7 +2323,7 @@ OnInit: end; OnTouch: if (job_3rd_gc == 12) { - if (checkquest(7107,PLAYTIME) == 2) { + if (questprogress(7107,PLAYTIME) == 2) { mes "This must be the place Estillda told me about."; next; switch(select("Go inside.:Observe the situation.")) { @@ -2339,7 +2342,7 @@ OnTouch: mes "I back up to watch the situation unfold."; close; } - } else if (checkquest(7107,PLAYTIME) == 1) { + } else if (questprogress(7107,PLAYTIME) == 1) { mes "This must be the place Estillda told me about."; mes "I have enough time for meeting."; close; @@ -3540,12 +3543,12 @@ OnTimer61500: job3_guil03,146,70,3 script Renzak#3rdgc16 4_F_GUILLOTINE,{ mes "[Renzak]"; - if (checkquest(7110,HUNTING) == 2) { + if (questprogress(7110,HUNTING) == 2) { mes "My peers will come here to settle this affair."; mes "Go to Mayshell for the report."; next; mes "[Renzak]"; - if (checkquest(7110,PLAYTIME) == 1) { + if (questprogress(7110,PLAYTIME) == 1) { mes "You finished quickly."; mes "Good job."; set job_3rd_gc, 18; @@ -3653,16 +3656,16 @@ job3_guil01,148,53,3 script Bercasell#3rdgc16 4_M_GUILLOTINE,{ mes "A sword of the shadow..."; setlook 7,0; jobchange roclass(eaclass()|EAJL_THIRD); - if (checkquest(7096) == 1) { + if (questprogress(7096) == 1) { set job_3rd_gc, 25; erasequest 7096; - } else if (checkquest(7097) == 1) { + } else if (questprogress(7097) == 1) { set job_3rd_gc, 26; erasequest 7097; - } else if (checkquest(7098) == 1) { + } else if (questprogress(7098) == 1) { set job_3rd_gc, 27; erasequest 7098; - } else if (checkquest(7099) == 1) { + } else if (questprogress(7099) == 1) { set job_3rd_gc, 28; erasequest 7099; } diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index d8a10820f..6c86be78b 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -384,7 +384,7 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ changequest 8256,8257; close; } else if (job_ranger01 == 4) { - if (checkquest(8257,HUNTING) == 2) { + if (questprogress(8257,HUNTING) == 2) { if (countitem(7064) > 0) { mes "Oh! Oh! Woooooow!"; mes "You've brought it! Let me see..."; @@ -549,9 +549,10 @@ tur_dun01,91,169,3 script Test Instructor#jr02 4_M_JOB_HUNTER,{ mes "Okay. I'll respect your opinion."; mes "I'll cancel the job change request from "+strcharinfo(0)+"."; delitem 1703,1; //Bow__ - set job_ranger01,0; - for(set .@i,8254; .@i<=8262; set .@i,.@i+1) - if (checkquest(.@i) > -1) erasequest .@i; + job_ranger01 = 0; + for(.@i = 8254; .@i <= 8262; ++.@i) + if (questprogress(.@i)) + erasequest .@i; close; } mes "[Test Instructor, Teardrop]"; @@ -710,9 +711,10 @@ job3_rang01,30,44,3 script Test Waiting Room#jr_03 4_M_ORIENT01,{ mes "Okay. I'll respect your opinion."; mes "I'll cancel the job change request from "+strcharinfo(0)+"."; delitem 1703,1; //Bow__ - set job_ranger01,0; - for(set .@i,8254; .@i<=8262; set .@i,.@i+1) - if (checkquest(.@i) > -1) erasequest .@i; + job_ranger01 = 0; + for(.@i = 8254; .@i <= 8262; ++.@i) + if (questprogress(.@i)) + erasequest .@i; close; close2; warp "alberta",117,57; @@ -1450,7 +1452,7 @@ OnTimer130000: job3_rang02,251,49,3 script Test Supervisor#jr_13 4_M_JOB_HUNTER,{ mes "[Test Supervisor, Freeze]"; if (job_ranger01 == 6) { - if (checkquest(8261) == -1) { + if (!questprogress(8261)) { mes "Congrats for passing the 2nd practical test! I am the 3rd practical test supervisor Freeze!"; next; mes "[Test Supervisor, Freeze]"; @@ -1705,9 +1707,10 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{ mes "[Ranger Master, Neveragain]"; mes "What are you doing here?"; mes "You are not supposed to be here. Get out!"; - set job_ranger01,0; - for(set .@i,8254; .@i<=8262; set .@i,.@i+1) - if (checkquest(.@i) > -1) erasequest .@i; + job_ranger01 = 0; + for(.@i = 8254; .@i <= 8262; ++.@i) + if (questprogress(.@i)) + erasequest .@i; close2; warp "alberta",117,57; end; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index ad8e4b8da..7c38c7c25 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -622,7 +622,7 @@ job3_rune01,90,50,3 script Rune Knight Lunarea 4_M_KNIGHT_GOLD,2,2,{ next; switch(select("Move to the test field now.:Please give me time to prepare.")) { case 1: - if (checkquest(3220,PLAYTIME) == 1) { + if (questprogress(3220,PLAYTIME) == 1) { mes "[Rune Knight, Lunarea]"; mes "Once someone enters into the test field you cannot enter directly. The test is taken one by one."; next; @@ -664,7 +664,7 @@ L_Test: set job_rune_edq,4; changequest 3202,3203; setquest 3220; // ? - } else if (checkquest(3220) > -1) { + } else if (questprogress(3220)) { erasequest 3220; setquest 3220; } @@ -1346,7 +1346,7 @@ mid_camp,235,250,3 script Sage Serpeone 4_F_FAIRY,2,2,{ mes "[Sage Serpeone]"; mes "Is it so? Then let's check this out."; next; - if (checkquest(3209,HUNTING) == 2 && checkquest(3210,HUNTING) == 2 && checkquest(3211,HUNTING) == 2 && checkquest(3212,HUNTING) == 2) { + if (questprogress(3209,HUNTING) == 2 && questprogress(3210,HUNTING) == 2 && questprogress(3211,HUNTING) == 2 && questprogress(3212,HUNTING) == 2) { mes "[Sage Serpeone]"; mes "Umm, this is great. Enough amount of living body magical energy has accumulated in your body."; next; @@ -1481,7 +1481,7 @@ job3_rune01,114,50,3 script Rune Knight Velpino 4_M_KNIGHT_BLACK,{ mes "For this test, only a one-hand weapon, a shield or a two-handed weapon can be equipped. Keep your other equipments with the Kafra Employee in the center."; close; } - if (checkquest(3220,PLAYTIME) == 1) { + if (questprogress(3220,PLAYTIME) == 1) { mes "[Rune Knight Velpino]"; mes "Haven't you failed at the test... If you fail once, you cannot enter again for 10 minutes."; next; @@ -1495,7 +1495,7 @@ job3_rune01,114,50,3 script Rune Knight Velpino 4_M_KNIGHT_BLACK,{ sc_start SC_INCINT,300000,40; getitem 12389,30; //Runstone_Storm getitem 12390,30; //Runstone_Millennium - if (checkquest(3220) > -1) erasequest 3220; + if (questprogress(3220)) erasequest 3220; setquest 3220; warp "job3_rune02",38,40; end; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index e264bfdca..caf2f428d 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -390,12 +390,12 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "You can start from the beginning then?"; mes "Why are you asking me such things?"; set job_gen,7; - if (checkquest(2209) == 1) erasequest 2209; - if (checkquest(2210) == 1) erasequest 2210; - if (checkquest(2211) == 1) erasequest 2211; - if (checkquest(2212) == 1) erasequest 2212; - if (checkquest(2213) == 1) erasequest 2213; - if (checkquest(2214) == 1) erasequest 2214; + if (questprogress(2209) == 1) erasequest 2209; + if (questprogress(2210) == 1) erasequest 2210; + if (questprogress(2211) == 1) erasequest 2211; + if (questprogress(2212) == 1) erasequest 2212; + if (questprogress(2213) == 1) erasequest 2213; + if (questprogress(2214) == 1) erasequest 2214; close; } } else if (job_gen == 60 || job_gen == 61) { @@ -473,15 +473,15 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ set job_gen,7; } } - if (checkquest(2209) == 1) erasequest 2209; - if (checkquest(2210) == 1) erasequest 2210; - if (checkquest(2211) == 1) erasequest 2211; - if (checkquest(2212) == 1) erasequest 2212; - if (checkquest(2213) == 1) erasequest 2213; - if (checkquest(2214) == 1) erasequest 2214; + if (questprogress(2209) == 1) erasequest 2209; + if (questprogress(2210) == 1) erasequest 2210; + if (questprogress(2211) == 1) erasequest 2211; + if (questprogress(2212) == 1) erasequest 2212; + if (questprogress(2213) == 1) erasequest 2213; + if (questprogress(2214) == 1) erasequest 2214; close; } else if (job_gen > 61 && job_gen < 76) { - if (checkquest(2223,HUNTING) == 2) { + if (questprogress(2223,HUNTING) == 2) { mes "[Devries]"; mes "Oh, wait a second."; mes "It seems that the mail's has arrived."; @@ -642,7 +642,7 @@ job3_gen01,12,56,3 script Plant Guide#generic HIDDEN_NPC,{ // QuestID,PlantName,Description{,Part?} function script Genetic_Job_Plant { if (job_gen == 7) { - if (checkquest(getarg(0)) == -1 || checkquest(getarg(0)) == 0) { + if (!questprogress(getarg(0))) { mes "- "+getarg(2)+" -"; next; switch(select("Use it as a material.:Do not use.")) { @@ -699,12 +699,8 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ mes "- It's not the time to start an experiment. -"; close; } - if ((checkquest(2209) == -1 || checkquest(2209) == 0) && - (checkquest(2210) == -1 || checkquest(2210) == 0) && - (checkquest(2211) == -1 || checkquest(2211) == 0) && - (checkquest(2212) == -1 || checkquest(2212) == 0) && - (checkquest(2213) == -1 || checkquest(2213) == 0) && - (checkquest(2214) == -1 || checkquest(2214) == 0)) { + if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211) && !questprogress(2212) + && !questprogress(2213) && !questprogress(2213) && !questprogress(2214)) { mes "["+strcharinfo(0)+"]"; mes "Hmm, I need to gather plant materials first."; close; @@ -731,16 +727,14 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ next; mes "["+strcharinfo(0)+"]"; mes "Good. Now I can let Miss Devries take a look at this seed!"; - if ((checkquest(2209) == -1 || checkquest(2209) == 0) && - (checkquest(2210) == -1 || checkquest(2210) == 0) && - (checkquest(2211) == -1 || checkquest(2211) == 0)){ + if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211)) { set job_gen,61; getitem 6272,1; //Experiment_Seed close; } - if (checkquest(2209) == 1) set job_gen,job_gen+10; - if (checkquest(2210) == 1) set job_gen,job_gen+10; - if (checkquest(2211) == 1) set job_gen,job_gen+10; + if (questprogress(2209) == 1) set job_gen,job_gen+10; + if (questprogress(2210) == 1) set job_gen,job_gen+10; + if (questprogress(2211) == 1) set job_gen,job_gen+10; set .@score, job_gen + JobLevel - 20; if (rand(1,100) < .@score) { set job_gen,60; @@ -756,12 +750,12 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ set job_gen,7; if (countitem(6273)) delitem 6273,1; //Altered_Seed if (countitem(6272)) delitem 6272,1; //Experiment_Seed - if (checkquest(2209) == 1) erasequest 2209; - if (checkquest(2210) == 1) erasequest 2210; - if (checkquest(2211) == 1) erasequest 2211; - if (checkquest(2212) == 1) erasequest 2212; - if (checkquest(2213) == 1) erasequest 2213; - if (checkquest(2214) == 1) erasequest 2214; + if (questprogress(2209) == 1) erasequest 2209; + if (questprogress(2210) == 1) erasequest 2210; + if (questprogress(2211) == 1) erasequest 2211; + if (questprogress(2212) == 1) erasequest 2212; + if (questprogress(2213) == 1) erasequest 2213; + if (questprogress(2214) == 1) erasequest 2214; close; } else if (job_gen == 60 || job_gen == 61) { mes " - It looks like I need to let Miss Devries take a look at this seed! -"; @@ -920,7 +914,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{ warp "job3_gen01",23,32; end; } else if (job_gen == 75) { - if (checkquest(2223,HUNTING) == 2) { + if (questprogress(2223,HUNTING) == 2) { mes "It seem Miss Devries found out that I put you in her spore pen."; mes "It's funny when you look at her face. After you've killed all those spores."; close; @@ -1017,7 +1011,7 @@ OnTouch: job3_gen01,24,32,0 script The gaze of Devries HIDDEN_WARP_NPC,2,2,{ OnTouch: - if (checkquest(2223,HUNTING) == 2) { + if (questprogress(2223,HUNTING) == 2) { mapannounce "job3_gen01","Devries: Whoa? Was there a lost kitty in the spore pen?",bc_map,"0x99CC00"; //FW_NORMAL 12 0 0 emotion e_omg,1; warp "job3_gen01",21,38; diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index a189d438d..be017920e 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -954,7 +954,7 @@ yuno,143,170,6 script Mr. Click#job_min 4_M_ALCHE_A,{ lighthalzen,155,119,3 script Little girl#job_min 4_F_HUGIRL,3,3,{ OnTouch: - if (checkquest(11145,HUNTING) == 2) { + if (questprogress(11145,HUNTING) == 2) { if (job_min == 12) { mes "[Little Girl]"; mes "Ah!!!!"; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index d1c6ce75f..fc95e1dc4 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -1719,12 +1719,12 @@ tur_dun03,38,209,1 script Blue Flame#sc_f01 4_NFWISP,{ mes "They seem to be related."; set job_sha,6; setquest 7164; - if (checkquest(7161) >= 0) erasequest 7161; - if (checkquest(7162) >= 0) erasequest 7162; - if (checkquest(7163) >= 0) erasequest 7163; + if (questprogress(7161)) erasequest 7161; + if (questprogress(7162)) erasequest 7162; + if (questprogress(7163)) erasequest 7163; close; } else if (job_sha == 6) { - if (checkquest(7164,HUNTING) == 2) { + if (questprogress(7164,HUNTING) == 2) { mes "It looks like the blue flame is under the limitation."; mes "You can't feel that rolling effect of a spell like before."; next; @@ -1787,7 +1787,7 @@ ice_dun02,206,223,1 script Red Flame#sc_f02 4_NFWISP,{ setquest 7171; close; } else if (job_sha == 14 || job_sha == 15 || job_sha == 16) { - if (checkquest(7171,HUNTING) == 2) { + if (questprogress(7171,HUNTING) == 2) { mes "You can't feel the soul from the flame."; mes "When you go closer, you can't see well because of darkness."; close2; @@ -1894,7 +1894,7 @@ niflheim,230,276,1 script Red Flame#sc_f03 4_NFWISP,{ setquest 7175; close; } else if (job_sha == 22) { - if (checkquest(7175,HUNTING) == 2) { + if (questprogress(7175,HUNTING) == 2) { mes "You can't feel the soul from the flame."; mes "When you go closer, you can't see well because of darkness."; set job_sha,23; diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index ce6aa152a..787c42e7a 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -377,7 +377,7 @@ ve_in,98,159,0 script Fighter#job_shu 4_F_SURA,{ close; } } else if (job_shu == 3) { - if (checkquest(11156,HUNTING) == 2) { + if (questprogress(11156,HUNTING) == 2) { mes "[???]"; mes "Wow~"; mes "Did you really kill all those wolves?"; diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index ae8cb109c..5a3319a62 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -770,8 +770,8 @@ hu_fild05,342,130,5 script Dancer Kim#fild 4_F_CAPEGIRL,{ changequest 2220,2221; close; } else if (job_wan == 7) { - if (checkquest(2221,PLAYTIME) == 0 || checkquest(2221,PLAYTIME) == 1) { - if (checkquest(2221,HUNTING) == 2) { + if (questprogress(2221,PLAYTIME) == 1) { + if (questprogress(2221,HUNTING) == 2) { mes "[Dancer Kim]"; mes "Whew!"; mes "Looks like I've lost!"; @@ -816,7 +816,7 @@ hu_fild05,342,130,5 script Dancer Kim#fild 4_F_CAPEGIRL,{ mes "But I'm sure I have a better chance to win."; close; } - } else if (checkquest(2221,PLAYTIME) == 2) { + } else if (questprogress(2221,PLAYTIME) == 2) { mes "[Dancer Kim]"; mes "Oh, you came back to me."; mes "I'm so tired. I don't give up halfway. It's a good exercise for me. I will have to give up Nollio to another Wanderer, it's all over...."; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index b7a4bd492..066f56331 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -1178,7 +1178,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER close2; } else if (job_novice_q < 15) { if (job_novice_q == 13) { - if (checkquest(7122,HUNTING) == 2) { + if (questprogress(7122,HUNTING) == 2) { mes "[Brade]"; mes "You can see it is not so hard, huh?"; mes "Nice job."; @@ -1412,8 +1412,8 @@ new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 4_M_JOB_KNIGHT1 end; } case 3: - set .@quest, checkquest(7123); - if (.@quest == -1) { + .@quest = questprogress(7123); + if (!.@quest) { mes "[Swordman Guildsman]"; mes "You want me to give you a quest?"; mes "Umm. Let me see."; @@ -1432,8 +1432,8 @@ new_5-3,96,30,4 duplicate(NvBradeB) Brade#nv5b 4_M_JOB_KNIGHT1 mes "I'll wait for you here."; mes "Wish you a good luck."; close; - } else if (.@quest == 0 || .@quest == 1) { - if (checkquest(7123,HUNTING) == 2) { + } else if (.@quest == 1) { + if (questprogress(7123,HUNTING) == 2) { mes "[Swordman Guildsman]"; mes "Great."; mes "I think that you're good enough to be a Swordman."; @@ -1646,8 +1646,8 @@ new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 4_F_SISTER end; } case 3: - set .@quest, checkquest(7127); - if (.@quest == -1) { + .@quest = questprogress(7127); + if (!.@quest) { mes "[Thief Guild Member]"; mes "Quests?"; mes "Hmm, what will be good for you?"; @@ -1662,8 +1662,8 @@ new_5-3,101,41,3 duplicate(NvAcolyte) Acolyte Guide#nv5 4_F_SISTER mes "If you equip the Thief manual, you can have the effect of the skill, Double Attack."; mes "Double Attack and Hide are the main skills of the Thief."; close; - } else if (.@quest == 0 || .@quest == 1) { - if (checkquest(7127,HUNTING) == 2) { + } else if (.@quest == 1) { + if (questprogress(7127,HUNTING) == 2) { mes "[Thief Guild Member]"; mes "You are very strong."; mes "These are not many but let me give you a reward for your effort."; @@ -1784,8 +1784,8 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 2_M_THIEFMASTER end; } case 3: - set .@quest, checkquest(7126); - if (.@quest == -1) { + .@quest = questprogress(7126); + if (!.@quest) { mes "[Merchant Guildsman]"; mes "Huh? Quest??"; mes "Humm... What would be suited for you...?"; @@ -1799,7 +1799,7 @@ new_5-3,105,41,3 duplicate(NvThief) Thief Guide#nv5 2_M_THIEFMASTER mes "I will wait for you here."; mes "Good luck!"; close; - } else if (.@quest == 0 || .@quest == 1) { + } else if (.@quest == 1) { if (Zeny >= 300) { mes "[Merchant Guildsman]"; mes "Excellent!"; @@ -2046,8 +2046,8 @@ new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 4_F_JOB_HUNTER end; } case 3: - set .@quest, checkquest(7124); - if (.@quest == -1) { + .@quest = questprogress(7124); + if (!.@quest) { mes "[Mage Guild Member]"; mes "Huh? Quest?"; mes "Hmm... What would be suited for you...?"; @@ -2062,8 +2062,8 @@ new_5-3,113,41,3 duplicate(NvArcher) Archer Guide#nv5 4_F_JOB_HUNTER mes "I will wait for you here."; mes "Good luck!"; close; - } else if (.@quest == 0 || .@quest == 1) { - if (checkquest(7124,HUNTING) == 2) { + } else if (.@quest == 1) { + if (questprogress(7124,HUNTING) == 2) { mes "[Mage Guild Member]"; mes "You have done an excellent job."; mes "So, did you find any interests about Mages?"; @@ -2443,10 +2443,10 @@ new_5-2,161,182,5 duplicate(NvEdwin) Instructor#nv5 4_F_03 function script F_NvErase { if (getarg(0,0)) { - if (checkquest(7123) > -1) erasequest 7123; - if (checkquest(7124) > -1) erasequest 7124; - if (checkquest(7126) > -1) erasequest 7126; - if (checkquest(7127) > -1) erasequest 7127; + if (questprogress(7123)) erasequest 7123; + if (questprogress(7124)) erasequest 7124; + if (questprogress(7126)) erasequest 7126; + if (questprogress(7127)) erasequest 7127; } nude; setarray .@manuals[0],countitem(2819),countitem(2820),countitem(2821),countitem(2822),countitem(2823),countitem(2824); diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt index 044e386fe..62facbdf9 100644 --- a/npc/re/jobs/novice/supernovice_ex.txt +++ b/npc/re/jobs/novice/supernovice_ex.txt @@ -58,7 +58,7 @@ function script Esseray_Ex { } beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ - if (checkquest(5092) >= 0) { + if (questprogress(5092)) { mes "[Fishing Novice]"; mes "Sh --------- !!"; mes "Be quiet please."; @@ -165,7 +165,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "- Talk to him again. -"; close; } - else if (checkquest(5093) >= 0) { + else if (questprogress(5093)) { mes "[Nodor]"; mes "Emmhmm ----- !!"; next; @@ -268,7 +268,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "Don't come back until you've hunted 1,000."; close; } - else if (checkquest(5094) >= 0 || checkquest(5095) >= 0 || checkquest(5096) >= 0 || checkquest(5097) >= 0) { + else if (questprogress(5094) || questprogress(5095) || questprogress(5096) || questprogress(5097)) { mes "["+strcharinfo(0)+"]"; mes "Hey, Nodor!"; next; @@ -277,7 +277,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "Oh my god!"; mes "So frightened... let me see?"; next; - if (checkquest(5094,HUNTING) != 2 && checkquest(5095,HUNTING) != 2 && checkquest(5096,HUNTING) != 2 && checkquest(5097,HUNTING) != 2) { + if (questprogress(5094,HUNTING) != 2 && questprogress(5095,HUNTING) != 2 && questprogress(5096,HUNTING) != 2 && questprogress(5097,HUNTING) != 2) { mes "[Nodor]"; mes "Hey! Super Novice!"; mes "Didn't I say to hunt 1,000?"; @@ -298,7 +298,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "Don't tell a lie!! I will hit you!!"; close; } - if (checkquest(5094+.@i,HUNTING) != 2) { + if (questprogress(5094+.@i,HUNTING) != 2) { mes "[Nodor]"; mes "Don't tell a lie!"; mes "I didn't tell you to hunt this!"; @@ -321,7 +321,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "I will let you know how to overcome your strength deficiencies."; close; } - else if (checkquest(5098) >= 0) { + else if (questprogress(5098)) { if (rand(10) != 1) { mes "[Nodor]"; mes "Oh! You already came here?"; @@ -377,7 +377,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "You can give some to my bro. He's up in the airship."; close; } - else if (checkquest(5099) >= 0) { + else if (questprogress(5099)) { mes "[Nodor]"; mes "Have you visited already?"; next; @@ -392,7 +392,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ mes "10,000,000 zeny is okay~"; close; } - else if (checkquest(5100) >= 0) { + else if (questprogress(5100)) { if (EXSUPNOV_Q_ == 3) set .@str$,"300,000"; else if (EXSUPNOV_Q_ == 4) set .@str$,"1,000,000"; else set .@str$,"100,000"; @@ -588,7 +588,7 @@ beach_dun2,119,92,4 script Fishing Novice#sp2 4_M_SIT_NOVICE,{ } airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{ - if (checkquest(5099) >= 0) { + if (questprogress(5099)) { mes "[Nudor]"; mes "Ahhh~ I have no money to buy any food."; mes "I'm hungry, but I have no idea when Brother is coming..."; @@ -670,7 +670,7 @@ airplane,33,47,5 script Nudor#sp2 4_F_NOVICE,{ mes "- tricked, so go back to Nodor. -"; close; } - else if (checkquest(5100) >= 0) { + else if (questprogress(5100)) { mes "[Nudor]"; mes "I cannot believe that my bro sent me money... I love it~"; next; diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt index 184f7071f..58d2489e4 100644 --- a/npc/re/jobs/repair.txt +++ b/npc/re/jobs/repair.txt @@ -169,7 +169,7 @@ prt_in,38,104,4 script Valerie 4_F_VALKYRIE,{ L_Second: if (getd(getarg(0)) != 0) { setd getarg(0),0; - if (checkquest(getarg(1)) == 2) + if (questprogress(getarg(1)) == 2) erasequest getarg(1); mes "[Valerie]"; mes "I will help clear your problems for you that came from your former attempts."; @@ -184,15 +184,15 @@ L_Third: if (getd(getarg(0)) != 0) { setd getarg(0),0; if (getarg(1)) { - if (checkquest(getarg(1)) == 2) + if (questprogress(getarg(1)) == 2) erasequest getarg(1); } for(set .@i,getarg(2); .@i<=getarg(3); set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } if (getarg(4,0)) { - if (checkquest(getarg(4)) > -1) + if (questprogress(getarg(4))) erasequest getarg(4); } mes "[Valerie]"; diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index 200454e81..17f5edb22 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -20,10 +20,10 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ close; } for(set .@i,11124; .@i<11134; set .@i,.@i+1) - if (checkquest(.@i,PLAYTIME) == 2) erasequest .@i; + if (questprogress(.@i,PLAYTIME) == 2) erasequest .@i; for(set .@i,11114; .@i<11123; set .@i,.@i+1) { - set .@j, checkquest(.@i,HUNTING); - if (.@j == 2) { + .@state = questprogress(.@i,HUNTING); + if (.@state == 2) { mes " - You must collect your - "; mes " - reward before starting - "; mes " - a new mission. - "; @@ -31,7 +31,7 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ mes " - Manager : Spike - "; close; } - else if (.@j >= 0) { + else if (.@state) { mes " - You can only request - "; mes " - one mission at a time. - "; mes " "; @@ -71,7 +71,7 @@ moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ } end; L_Quest: - if (checkquest(getarg(0),PLAYTIME) == 1) { + if (questprogress(getarg(0),PLAYTIME) == 1) { mes " - Mission ^4d4dff"+getarg(1)+"^000000 - "; mes " - is already finished for today. - "; mes " "; @@ -91,7 +91,7 @@ L_Quest: } for(set .@i,2; .@i= 0) { + else if (.@state) { mes "[Spike]"; mes "You haven't finished your mission yet."; mes "Keep up the good work. You are almost done."; @@ -127,7 +127,7 @@ moc_para01,32,30,6 script Spike 4_F_CHILD,{ mes "Why don't you look around and find some interesting tasks?"; close; L_Quest: - if (checkquest(getarg(0),HUNTING) == 2) { + if (questprogress(getarg(0),HUNTING) == 2) { if (getarg(3,0)) if (countitem(getarg(3)) < getarg(4)) { mes "[Spike]"; diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index a4f0d5637..3ff9f5213 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -84,7 +84,7 @@ L_Quest: mes "You have declined the "+getarg(2)+" mission."; close; } - if (checkquest(getarg(0)) > -1) mes "You are already doing this mission."; + if (questprogress(getarg(0))) mes "You are already doing this mission."; else { setquest getarg(0); mes "You have accepted the "+getarg(2)+" mission."; @@ -134,8 +134,8 @@ geffen,103,42,5 script Sponiac 4W_M_03,{ end; L_Quest: //QuestID,Quest,BExp,JExp,PotionAmt,Desc - if (checkquest(getarg(0)) == 1) { - if (checkquest(getarg(0),HUNTING) == 2) { + if (questprogress(getarg(0)) == 1) { + if (questprogress(getarg(0),HUNTING) == 2) { mes "[Sponiac]"; mes getarg(1)+"!"; mes "Wow, I didn't expect you would do that mission. I was just about to give up. But you did good job. I appreciate it!"; @@ -209,7 +209,7 @@ moc_ruins,173,55,3 script Dieshin Man 4_M_ORIENT02,{ } end; L_Quest: - if (checkquest(getarg(0)) != 1) { + if (questprogress(getarg(0)) != 1) { mes "[Dieshin Man]"; mes "Huh? Are you sure? Something is wrong..."; next; @@ -281,7 +281,7 @@ pay_fild07,83,89,7 script Zoologist 4_M_ORIENT02,{ mes "Oh, I need an Insecticide to continue the study."; close; } - if (checkquest(8271) != 1) { + if (questprogress(8271) != 1) { mes "[Zoologist]"; mes "Huh?"; mes "You are not Dieshin's delivery man?"; @@ -346,7 +346,7 @@ prt_fild03,30,254,3 script Entomologist 4_M_01,{ mes "Oh, I need Honey to continue the study."; close; } - if (checkquest(8272) != 1) { + if (questprogress(8272) != 1) { mes "[Entomologist]"; mes "Huh?"; mes "You are not Dieshin's delivery man?"; @@ -411,7 +411,7 @@ xmas_fild01,92,57,3 script Biologist 4W_M_01,{ mes "Huh, whatever. But be careful! It's very slippery here."; close; } - if (checkquest(8273) != 1) { + if (questprogress(8273) != 1) { mes "[Biologist]"; mes "Huh?"; mes "You are not Dieshin's delivery man?"; @@ -645,7 +645,7 @@ payon,179,66,3 script Dashia 4_M_RACHMAN1,{ mes "Anyway, I will be here waiting for you. Please come back when you finish the mission!"; close; L_Quest: - if (checkquest(getarg(0)) != 1) { + if (questprogress(getarg(0)) != 1) { mes "[Dashia]"; mes "Huh? Are you sure? Something is wrong..."; next; diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index eb1c22e42..7898060b5 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -22,7 +22,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ mes "You cannot receive any more items because you're carrying too many items. Please try again after you lighten up.^000000"; close; } - if (checkquest(12088) == -1) { + if (!questprogress(12088)) { if (BaseLevel < 41 || BaseLevel > 55) { mes "Mission bulletin board for Lv41~55 adventurers."; close; @@ -56,7 +56,7 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ } setarray .@exp[0],9600,7200,15750,7875,11100,8550,17100,9000,12300,9900,20250,10350,13800,11025,22500,11250; for(set .@i,0; .@i<16; set .@i,.@i+1) - if (checkquest(12072+.@i,HUNTING) == 2) { + if (questprogress(12072+.@i,HUNTING) == 2) { mes "[Mission Board]"; mes "You have completed the mission."; mes "Here is your reward."; @@ -66,7 +66,10 @@ moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ getexp .@exp[.@i],0; close; } - if ((checkquest(12072,HUNTING) == 0) && (checkquest(12073,HUNTING) == 0) && (checkquest(12074,HUNTING) == 0) && (checkquest(12075,HUNTING) == 0) && (checkquest(12076,HUNTING) == 0) && (checkquest(12077,HUNTING) == 0) && (checkquest(12078,HUNTING) == 0) && (checkquest(12079,HUNTING) == 0) && (checkquest(12080,HUNTING) == 0) && (checkquest(12081,HUNTING) == 0) && (checkquest(12082,HUNTING) == 0) && (checkquest(12083,HUNTING) == 0) && (checkquest(12084,HUNTING) == 0) && (checkquest(12085,HUNTING) == 0) && (checkquest(12086,HUNTING) == 0) && (checkquest(12087,HUNTING) == 0)) { + if (!questprogress(12072,HUNTING) && !questprogress(12073,HUNTING) && !questprogress(12074,HUNTING) && !questprogress(12075,HUNTING) + && !questprogress(12076,HUNTING) && !questprogress(12077,HUNTING) && !questprogress(12078,HUNTING) && !questprogress(12079,HUNTING) + && !questprogress(12080,HUNTING) && !questprogress(12081,HUNTING) && !questprogress(12082,HUNTING) && !questprogress(12083,HUNTING) + && !questprogress(12084,HUNTING) && !questprogress(12085,HUNTING) && !questprogress(12086,HUNTING) && !questprogress(12087,HUNTING)) { mes "You may now view the bulletin board."; erasequest 12088; close; diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index c7e5103a8..c014da7d1 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -51,7 +51,7 @@ moc_para01,42,38,3 script Mission [56 - 70] 4_BOARD3,{ end; L_Quest: - if (checkquest(getarg(0)) == -1) { + if (!questprogress(getarg(0))) { callsub L_Details, getarg(0); next; mes "Would you like to accept this mission?"; @@ -74,7 +74,7 @@ L_Quest: else set .@items,2; //complete } - if (checkquest(getarg(0)) < 2 && (countitem(getarg(3)) < getarg(4) || .@items == 1)) { + if (questprogress(getarg(0)) != 2 && (countitem(getarg(3)) < getarg(4) || .@items == 1)) { mes "You have an on-going mission. Would you like to check the details?"; next; if(select("Check the details.:Cancel.") == 1) @@ -96,7 +96,7 @@ L_Quest: end; L_HuntingQuest: - if (checkquest(getarg(0)) == -1) { + if (!questprogress(getarg(0))) { callsub L_Details, getarg(0); next; mes "Would you like to accept this mission?"; @@ -119,13 +119,13 @@ L_HuntingQuest: else set .@items,2; //complete } - if (checkquest(getarg(0),HUNTING) < 2 || .@items == 1) { + if (questprogress(getarg(0),HUNTING) != 2 || .@items == 1) { mes "You have an on-going mission. Would you like to check the details?"; next; if(select("Check the details.:Cancel.") == 1) callsub L_Details, getarg(0); close; - } else if (checkquest(getarg(0),HUNTING) == 2) { + } else if (questprogress(getarg(0),HUNTING) == 2) { mes "I have done pretty well for the mission. Should I report it now?"; next; if(select("Report the mission.:Do not report it yet.") == 1) { diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index 57102982c..f2ea5f2a1 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -23,9 +23,9 @@ moc_para01,44,38,3 script Mission [71 - 85] 4_BOARD3,{ // Clear the original quest data (no longer used). if (slv_quest) set slv_quest,0; - if (checkquest(10102) > -1 || checkquest(10103) > -1 || checkquest(10104) > -1 || checkquest(10105) > -1 || checkquest(10106) > -1) { + if (questprogress(10102) || questprogress(10103) || questprogress(10104) || questprogress(10105) || questprogress(10106)) { for(set .@quest,10102; .@quest<=10106; set .@quest,.@quest+1) { - if (checkquest(.@quest) > -1) + if (questprogress(.@quest)) erasequest .@quest; } mes "- Since the client has moved -"; @@ -50,10 +50,10 @@ moc_para01,44,38,3 script Mission [71 - 85] 4_BOARD3,{ 10118,10119,10120, 10121,10122,10123,5055,5056; for(set .@i,0; .@i -1 && countitem(7187) >= 30) + if (questprogress(5057) && countitem(7187) >= 30) set .@complete[getarraysize(.@complete)],5057; if (getarraysize(.@complete)) { mes "You have quests in progress."; @@ -184,13 +184,14 @@ L_Quest: } else { if (.@quest == 5057) { // Quest 5057 is the only collection quest, so separate conditions are unnecessary. - if (checkquest(5057) == -1) - set .@hunting,-1; + if (!questprogress(5057)) + .@hunting = 0; else if (countitem(7187) >= 30) - set .@hunting,2; - } else - set .@hunting, checkquest(.@quest,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = 2; + } else { + .@hunting = questprogress(.@quest,HUNTING); + } + if (.@hunting == 1) { mes getarg(1); mes getarg(2); next; diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 01c8fec29..2431670a0 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -78,8 +78,8 @@ moc_para01,48,175,3 script 86-90 Mission Board 4_BOARD3,{ 72000,72000,72000,86000,80000; mes "You must be within level 86-90 to accept these missions."; for(set .@quest,4167; .@quest<=4180; set .@quest,.@quest+1) { - set .@hunting, checkquest(.@quest,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest,HUNTING); + if (.@hunting == 1) { next; mes ":: You cannot proceed in"; mes ":: ^0000FF"+.@names$[.@quest-4167]+" Hunting^000000."; @@ -152,14 +152,14 @@ moc_para01,48,175,3 script 86-90 Mission Board 4_BOARD3,{ L_Quest: set .@quest1, getarg(0); set .@quest2, .@quest1+31; - set .@playtime, checkquest(.@quest2,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(.@quest2,PLAYTIME); + if (.@playtime == 1) { mes "[86-90 Mission Board]"; mes "You need to wait 3 hours before you can take this mission again."; close; } - set .@hunting, checkquest(.@quest1,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest1,HUNTING); + if (.@hunting == 1) { mes "[86-90 Mission Board]"; mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?"; close; @@ -168,7 +168,7 @@ L_Quest: mes "You have completed the hunting."; mes "Please accept this reward as a compensation."; erasequest .@quest1; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest2; getexp getarg(2),0; close; @@ -190,7 +190,7 @@ L_Quest: if(select("I'll hunt them.:No thanks.") == 1) { mes "[86-90 Mission Board]"; mes "When you have completed the mission, post it on this board and collect your reward."; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest1; } close; diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index e6744e80f..707cde268 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -80,8 +80,8 @@ moc_para01,48,177,3 script 91-99 Mission Board 4_BOARD3,{ 110000,138000,118000,96000,134000; mes "You must be within level 91-99 to accept these missions."; for(set .@quest,4181; .@quest<=4196; set .@quest,.@quest+1) { - set .@hunting, checkquest(.@quest,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest,HUNTING); + if (.@hunting == 1) { next; mes ":: You cannot proceed in"; mes ":: ^0000FF"+.@names$[.@quest-4181]+" Hunting^000000."; @@ -161,14 +161,14 @@ moc_para01,48,177,3 script 91-99 Mission Board 4_BOARD3,{ L_Quest: set .@quest1, getarg(0); set .@quest2, .@quest1+31; - set .@playtime, checkquest(.@quest2,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(.@quest2,PLAYTIME); + if (.@playtime == 1) { mes "[91-99 Mission Board]"; mes "You need to wait 3 hours before you can take this mission again."; close; } - set .@hunting, checkquest(.@quest1,HUNTING); - if (.@hunting == 0 || .@hunting == 1) { + .@hunting = questprogress(.@quest1,HUNTING); + if (.@hunting == 1) { mes "[91-99 Mission Board]"; mes "Have you finished hunting all 30 "+getarg(1)+getarg(5,"")+" yet?"; close; @@ -177,7 +177,7 @@ L_Quest: mes "You have completed the hunting."; mes "Please accept this reward as a compensation."; erasequest .@quest1; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest2; // Job Experience calculation. @@ -207,7 +207,7 @@ L_Quest: if(select("I'll hunt them.:No thanks.") == 1) { mes "[91-99 Mission Board]"; mes "When you have completed the mission, post it on this board and collect your reward."; - if (.@playtime > -1) erasequest .@quest2; + if (.@playtime) erasequest .@quest2; setquest .@quest1; } close; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index f1b54a9e7..6b98b217e 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -1139,7 +1139,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ } } if (para_suv01 == 2) { - if (checkquest(7129,HUNTING) == 2) { + if (questprogress(7129,HUNTING) == 2) { mes "[Talking Dog]"; mes "Woooohh..."; mes "Great!"; @@ -1186,7 +1186,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ close; } if (para_suv01 == 3) { - if (checkquest(7130,HUNTING) == 2) { + if (questprogress(7130,HUNTING) == 2) { mes "[Talking Dog]"; mes "You are so perfect."; next; @@ -1224,7 +1224,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ close; } if (para_suv01 == 4) { - if (checkquest(7131,HUNTING) == 2) { + if (questprogress(7131,HUNTING) == 2) { mes "[Talking Dog]"; mes "Um. Excellent."; mes "You are awesome!"; @@ -1388,7 +1388,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ } } if (para_suv01 == 7) { - if (checkquest(7134,HUNTING) == 2) { + if (questprogress(7134,HUNTING) == 2) { mes "[Timid Cat]"; mes "Now do you understand the dirty and humid underground sewers?"; mes "Eeeh look what's next meow."; @@ -1426,7 +1426,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ close; } if (para_suv01 == 8) { - if (checkquest(7135,HUNTING) == 2) { + if (questprogress(7135,HUNTING) == 2) { mes "[Timid Cat]"; mes "Great job~!"; mes "How'd you get rid of those dirty bugs and Tarou. You are brave."; @@ -1464,7 +1464,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ close; } if (para_suv01 == 9) { - if (checkquest(7136,HUNTING) == 2) { + if (questprogress(7136,HUNTING) == 2) { mes "[Timid Cat]"; mes "You are great meow~"; mes "You killed them so quickly!"; @@ -1572,7 +1572,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ close; } if (para_suv01 == 14) { - if (checkquest(7139,HUNTING) == 2) { + if (questprogress(7139,HUNTING) == 2) { mes "[Karl]"; mes "Did you get how the undead work?"; mes "As you know undead never die so, blessing of live person it's same as curse to them."; @@ -1611,7 +1611,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ close; } if (para_suv01 == 15) { - if (checkquest(7140,HUNTING) == 2) { + if (questprogress(7140,HUNTING) == 2) { mes "[Karl]"; mes "Did you get back what the Poporing stole?"; mes "This cave is really deep and there are lots of precious things that they could have picked up."; @@ -1734,7 +1734,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ } } if (para_suv01 == 18) { - if (checkquest(7143,HUNTING) == 2) { + if (questprogress(7143,HUNTING) == 2) { mes "[Cloud]"; mes "Hey, what was it?"; mes "Maybe you saw an Andre when you were hunting Pierre."; @@ -1764,7 +1764,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ close; } if (para_suv01 == 19) { - if (checkquest(7144,HUNTING) == 2) { + if (questprogress(7144,HUNTING) == 2) { mes "[Cloud]"; mes "Great. You seem to have killed all of the Andre."; mes "How do you think about fighting ants?"; @@ -1803,7 +1803,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ close; } if (para_suv01 == 20) { - if (checkquest(7145,HUNTING) == 2) { + if (questprogress(7145,HUNTING) == 2) { mes "[Cloud]"; mes "Oh... it might have been an anoying fight."; mes "You finished so fast."; @@ -1913,7 +1913,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 25) { - if (checkquest(7148,HUNTING) == 2) { + if (questprogress(7148,HUNTING) == 2) { mes "[Hooksha]"; mes "Great. Awesome."; mes "It's not very pleasant so let's move on."; @@ -1946,7 +1946,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 26) { - if (checkquest(7149,HUNTING) == 2) { + if (questprogress(7149,HUNTING) == 2) { mes "[Hooksha]"; mes "Now you can move on to the next step."; next; @@ -1977,7 +1977,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 27) { - if (checkquest(7150,HUNTING) == 2) { + if (questprogress(7150,HUNTING) == 2) { mes "[Hooksha]"; mes "Great job."; mes "Now you should understand how the orc tribe works here in Orc Village."; @@ -2044,7 +2044,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 30) { - if (checkquest(7153,HUNTING) == 2) { + if (questprogress(7153,HUNTING) == 2) { mes "[Hooksha]"; mes "It's different from what you saw in Payon, right?"; mes "Although you managed to kill the Orc Zombies, you can't be sure you are much stronger.."; @@ -2076,7 +2076,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ close; } if (para_suv01 == 31) { - if (checkquest(7154,HUNTING) == 2) { + if (questprogress(7154,HUNTING) == 2) { mes "[Hooksha]"; mes "Your training mission has been completed."; mes "Go back to the Eden Group headquarters and report."; @@ -2172,7 +2172,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ close; } if (para_suv01 == 34) { - if (checkquest(7157,HUNTING) == 2) { + if (questprogress(7157,HUNTING) == 2) { mes "[Callandiva]"; mes "Oh, you came back~!"; mes "What did you think of those threatening Mermans?"; @@ -2203,7 +2203,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ close; } if (para_suv01 == 35) { - if (checkquest(7158,HUNTING) == 2) { + if (questprogress(7158,HUNTING) == 2) { mes "[Callandiva]"; mes "Did you kill all the Strouf already?"; mes "I wasn't counting that you'd make it."; @@ -4000,7 +4000,7 @@ comodo,173,354,6 script Romeo#01 1_M_JOBTESTER,{ close; } if (romeo == 1) { - if (checkquest(7215,HUNTING) == 2) { + if (questprogress(7215,HUNTING) == 2) { mes "[Romeo]"; mes "You did it? Thats all the proof I needed."; next; @@ -4033,7 +4033,7 @@ comodo,173,354,6 script Romeo#01 1_M_JOBTESTER,{ um_fild01,34,280,6 script Romeo#02 1_M_JOBTESTER,{ if (romeo == 2) { - if (checkquest(7216,HUNTING) == 2) { + if (questprogress(7216,HUNTING) == 2) { mes "[Romeo]"; mes "Wow, you have arrived sooner than I expected."; next; @@ -4098,7 +4098,7 @@ glast_01,195,131,6 script Johan 4_F_SISTER,{ close; } if (johan == 1) { - if (checkquest(7220,HUNTING) == 2) { + if (questprogress(7220,HUNTING) == 2) { mes "[Johan]"; mes "Good."; next; @@ -4117,7 +4117,7 @@ glast_01,195,131,6 script Johan 4_F_SISTER,{ close; } if (johan == 2) { - if (checkquest(7221,HUNTING) == 2) { + if (questprogress(7221,HUNTING) == 2) { mes "[Johan]"; mes "Hmmmm, better."; next; @@ -4163,7 +4163,7 @@ ein_fild08,172,359,4 script Kiren 4_M_4THPRIN1,{ close; } if (kiren == 1) { - if (checkquest(7224,HUNTING) == 2) { + if (questprogress(7224,HUNTING) == 2) { mes "[Kiren]"; mes "Wow, most people spend twice as long as you did to kill those Porcellios!"; next; @@ -4183,7 +4183,7 @@ ein_fild08,172,359,4 script Kiren 4_M_4THPRIN1,{ close; } if (kiren == 2) { - if ((checkquest(7226,HUNTING) == 2) && (checkquest(7227,HUNTING) == 2)) { + if ((questprogress(7226,HUNTING) == 2) && (questprogress(7227,HUNTING) == 2)) { mes "[Kiren]"; mes "Incredible, you set a new record!"; next; @@ -4230,7 +4230,7 @@ ice_dun01,154,13,6 script Naomi 4_F_JOB_BLACKSMITH,{ close; } if (naomi == 1) { - if (checkquest(7230,HUNTING) == 2) { + if (questprogress(7230,HUNTING) == 2) { mes "[Naomi]"; mes "Thank you, but there are still so many Siromas here!"; next; @@ -4249,7 +4249,7 @@ ice_dun01,154,13,6 script Naomi 4_F_JOB_BLACKSMITH,{ close; } if (naomi == 2) { - if ((checkquest(7231,HUNTING) == 2) && (countitem(7066) >= 30) && (countitem(519) >= 1) && (countitem(7453) >= 1)) { + if ((questprogress(7231,HUNTING) == 2) && (countitem(7066) >= 30) && (countitem(519) >= 1) && (countitem(7453) >= 1)) { mes "[Naomi]"; mes "Yay, you did it!"; next; @@ -4349,7 +4349,7 @@ man_fild01,43,234,2 script Paradise Dispatch#01 4_DST_SOLDIER,{ close; } if (margaret == 2) { - if (checkquest(7235,HUNTING) == 2) { + if (questprogress(7235,HUNTING) == 2) { mes "[Paradise Dispatch]"; mes "Thanks!"; next; @@ -4395,7 +4395,7 @@ spl_fild02,377,149,4 script Paradise Dispatch#02 4_M_DST_MASTER,{ close; } if (margaret == 5) { - if (checkquest(7236,HUNTING) == 2) { + if (questprogress(7236,HUNTING) == 2) { mes "[Paradise Dispatch]"; mes "You make it look so easy, but I couldn't even kill 1..."; next; @@ -4701,12 +4701,12 @@ moc_para01,111,83,3 script Toren 2_M_OLDBLSMITH,{ mes "It is finished! Come back tomorrow if you want to enchant more."; close; } - if ((paragearenchant == 4) && (checkquest(7241,PLAYTIME) != 2)) { + if ((paragearenchant == 4) && (questprogress(7241,PLAYTIME) != 2)) { mes "[Toren]"; mes "Please come back tomorrow if you want to enchant more."; close; } - if ((paragearenchant == 4) && (checkquest(7241,PLAYTIME) == 2)) { + if ((paragearenchant == 4) && (questprogress(7241,PLAYTIME) == 2)) { set paragearenchant,0; erasequest 7241; mes "[Toren]"; diff --git a/npc/re/quests/eden/eden_tutorial.txt b/npc/re/quests/eden/eden_tutorial.txt index 92cfb26fd..408ba83df 100644 --- a/npc/re/quests/eden/eden_tutorial.txt +++ b/npc/re/quests/eden/eden_tutorial.txt @@ -14,7 +14,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ if (Class == Job_Novice) { // Fall through - } else if (checkquest(9167) == -1) { + } else if (!questprogress(9167)) { OnStartQuest: if (@tutorial_restart) { set .@tutorial_restart,1; @@ -85,7 +85,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "When you're not so busy, come find me again."; close; } - } else if (checkquest(9167) == 0 || checkquest(9167) == 1) { + } else if (questprogress(9167) == 1) { if (!getmercinfo(1)) { mes "[Tutorial Instructor]"; mes "You haven't gotten a mercenary yet."; @@ -146,7 +146,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ completequest 9167; setquest 9168; close; - } else if (checkquest(9168) == 0 || checkquest(9168) == 1) { + } else if (questprogress(9168) == 1) { if (checkweight(607,1) == 0) { if (MaxWeight - Weight < getiteminfo(607,6)) { mes "[Tutorial Instructor]"; @@ -237,7 +237,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "the ^006400Quest Window^000000,"; mes "come find and talk to me again."; close; - } else if (checkquest(9169) == 0 || checkquest(9169) == 1) { + } else if (questprogress(9169) == 1) { if (countitem(12580) == 0) { mes "[Tutorial Instructor]"; mes "Hmm? So I noticed that"; @@ -280,7 +280,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ completequest 9169; setquest 9170; close; - } else if (checkquest(9170) == 0 || checkquest(9170) == 1) { + } else if (questprogress(9170) == 1) { if (countitem(12580)) { mes "[Tutorial Instructor]"; mes "Hmm... It seems that you still have"; @@ -319,7 +319,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ completequest 9170; setquest 9171; close; - } else if (checkquest(9171) == 0 || checkquest(9171) == 1) { + } else if (questprogress(9171) == 1) { if (countitem(909) < 10) { mes "[Tutorial Instructor]"; mes "It seems you didn't bring"; @@ -401,7 +401,7 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "When you're done looking at them,"; mes "give them back to me."; close; - } else if (checkquest(9172) == 0 || checkquest(9172) == 1) { + } else if (questprogress(9172) == 1) { if (countitem(15033) == 0 || countitem(15034) == 0) { mes "[Tutorial Instructor]"; mes "What did you do with the Enchanted"; @@ -438,13 +438,13 @@ moc_para01,34,178,3 script Tutorial Instructor 4_M_KHMAN,{ mes "then bring them back to me."; close; } - } else if (checkquest(9173) == 0 || checkquest(9173) == 1) { + } else if (questprogress(9173) == 1) { mes "[Tutorial Instructor]"; mes "Do you have any questions?"; next; switch(select("Can I do the same quest again?:About the Quest Window...:About ENCHANT...:About Searching Vends...:About Mercenary and Pets...:End Conversation.")) { case 1: - if (checkquest(9173,PLAYTIME) == 0 || checkquest(9173,PLAYTIME) == 1) { + if (questprogress(9173,PLAYTIME) == 1) { mes "[Tutorial Instructor]"; mes "The one method to do the same quests repeatdedly is to do the ^006400Daily Quests^000000."; next; @@ -579,32 +579,32 @@ moc_para01,32,179,4 script Tutorial Goal 4_F_KHELLY,{ close; } } - if (checkquest(4161) == 0 || checkquest(4161) == 1) { + if (questprogress(4161) == 1) { mes "[Tutorial Goal]"; mes "Well~ We gotta go challenge the experts right?"; mes "Let's start off by finding the ^006400Siege Expert^000000!"; close; - } else if (checkquest(4162) == 0 || checkquest(4162) == 1) { + } else if (questprogress(4162) == 1) { mes "[Tutorial Goal]"; mes "You've passed the ^006400Siege Expert^000000's test! Congrats!"; mes "Now, go find the ^006400Party Recruiting Expert^000000!"; close; - } else if (checkquest(4163) == 0 || checkquest(4163) == 1) { + } else if (questprogress(4163) == 1) { mes "[Tutorial Goal]"; mes "Oh! You've passed the ^006400Party Recruiting Expert^000000's test! Congrats!"; mes "Now, go find the ^006400Battleground Expert^000000!"; close; - } else if (checkquest(4164) == 0 || checkquest(4164) == 1) { + } else if (questprogress(4164) == 1) { mes "[Tutorial Goal]"; mes "Yay! You passed the test from the ^006400Battleground Expert^000000! Congrats!"; mes "Next, go and find the ^006400Memorial Dungeon Expert^000000!"; close; - } else if (checkquest(4165) == 0 || checkquest(4165) == 1) { + } else if (questprogress(4165) == 1) { mes "[Tutorial Goal]"; mes "You passed the test from ^006400Memorial Dungeon Expert^000000! That's great!"; mes "Try finding the ^006400Map Expert^000000!"; close; - } else if (checkquest(4166) == 0 || checkquest(4166) == 1) { + } else if (questprogress(4166) == 1) { mes "[Tutorial Goal]"; mes "You passed ^006400Map Expert^000000's test! Congrats!"; mes "I'm so glad that you were to pass all the Experts' tests! You're better than I expected!!"; @@ -621,7 +621,7 @@ moc_para01,32,179,4 script Tutorial Goal 4_F_KHELLY,{ getitem 504,5; //White_Potion getitem 608,1; //Seed_Of_Yggdrasil close; - } else if (checkquest(4166) == 2) { + } else if (questprogress(4166) == 2) { mes "[Tutorial Goal]"; mes "Now, even you are an ^006400Expert^000000!! Such a fitting nick name for you!"; mes "Thank you so much for your hard work."; @@ -662,7 +662,7 @@ moc_para01,32,179,4 script Tutorial Goal 4_F_KHELLY,{ } moc_para01,24,175,4 script Siege Master 4_M_JOB_KNIGHT2,{ - set .@checkquest, checkquest(4161); + .@checkquest = questprogress(4161); if (.@checkquest == 2) { mes "[Siege Expert]"; mes "Since you've come again, I assume you're curious about ^006400Siege^000000?"; @@ -678,7 +678,7 @@ moc_para01,24,175,4 script Siege Master 4_M_JOB_KNIGHT2,{ mes "If you want to go over anything, just come talk to me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Siege Expert]"; mes "I am someone who has studied War of Emperium for 16 years! So that makes me an expert! Since you came to find me, I assume you want to learn more about ^006400Siege^000000."; next; @@ -835,7 +835,7 @@ L_Info: } moc_para01,21,172,4 script Party Recruiting Expert 4_M_OILMAN,{ - set .@checkquest, checkquest(4162); + .@checkquest = questprogress(4162); if (.@checkquest == 2) { mes "[Party Recruiting Expert]"; mes "Since you've come and found me, it seems you're curious about ^006400Party Recruiting^000000?"; @@ -851,7 +851,7 @@ moc_para01,21,172,4 script Party Recruiting Expert 4_M_OILMAN,{ mes "Well, if you have any questions, come find me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Party Recruiting Expert]"; mes "I am the ^006400Party Recruiting^000000 expert because I did research about Party Recruting for 16 years! It seems that the ^006400Siege Expert^000000 sent you my way since you passed his tests, hmm?"; next; @@ -1017,7 +1017,7 @@ L_Info: } moc_para01,12,179,6 script Battleground Master 4_M_KY_HEAD,{ - set .@checkquest, checkquest(4163); + .@checkquest = questprogress(4163); if (.@checkquest == 2) { mes "[Battleground Expert]"; mes "Seeing that you sought me out, I guess you want to learn about ^006400Battleground^000000s, eh?"; @@ -1033,7 +1033,7 @@ moc_para01,12,179,6 script Battleground Master 4_M_KY_HEAD,{ mes "If you want to go over anything, let me know."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Battleground Expert]"; mes "For 16 years, I experienced the intense heat of battle on the ^006400Battleground^000000s... I am the ^006400Battleground^000000 Expert!"; mes "It seems that the ^006400Party Recruiting Expert^000000 sent you to me since you passed his quiz."; @@ -1197,7 +1197,7 @@ L_Info: } moc_para01,28,167,3 script Memorial Dungeon Expert 4_M_LGTGUARD,{ - set .@checkquest, checkquest(4164); + .@checkquest = questprogress(4164); if (.@checkquest == 2) { mes "[Memorial Dungeon Expert]"; mes "Since you've come here, it seems you want to learn about the ^006400Memorial Dungeon^000000."; @@ -1213,7 +1213,7 @@ moc_para01,28,167,3 script Memorial Dungeon Expert 4_M_LGTGUARD,{ mes " If you want to hear about it again, come find me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Memorial Dungeon Expert]"; mes "I am the ^006400Memorial Dungeon^000000 Expert! I studied the ^006400Memorial Dungeon^000000 for 16 years!"; mes "Since you've sought me out, I assume that you've passed the ^006400Battleground Expert^000000's quiz."; @@ -1375,7 +1375,7 @@ L_Info: } moc_para01,14,168,6 script Map Expert 2_M_SAGE_OLD,{ - set .@checkquest, checkquest(4165); + .@checkquest = questprogress(4165); if (.@checkquest == 2) { mes "[Map Expert]"; mes "Seeing that you came to me, I assume you have some questions about ^006400MAP^000000s?"; @@ -1392,7 +1392,7 @@ moc_para01,14,168,6 script Map Expert 2_M_SAGE_OLD,{ mes "If you have any more questions, come find me."; close; } - } else if (.@checkquest == 0 || .@checkquest == 1) { + } else if (.@checkquest == 1) { mes "[Map Expert]"; mes "I have been researching and studying ^006400MAP^000000s for 16 years and so now I am the ^006400MAP^000000 Expert!"; mes "Since you've sought me out, it seems you've passed ^006400Memorial Dungeon Expert^000000's quiz."; diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index d5abca9fd..0c8f39b30 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -20,13 +20,13 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 4_M_ALCHE_E,{ if (countitem(6415)) { if (Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) { disable_items; - if (checkquest(4159) == -1 && checkquest(4160) == -1) { + if (!questprogress(4159) && !questprogress(4160)) { mes "[Viorel]"; mes "Why are you here?"; mes "Shouldn't you be at ^005DFFJeyna^000000's house?"; close2; - for(set .@i,4154; .@i<=4160; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + for(.@i = 4154; .@i <= 4160; ++.@i) { + if (questprogress(.@i)) erasequest .@i; } setquest 4154; @@ -64,8 +64,8 @@ job3_gen01,12,44,3 script Viorel#job3_gen01 4_M_ALCHE_E,{ close; } } - if ((Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) && (checkquest(4154) > -1)) { - if ((checkquest(4155) > -1) || (checkquest(4160) > -1)) { + if ((Class == Job_Genetic || Class == Job_Genetic_T || Class == Job_Baby_Genetic) && questprogress(4154)) { + if (questprogress(4155) || questprogress(4160)) { mes "[Viorel]"; mes "Weather's great."; next; @@ -270,7 +270,7 @@ L_CheckHomunculus: } que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ - if (checkquest(4155) > -1) { + if (questprogress(4155)) { emotion e_dum; mes "[Viorel]"; mes "Good."; @@ -400,7 +400,7 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ end; } } - } else if (checkquest(4160) > -1) { + } else if (questprogress(4160)) { playbgm "33.mp3"; // Yuna Song mes "[Viorel]"; mes "The ^FF4800Homunculus^000000 I saw before has returned to its ^0000FFembryo^000000 state."; @@ -592,7 +592,7 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ close; } else { for(set .@i,4154; .@i<=4160; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } mes "[Viorel]"; @@ -605,7 +605,7 @@ que_house_s,24,47,3 script Viorel#homun_s 4_M_ALCHE_E,{ } que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ - if (checkquest(4156) > -1) { + if (questprogress(4156)) { playbgm "28.mp3"; // You're in Ruins emotion e_gasp; mes "[Jeyna]"; @@ -661,14 +661,14 @@ que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ setquest 4157; erasequest 4156; end; - } else if (checkquest(4157) > -1) { + } else if (questprogress(4157)) { emotion e_what; mes "[Jeyna]"; mes "Take a look at the board behind me, on the right."; close2; emotion e_gasp,0,"Magic Board#homun_s"; end; - } else if (checkquest(4158) > -1) { + } else if (questprogress(4158)) { playbgm "28.mp3"; // You're in Ruins disable_items; mes "[Jeyna]"; @@ -772,7 +772,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ mes "Maybe I shouldn't have asked in the first place."; close; } - } else if (checkquest(4159) > -1 || checkquest(4160) > -1) { + } else if (questprogress(4159) || questprogress(4160)) { playbgm "28.mp3"; // You're in Ruins mes "[Jeyna]"; mes "^005DFFViorel^000000 will finish the mutation process."; @@ -790,7 +790,7 @@ que_house_s,80,42,3 script Jeyna#homun_s 4_F_ALCHE_A,{ warp "que_house_s",19,42; end; } else { - if (checkquest(4154) > -1) + if (questprogress(4154)) erasequest 4154; mes "[Jeyna]"; mes "Hey, how did you get in here?"; @@ -847,7 +847,7 @@ que_house_s,83,47,3 script Magic Board#homun_s 4_BOARD3,{ mes "--------------------------"; mes "The rest is sealed because it seems to be a private message."; close2; - if (checkquest(4157) > -1) { + if (questprogress(4157)) { setquest 4158; erasequest 4157; } diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt index 0fd885d8f..eac06cb83 100644 --- a/npc/re/quests/magic_books.txt +++ b/npc/re/quests/magic_books.txt @@ -626,7 +626,7 @@ mid_camp,255,244,4 script Galfos 4_M_JOB_WIZARD,{ mes "Are you kidding me? You already have the book!"; close; } - if ((.@i == 1 && checkquest(12218) == 2) || (.@i == 2 && checkquest(12219) == 2 && checkquest(12220) == 2 && checkquest(12221) == 2 && checkquest(12222) == 2)) { + if ((.@i == 1 && questprogress(12218) == 2) || (.@i == 2 && questprogress(12219) == 2 && questprogress(12220) == 2 && questprogress(12221) == 2 && questprogress(12222) == 2)) { mes "Oh my, I sense incredible energy coming from you. This is great! Now we're ready to make the Ultimate Magic Book."; next; mes "[Galfos]"; @@ -676,11 +676,11 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ mes "When you approach the documents, an Evil Giant that looks like the archive manager tries to call Guard Galton. You should get out of here quickly."; close; } - if (checkquest(12165,"PLAYTIME") == 1) { + if (questprogress(12165,PLAYTIME) == 1) { mes "The documents are making you feel nauseous. You should come back later after your stomach settles."; close; } - if (checkquest(12165,"PLAYTIME") == 2) { + if (questprogress(12165,PLAYTIME) == 2) { mes "You don't feel as nauseous anymore. It should be safe to proceed now."; erasequest 12165; close; @@ -703,7 +703,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ if (mac_book == 4) { if (rand(1,10) == 1) { if (getskilllv(2213) > 0) { - if (checkquest(12218) == 1) { + if (questprogress(12218) == 1) { mes "You already own this document."; close; } @@ -721,7 +721,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 2) { if (getskilllv(2217) > 0) { - if (checkquest(12219) == 1) { + if (questprogress(12219) == 1) { mes "You already own this document."; close; } @@ -739,7 +739,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 3) { if (getskilllv(2217) > 0) { - if (checkquest(12220) == 1) { + if (questprogress(12220) == 1) { mes "You already own this document."; close; } @@ -756,7 +756,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 4) { if (getskilllv(2217) > 0) { - if (checkquest(12221) == 1) { + if (questprogress(12221) == 1) { mes "You already own this document."; close; } @@ -774,7 +774,7 @@ dic_in01,25,190,0 script Mysterious Documents CLEAR_NPC,{ } if (rand(1,10) == 5) { if (getskilllv(2217) > 0) { - if (checkquest(12222) == 1) { + if (questprogress(12222) == 1) { mes "You already own this document."; close; } @@ -807,7 +807,7 @@ function script Magic_Book_Essence { mes "Please lighten your bag."; close; } - if (checkquest(getarg(0)) == 1 && countitem(getarg(1)) >= getarg(2)) { + if (questprogress(getarg(0)) == 1 && countitem(getarg(1)) >= getarg(2)) { specialeffect2 EF_BLIND; specialeffect2 EF_BEGINSPELL; progressbar "ffff00",4; @@ -823,7 +823,7 @@ function script Magic_Book_Essence { mes "^008888You have failed to refine the essence using "+getarg(2)+" "+getitemname(getarg(1))+"s.^000000"; close; } - if (checkquest(getarg(0)) == 2) { + if (questprogress(getarg(0)) == 2) { mes "You've already created "+getarg(3)+" Essence in this area."; close; } diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 33758fe9a..e74d14c77 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -31,22 +31,22 @@ brasilis,297,307,5 script Angelo#br 1_M_04,{ mes "Gosh... what can I do... ?"; close; } - if (checkquest(9032,PLAYTIME) == 2) { + if (questprogress(9032,PLAYTIME) == 2) { erasequest 9032; } - if (checkquest(9032,PLAYTIME) == 0) { + if (questprogress(9032,PLAYTIME) == 1) { mes "[Angelo]"; mes "The day is not finished yet."; mes "You can only help once a day. Hehe."; close; } - if (checkquest(9030) == 1) { + if (questprogress(9030) == 1) { mes "[Angelo]"; mes "My pets are in the field outside of the village."; mes "Why did they leave? Please find them."; close; } - if (checkquest(9031) == 1) { + if (questprogress(9031) == 1) { mes "[Angelo]"; mes "Oh, thank you. You found all of 3 puppies."; mes "Thanks a lot."; @@ -89,7 +89,7 @@ OnGo: } - script Puppy#bra -1,{ - if (checkquest(9030) == 1) { + if (questprogress(9030) == 1) { if (brazil_kid < 3) { mes "[Puppy]"; mes "bow wow bow wow!!"; @@ -169,9 +169,8 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ close; } else { - set .@nQState1,checkquest(9028); - set .@nQState2,checkquest(9029); - if (.@nQState1 == -1) { + .@nQState = questprogress(9028); + if (!.@nQState) { mes "[Lucia]"; mes "Hello."; mes "Have you come here to hunt ^FF0000Strange Hydra^000000s?"; @@ -215,7 +214,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ close; } } - else if ((.@nQState1 == 0) || (.@nQState1 == 1)) { + else if (.@nQState == 1) { if (countitem(6221) > 0) { mes "[Lucia]"; mes "Hello, you really did it!"; @@ -227,7 +226,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ delitem 6221,1; //Mystic_Leaf_Cat_Ball completequest 9028; //recall_completequest 9029; - if (.@nQState2 > -1) erasequest 9029; + if (questprogress(9029)) erasequest 9029; setquest 9029; consumeitem 607; //Yggdrasilberry consumeitem 12070; //Luk_Dish05 @@ -290,8 +289,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ else { mes "[Lucia]"; mes "Oh, ^0000FF"+strcharinfo(0)+"^000000 you're back."; - set .@nCheckTime,checkquest(9029,PLAYTIME); - if ((.@nCheckTime == 0) || (.@nCheckTime == 1)) { + if (questprogress(9029,PLAYTIME) == 1) { mes "I'm so grateful for your help."; mes "Each ^006400Hydra Ball^000000 is provided ^006400every 24 hours^000000"; mes "Please come at the appropriate time."; @@ -299,7 +297,7 @@ brasilis,192,133,6 script Lucia#brasilis 4_F_BRZ_WOMAN,{ } else { //recall_completequest 9028; - if (.@nQState1 > -1) erasequest 9028; + if (.@nQState) erasequest 9028; completequest 9029; mes "Did you come here to hunt ^FF0000Strange Hydra^000000s?"; next; @@ -2849,8 +2847,7 @@ OnInit: // Iara :: iara.sc //============================================================ brasilis,315,334,5 script Shaman#nk 4_F_BRZ_INDOLD,{ - set .@iara_re,checkquest(4135,PLAYTIME); - if ((.@iara_re == 0) || (.@iara_re == 1)) { + if (questprogress(4135,PLAYTIME) == 1) { mes "[Anori]"; mes "I'm still preparing."; mes "I don't require your help at this time."; @@ -2858,9 +2855,8 @@ brasilis,315,334,5 script Shaman#nk 4_F_BRZ_INDOLD,{ close; } else { - if (checkquest(4135) > 1) erasequest 4135; - set .@iara_q,checkquest(4133); - if ((.@iara_q == 0) || (.@iara_q == 1)) { + if (questprogress(4135) == 2) erasequest 4135; + if (questprogress(4133) == 1) { mes "[Anori]"; mes "To block Iara "; mes "seducing the tribes"; @@ -2914,8 +2910,7 @@ brasilis,315,334,5 script Shaman#nk 4_F_BRZ_INDOLD,{ mes "The tribe is facing a major threat."; close; } - set .@re_q,checkquest(4134); - if (.@re_q == 2) { + if (questprogress(4134) == 2) { mes "[Anori]"; mes "you are..."; mes "the adventurer who came for the"; @@ -3138,7 +3133,7 @@ bra_fild01,188,301,5 script Native Warrior#nk 4_M_BRZ_INDIAN,{ mes "[Native Warrior]"; mes "When will she come out of the waterfall again...?"; next; - if ((checkquest(4133) >= 0) || (checkquest(4134) >= 0)) { + if (questprogress(4133) || questprogress(4134)) { mes "[" + strcharinfo(0) + "]"; mes "(Wh...what's this guy?)"; } diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt index e3d1a7302..a2424cdfc 100644 --- a/npc/re/quests/quests_dewata.txt +++ b/npc/re/quests/quests_dewata.txt @@ -754,7 +754,7 @@ dewata,109,262,4 script Memo#dew_drink 4_M_DEWOLDMAN,{ close; } } - set .@playtime, checkquest(5044,PLAYTIME); + .@playtime = questprogress(5044,PLAYTIME); if (.@playtime == 0) { mes "[Memo]"; mes "Will you help me again tomorrow?"; @@ -913,14 +913,14 @@ dewata,109,262,4 script Memo#dew_drink 4_M_DEWOLDMAN,{ set dew_drink,8; close; } else if (dew_drink == 8) { - if (checkquest(5043,PLAYTIME) == 0) { + if (questprogress(5043,PLAYTIME) == 1) { mes "[Memo]"; mes "... ... ..."; emotion e_swt2; next; mes "- Memo is making an ark. -"; close; - } else if (checkquest(5043,PLAYTIME) == -1) { + } else if (!questprogress(5043,PLAYTIME)) { mes "- There is error in the quest. -"; close; } @@ -968,7 +968,7 @@ dewata,109,262,4 script Memo#dew_drink 4_M_DEWOLDMAN,{ close; } else if (dew_drink == 10) { for(set .@i,0; .@i<7; set .@i,.@i+1) - if (checkquest(5045+.@i) > -1) + if (questprogress(5045+.@i)) set .@j, .@j | (1<<.@i); if (.@j == 0) { mes "[Memo]"; @@ -1166,14 +1166,14 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{ mes "Although he is lazy and rather careless, he is the best worker."; close; } else if (dew_drink == 4) { - if (checkquest(5038) > -1) { + if (questprogress(5038)) { mes "[Lero]"; mes "You can ask Poby about the best method of gathering nuts where you met him in the forest. He should be able to teach you the technique."; next; mes "[Lero]"; mes "Although he is lazy and rather careless, he is the best worker."; close; - } else if (checkquest(5039) > -1) { + } else if (questprogress(5039)) { if (countitem(6402) < 60) { mes "[Lero]"; mes "Did you gather the nuts already?"; @@ -1226,7 +1226,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{ getitem 6401,30; //Palm_O close; } else if (dew_drink == 7) { - if (checkquest(5042) > -1 && countitem(6401) > 29) { + if (questprogress(5042) && countitem(6401) > 29) { mes "[Lero]"; mes "It is heavier than you might think, so be careful when carrying it."; next; @@ -1266,7 +1266,7 @@ dew_fild01,114,275,4 script Lero#dew_drink 4_M_DEWMAN,{ close; } else if (dew_drink == 10) { for(set .@i,0; .@i<7; set .@i,.@i+1) - if (checkquest(5045+.@i) > -1) + if (questprogress(5045+.@i)) set .@j, .@j | (1<<.@i); if (.@j == 0) { mes "[Lero]"; @@ -1391,7 +1391,7 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ emotion e_swt2; close; } else if (dew_drink == 4) { - if (checkquest(5039) > -1) { + if (questprogress(5039)) { if (countitem(6402) > 59) { // Oil_Palm_F mes "[Poby]"; mes "You got all the fruits. Bring them to Mr. Lero."; @@ -1440,11 +1440,11 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ mes "[Poby]"; mes "Oh! "+strcharinfo(0)+", we meet again. What's going on?"; - if (checkquest(5047) > -1) + if (questprogress(5047)) set .@count,10; - else if (checkquest(5049) > -1) + else if (questprogress(5049)) set .@count,15; - else if (checkquest(5051) > -1) + else if (questprogress(5051)) set .@count,20; if (.@count) { if (countitem(6401) >= .@count) { @@ -1501,10 +1501,10 @@ dew_fild01,259,48,4 script Poby#dew_drink 4_M_DEWBOY,{ close; } - if (checkquest(5039) > -1) set .@count,60; - else if (checkquest(5046) > -1) set .@count,20; - else if (checkquest(5048) > -1) set .@count,30; - else if (checkquest(5050) > -1) set .@count,40; + if (questprogress(5039)) set .@count,60; + else if (questprogress(5046)) set .@count,20; + else if (questprogress(5048)) set .@count,30; + else if (questprogress(5050)) set .@count,40; if (.@count == 0) { mes "There's a palm tree"; mes "facing the cool wind."; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index d17b63267..e8d493c9b 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -443,8 +443,8 @@ sec_in02,10,42,1 script 13.3 Related Reset 4_MAN_BENKUNI,{ mes "[Reset]"; mes "Resets all quest windows including daily and map quests for 13.3."; freeloop(1); - for(set .@i,12099; .@i<=12216; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + for(.@i = 12099; .@i <= 12216; ++.@i) { + if (questprogress(.@i)) erasequest .@i; } freeloop(0); @@ -455,11 +455,11 @@ sec_in02,10,42,1 script 13.3 Related Reset 4_MAN_BENKUNI,{ //============================================================ function script que_dic { if (!getarg(0)) { - if (checkquest(getarg(1),HUNTING) != 2) return; + if (questprogress(getarg(1),HUNTING) != 2) return; mes getarg(3); } else if (getarg(0) == 1) { - if (checkquest(getarg(1)) == -1) return; + if (!questprogress(getarg(1))) return; if (countitem(getarg(3)) < getarg(4)) { mes "It looks like you are short on the amount."; close; @@ -469,8 +469,8 @@ function script que_dic { delitem getarg(3), getarg(4); } else if (getarg(0) == 2) { - for(set .@i,1; .@i= 0) + for(.@i = 1; .@i < getargcount(); ++.@i) { + if (questprogress(getarg(.@i))) erasequest getarg(.@i); } return; @@ -507,7 +507,7 @@ dic_in01,48,263,5 script Hunting Dept. 1 Manager 4_MAN_BENKUNI,{ mes "Umm...What are you up to? Anything to do with me?"; close; } - if (checkquest(12159,PLAYTIME) == -1) { + if (!questprogress(12159,PLAYTIME)) { mes "[Hunting Dept. 1 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -516,7 +516,7 @@ dic_in01,48,263,5 script Hunting Dept. 1 Manager 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12159,PLAYTIME) == 2) { + else if (questprogress(12159,PLAYTIME) == 2) { mes "[Hunting Dept. 1 Manager]"; mes "Time limit has expired for the existing request."; next; @@ -577,7 +577,7 @@ dic_in01,51,266,6 script Hunting Dept. 2 Manager 4_MAN_BENKUNI,{ mes "Ha ha, you will need to train a little more to work with me."; close; } - if (checkquest(12160,PLAYTIME) == -1) { + if (!questprogress(12160,PLAYTIME)) { mes "[Hunting Dept. 2 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -586,7 +586,7 @@ dic_in01,51,266,6 script Hunting Dept. 2 Manager 4_MAN_BENKUNI,{ mes "you one. Try to find him."; close; } - else if (checkquest(12160,PLAYTIME) == 2) { + else if (questprogress(12160,PLAYTIME) == 2) { mes "[Hunting Dept. 2 Manager]"; mes "Kalipo seems to have another request for you."; next; @@ -646,7 +646,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 4_MAN_BENKUNI,{ mes "You gotta be strong enough to deal with Supply Dept. 1."; close; } - if (checkquest(12161,PLAYTIME) == -1) { + if (!questprogress(12161,PLAYTIME)) { mes "[Supply Dept. 1 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -655,7 +655,7 @@ dic_in01,51,270,7 script Supply Dept. 1 Manager 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12161,PLAYTIME) == 2) { + else if (questprogress(12161,PLAYTIME) == 2) { mes "[Supply Dept. 1 Manager]"; mes "Pura is looking for you."; next; @@ -717,7 +717,7 @@ dic_in01,48,273,8 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{ mes "No way, You can't stand the job of Supply Dept. 2 with that weak body."; close; } - if (checkquest(12162,PLAYTIME) == -1) { + if (!questprogress(12162,PLAYTIME)) { mes "[Supply Dept. 2 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -726,7 +726,7 @@ dic_in01,48,273,8 script Supply Dept. 2 Manager 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12162,PLAYTIME) == 2) { + else if (questprogress(12162,PLAYTIME) == 2) { mes "[Supply Dept. 2 Manager]"; mes "I erased all records related with the previous request. Tragis is looking for you so hurry up to meet him."; next; @@ -784,7 +784,7 @@ dic_in01,43,273,1 script Transport Dept. 1 Mgr 4_MAN_BENKUNI,{ mes "You're not qualified. You won't last a day with your strength working here at Transport Dept. 1."; close; } - if (checkquest(12163,PLAYTIME) == -1) { + if (!questprogress(12163,PLAYTIME)) { mes "[Transport Dept. 1 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -793,7 +793,7 @@ dic_in01,43,273,1 script Transport Dept. 1 Mgr 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12163,PLAYTIME) == 2) { + else if (questprogress(12163,PLAYTIME) == 2) { mes "[Transport Dept. 1 Manager]"; mes "I erased all records related with the previous request. Calyon is looking for you so hurry up to meet him."; next; @@ -858,7 +858,7 @@ dic_in01,40,270,2 script Transport Dept. 2 Mgr 4_MAN_BENKUNI,{ mes "You're not qualified. You won't last a day with your strength working here at Transport Dept. 2."; close; } - if (checkquest(12164) == -1) { + if (!questprogress(12164)) { mes "[Transport Dept. 2 Manager]"; mes "So you didn't get"; mes "any requests yet."; @@ -867,7 +867,7 @@ dic_in01,40,270,2 script Transport Dept. 2 Mgr 4_MAN_BENKUNI,{ mes "you one. Try meeting him."; close; } - else if (checkquest(12164,PLAYTIME) == 2) { + else if (questprogress(12164,PLAYTIME) == 2) { mes "[Transport Dept. 2 Manager]"; mes "I erased all records related with the previous request. Moltuka is looking for you so hurry up to meet him."; next; @@ -1026,12 +1026,12 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ mes "When you try to open and read a document, a Sapha manager motions to call Guard Galten. Let's get out of here quickly."; close; } - if (checkquest(12165,PLAYTIME) == 2) { + if (questprogress(12165,PLAYTIME) == 2) { mes "Feeling a bit better"; erasequest 12165; close; } - else if (checkquest(12165,PLAYTIME) != -1) { + else if (questprogress(12165,PLAYTIME)) { mes "Ugh... feel dizzy from simply staring at the document. Will come back after cooling down"; close; } @@ -1099,7 +1099,7 @@ dic_in01,40,193,1 script Papyrus#0001 4_MAN_NITT,{ close; function eldicastes_dp { - if (checkquest(getarg(0)) >= 0) { + if (questprogress(getarg(0))) { mes "You've found a document you already have."; close; } @@ -1120,7 +1120,7 @@ dic_in01,25,187,0 duplicate(Document Package#main) Document Package#0004 CLEAR_N // Unknown Relics //============================================================ function script unknown_d { - if (checkquest(getarg(0)) == -1) { + if (!questprogress(getarg(0))) { mes "You see some traces of digging."; close; } @@ -1465,14 +1465,14 @@ dic_in01,294,276,5 script Secret Adjutant#ep133_2 4_M_CATMAN2,{ } } else if (ep13_3_ahtdayq == 2) { - if (checkquest(7200,PLAYTIME) == 0 || checkquest(7200,PLAYTIME) == 1) { + if (questprogress(7200,PLAYTIME) == 1) { mes "[Cheshire]"; mes "Not just yet."; mes "We must plan the cleanup near the crack carefully."; mes "Come back later."; close2; } - else if (checkquest(7200,PLAYTIME) == 2) { + else if (questprogress(7200,PLAYTIME) == 2) { mes "[Cheshire]"; mes "Back to work today."; mes "Clotted Bloodstain, Piece of Frozen Skin, Strange Magic Stone.."; @@ -1482,7 +1482,7 @@ dic_in01,294,276,5 script Secret Adjutant#ep133_2 4_M_CATMAN2,{ mes "Collect 10 of each as always."; mes "Got it?"; set ep13_3_ahtdayq, 1; - if (checkquest(7200,PLAYTIME) >= 0) erasequest 7200; + if (questprogress(7200,PLAYTIME)) erasequest 7200; setquest 7201; next; mes "You've received a request from Cheshire to clean up the crack area."; @@ -2339,10 +2339,10 @@ dicastes01,223,190,1 script Calyon#pa8029 4_MAN_NITT,{ mes "Ha ha, come back again after you are trained more. I have no request that fits you."; close; } - if (checkquest(12163,PLAYTIME) == 2) { + if (questprogress(12163,PLAYTIME) == 2) { mes "Calculate your request activities with the ^800080Transport Dept. 1 Manager^000000 at Operations and then come back."; close; - } else if (checkquest(12163,PLAYTIME) != -1) { + } else if (questprogress(12163,PLAYTIME)) { mes "We're done for the day. You can report back to the ^800080Transport Dept. 1 Manager^000000 at Operations. Good luck."; close; } @@ -2512,12 +2512,12 @@ dicastes01,211,178,2 script Moltuka#pa0829 4_MAN_NITT,{ mes "Ha ha, come back again after you are trained more. I have no request that fits you."; close; } - if (checkquest(12164,PLAYTIME) == 2) { + if (questprogress(12164,PLAYTIME) == 2) { mes "[Moltuka]"; mes "Have you met the ^990099Transport Dept. 2 Manager^000000 at Operations? I will give you a new request after you clear your request history."; close; } - else if (checkquest(12164,PLAYTIME) != -1) { + else if (questprogress(12164,PLAYTIME)) { mes "[Moltuka]"; mes "I don't have any requests for you now. Report back to the ^990099Transport Dept. 2 Manager^000000 at Operations after you complete all requests."; close; @@ -2736,13 +2736,13 @@ dicastes01,175,217,5 script Kalipo#pa0829 4_MAN_NITT,{ mes "Ha ha ha, many other adventurers are giving a helping hand. I'll see you next time."; close; } - if (checkquest(12160,PLAYTIME) == 2) { + if (questprogress(12160,PLAYTIME) == 2) { mes "[Kalipo]"; mes "Please come back after checking"; mes "previous requests with the ^990099Hunting Dept. 2 Manager^000000."; close; } - else if (checkquest(12160,PLAYTIME) > -1) { + else if (questprogress(12160,PLAYTIME)) { mes "[Kalipo]"; mes "I do not have any additional requests. Please report to the ^990099Hunting Dept. 2 Manager^000000 at Operations to report request completion."; close; @@ -2878,12 +2878,12 @@ dicastes01,187,230,5 script Laponte#pa0829 4_MAN_NITT,{ mes "Ha ha ha, many other adventurers are giving a helping hand. I'll see you next time."; close; } - if (checkquest(12159,PLAYTIME) > -1 && checkquest(12159,PLAYTIME) < 2) { + if (questprogress(12159,PLAYTIME) && questprogress(12159,PLAYTIME) != 2) { mes "[Laponte]"; mes "I do not have any additional requests. Please report to the ^990099Hunting Dept. 1 Manager^000000 at Operations to report request completion."; close; } - else if (checkquest(12159,PLAYTIME) == 2) { + else if (questprogress(12159,PLAYTIME) == 2) { mes "[Laponte]"; mes "Please come back after checking"; mes "previous requests with the ^990099Hunting Dept. 1 Manager^000000."; @@ -3050,12 +3050,12 @@ dicastes01,208,230,3 script Pura#pa0829 4_MAN_NITT,{ mes "We are not that unfortunate to receive help from you."; close; } - if (checkquest(12161,PLAYTIME) == 2) { + if (questprogress(12161,PLAYTIME) == 2) { mes "[Pura]"; mes "Have you already met the ^990099Supply Dept. 1 Manager^000000 at Operations? I will give you a new request after you clear your request history."; close; } - else if (checkquest(12161,PLAYTIME) > -1) { + else if (questprogress(12161,PLAYTIME)) { mes "[Pura]"; mes "I don't have any requests for you now. Report back to the ^990099Supply Dept. 1 Manager^000000 at Operations after you complete all requests."; close; @@ -3240,12 +3240,12 @@ dicastes01,225,211,3 script Tragis#pa0829 4_MAN_NITT,{ mes "It is pretty embarassing that you are looking for a request with your level, you know that?"; close; } - if (checkquest(12162,PLAYTIME) == 2) { + if (questprogress(12162,PLAYTIME) == 2) { mes "[Tragis]"; mes "Calculate your request activities with the ^990099Supply Dept. 2 Manager^000000 at Operations and then come back."; close; } - else if (checkquest(12162,PLAYTIME) > -1) { + else if (questprogress(12162,PLAYTIME)) { mes "[Tragis]"; mes "I don't have any requests for you now. Report back to the ^990099Supply Dept. 2 Manager^000000 at Operations after you complete all requests."; close; @@ -3845,9 +3845,10 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ "7190","Galtens are interested in the Cat Merchant for their cat ears."; mes "[" + strcharinfo(0) + "]"; mes "I'm trying to organize the information I've collected."; - for (set .@size, getarraysize(.@ward$); .@i < .@size; set .@i, .@i + 2) - if (checkquest(atoi(.@ward$[.@i])) >= 0) { - set .@sealall, .@sealall + 1; + .@size = getarraysize(.@ward$); + for (.@i = 0; .@i < .@size; .@i += 2) + if (questprogress(atoi(.@ward$[.@i]))) { + ++.@sealall; mes .@ward$[.@i+1]; } if (!.@sealall) mes "But what should I do with the collected information?"; @@ -4050,8 +4051,8 @@ dic_in01,245,119,4 script Shay#ep133_13 4_M_ACROSS,{ mes "Meet Ahat by collecting exploit certifications."; mes "And then find doubt what is the relationship between him and the crack."; set ep13_3_secret, 12; - for (set .@i, 0; .@i < getarraysize(.@quest); set .@i, .@i + 1) - if (checkquest(.@quest[.@i]) >= 0) erasequest .@quest[.@i]; + for (.@i = 0; .@i < getarraysize(.@quest); ++.@i) + if (questprogress(.@quest[.@i])) erasequest .@quest[.@i]; setquest 7197; break; } @@ -4315,7 +4316,7 @@ dicastes01,207,210,5 script Walking Knit#ep133_15 4_MAN_BENKUNI,{ mes "Ah, did you see the group of cats in front of the castle?"; mes "They are really soft and cuddly unlike us."; next; - if (checkquest(7188) >= -1) { + if (questprogress(7188)) { mes "[Knit]"; mes "And especially their ear and tail!!"; next; @@ -4404,7 +4405,7 @@ dicastes01,112,248,5 script Resting Piom#ep133_16 4_MAN_PIOM5,{ mes "Huh? You're... human!"; mes "Why are you here?"; next; - if (checkquest(7189) >= -1) { + if (questprogress(7189)) { select("About a human with cat ears.."); mes "[Piom]"; mes "HAHAHAHA!!!"; @@ -4476,7 +4477,7 @@ dicastes01,249,140,3 script Training Galten#ep133_17 4_MAN_GALTUN,{ mes "Hmm? Aren't you the outsider that came here awhile ago?"; mes "Have you come to see the training grounds?"; next; - if (checkquest(7190) >= -1) { + if (questprogress(7190)) { select("About a human with cat ears.."); mes "[Galten]"; mes "Cat ears?"; @@ -4883,14 +4884,14 @@ dic_fild01,231,174,5 script BK#ep133_18 4_M_MERCAT2,{ if (countitem(.@item[.@type]) == 10) { mes "Collected enough for Cheshire but"; mes "you may need some more to report separately."; - if (checkquest(7202) == -1) setquest 7202; + if (!questprogress(7202)) setquest 7202; close; } mes "Not enough was collected to fill Cheshire's request."; close; } else if (countitem(.@item[.@type]) == 10) { - if (checkquest(7202) >= 0) { + if (questprogress(7202)) { setarray .@str$, "stone fragments","bloodstains","pieces of skin"; mes "Need more " + .@str$[.@type] + " to report back to Doha at the expedition camp."; } @@ -5219,9 +5220,10 @@ dic_in01,165,104,0 script Frede#13_3_in 4_MAN_PIOM,{ } else if (ep13_3_bra == 4) { setarray .@quest_id, 11159,11160,11161,11162,11163,11164; - for (set .@size, getarraysize(.@quest_id); .@i < .@size; set .@i, .@i + 1) - if (checkquest(.@quest_id[.@i]) == -1) { - set .@fail, 1; + .@size = getarraysize(.@quest_id); + for (.@i = 0; .@i < .@size; ++.@i) + if (!questprogress(.@quest_id[.@i])) { + .@fail = true; break; } if (!.@fail) { @@ -5307,9 +5309,10 @@ dic_in01,165,104,0 script Frede#13_3_in 4_MAN_PIOM,{ close; } setarray .@quest_id, 11165,11166,11167,11168,11169,11170; - for (set .@size, getarraysize(.@quest_id); .@i < .@size; set .@i, .@i + 1) - if (checkquest(.@quest_id[.@i]) == -1) { - set .@fail, 1; + .@size = getarraysize(.@quest_id); + for (.@i = 0; .@i < .@size; ++.@i) + if (!questprogress(.@quest_id[.@i])) { + .@fail = true; break; } if (!.@fail) { @@ -5360,7 +5363,7 @@ dic_dun01,205,43,5 script Brian#ep13_3_ 4_MAN_PIOM4,{ close; } else if (ep13_3_bra < 8) { - if (checkquest(11159) >= 0 || ep13_3_bra != 4) { + if (questprogress(11159) || ep13_3_bra != 4) { mes "[Brian]"; mes "Oh... that reminds me, how many days passed since I came here..."; mes "Do you happen to know what day it is today?"; @@ -5399,7 +5402,7 @@ dic_dun01,205,43,5 script Brian#ep13_3_ 4_MAN_PIOM4,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11165) >= 0) { + if (questprogress(11165)) { mes "[Brian]"; mes "I'm out of Bradium already."; mes "Frede has been nagging me about this all the time but now I see why."; @@ -5461,7 +5464,7 @@ dic_dun01,153,107,4 script Tyler#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11161) >= 0) { + if (questprogress(11161)) { mes "[Tyler]"; mes "If you happen to bump into him in the village, please tell him I'm fine and not to worry."; close; @@ -5523,7 +5526,7 @@ dic_dun01,153,107,4 script Tyler#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11167) >= 0) { + if (questprogress(11167)) { mes "[Tyler]"; mes "Oh!! I was out of Bradium. How did you know!"; mes "Thanks!"; @@ -5591,7 +5594,7 @@ dic_dun01,235,243,0 script John#13_3 4_MAN_PIOM,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11160) >= 0) { + if (questprogress(11160)) { mes "[John]"; mes "Oh well..."; mes "There... is nothing to worry about."; @@ -5645,7 +5648,7 @@ dic_dun01,235,243,0 script John#13_3 4_MAN_PIOM,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11166) >= 0) { + if (questprogress(11166)) { mes "[John]"; mes "......"; mes "Thanks...."; @@ -5691,7 +5694,7 @@ dic_dun02,110,127,5 script Rose#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11162) >= 0) { + if (questprogress(11162)) { mes "[Rose]"; mes "Tell him there is no problem at all except that I am too good at my job."; mes "Because I'm perfect."; @@ -5729,7 +5732,7 @@ dic_dun02,110,127,5 script Rose#13_3 4_MAN_PIOM6,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11168) >= 0) { + if (questprogress(11168)) { mes "[Rose]"; mes "I'll return to the village soon."; mes "We can meet up then~"; @@ -5788,7 +5791,7 @@ dic_dun01,64,107,7 script Bain#13_3 4_MAN_PIOM4,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11163) >= 0) { + if (questprogress(11163)) { mes "[Bain]"; mes "Just tell him I'm doing well."; mes "Simple, isn't it?"; @@ -5819,7 +5822,7 @@ dic_dun01,64,107,7 script Bain#13_3 4_MAN_PIOM4,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11169) >= 0) { + if (questprogress(11169)) { mes "[Bain]"; mes "But I will be in trouble if I don't go back to the village for Bradium."; next; @@ -5883,7 +5886,7 @@ dic_dun01,58,225,4 script Lash#13_3 4_MAN_PIOM5,{ close; } else if (ep13_3_bra == 4) { - if (checkquest(11164) >= 0) { + if (questprogress(11164)) { mes "[Lash]"; mes "If you'd like to tell him how I'm doing, look at my forearm. Doesn't it spell out 'Strong' on it?"; next; @@ -5929,7 +5932,7 @@ dic_dun01,58,225,4 script Lash#13_3 4_MAN_PIOM5,{ close; } else if (ep13_3_bra == 8) { - if (checkquest(11170) >= 0) { + if (questprogress(11170)) { mes "[Lash]"; mes "Wow!!!!"; mes "You've saved me!"; @@ -6050,7 +6053,7 @@ dic_in01,349,129,5 script Bouy#13_3 4_MAN_BENKUNI,{ close; } else if (ep13_3_bra == 7) { - if (checkquest(11175,PLAYTIME) > 1) { + if (questprogress(11175,PLAYTIME) == 2) { mes "[Bouy]"; mes "I did it!"; mes "I was a bit nervous because it has been a long time since I did manual work but I think I did a good job."; diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index 0bc237d58..f7776ec81 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -347,7 +347,7 @@ eclage,102,32,4 script Fairy Carpenter#ep14_2 4_M_FAIRYKID2,{ emotion e_sob; close; } - if (checkquest(11312) == -1) { + if (!questprogress(11312)) { mes "[Fairy Carpenter]"; mes "This area is kind of broken, so be careful."; mes "Otherwise, you'll fall aaaaaall the way down."; @@ -743,7 +743,7 @@ ecl_in04,109,215,2 script Hiel#pa0829 4_M_FAIRYSCHOLAR,{ // For Eclage //============================================================ function script F_Eclage_Traveler { - if (checkquest(7411) > -1 && checkquest(7412) > -1 && checkquest(7413) > -1) { + if (questprogress(7411) && questprogress(7412) && questprogress(7413)) { cutin "minuel01.bmp",4; donpcevent "Eclage Guard#tl01::OnEnable"; mes "[Eclage Guard]"; @@ -792,7 +792,7 @@ function script F_Eclage_Traveler { ecl_in01,32,52,4 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ if (ep14_2_tl == 0) { - if (checkquest(7411) == -1) { + if (!questprogress(7411)) { mes "[Fome]"; mes "Come here and have a talk with us."; mes "My name is Fome and I'm from the central region of Alpheim."; @@ -903,7 +903,7 @@ ecl_in01,32,52,4 script Traveler Fome#tl01 4_F_DOGTRAVELER,3,3,{ close; } OnTouch: - if (ep14_2_tl == 0 && checkquest(7411) == -1 && checkquest(7412) == -1 && checkquest(7413) == -1) { + if (ep14_2_tl == 0 && !questprogress(7411) && !questprogress(7412) && !questprogress(7413)) { mes "A group of travelers of Alpheim are having a conversation."; emotion e_loud; next; @@ -920,7 +920,7 @@ OnTouch: ecl_in01,32,51,6 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{ if (ep14_2_tl == 0) { - if (checkquest(7412) == -1) { + if (questprogress(7412)) { mes "[Litrip]"; mes "Oh, look at this strange traveler."; mes "Come here. My name is Litrip."; @@ -1008,7 +1008,7 @@ ecl_in01,32,51,6 script Traveler Litrip#tl02 4_M_DOGTRAVELER,{ ecl_in01,35,51,2 script Traveler Chiba#tl03 4_M_DOGTRAVELER2,{ if (ep14_2_tl == 0) { - if (checkquest(7413) == -1) { + if (questprogress(7413)) { mes "[Chiba]"; mes "You're human from Midgard."; mes "I'm Chiba."; @@ -1157,7 +1157,7 @@ ecl_in01,82,70,2 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ mes "I see you pretty often."; mes "I was notified in advance that the Chief of Staff requested for an audience."; next; - if (checkquest(7416,PLAYTIME) < 2) { + if (questprogress(7416,PLAYTIME) != 2) { mes "[Eclage Guard]"; mes "But I'm afraid it's too early."; mes "I think you have to wait for a while."; @@ -1210,7 +1210,7 @@ ecl_in01,82,70,2 script Eclage Guard#tl02 4_M_FAIRYSOLDIER,{ end; } } else if (ep14_2_tl == 5) { - if (checkquest(7418) == -1) { + if (!questprogress(7418)) { cutin "minuel01.bmp",2; mes "[Eclage Guard]"; mes "Eh, good to see you again."; @@ -1428,7 +1428,7 @@ ecl_in03,245,93,2 script Chief of Staff#tl01 4_F_FAIRY,{ warp "ecl_in01",47,28; end; } else if (ep14_2_tl == 3) { - if (checkquest(7416,PLAYTIME) < 2) { + if (questprogress(7416,PLAYTIME) != 2) { mes "[Shenime]"; mes "You need to wait a little longer to see Mayor Jun."; mes "He is pretty busy, so please bear with us."; @@ -1618,7 +1618,7 @@ ecl_fild01,205,86,4 script Eclage Messenger Roy#tl 4_M_FAIRYSOLDIER2,{ mes "...Ah... I'm just feeling sorry for myself, so just continue on your way."; close; } else { - if (checkquest(7419) == -1) { + if (!questprogress(7419)) { mes "[Roy]"; mes "It's hard."; mes "It really is hard."; @@ -1705,7 +1705,7 @@ eclage,112,40,4 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ mes "I hope you enjoy your trip."; close; } else { - if (checkquest(7420) == -1) { + if (!questprogress(7420)) { mes "[Leo]"; mes "Hi, how are you?"; emotion e_gasp; diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index 0511a1e55..f6e55302c 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -1100,12 +1100,12 @@ mal_in02,179,57,1 script Geologist Mali#mal 4_CAT_ADV1,{ getitem 6422,20; //Egrade_Coin close; } else if (ma_tomas > 99) { - if (checkquest(11240) > -1 || checkquest(11241) > -1) { + if (questprogress(11240) || questprogress(11241)) { mes "[Geologist Mali]"; mes "Please listen to ^6666ccmy assistant, Bob^000000 in detail, mew~."; mes "Get out of here and visit the ^6666cca room on your right^000000, mew~"; close; - } else if (checkquest(11242) > -1) { + } else if (questprogress(11242)) { mes "[Geologist Mali]"; mes "Ah! Bob complimented you so much on your great job, mew~"; mes "Please help us next time again when you can, mew~"; @@ -1113,13 +1113,13 @@ mal_in02,179,57,1 script Geologist Mali#mal 4_CAT_ADV1,{ getitem 6422,4; //Egrade_Coin close; } else { - if (checkquest(11243,PLAYTIME) == 0 || checkquest(11243,PLAYTIME) == 1) { + if (questprogress(11243,PLAYTIME) == 1) { mes "[Geologist Mali]"; mes "Don't overdo yourself, mew~"; mes "It'd be bad if your health gets worse, mew~"; close; } - if (checkquest(11243,PLAYTIME) == 2) + if (questprogress(11243,PLAYTIME) == 2) erasequest 11243; mes "[Geologist Mali]"; mes "There is a lot more repairing left to do for today!"; @@ -1292,10 +1292,10 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ changequest 11223,11224; close; } else if (ma_tomas > 99) { - if (checkquest(11240) > -1) { + if (questprogress(11240)) { set @mal_bob_q,2; goto L_Quest1; - } else if (checkquest(11241) > -1) + } else if (questprogress(11241)) goto L_Quest2; } mes "[Bob]"; @@ -1307,7 +1307,7 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ - script Crack#mal0 -1,{ if (.off) end; // Official script uses a 1-second timer to disable cracks. Added to prevent abuse. - if (ma_tomas == 15 || checkquest(11241) > -1) { + if (ma_tomas == 15 || questprogress(11241)) { if (countitem(6434) < 1) { mes "- To repair the crack -"; mes "- you need a Fix Kit. -"; @@ -1363,7 +1363,7 @@ mal_in02,140,94,0 script Bob#mal 4_CAT_DOWN,{ set ma_tomas,16; changequest 11222,11223; } - if (checkquest(11241) > -1) { + if (questprogress(11241)) { changequest 11241,11242; } } else { @@ -1805,7 +1805,7 @@ mal_in01,114,169,5 script Rican#mal 4_CAT_SAILOR4,{ mes "If you see my son, please tell him to get back soon~"; close; } else if (ma_tomas > 99) { - if (checkquest(11238) != -1) { + if (questprogress(11238)) { if (countitem(6435) < 30) { mes "[Rican]"; mes "You need exactly 30 to get a set!"; @@ -1819,13 +1819,13 @@ mal_in01,114,169,5 script Rican#mal 4_CAT_SAILOR4,{ setquest 11239; getitem 6422,5; //Egrade_Coin close; - } else if (checkquest(11239,PLAYTIME) == 0 || checkquest(11239,PLAYTIME) == 1) { + } else if (questprogress(11239,PLAYTIME) == 1) { mes "[Rican]"; mes "Would you like to take a rest for a while?"; mes "It hasn't been a day yet since you last worked~"; close; } else { - if (checkquest(11239,PLAYTIME) == 2) + if (questprogress(11239,PLAYTIME) == 2) erasequest 11239; mes "[Rican]"; mes "Hehe~"; @@ -1900,7 +1900,7 @@ mal_in01,116,168,0 script Dry Machine#mal 2_SLOT_MACHINE,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (ma_tomas == 9 || checkquest(11238) > -1) { + if (ma_tomas == 9 || questprogress(11238)) { if (rand(1,5) == 4) { mes "- As I put my hand in the sand -"; mes "- a fresh smell comes out. -"; @@ -2385,15 +2385,15 @@ mal_dun01,136,122,3 script Biscuit#mal 4_ASTER,{ getitem 12636,20; //Malang_Sp_Can close; } else if (ma_tomas > 99) { - if (checkquest(11244) > -1) { + if (questprogress(11244)) { set @mal_bob_q,2; goto L_Quest; - } else if (checkquest(11245,PLAYTIME) == 0 || checkquest(11245,PLAYTIME) == 1) { + } else if (questprogress(11245,PLAYTIME) == 1) { mes "[Biscuit]"; mes "I'll call you when I need you, so don't worry!"; close; } else { - if (checkquest(11245,PLAYTIME) == 2) + if (questprogress(11245,PLAYTIME) == 2) erasequest 11245; mes "[Biscuit]"; mes "It's the time for Star Candy to have a meal."; @@ -2890,7 +2890,7 @@ malangdo,175,206,3 script Gobonge#ml 4_CAT_SAILOR5,{ mes "- Can't go next step due to having too many items. -"; close; } - if (checkquest(1152,PLAYTIME) == 0) { + if (!questprogress(1152,PLAYTIME)) { mes "[Gobonge]"; mes "Hmm, investigation is not enough."; mes "We need go back to basic point."; @@ -2898,10 +2898,10 @@ malangdo,175,206,3 script Gobonge#ml 4_CAT_SAILOR5,{ mes "I might be in pain of stomach"; mes "like usual."; close; - } else if (checkquest(1152,PLAYTIME) == 1) { + } else if (questprogress(1152,PLAYTIME) == 1) { erasequest 1152; set malang_bad_guys,0; - } else if (checkquest(1152,PLAYTIME) == 2) { + } else if (questprogress(1152,PLAYTIME) == 2) { completequest 1152; erasequest 1152; set malang_bad_guys,0; @@ -3451,7 +3451,7 @@ malangdo,125,147,3 script Patrol Leader#ml 4_CAT_SAILOR2,{ close; } } else if (malang_bad_guys == 11) { - if (checkquest(1154,HUNTING) == 2) { + if (questprogress(1154,HUNTING) == 2) { mes "[Patrol Leader]"; mes "Wow, you did to ^0000FFRed Eruma^000000 so badly!"; mes "I am impressed at your work."; @@ -3654,7 +3654,7 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ close; } } else if (mal_qook == 1) { - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { emotion e_omg; mes "[Cleanyang]"; mes "Uh. What is that? Meow."; @@ -3839,14 +3839,14 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ next; switch(select("It's time to promise~:I'm here to see the result~:Shake your butt~")) { case 1: - if (checkquest(7267,PLAYTIME) == 0) { + if (!questprogress(7267,PLAYTIME)) { mes "[Cleanyang]"; mes "Uh? Not yet."; mes "Today's cat's ship biscuit is not provided yet, so I will know that after wait little bit more."; mes "It might be after chef's distribution of cat's ship biscuit."; close; } - if (checkquest(7268) != -1) { + if (questprogress(7268)) { mes "[Cleanyang]"; mes "My service to you today."; mes "Recently, there are 9 spot that hided cat's ship biscuit as well."; @@ -3860,7 +3860,7 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ mes "Please search the 9 spot where hiding frequently."; close; } - if (checkquest(7267,PLAYTIME) == 2) + if (questprogress(7267,PLAYTIME) == 2) completequest 7267; erasequest 7267; mes "[Cleanyang]"; @@ -3884,15 +3884,15 @@ mal_in02,76,63,7 script Cleanyang 4_CAT_SAILOR1,{ close; } case 2: - if (checkquest(7268) == -1) { + if (!questprogress(7268)) { mes "[Cleanyang]"; mes "Um? Nobody request for collecting cat's ship biscuit today."; mes "By the way, what is the result report?"; mes "Are you sick?"; close; } - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1 && checkquest(7269) != -1 && checkquest(7270) != -1 && - checkquest(7271) != -1 && checkquest(7272) != -1 && checkquest(7273) != -1 && checkquest(7274) != -1 && checkquest(7275) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263) && questprogress(7269) && questprogress(7270) && + questprogress(7271) && questprogress(7272) && questprogress(7273) && questprogress(7274) && questprogress(7275)) { mes "[Cleanyang]"; mes "Um, the rising cat's ship biscuit spot!"; mes "Did you collect all fully?"; @@ -3953,7 +3953,7 @@ mal_in02,29,67,0 script #CaptainRoom3 CLEAR_NPC,{ close; } if (mal_qook == 1) { - if (checkquest(7261) == -1) { + if (!questprogress(7261)) { mes "Lots of junk are piled up in a corner of captain's room."; mes "Cleanyang might not clean in a corner because it is not within his hand."; next; @@ -3987,7 +3987,7 @@ mal_in02,29,67,0 script #CaptainRoom3 CLEAR_NPC,{ setquest 7261; getitem 11536,1; //Cat_Hard_Biscuit next; - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { mes "I guess I searched pretty enough."; mes "Let's tell Cleanyang that is infested of insects due to cat's ship biscuit is left long time."; close; @@ -4000,8 +4000,8 @@ mal_in02,29,67,0 script #CaptainRoom3 CLEAR_NPC,{ mes "I think it's ok now due to we removed all of them."; close; } - if (checkquest(7268) != -1) { - if (checkquest(7261) == -1) { + if (questprogress(7268)) { + if (!questprogress(7261)) { mes "Lots of junk are piled up in a corner of captain's room."; mes "Cleanyng might not clean in a corner because it is not within his hand."; mes "He reached out and search under the junk."; @@ -4031,8 +4031,8 @@ mal_in02,183,49,0 script #MeetingFloor4 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (mal_qook == 1 || checkquest(7268) != -1) { - if (checkquest(7263) == -1) { + if (mal_qook == 1 || questprogress(7268)) { + if (!questprogress(7263)) { mes "This is ventilation window on the floor. It is really close to Cooking table"; mes "I'm trying to ignore that but it is on my mind. What should I do?"; next; @@ -4056,7 +4056,7 @@ mal_in02,183,49,0 script #MeetingFloor4 CLEAR_NPC,{ getitem 11536,1; //Cat_Hard_Biscuit if (mal_qook == 1) { next; - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { mes "I guess I searched pretty enough."; mes "Let's tell Cleanyang that is infested of insects due to cat's ship biscuit is left long time."; } else @@ -4078,8 +4078,8 @@ mal_in02,103,22,0 script #MalBed5 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (mal_qook == 1 || checkquest(7268) != -1) { - if (checkquest(7262) == -1) { + if (mal_qook == 1 || questprogress(7268)) { + if (!questprogress(7262)) { mes "This is bed for sailors. There is too much hair and so messy."; mes "At the corner of under the bed is does not reached hand so I'm thinking too much about that."; next; @@ -4096,7 +4096,7 @@ mal_in02,103,22,0 script #MalBed5 CLEAR_NPC,{ getitem 11536,1; //Cat_Hard_Biscuit if (mal_qook == 1) { next; - if (checkquest(7261) != -1 && checkquest(7262) != -1 && checkquest(7263) != -1) { + if (questprogress(7261) && questprogress(7262) && questprogress(7263)) { mes "I guess I searched pretty enough."; mes "Let's tell Cleanyang that is infested of insects due to cat's ship biscuit is left long time."; } else @@ -4123,8 +4123,8 @@ malangdo,141,178,0 script #Darkweed6 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7269) == -1) { + if (questprogress(7268)) { + if (!questprogress(7269)) { mes "Many weeds are growing in rest area near cat tower."; mes "It's easily ignored, so it's on my mind."; next; @@ -4160,9 +4160,9 @@ malangdo,133,134,0 script Strange Pile of Sand#7 4_SOIL,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { + if (questprogress(7268)) { set .@quest, (strnpcinfo(0) == "Strange Pile of Sand#7")?7270:7275; - if (checkquest(.@quest) == -1) { + if (!questprogress(.@quest)) { mes "The pile of sand is billowed like a grave. Should be something in there."; mes "According to rumors, cats have a habit to bury with sand after stool..."; next; @@ -4204,8 +4204,8 @@ malangdo,232,131,0 script #UnderStairs8 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7271) == -1) { + if (questprogress(7268)) { + if (!questprogress(7271)) { mes "Some weeds are growing under the low stairs."; mes "It's really hard to find something fell under the stairs.."; next; @@ -4238,8 +4238,8 @@ mal_in01,74,20,0 script #CornerTower9 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7272) == -1) { + if (questprogress(7268)) { + if (!questprogress(7272)) { mes "This cat tower is for playing and resting."; mes "Dust is piled up because there is gap between the foothold and ground."; next; @@ -4269,8 +4269,8 @@ mal_in01,159,225,0 script #CornerLocker10 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7273) == -1) { + if (questprogress(7268)) { + if (!questprogress(7273)) { mes "In the corner of the gap between the wall and locker that is used by cat's gamers,"; mes "I can see something there. It's really hard to find object if drop there."; next; @@ -4300,8 +4300,8 @@ mal_in01,24,72,0 script #FootholdTower11 CLEAR_NPC,{ mes "- You have too many items so you can't continue the quest. -"; close; } - if (checkquest(7268) != -1) { - if (checkquest(7274) == -1) { + if (questprogress(7268)) { + if (!questprogress(7274)) { mes "This cat tower is for playing and resting in Malangdo."; mes "Dust is piled up because there is gap between the foothold and ground."; next; @@ -4485,7 +4485,7 @@ mal_in02,187,58,3 script Chef Nyas 4_CAT_CHEF,{ next; switch(select("What's today's work?:Food Delivery:Just bored...")) { case 1: - if (checkquest(7276,PLAYTIME) == 0) { + if (questprogress(7276,PLAYTIME)) { mes "[Chef Nyas]"; mes "Now, cat's ship biscuit is being baked in this oven."; mes "It's all for your delivery food."; @@ -4506,12 +4506,12 @@ mal_in02,187,58,3 script Chef Nyas 4_CAT_CHEF,{ mes "Just take care of them."; close; } - if (checkquest(7276,PLAYTIME) == 2) + if (questprogress(7276,PLAYTIME) == 2) completequest 7276; mes "[Chef Nyas]"; mes "Here you are."; mes "I need ingredients for cat's ship biscuit now. Fortunately, you are here at the right moment."; - if (checkquest(7276) != -1) + if (questprogress(7276)) erasequest 7276; next; mes "[Chef Nyas]"; @@ -4951,7 +4951,7 @@ malangdo,211,203,4 script [Meow Team] Charo#nya_11 4_CAT_ADV2,{ mes "I'm really disappointed."; mes "Try again~ you can make it!"; set nyadven02,0; - if (checkquest(7257) > -1) + if (questprogress(7257)) erasequest 7257; close; } @@ -5291,7 +5291,7 @@ malangdo,215,201,3 script [Meow Team] Roku#nya_10 4_CAT_DOWN,{ delitem 12636,1; //Malang_Sp_Can getitem 6428,1; //Bravery_Card_A set nyadven02,0; - if (checkquest(7257) > -1) + if (questprogress(7257)) erasequest 7257; close; case 2: @@ -5336,7 +5336,7 @@ malangdo,215,201,3 script [Meow Team] Roku#nya_10 4_CAT_DOWN,{ mes "Do you want to try again?"; mes "I will delete the report of the failed result."; } else { - if (checkquest(7257,PLAYTIME) == 0 || checkquest(7257,PLAYTIME) == 1) { + if (questprogress(7257,PLAYTIME) == 1) { mes "[Roku]"; mes "No, not yet."; mes "Duruduru race is only once for a day."; @@ -5347,7 +5347,7 @@ malangdo,215,201,3 script [Meow Team] Roku#nya_10 4_CAT_DOWN,{ mes "I know that you will try the Duruduru race."; mes "I deleted your last report."; } - if (checkquest(7257) > -1) + if (questprogress(7257)) erasequest 7257; next; mes "[Roku]"; @@ -5616,7 +5616,7 @@ malangdo,175,163,0 script Meowbell#nya_12 CLEAR_NPC,{ viewpoint 2,1,1,3,0xFFFFFF; viewpoint 2,1,1,4,0xFFFFFF; viewpoint 2,1,1,5,0xFFFFFF; - if (checkquest(.@quest,PLAYTIME) == 0 || checkquest(.@quest,PLAYTIME) == 1) { + if (questprogress(.@quest,PLAYTIME) == 1) { mes "Knock Meowbell!!"; set nyadven02,27; changequest .@quest,7257; @@ -6000,7 +6000,7 @@ malangdo,172,178,7 script Cat Detective#nya_14 4_CAT_ADV2,{ next; switch(select("How's the condition of Bang?:Ignore it.")) { case 1: - if (checkquest(7249,PLAYTIME) == 0 || checkquest(7249,PLAYTIME) == 1) { + if (questprogress(7249,PLAYTIME) == 1) { mes "[Homnya]"; mes "it's so motivated but it's not the time yet."; mes "Not yet even though naughty machine is noisy."; @@ -6010,7 +6010,7 @@ malangdo,172,178,7 script Cat Detective#nya_14 4_CAT_ADV2,{ mes "We also have break time....."; close2; } else { - if (checkquest(7249,PLAYTIME) == 2) + if (questprogress(7249,PLAYTIME) == 2) erasequest 7249; mes "[Homnya]"; mes "Can you hear how noisy this one is?"; @@ -6102,7 +6102,7 @@ malangdo,174,175,0 script Noisy Machine#nya_13 CLEAR_NPC,{ mes "It looks more unstable as it spins faster."; close; } - if (checkquest(7249,PLAYTIME) == 0 || checkquest(7249,PLAYTIME) == 1) { + if (questprogress(7249,PLAYTIME) == 1) { mes "[Homnya]"; mes "It's so motivated, but it's not time yet."; mes "Not yet, even though the machine is so noisy."; @@ -6308,7 +6308,7 @@ function script F_Mal_Picture { return 1; else if (nyadven != 10) return 2; - else if (checkquest(getarg(0)) > -1) + else if (questprogress(getarg(0))) return 3; else { mes getarg(2); @@ -6319,7 +6319,7 @@ function script F_Mal_Picture { setquest getarg(0); getitem 6430,1; //Picture_Piece next; - if (checkquest(7251) > -1 && checkquest(7252) > -1 && checkquest(7253) > -1 && checkquest(7254) > -1 && checkquest(7255) > -1 && checkquest(7256) > -1) { + if (questprogress(7251) && questprogress(7252) && questprogress(7253) && questprogress(7254) && questprogress(7255) && questprogress(7256)) { mes "It looks like you can put these pieces of paintings together."; mes "If I found all the pieces, I should go back to Homnya."; set nyadven,11; @@ -6686,7 +6686,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ setquest 5060; close; } else if (malang_gamer == 5) { - if (checkquest(5060,PLAYTIME) == 0 || checkquest(5060,PLAYTIME) == 1) { + if (questprogress(5060,PLAYTIME) == 1) { mes "Cat Gamers Director seems to be in shock. Let's give him some time to calm down."; close; } @@ -6731,7 +6731,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ setquest 5061; close; } else if (malang_gamer == 6) { - if (checkquest(5062) == 2 && checkquest(5063) == 2 && checkquest(5064) == 2 && checkquest(5065) == 2) { + if (questprogress(5062) == 2 && questprogress(5063) == 2 && questprogress(5064) == 2 && questprogress(5065) == 2) { mes "[Cat Gamers Director]"; mes "Heh~ It seems some humans are scamming cats around this town."; next; @@ -6780,7 +6780,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "I appreciate your help, "+strcharinfo(0)+". heh~"; close; } else if (malang_gamer == 7) { - if (checkquest(5060,PLAYTIME) == 0 || checkquest(5060,PLAYTIME) == 1) { + if (questprogress(5060,PLAYTIME) == 1) { mes "Cat Gamers Director seems to be in shock once again. Better give more time to calm down."; close; } @@ -6847,7 +6847,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ setquest 5068; close; } else if (malang_gamer == 10) { - if (checkquest(5068,PLAYTIME) == 0 || checkquest(5068,PLAYTIME) == 1) { + if (questprogress(5068,PLAYTIME) == 1) { mes "[Cat Gamers Director]"; mes "Still receiving petition letters. Heh~"; next; @@ -7019,7 +7019,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ close; } } else if (malang_gamer == 12) { - if (checkquest(5069,PLAYTIME) == 0 || checkquest(5069,PLAYTIME) == 1) { + if (questprogress(5069,PLAYTIME) == 1) { mes "[Cat Gamers Director]"; mes "Heh~ You want to get the '^0000FFCat Gamers Certificate^000000' faster. Heh~ It's not really easy to get such a certificate easily."; next; @@ -7133,10 +7133,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ // Detect quest (ID range 5074~5090) mes "[Cat Gamers Director]"; - if (checkquest(5074,HUNTING) > -1) { + if (questprogress(5074,HUNTING)) { mes "Heh~ It's not like I didn't feed them right... Heh~ I hope it was not too much for you, "+strcharinfo(0)+"."; next; - if (checkquest(5074,HUNTING) == 2 && countitem(1023) >= 10) { + if (questprogress(5074,HUNTING) == 2 && countitem(1023) >= 10) { delitem 1023,10; //Fish_Tail callsub L_CompleteQuest,5074, "Heh~ So, you brought 30 Phens and 10 Fish Tails, just as ordered."; @@ -7145,10 +7145,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ It says in the note to bring 30 Phens and 10 Fish Tails. Heh~ Maybe you didn't catch enough Phens, or forgot some Fish Tails? Heh~"; close; } - } else if (checkquest(5075,HUNTING) > -1) { + } else if (questprogress(5075,HUNTING)) { mes "Heh~ Hmm, 50 Marses, and 30 Milk Bottles... Heh~"; next; - if (checkquest(5075,HUNTING) == 2 && countitem(519) >= 30) { + if (questprogress(5075,HUNTING) == 2 && countitem(519) >= 30) { delitem 519,30; //Milk callsub L_CompleteQuest,5075, "Heh~ Guess they wanted some healthy food. Heh~ They should have just told me... Let me show you my skills. Heh~"; @@ -7157,10 +7157,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ But, where are 50 Marses and 30 Milk Bottles? Heh~ Please see if you haven't missed them..."; close; } - } else if (checkquest(5076,HUNTING) > -1) { + } else if (questprogress(5076,HUNTING)) { mes "Heh~ Our team must have some grudge over Team 'Dog n Waltz', enough to ask you for this kind of favor..."; next; - if (checkquest(5076,HUNTING) == 2) { + if (questprogress(5076,HUNTING) == 2) { callsub L_CompleteQuest,5076, "Heh~ So you have finished harassing 30 Kobold Archers as noted. Heh~ Outstanding."; } else { @@ -7168,11 +7168,11 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ It says on the note, harass 30 Kobold Archers. Heh~ Please check if you have harassed 30 of them already."; close; } - } else if (checkquest(5077,HUNTING) > -1) { + } else if (questprogress(5077,HUNTING)) { mes "Heh~ Ah, quickness training. It's good to see our players trying their best on training."; mes "Heh~ Yes, nothing is better than mouse catching for improving quickness."; next; - if (checkquest(5077,HUNTING) == 2) { + if (questprogress(5077,HUNTING) == 2) { callsub L_CompleteQuest,5077, "Heh~ Oh, you got some fresh and chubby Cramps. Heh~ Great."; } else { @@ -7180,10 +7180,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh? Where are those 10 Cramps you promised? Heh~ You didn't eat them... did you?"; close; } - } else if (checkquest(5078,HUNTING) > -1) { + } else if (questprogress(5078,HUNTING)) { mes "Heh~ '50 Peco Peco please!! Let's party.' Hmm... Heh~ 50 Pecos can feed all of our neighbors."; next; - if (checkquest(5078,HUNTING) == 2) { + if (questprogress(5078,HUNTING) == 2) { callsub L_CompleteQuest,5078, "Heh~ Wow, you did bring 50 Peco Pecos. Heh~ I guess we'll really have a party this evening."; } else { @@ -7191,7 +7191,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are those Peco Pecos? Still not ready? Heh~"; close; } - } else if (checkquest(5079) > -1) { + } else if (questprogress(5079)) { mes "Heh~ Hmm... let me see... Heh~ That's right, I was worrying about our team getting so nervous before the actual game... But, they won't even talk to me about it."; next; if (countitem(7038) >= 20) { @@ -7203,7 +7203,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are those 20 yarns? It says 20 on the note, right...? Please check if you have lost them somewhere."; close; } - } else if (checkquest(5080) > -1) { + } else if (questprogress(5080)) { mes "Heh~ The note says, get me 30 Rat Tails for a snack."; next; if (countitem(1016) >= 30) { @@ -7215,7 +7215,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are those 30 Rat Tails? Please check and come back later."; close; } - } else if (checkquest(5081) > -1) { + } else if (questprogress(5081)) { mes "Heh~ It says 5 on the note... 5 of what? What?! Lemons?"; next; if (countitem(568) >= 5) { @@ -7227,7 +7227,7 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Let's just get 5 Lemons for them, will you? Heh~ I am still not sure where they want to use them..."; close; } - } else if (checkquest(5082) > -1) { + } else if (questprogress(5082)) { mes "Heh~ Give us 10 Ice Pieces or 10 Ice Creams!! Heh~ I personally prefer Ice Cream, just so you know."; next; if (countitem(7066) >= 10) { @@ -7243,10 +7243,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ mes "Heh~ Where are the Ice Pieces or Ice Creams? You should get them before they melt..."; close; } - } else if (checkquest(5083) > -1 || checkquest(5084) > -1) { + } else if (questprogress(5083) || questprogress(5084)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5083) > -1) { + if (questprogress(5083)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Eryu together.'. Heh~ Have you met Eryu already? I don't think so... Heh~"; close; @@ -7254,10 +7254,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ callsub L_CompleteQuest,5084, "Heh~ Oh, you did meet Eryu. Heh~ I will lecture them later for making you work too much... Heh~"; } - } else if (checkquest(5085) > -1 || checkquest(5086) > -1) { + } else if (questprogress(5085) || questprogress(5086)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5085) > -1) { + if (questprogress(5085)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Stew together.'. Heh~ Have you met Stew already? I don't think so... Heh~"; close; @@ -7265,10 +7265,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ callsub L_CompleteQuest,5086, "Heh~ Oh, you did meet Stew. Heh~ I will lecture them later for making you work too much... Heh~"; } - } else if (checkquest(5087) > -1 || checkquest(5088) > -1) { + } else if (questprogress(5087) || questprogress(5088)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5087) > -1) { + if (questprogress(5087)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Ketchup together.'. Heh~ Have you met Ketchup already? I don't think so... Heh~"; close; @@ -7276,10 +7276,10 @@ mal_in01,31,210,2 script Cat Gamers Director 4_CAT_MERMASTER,{ callsub L_CompleteQuest,5088, "Heh~ Oh, you did meet Ketchup. Heh~ I will lecture them later for making you work too much... Heh~"; } - } else if (checkquest(5089) > -1 || checkquest(5090) > -1) { + } else if (questprogress(5089) || questprogress(5090)) { mes "Heh~ Here, I found the note from our team. Heh~"; next; - if (checkquest(5089) > -1) { + if (questprogress(5089)) { mes "[Cat Gamers Director]"; mes "Heh~ It says 'We will meet Eff together.'. Heh~ Have you met Eff already? I don't think so... Heh~"; close; @@ -7606,8 +7606,8 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5062) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5062)) { mes "You found Eryu the cat, and start talking."; next; mes "[Eryu]"; @@ -7719,7 +7719,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ break; } close2; - } else if (checkquest(5062) == 2) { + } else if (questprogress(5062) == 2) { mes "[Eryu]"; mes "Aren't you the magazine writer?"; mes "What brings you here again...?"; @@ -7739,7 +7739,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5083) == 0 || checkquest(5083) == 1) { + } else if (questprogress(5083) == 1) { mes "[Eryu]"; mes "Who are you?"; next; @@ -7763,7 +7763,7 @@ malangdo,161,197,4 script Eryu#gamer 4_CAT,{ mes "Eryu seems to recognize you."; mes .@str$; close2; - } else if (checkquest(5084) == 0 || checkquest(5084) == 1) { + } else if (questprogress(5084) == 1) { mes "[Eryu]"; mes "I think you are the writer..."; mes "Hey~ Stop there~"; @@ -7822,8 +7822,8 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5063) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5063)) { mes "You found Stew the cat, and start talking."; next; mes "[Stew]"; @@ -7948,7 +7948,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ break; } close2; - } else if (checkquest(5063) == 2) { + } else if (questprogress(5063) == 2) { mes "[Stew]"; mes "Aren't you from the 'Boom Can' Company?"; mes "Another survey meow?"; @@ -7967,7 +7967,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5085) == 0 || checkquest(5085) == 1) { + } else if (questprogress(5085) == 1) { mes "[Stew]"; mes "Who are you meow?"; emotion e_what; @@ -7992,7 +7992,7 @@ malangdo,230,197,4 script Stew#gamer 4_CAT_3COLOR,{ mes "Stew seems to recognize you."; mes .@str$; close2; - } else if (checkquest(5086) == 0 || checkquest(5086) == 1) { + } else if (questprogress(5086) == 1) { mes "[Stew]"; mes "I think you are from the 'Boom Can' Company, meow... Who are you, meow~"; next; @@ -8051,8 +8051,8 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5064) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5064)) { mes "You found Ketchup the cat, and start talking."; next; mes "[Ketchup]"; @@ -8136,7 +8136,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ break; } close2; - } else if (checkquest(5064) == 2) { + } else if (questprogress(5064) == 2) { mes "[Ketchup]"; mes "You are..."; emotion e_omg; @@ -8149,7 +8149,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5087) == 0 || checkquest(5087) == 1) { + } else if (questprogress(5087) == 1) { mes "[Ketchup]"; mes "Who are you?"; emotion e_what; @@ -8182,7 +8182,7 @@ malangdo,244,144,4 script Ketchup#gamer 4_CAT_SAILOR3,{ mes "It seems you need to find Ketchup one more time."; close2; } - } else if (checkquest(5088) == 0 || checkquest(5088) == 1) { + } else if (questprogress(5088) == 1) { mes "[Ketchup]"; mes "Can... 'Cans for Kittens'?"; emotion e_omg; @@ -8240,8 +8240,8 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ mes "Your inventory is too full to proceed. Come back after reducing your load."; close; } - if (checkquest(5061) == 0 || checkquest(5061) == 1) { - if (checkquest(5065) == -1) { + if (questprogress(5061) == 1) { + if (!questprogress(5065)) { mes "You found Eff the cat, and start talking."; next; mes "[Eff]"; @@ -8395,7 +8395,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ break; } close2; - } else if (checkquest(5065) == 2) { + } else if (questprogress(5065) == 2) { mes "[Eff]"; mes "You are--!!"; mes "Meow~ I want to invest. Meow~"; @@ -8417,7 +8417,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ mes "This is not possible. Please contact an administrator."; close2; } - } else if (checkquest(5089) == 0 || checkquest(5089) == 1) { + } else if (questprogress(5089) == 1) { mes "[Eff]"; mes "Who are you, meow?"; next; @@ -8440,7 +8440,7 @@ malangdo,181,119,7 script Eff#gamer 4_CAT_ADV2,{ mes "Eff seems to recognize you."; mes .@str$; close2; - } else if (checkquest(5090) == 0 || checkquest(5090) == 1) { + } else if (questprogress(5090) == 1) { mes "[Eff]"; mes "You are--!!"; mes "Meow~ I want to invest. Meow~"; @@ -8502,7 +8502,7 @@ mal_in01,91,216,4 script Ser#gamer 4_CAT_SAILOR1,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Ser]"; mes "Hey, ^0000FF"+strcharinfo(0)+"^000000. You haven't done what we asked you for. A promise is a promise, you know."; next; @@ -8535,11 +8535,11 @@ mal_in01,91,216,4 script Ser#gamer 4_CAT_SAILOR1,{ mes "Please go get the certificate."; close; } - if (checkquest(5070,PLAYTIME) == 0 || checkquest(5070,PLAYTIME) == 1) { + if (questprogress(5070,PLAYTIME) == 1) { mes "[Ser]"; mes "Is it tomorrow already? I don't think so! Can't you read the time?"; close; - } else if (checkquest(5070,PLAYTIME) == 2) + } else if (questprogress(5070,PLAYTIME) == 2) erasequest 5070; mes "[Ser]"; mes "Oh, ^0000FF"+strcharinfo(0)+"^000000? Want to play the Rock Paper Scissors game?"; @@ -8846,7 +8846,7 @@ mal_in01,86,222,4 script Paa#gamer 4_CAT_SAILOR1,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Paa]"; mes "You haven't done what we asked you for meow. A promise is a promise, you know meow."; next; @@ -8879,11 +8879,11 @@ mal_in01,86,222,4 script Paa#gamer 4_CAT_SAILOR1,{ mes "Go get the certificate meow."; close; } - if (checkquest(5070,PLAYTIME) == 0 || checkquest(5070,PLAYTIME) == 1) { + if (questprogress(5070,PLAYTIME) == 1) { mes "[Paa]"; mes "We can only play the game once a day meow. Come tomorrow meow."; close; - } else if (checkquest(5070,PLAYTIME) == 2) + } else if (questprogress(5070,PLAYTIME) == 2) erasequest 5070; mes "[Paa]"; mes "Oh, ^0000FF"+strcharinfo(0)+"^000000 meow? Want to play the Rock Paper Scissors game meow?"; @@ -9176,7 +9176,7 @@ mal_in01,91,222,4 script Kuka#gamer 4_M_BABYCAT,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Kuka]"; mes "You haven't done what we asked you for yo~. A promise is a promise, you know yo~."; next; @@ -9209,11 +9209,11 @@ mal_in01,91,222,4 script Kuka#gamer 4_M_BABYCAT,{ mes "Please go get the certificate yo~"; close; } - if (checkquest(5071,PLAYTIME) == 0 || checkquest(5071,PLAYTIME) == 1) { + if (questprogress(5071,PLAYTIME) == 1) { mes "[Kuka]"; mes "Is it not tomorrow yet yo~ You can play one game a day yo~ Come back tomorrow yo~"; close; - } else if (checkquest(5071,PLAYTIME) == 2) + } else if (questprogress(5071,PLAYTIME) == 2) erasequest 5071; mes "[Kuka]"; mes "Oh great member you, ^0000FF"+strcharinfo(0)+"^000000~ Let's play ChamChamCham yo~"; @@ -9498,7 +9498,7 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[KungKung]"; mes "You didn't keep your promise. I have no business with you."; close; @@ -9525,11 +9525,11 @@ mal_in01,134,221,4 script KungKung#gamer 4_M_BABYCAT,{ mes "Where is your certificate? You cannot practice with us unless you have that certificate. Go get it."; close; } - if (checkquest(5072,PLAYTIME) == 0 || checkquest(5072,PLAYTIME) == 1) { + if (questprogress(5072,PLAYTIME) == 1) { mes "[KungKung]"; mes "You don't have a watch? Or can't read the time? It's not the time yet."; close; - } else if (checkquest(5072,PLAYTIME) == 2) + } else if (questprogress(5072,PLAYTIME) == 2) erasequest 5072; mes "[KungKung]"; mes "Are you the practice partner? You are late. Let's start right away."; @@ -9916,7 +9916,7 @@ mal_in01,133,214,6 script Leader#gamer 4_CAT_SAILOR3,{ close; } for(set .@i,5074; .@i<=5090; set .@i,.@i+1) { - if (checkquest(.@i) > -1) { + if (questprogress(.@i)) { mes "[Leader]"; mes "You cannot challenge this Flag Game unless you are done with your assigned work."; close; @@ -9943,11 +9943,11 @@ mal_in01,133,214,6 script Leader#gamer 4_CAT_SAILOR3,{ mes "You cannot challenge this Flag Game unless you are wearing our certificate item. Please come back later."; close; } - if (checkquest(5073) == 0 || checkquest(5073) == 1) { + if (questprogress(5073) == 1) { mes "[Leader]"; mes "The Flag Game is only available once a day."; close; - } else if (checkquest(5073) == 2) + } else if (questprogress(5073) == 2) erasequest 5073; mes "[Leader]"; mes "Do you want to challege?"; @@ -10446,8 +10446,8 @@ mal_in01,142,220,6 script Sign#Cat G B2 4_BULLETIN_BOARD2,{ } mal_in01,155,222,2 script Uneet#gamer 4_LAM,{ - set .@playtime, checkquest(5069,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(5069,PLAYTIME); + if (.@playtime == 1) { mes "[Uneet]"; mes "Wow Wot~ What a busy day~"; mes "Oh, you are the one who won the honorable certificate?"; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 617ccf2c7..c64dd5230 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -70,8 +70,8 @@ malaya,266,76,3 script Rodel the Guard#malaya 4_MAL_SOLDIER,4,4,{ mes "I was thinking of giving you the extermination mission that's being carried out in the city. What a shame. "; close; } - .@playtime = checkquest(7405, PLAYTIME); - if (.@playtime == 0) { + .@playtime = questprogress(7405, PLAYTIME); + if (!.@playtime) { mes "[Rodel the Guard]"; mes "Whew, thanks to you, I have one less thing to worry about."; mes "I will lose less of my things."; @@ -93,8 +93,8 @@ malaya,266,76,3 script Rodel the Guard#malaya 4_MAL_SOLDIER,4,4,{ mes "Come and find me when you decide."; close; } else { - .@hunting = checkquest(7404, HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(7404, HUNTING); + if (!.@hunting) { mes "[Rodel the Guard]"; switch(rand(1, 6)) { case 1: @@ -133,7 +133,7 @@ malaya,266,76,3 script Rodel the Guard#malaya 4_MAL_SOLDIER,4,4,{ mes "It would be a simple task for you."; setquest 7404; close; - } else if (.@hunting == 0) { + } else if (.@hunting == 0) { // FIXME mes "[Rodel the Guard]"; mes "You have to get rid of 20 Jejelings."; mes "20 should be enough to give those Jejelings a good scare."; @@ -259,7 +259,7 @@ malaya,185,358,3 script Leader Phong in Mumbaki 4_BARYO_CHIEF,{ mes "Young friend. Your presence is welcomed anywhere."; mes "The light from your pure soul will protect you from the darkness."; set malaya_hi, 10; - if (checkquest(7350) > -1) + if (questprogress(7350)) erasequest 7350; close; } else if (malaya_hi == 10) { @@ -487,7 +487,7 @@ malaya,185,358,3 script Leader Phong in Mumbaki 4_BARYO_CHIEF,{ close; } case 2: - if (checkquest(7402) == -1) { + if (!questprogress(7402)) { mes "[Phong in Mumbaki]"; mes "Who is the floral tribute for?"; mes "Don't tell me you're making one in advance cause you're lazy?"; @@ -643,8 +643,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ setquest 7367; close; } else if (malaya_hi == 22) { - .@playtime = checkquest(7367, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7367, PLAYTIME); + if (.@playtime == 1) { mes "Imelda is in ritual with a devout aura, compared to when she streamed invectives."; mes "Better not disturb her."; close; @@ -720,7 +720,7 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ next; switch (select("I'll help you making Spiritual Protections.:Love and Spiritual Protection for all.")) { case 1: - if (checkquest(7380) > -1) { + if (questprogress(7380)) { if ((countitem(6501) < 6) || (countitem(6502) < 6) || (countitem(6500) < 6)) { mes "[Imelda]"; mes "Materials for making a Spiritual Protection are"; @@ -749,8 +749,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ getexp 200000,200000; close; } else { - .@playtime = checkquest(7381, PLAYTIME); - if ((.@playtime == 0) || (.@playtime == 1)) { + .@playtime = questprogress(7381, PLAYTIME); + if (.@playtime == 1) { mes "[Imelda]"; mes "I appreciate your kindness, but we have enough for today."; mes "I'll ask for you when I need more materials."; @@ -789,8 +789,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ } } case 2: - if (checkquest(7374) != -1) { - if (checkquest(7379) == -1) { + if (questprogress(7374)) { + if (!questprogress(7379)) { mes "[Imelda]"; mes "Please deliver these new Spiritual Protections to the villagers."; mes "You know them, right?"; @@ -819,8 +819,8 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ $malayaNames$[0] = strcharinfo(0); close; } else { - .@playtime = checkquest(7375, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7375, PLAYTIME); + if (.@playtime == 1) { mes "[Imelda]"; mes "The Spiritual Protections given before will still be in effect"; mes "It's okay for now."; @@ -838,7 +838,7 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ mes "Of course, you'll still encounter ghosts here and there."; close; } - if ((checkquest(7381) == 0) || (checkquest(7381) == 1)) { + if (questprogress(7381) == 1) { mes "[Imelda]"; mes "Thank you very much."; mes "Come back when you've given them all out."; @@ -873,7 +873,7 @@ malaya,169,350,5 script Imelda#malaya 4_M_BRZ_JACI,{ mes "Of course, you'll still encounter ghosts here and there."; close; } - if ((checkquest(7381, PLAYTIME) == 0) || (checkquest(7381, PLAYTIME) == 1)) { + if (questprogress(7381, PLAYTIME) == 1) { mes "[Imelda]"; mes "Thank you very much."; mes "Come back when you've given them all out."; @@ -912,7 +912,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "Not from around here, I see. I have nothing to say."; close; } else if (malaya_hi == 10) { - if (checkquest(7353) == 2) { + if (questprogress(7353) == 2) { mes "[Old Man Nardo]"; mes "How about lending a hand for a poor old man?"; mes "I don't care if it's just a sleeve of your shirt, just give me something with your vigor."; @@ -937,7 +937,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "-The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7353; completequest 7353; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "-So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -951,7 +951,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "Must counsel with Mumbaki first!"; close; } else if (malaya_hi == 12) { - if (checkquest(7360) != -1) { + if (questprogress(7360)) { mes "[Old Man Nardo]"; mes "To be honest, I do not believe that this Holy Artifact has any abilities."; mes "It's just for the peace of mind."; @@ -980,7 +980,8 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ delitem 523, 1; //Holy_Water setquest 7360; completequest 7360; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With the Old Man as last, enough Holy Artifacts have been given out.-"; set malaya_hi, 13; erasequest 7351; @@ -1032,7 +1033,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "Thank you."; close; case 2: - if ((checkquest(7374) != -1) && (checkquest(7369) != -1)) { + if (questprogress(7374) && questprogress(7369)) { if (!countitem(6503)) { mes "^4d4dffThere's no Spiritual Protection to give to the Old Man.^000000"; close; @@ -1046,7 +1047,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ delitem 6503, 1; // Soul_Protection erasequest 7369; setquest 7383; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "- With the Old Man as last, all Spiritual Protections have been delivered. Head back to Imelda.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1075,7 +1076,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "I'm sorry but I can't let you carry the precious Cast Iron Cauldron."; close; } - if ((checkquest(7378, PLAYTIME) == 0) || (checkquest(7378, PLAYTIME) == 1)) { + if (questprogress(7378, PLAYTIME) == 1) { mes "[Old Man Nardo]"; mes "You've delivered the Cast Iron Cauldron to Baryo, so that's enough for today."; mes "No matter how strong a cauldron is, even with the toughest cast iron, it only lasts a day."; @@ -1083,7 +1084,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ mes "[Old Man Nardo]"; mes "Help me out again tomorrow if you can."; close; - } else if (checkquest(7378, PLAYTIME) == 2) { + } else if (questprogress(7378, PLAYTIME) == 2) { mes "[Old Man Nardo]"; mes "Hey there!"; mes "So, are you well and well fed?"; @@ -1094,7 +1095,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ erasequest 7378; close; } else { - if (checkquest(7377) != -1) { + if (questprogress(7377)) { if (countitem(6503) < 5) { mes "[Old Man Nardo]"; mes "Did you deliver the cauldron in one piece?"; @@ -1121,7 +1122,7 @@ malaya,181,353,5 script Old Man Nardo#malaya 4_M_BARYO_OLD,{ $malayaNames$[2] = strcharinfo(0); close; } else { - if (checkquest(7376) > -1) { + if (questprogress(7376)) { mes "[Old Man Nardo]"; mes "Go to Kiko in Mumbaki at Baryo Mahiwaga and deliver the Cast Iron Cauldron."; mes "This should help against the Bakonawa troubles."; @@ -1176,7 +1177,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "(He evades your gaze and ignores you.)"; close; } else if (malaya_hi == 10) { - if (checkquest(7357) == 2) { + if (questprogress(7357) == 2) { mes "[Romel]"; mes "....So cold-hearted."; mes "And here we are, always trembling in anxiety..."; @@ -1201,7 +1202,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "-The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7357; completequest 7357; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -1214,7 +1215,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "He'll surely take a hair or pull a sleeve if he had his way!"; close; } else if (malaya_hi == 12) { - if (checkquest(7364) != -1) { + if (questprogress(7364)) { mes "[Romel]"; mes "Frankly speaking, it's for the peace of mind."; mes "With it, I could face them with more boldness."; @@ -1245,7 +1246,8 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ delitem 523, 1; //Holy_Water setquest 7364; completequest 7364; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Romel as last, I think enough Holy Artifacts have been given.-"; set malaya_hi, 13; erasequest 7351; @@ -1286,7 +1288,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ mes "I am at peace these days."; close; } - if ((checkquest(7374) == -1) || (checkquest(7373) == -1)) { + if (!questprogress(7374) || !questprogress(7373)) { mes "[Romel]"; mes "A new Spiritual Protection?"; mes "The one you gave me before still works fine."; @@ -1306,7 +1308,7 @@ malaya,224,267,3 script Romel#malaya 4_M_MAYOR,{ delitem 6503, 1; // Soul_Protection erasequest 7373; setquest 7387; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "- With Romel as last, all Spiritual Protections have been delivered. Head back to Imelda.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1332,7 +1334,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "(When your eyes met with hers, she ran and hid behind her father.)"; close; } else if (malaya_hi == 10) { - if (checkquest(7356) == 2) { + if (questprogress(7356) == 2) { mes "[Talah]"; mes "Talah might be taken away tonight."; mes "Scary kids might come to Talah."; @@ -1355,7 +1357,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "- The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7356; completequest 7356; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -"; set malaya_hi, 11; @@ -1367,7 +1369,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "Talah looks from you to her father with inquisitive eyes."; close; } else if (malaya_hi == 12) { - if (checkquest(7363) != -1) { + if (questprogress(7363)) { mes "[Talah]"; mes "I dont know for sure"; mes "but I get a warm feel from them."; @@ -1393,7 +1395,8 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ delitem 523, 1; //Holy_Water setquest 7363; completequest 7363; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Talah as last, I think enough Holy Artifacts have been given.-"; set malaya_hi, 13; erasequest 7351; @@ -1415,7 +1418,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ mes "You're keeping us safe aren't you?"; close; } - if ((checkquest(7374) != -1) && (checkquest(7372) != -1)) { + if (questprogress(7374) && questprogress(7372)) { if (!countitem(6503)) { mes "^4d4dffThere is no Spiritual Protection to give to Talah.^000000"; close; @@ -1430,7 +1433,7 @@ malaya,223,267,5 script Talah#malaya 4_F_DST_CHILD,{ delitem 6503, 1; // Soul_Protection erasequest 7372; setquest 7386; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "- With Talah as last, all Spiritual Protections have been delivered. Head back to Imelda. -"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1460,7 +1463,7 @@ malaya,62,274,0 script Sand Trap#malaya 4_SOIL,{ mes "- Cannot proceed with the quest. You are carrying too many items. -"; close; } - if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) { + if (!questprogress(7366) && !questprogress(7380)) { mes "A device to evaporate sea water is buried in the sand..."; close; } @@ -1494,7 +1497,7 @@ ma_fild01,178,206,0 script Black Bamboo#malaya CLEAR_NPC,4,4,{ mes "- Cannot proceed with the quest. You are carrying too many items. -"; close; } - if ((checkquest(7366) == -1) && (checkquest(7380) == -1)) { + if (!questprogress(7366) && !questprogress(7380)) { mes "There's a short and black bamboo tree."; close; } @@ -1513,7 +1516,7 @@ ma_fild01,178,206,0 script Black Bamboo#malaya CLEAR_NPC,4,4,{ mes "I knew I could do this!"; close; OnTouch: - if ((checkquest(7366) != -1) || (checkquest(7380) != -1)) { + if (questprogress(7366) || questprogress(7380)) { specialeffect EF_LEVEL99_4; } end; @@ -1540,7 +1543,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "Go away. Shoo, leave!"; close; } else if (malaya_hi == 10) { - if (checkquest(7355) == 2) { + if (questprogress(7355) == 2) { mes "[Woeon]"; mes "Now, look here my friend..."; mes "This can all be solved by giving me a button."; @@ -1564,7 +1567,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "- The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7355; completequest 7355; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -1584,7 +1587,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "Cold hearted son of a..."; close; } else if (malaya_hi == 12) { - if (checkquest(7362) != -1) { + if (questprogress(7362)) { mes "[Woeon]"; mes "Hmm. Look at my hands."; mes "Less shaky, eh?"; @@ -1618,7 +1621,8 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ delitem 523, 1; //Holy_Water setquest 7362; completequest 7362; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Woeon as last, I think enough Holy Artifacts have been given.-"; set malaya_hi, 13; erasequest 7351; @@ -1636,7 +1640,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "Oh, hi there!"; next; if (select("Give Spiritual Protection.:The Dealer and his Collection") == 1) { - if (((checkquest(7374) == 0) || (checkquest(7374) == 1)) && ((checkquest(7371) == 0) || (checkquest(7371) == 1))) { + if (questprogress(7374) == 1 && questprogress(7371) == 1) { if (!countitem(6503)) { mes "^4d4dffThere is no Spiritual Protection to give to Woeon.^000000"; close; @@ -1650,7 +1654,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ delitem 6503, 1; // Soul_Protection erasequest 7371; setquest 7385; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "-With Woeon as last, all Spiritual Protections have been delivered.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1683,13 +1687,13 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ mes "I'll let you have at it once you're stronger, my friend!"; close; } - if ((checkquest(7392, PLAYTIME) == 0) || (checkquest(7392, PLAYTIME) == 1)) { + if (questprogress(7392, PLAYTIME) == 1) { mes "[Woeon]"; mes "Oh, the Jejellopy collecting?"; mes "I have enough for today."; mes "Come back again tomorrow."; close; - } else if (checkquest(7392, PLAYTIME) == 2) { + } else if (questprogress(7392, PLAYTIME) == 2) { mes "[Woeon]"; mes "Oh, yes yes."; mes "You're going to collect Jejellopy today as well?"; @@ -1708,7 +1712,7 @@ malaya,295,171,3 script Collection Dealer Woeon 4_M_MALAYA,{ setquest 7391; close; } else { - if ((checkquest(7391) == 0) || (checkquest(7391) == 1)) { + if (questprogress(7391) == 1) { if (countitem(6498) < 30) { mes "[Woeon]"; mes "Hmm? I don't think you have enough."; @@ -1777,7 +1781,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "Go... Go away!"; close; } else if (malaya_hi == 10) { - if (checkquest(7354) == 2) { + if (questprogress(7354) == 2) { mes "[Pandoi]"; mes "Please.."; mes "Couldn't you help a guy out here, just for the sake of it?"; @@ -1806,7 +1810,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "-The troubled villagers desire your belongings because you fend off the ghosts. -"; setquest 7354; completequest 7354; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki.-"; set malaya_hi, 11; @@ -1826,7 +1830,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "Do you really think ignoring me is the best option?!"; close; } else if (malaya_hi == 12) { - if (checkquest(7361) != -1) { + if (questprogress(7361)) { mes "[Pandoi]"; mes "Now that I have confidence, the only thing left for me to do is charge to the hospital or field for material!"; mes "Bu... But, I'm too scared..."; @@ -1850,7 +1854,8 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ delitem 523, 1; //Holy_Water setquest 7361; completequest 7361; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Pandoi as last, I think I've given enough Holy Artifacts.-"; set malaya_hi, 13; erasequest 7351; @@ -1887,7 +1892,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ next; switch (select("Give Spiritual Protection.:Silver Blade.:Silver Cross")) { case 1: - if ((checkquest(7374) == -1) || (checkquest(7370) == -1)) { + if (!questprogress(7374) || !questprogress(7370)) { mes "[Pandoi]"; mes "I appreciate you taking care of the expiration dates of my Spiritual Protection."; mes "I think mine's good for now. "; @@ -1906,7 +1911,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ delitem 6503, 1; // Soul_Protection erasequest 7370; setquest 7384; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "-With Pandoi as last, all Spiritual Protections have been delivered.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -1932,7 +1937,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "If you go in there like that... You'll never make it out alive!"; close; } - .@hunting = checkquest(7393, HUNTING); + .@hunting = questprogress(7393, HUNTING); if (.@hunting == 2) { if (countitem(6508) < 10) { mes "[Pandoi]"; @@ -1968,7 +1973,7 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ if (!rand(3)) $malayaNames$[1] = strcharinfo(0); close; - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Pandoi]"; mes "The village hospital holds the most hideous things inside."; mes "I'm not sure what exactly... Whatever's in there, I'm not willing to go near it..."; @@ -1978,8 +1983,8 @@ malaya,119,217,3 script Blacksmith Pandoi 4_M_DEWBOY,{ mes "You're the only one I can trust!"; close; } else { - .@playtime = checkquest(7394, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7394, PLAYTIME); + if (.@playtime == 1) { mes "[Pandoi]"; mes "I still have some silver to smelt."; mes "I'll request more if I fail again."; @@ -2125,7 +2130,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "I'm seeing ghosts. I think it's my time to die."; close; } else if (malaya_hi == 10) { - if (checkquest(7352) == 2) { + if (questprogress(7352) == 2) { mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-"; close; } @@ -2168,7 +2173,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "- Pedro the Sailor seems to have given up, but he can't take his gaze off of me.-"; setquest 7352; completequest 7352; - if ((checkquest(7352) + checkquest(7353) + checkquest(7354) + checkquest(7355) + checkquest(7356) + checkquest(7357)) > 9) { + if (questprogress(7352) + questprogress(7353) + questprogress(7354) + questprogress(7355) + questprogress(7356) + questprogress(7357) > 9) { next; mes "- So many have already asked you for this. Perhaps it will be better to speak with Phong in Mumbaki. -"; set malaya_hi, 11; @@ -2181,7 +2186,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "This is so awkward."; close; } else if (malaya_hi == 12) { - if (checkquest(7359) != -1) { + if (questprogress(7359)) { mes "[Pedro the Sailor]"; mes "Anyway, now that I have what they hate..."; mes "Now's the time to charge into my ship...!"; @@ -2208,7 +2213,8 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ delitem 523, 1; //Holy_Water setquest 7359; completequest 7359; - if ((checkquest(7359) + checkquest(7360) + checkquest(7361) + checkquest(7362) + checkquest(7363) + checkquest(7364)) > 11) { + if (questprogress(7359) == 2 && questprogress(7360) == 2 && questprogress(7361) == 2 + && questprogress(7362) == 2 && questprogress(7363) == 2 && questprogress(7364) == 2) { mes "-With Pedro the Sailor as last, I think I gave enough Holy Artifacts.-"; set malaya_hi, 13; erasequest 7351; @@ -2229,7 +2235,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ mes "Well, living the dream, eh?"; next; if (select("Give Spiritual Protection.:About the Ferry Ride") == 1) { - if ((checkquest(7374) == -1) || (checkquest(7368) == -1)) { + if (!questprogress(7374) || !questprogress(7368)) { mes "[Pedro the Sailor]"; mes "The Spiritual Protection you gave me before works fine."; mes "I'm good for now."; @@ -2248,7 +2254,7 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ delitem 6503, 1; // Soul_Protection erasequest 7368; setquest 7382; - if ((checkquest(7382) + checkquest(7383) + checkquest(7384) + checkquest(7385) + checkquest(7386) + checkquest(7387)) > 5) { + if (questprogress(7382) + questprogress(7383) + questprogress(7384) + questprogress(7385) + questprogress(7386) + questprogress(7387) > 5) { mes "-With Pedro the Sailor as last, all Spiritual Protections have been delivered.-"; if (malaya_hi == 23) { set malaya_hi, 24; @@ -2381,8 +2387,8 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ $malayaNames$[0] = strcharinfo(0); close; } else { - .@playtime = checkquest(7401, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7401, PLAYTIME); + if (.@playtime == 1) { mes "[Pedro the Sailor]"; mes "If you want to go to Alberta, use the big ship over there."; mes "This little one goes to Izlude."; @@ -2412,8 +2418,8 @@ malaya,326,68,2 script Pedro the Sailor 4W_SAILOR,{ erasequest 7401; goto L_SetQuest; } else { - if (checkquest(7403) == -1) { - if (checkquest(7402) == -1) { + if (!questprogress(7403)) { + if (!questprogress(7402)) { goto L_SetQuest; } mes "[Pedro the Sailor]"; @@ -2630,9 +2636,9 @@ OnTouch: mes "If they bother me again, however, I won't be."; close; } else { - if (checkquest(7402) == -1) { - if (checkquest(7403) == -1) { - if ((checkquest(7401, PLAYTIME) == 0) || (checkquest(7401, PLAYTIME) == 1)) { + if (!questprogress(7402)) { + if (!questprogress(7403)) { + if (questprogress(7401, PLAYTIME) == 1) { cutin "malaya_diwata02", 2; mes "[Diwata]"; mes "Surprisingly enough, I'm doing fine."; @@ -2733,8 +2739,8 @@ ma_fild01,261,208,2 script Kiko in Mumbaki 4_BARYO_CHIEF,{ next; switch (select("Give Cast-Iron Caldron.:Request Purification Ritual.:Exchange Jellopy for gold.")) { case 1: - if (checkquest(7376) == -1) { - if (checkquest(7377) == -1) { + if (!questprogress(7376)) { + if (!questprogress(7377)) { mes "[Kiko in Mumbaki]"; mes "What cauldron?"; mes "As far as I know, you're not the one bringing it."; @@ -2779,8 +2785,8 @@ ma_fild01,261,208,2 script Kiko in Mumbaki 4_BARYO_CHIEF,{ erasequest 7376; close; case 2: - if (checkquest(7406) == -1) { - if (checkquest(7407) == -1) { + if (!questprogress(7406)) { + if (!questprogress(7407)) { mes "[Kiko in Mumbaki]"; mes "The only purification needed in this village is Vantai's food."; mes "There are no rituals where an outsider, like yourself, can take part in."; @@ -2861,8 +2867,8 @@ ma_fild01,239,253,3 script Dhong the Guard 4_MAL_SOLDIER,{ mes "Ha ha ha ha ha ha ha!"; close; } - .@playtime = checkquest(7408, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7408, PLAYTIME); + if (.@playtime == 1) { mes "[Dhong the Guard]"; mes "The bones you brought Vantai gave him a feast."; mes "He'll be full and merry for a while now."; @@ -2889,7 +2895,7 @@ ma_fild01,239,253,3 script Dhong the Guard 4_MAL_SOLDIER,{ mes "for the hero to get us some Evil Spirit Bones from the forest."; close; } else { - if (checkquest(7406) != -1) { + if (questprogress(7406)) { mes "[Dhong the Guard]"; mes "What I'm saying is that, to be a good guard dog, he must be able to stand ground against evil spirits."; mes "For that he needs to eat Evil Spirit Bones, but it must be purified before he can eat them."; @@ -2899,7 +2905,7 @@ ma_fild01,239,253,3 script Dhong the Guard 4_MAL_SOLDIER,{ mes "Kiko in Mumbaki will purify them for you."; close; } else { - if (checkquest(7407) == 1) { + if (questprogress(7407) == 1) { if (countitem(6505) < 10) { mes "[Dhong the Guard]"; mes "Kiko in Mumbaki asked for 10 Purified Spirit Bones."; @@ -2995,8 +3001,8 @@ ma_fild01,200,190,3 script Maries#malaya 4_F_BARYO_WOMAN,{ mes "An anxious looking woman is stands."; close; } - .@playtime = checkquest(7390, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7390, PLAYTIME); + if (.@playtime == 1) { mes "[Maries]"; mes "Now that the children know that they can get back home with an Inside-out Shirt,"; mes "they play out in the forest recklessly and timelessly."; @@ -3012,7 +3018,7 @@ ma_fild01,200,190,3 script Maries#malaya 4_F_BARYO_WOMAN,{ erasequest 7390; close; } else { - if (checkquest(7389) != -1) { + if (questprogress(7389)) { mes "[Maries]"; mes "You came back."; mes "Thanks to you, the child has returned home safely."; @@ -3031,7 +3037,7 @@ ma_fild01,200,190,3 script Maries#malaya 4_F_BARYO_WOMAN,{ $malayaNames$[2] = strcharinfo(0); close; } else { - if (checkquest(7388) != -1) { + if (questprogress(7388)) { mes "[Maries]"; mes "I'm sure they're lost in the woods because of mischievous spirits."; mes "Please give the child the ^4d4dffInside-out Shirt^000000 when found."; @@ -3099,7 +3105,7 @@ ma_fild01,203,189,3 script Little Girl#malaya 4_F_BARYO_GIRL,{ } ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ - if (checkquest(7388) > -1) { + if (questprogress(7388)) { if (!countitem(12700)) { mes "[Little Kid]"; mes "Sigh. Are you lost too?"; @@ -3144,7 +3150,7 @@ ma_fild01,251,93,3 script Lost Child#malaya01 4_F_BARYO_GIRL,{ } end; } else { - if (checkquest(7389) != -1) { + if (questprogress(7389)) { mes "[Little Kid]"; mes "I want to play some more."; mes "I can always go back with this shirt."; @@ -3226,8 +3232,8 @@ ma_fild02,241,39,5 script Good Capre Budidai 4_MAL_BUDIDAI,{ mes "We'll never make it."; close; } - .@playtime = checkquest(7410, PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7410, PLAYTIME); + if (.@playtime == 1) { mes "[Budidai]"; mes "Traveler, my friend!"; mes "Bongisungisu ran far far away."; @@ -3243,8 +3249,8 @@ ma_fild02,241,39,5 script Good Capre Budidai 4_MAL_BUDIDAI,{ mes "You won't turn you're back on a good Capre?"; close; } else { - if (checkquest(7409) != -1) { - if (checkquest(7409, HUNTING) == 2) { + if (questprogress(7409)) { + if (questprogress(7409, HUNTING) == 2) { mes "[Budidai]"; mes "Astonishing, wanderer!"; mes "I could hear the pitiful wails of Bongisungisu all the way from here!"; @@ -4642,8 +4648,8 @@ malaya,290,340,3 script Guard Leader#buwaya 4_MAL_CAPTAIN,{ getexp 1000000, 600000; completequest 2280; } else { - set .@hunting, checkquest(2281,HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(2281,HUNTING); + if (!.@hunting) { mes "[Guard Leader]"; mes "Hear Buwaya appeared from the depth of the Forest."; mes "As everyone knows, all our manpower is dispatched to handle Bangungots servants attacking the hospital recently."; @@ -4673,7 +4679,7 @@ malaya,290,340,3 script Guard Leader#buwaya 4_MAL_CAPTAIN,{ mes "Keep this in mind and be cautious at all times."; mes "I recommend asking trustful colleagues for help."; setquest 2281; - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Guard Leader]"; mes "How is it going with the Buwaya situation?"; next; @@ -6150,7 +6156,7 @@ malaya,289,364,4 script Young Fortune Teller 4_F_MALAYA,{ close; } } else if (malaya_bakona2 == 7) { - if (checkquest(1186,HUNTING) == 2) { + if (questprogress(1186,HUNTING) == 2) { mes "[Young Fortune Teller]"; mes "It looks like you took care of ^FF0000Tikbalang^000000"; mes "well enough."; @@ -6549,7 +6555,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ set malaya_bakona1,0; set malaya_bakona2,0; for(set .@i,1174; .@i<=1193; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } close; @@ -6558,7 +6564,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ mes "Here you go!"; set malaya_bakona1,6; for(set .@i,1174; .@i<=1178; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } setquest 1179; @@ -6568,7 +6574,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ mes "Here you go!"; set malaya_bakona2,0; for(set .@i,1180; .@i<=1193; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } close; @@ -6583,7 +6589,7 @@ sec_in02,10,16,5 script Bakonawa Intro Helper 4_MASK_SMOKEY,{ set malaya_bakona2,8; setquest 1187; for(set .@i,1178; .@i<=1193; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } close; @@ -6689,7 +6695,7 @@ function script F_Malaya_Nurse { callsub L_Warp, getarg(0), 1; } else if (malaya_bang == 40) { callsub L_Weight; - if (checkquest(11309,HUNTING) == 2) { + if (questprogress(11309,HUNTING) == 2) { callsub L_Complete; set malaya_bang,41; completequest 11309; @@ -6703,7 +6709,7 @@ function script F_Malaya_Nurse { } } else if (malaya_bang > 40) { if (malaya_bang == 42) { - if (checkquest(11309,HUNTING) == 2) { + if (questprogress(11309,HUNTING) == 2) { callsub L_Complete; set malaya_bang,41; completequest 11309; diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index a8697058a..94429ae8e 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -138,7 +138,7 @@ mid_camp,148,222,4 script Theore#ep14_1_bs 4_F_SCIENCE,3,3,{ } } } else if (ep14_1_bs == 2) { - if (checkquest(11182,PLAYTIME) < 2) { + if (questprogress(11182,PLAYTIME) != 2) { mes "[Theore]"; mes "......"; switch(rand(1,4)) { @@ -530,7 +530,7 @@ splendide,183,117,4 script Tired-looking Fairy 4_F_FAIRYKID3,{ mes "I'm tired, don't talk to me."; close; } else if (ep14_1_bs < 10) { - if (checkquest(11187) == -1) { + if (!questprogress(11187)) { mes "[Tired-looking Fairy]"; mes "I'm tired, don't talk to me."; next; @@ -552,7 +552,7 @@ splendide,183,117,4 script Tired-looking Fairy 4_F_FAIRYKID3,{ mes "Then tell me if you remember anything."; close; } - } else if (checkquest(11187) == 2) { + } else if (questprogress(11187) == 2) { mes "[Tired-looking Fairy]"; mes "I hope you can find the owner."; close; @@ -771,7 +771,7 @@ splendide,119,138,4 script Kusmi#ep14_1_bs 4_F_FAIRYKID5,{ next; mes "[Kusmi]"; mes "If you go to the warehouse in Mora Village, the manager will tell you moree."; - if (checkquest(11193) > -1 && checkquest(11193) < 2) + if (questprogress(11193) == 1) close; mes "Also, on the way back, will you check to see that my friend Rondo is in Mora Villagee?"; next; @@ -779,7 +779,7 @@ splendide,119,138,4 script Kusmi#ep14_1_bs 4_F_FAIRYKID5,{ mes "He always used to visit Splendide around this time, but the situation is no good now. I'll have to tell him to come another time."; close; } else if (ep14_1_bs > 14) { - if (checkquest(11193) == -1) { + if (!questprogress(11193)) { mes "[Kusmi]"; mes "Will you check to see that my friend Rondo is in Mora Villagee?"; next; @@ -802,7 +802,7 @@ splendide,119,138,4 script Kusmi#ep14_1_bs 4_F_FAIRYKID5,{ mes "[Kusmi]"; mes "Oh, And Daphrer is in northwest Splendide."; } - if (checkquest(11193) < 2) { + if (questprogress(11193) != 2) { completequest 11192; completequest 11193; } @@ -958,14 +958,14 @@ splendide,304,295,4 script Theodore#ep14_1_bs 4_M_FAIRYKID4,{ mes "[Theodore]"; mes "If you speak to the Warehouse Manager of Mora Village, you'd be able to get more information."; mes "If you're willing, will you go to Bifrost's 'Mora' Village and meet the Warehouse Manager?"; - if (checkquest(11199) > -1 && checkquest(11199) < 2) + if (questprogress(11199) == 1) close; next; mes "[Theodore]"; mes "And if it's not too much trouble, you could drop by my friend Lilitia's also..."; close; } else if (ep14_1_bs > 14) { - if (checkquest(11199) == -1) { + if (!questprogress(11199)) { mes "[Theodore]"; mes "And if it's not too much trouble, you could drop by my friend Lilitia's also..."; close; @@ -984,7 +984,7 @@ splendide,304,295,4 script Theodore#ep14_1_bs 4_M_FAIRYKID4,{ mes "[Theodore]"; mes "Oh, And Daphrer is in northwest Splendide."; } - if (checkquest(11199) < 2) { + if (questprogress(11199) != 2) { completequest 11198; completequest 11199; } @@ -1140,7 +1140,7 @@ splendide,168,301,4 script Pauchon#ep14_1_bs 4_F_FAIRYKID4,{ next; mes "[Pauchon]"; mes "The supplies from the mainland come through the Village. If you go speak to the Warehouse Manager, he'll be able to tell you something."; - if (checkquest(11205) > -1 && checkquest(11205) < 2) + if (questprogress(11205) == 1) close; mes "Also, please pay a visit to my friend Humming."; next; @@ -1148,7 +1148,7 @@ splendide,168,301,4 script Pauchon#ep14_1_bs 4_F_FAIRYKID4,{ mes "He's such a flighty guy, might have already left, but we were supposed to meet up in Mora Village."; close; } else if (ep14_1_bs > 14) { - if (checkquest(11205) == -1) { + if (!questprogress(11205)) { mes "[Pauchon]"; mes "Please pay a visit to my friend Humming."; mes "He's such a flighty guy, might have already left, but we were supposed to meet up in Mora Village."; @@ -1167,7 +1167,7 @@ splendide,168,301,4 script Pauchon#ep14_1_bs 4_F_FAIRYKID4,{ mes "[Pauchon]"; mes "Oh, And Daphrer is in northwest Splendide."; } - if (checkquest(11205) < 2) { + if (questprogress(11205) != 2) { completequest 11204; completequest 11205; } @@ -1201,13 +1201,13 @@ splendide,262,376,4 script Laphine Soldier#ep14_1 4_M_FAIRYSOLDIER,{ next; mes "[Laphine Soldier]"; mes "You can get to Alfheim by making it through the Maze of the Hazy Forest. However, nobody has ever come back from the Maze of the Hazy Forest."; - if (checkquest(11190) > -1 && checkquest(11190) < 2) { + if (questprogress(11190) == 1) { set ep14_1_bs,13; changequest 11190,11191; - } else if (checkquest(11196) > -1 && checkquest(11196) < 2) { + } else if (questprogress(11196) == 1) { set ep14_1_bs,13; changequest 11196,11197; - } else if (checkquest(11202) > -1 && checkquest(11202) < 2) { + } else if (questprogress(11202) == 1) { set ep14_1_bs,13; changequest 11202,11203; } @@ -1270,7 +1270,7 @@ mora,35,119,4 script Rondo#ep14_1_bs 4_M_DOGTRAVELER,{ mes "[Rondo]"; mes "Please tell Kusmi"; mes "that if he wants to meet, we can meet any time. There is nothing to worry about."; - if (checkquest(11193) == -1) + if (!questprogress(11193)) setquest 11193; } close; @@ -1290,7 +1290,7 @@ mora,98,66,4 script Lilitia#ep14_1_bs 4_F_RAFLE_PK,{ mes "[Lilitia]"; mes "What? Theodore sent you?"; mes "Please tell him that I'm so mad!!"; - if (checkquest(11199) == -1) + if (!questprogress(11199)) setquest 11199; close; } @@ -1316,7 +1316,7 @@ mora,139,102,2 script Humming#ep14_1_bs 4_F_DOGTRAVELER,{ mes "[Humming]"; mes "If you reach Splendide before me, please tell Pauchon"; mes "that I'm going through the Maze of the Hazy Forest."; - if (checkquest(11205) == -1) + if (!questprogress(11205)) setquest 11205; close; } @@ -1465,7 +1465,7 @@ sec_in02,35,175,0 script Theore Set Guid 4_F_FAIRYKID,{ dic_in01,262,191,0 script #ep14_1_xq02 HIDDEN_WARP_NPC,0,3,{ end; OnTouch: - if (ep13_3_secret > 22 && checkquest(7206) == -1) { + if (ep13_3_secret > 22 && !questprogress(7206)) { enablenpc "Cheshire#ep14_1_xq01"; cutin "ep13_cheshire_h",1; mes "[Cheshire]"; @@ -1507,8 +1507,8 @@ dic_dun01,274,114,0 script Stacked Boxes of Goods CLEAR_NPC,{ mes "- You have too many items to do this quest. -"; close; } - set .@playtime, checkquest(7208,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7208,PLAYTIME); + if (.@playtime == 1) { mes "Boxes with all kinds of goods in them are stacked to the ceiling."; mes "The marked box Cheshire was talking about doesn't seem to be here yet."; close; @@ -1531,8 +1531,8 @@ dic_dun01,274,114,0 script Stacked Boxes of Goods CLEAR_NPC,{ close; } } else { - if (checkquest(7207) == -1) { - if (checkquest(7206) > -1) { + if (!questprogress(7207)) { + if (questprogress(7206)) { mes "Boxes with all kinds of goods in them are stacked to the ceiling."; mes "Looking closely, you find a box with a small piece of paper stuck to it."; next; @@ -1545,7 +1545,7 @@ dic_dun01,274,114,0 script Stacked Boxes of Goods CLEAR_NPC,{ getitem 6392,1; //Bradium_Box close; } - } else if (checkquest(7207) < 2) { + } else if (questprogress(7207) != 2) { mes "You've already obtained the box Cheshire was talking about."; mes "Now you only have to take it to the Crevice of Bifrost."; close; @@ -1562,7 +1562,7 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ close; } cutin "ep13_cheshire",1; - if (checkquest(7209) > -1) { + if (questprogress(7209)) { if (countitem(6090) < 20) { mes "[Cheshire]"; mes "Bring me 20 pieces of refined Bradium."; @@ -1592,7 +1592,7 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ end; } callsub L_CheckPlaytime; - if (checkquest(7210) > -1) { + if (questprogress(7210)) { if (countitem(6392) == 0) callsub L_LostQuest,7210; else { @@ -1616,8 +1616,8 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ } } if (ep13_3_secret > 22) { - if (checkquest(7207) == -1) { - if (checkquest(7206) == -1) { + if (!questprogress(7207)) { + if (!questprogress(7206)) { mes "[Cheshire]"; mes "...Hmm? Huh?"; mes "It's "+strcharinfo(0)+"!"; @@ -1685,7 +1685,7 @@ bif_fild01,335,168,3 script Cheshire#ep14_1_xq04 4_M_CATMAN1,{ cutin "",255; end; } - } else if (checkquest(7207) < 2) { + } else if (questprogress(7207) != 2) { if (countitem(6392) == 0) callsub L_LostQuest,7207; else { @@ -1828,8 +1828,8 @@ L_LostQuest: cutin "",255; end; L_CheckPlaytime: - set .@playtime, checkquest(7208,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(7208,PLAYTIME); + if (.@playtime == 1) { mes "[Cheshire]"; mes "Each day, one of these boxes is sent to Kamidal Tunnel."; mes "It's smuggled in among other items."; @@ -2662,7 +2662,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ emotion e_paper; close; } else if (ep14_1_muk == 1) { - if (checkquest(5016) > -1 && countitem(6385) == 0) { + if (questprogress(5016) && countitem(6385) == 0) { mes "[Raffle Researcher]"; mes "You're back? Where are my research tools?"; emotion e_what; @@ -2716,7 +2716,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ close; } else if (ep14_1_muk == 2) { // Unofficial check, but it's needed here. - if (checkquest(5029,PLAYTIME) == 0 || checkquest(5029,PLAYTIME) == 1) { + if (questprogress(5029,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "It must've been hard work to retrieve the tools."; mes "Why don't you take this and go to the inn"; @@ -2847,7 +2847,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ setquest 5019; close; } else if (ep14_1_muk == 7) { - if (checkquest(5019) > -1 && countitem(6386) < 10) { + if (questprogress(5019) && countitem(6386) < 10) { mes "[Raffle Researcher]"; mes "Have you collected the samples yet?"; mes "Please hurry up."; @@ -2882,7 +2882,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ setquest 5020; close; } else if (ep14_1_muk == 8) { - if (checkquest(5020,PLAYTIME) == 0 || checkquest(5020,PLAYTIME) == 1) { + if (questprogress(5020,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "The basic tests have not been completed yet."; mes "There's nothing for you to do now."; @@ -2924,8 +2924,8 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ setquest .@quest; close; } else if (ep14_1_muk == 9) { - if (checkquest(5021) > -1 || checkquest(5022) > -1) { - if (checkquest(5021) > -1) { + if (questprogress(5021) || questprogress(5022)) { + if (questprogress(5021)) { set .@quest,5021; set .@item,6387; //Teeth_Sample setarray .@str$[0],"tooth","teeth"; @@ -2966,7 +2966,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ erasequest .@quest; setquest 5023; close; - } else if (checkquest(5023,PLAYTIME) == 0 || checkquest(5023,PLAYTIME) == 1) { + } else if (questprogress(5023,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "I'm still analyzing the DNA."; mes "The DNA analysis takes about 6 hours."; @@ -3189,7 +3189,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{ mes "will take about 12 hours."; close; } else if (ep14_1_muk == 14) { - if (checkquest(5028,PLAYTIME) == 0 || checkquest(5028,PLAYTIME) == 1) { + if (questprogress(5028,PLAYTIME) == 1) { mes "[Raffle Researcher]"; mes "What? You're here? Well..."; next; @@ -3462,8 +3462,8 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ donpcevent "Black Shadow#ep14_muk::OnDisable"; end; } - set .@playtime, checkquest(5029,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(5029,PLAYTIME); + if (.@playtime == 1) { mes "You see a dark hole. As you show interest, something disappears quickly into the dark hole."; close2; donpcevent "Black Shadow#ep14_muk::OnDisable"; @@ -3471,7 +3471,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ } else if (.@playtime == 2) erasequest 5029; if (ep14_1_goki == 30) { - if (checkquest(5030) == -1 && checkquest(5031) == -1 && checkquest(5032) == -1 && checkquest(5033) == -1 && checkquest(5034) == -1) { + if (!questprogress(5030) && !questprogress(5031) && !questprogress(5032) && !questprogress(5033) && !questprogress(5034)) { mes "[Unidentified creature]"; mes "Arrgghh!!!"; mes "Why you bother me."; @@ -3548,7 +3548,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ mes "You tell me my family do okay."; setquest 5030+rand(4); //5030,5031,5032,5033 close; - } else if (checkquest(5030) > -1 || checkquest(5031) > -1 || checkquest(5032) > -1 || checkquest(5033) > -1) { + } else if (questprogress(5030) || questprogress(5031) || questprogress(5032) || questprogress(5033)) { mes "[Fishee]"; mes "Please. In puddle."; mes "You tell me my family do okay."; @@ -3567,7 +3567,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ mes "Please. In puddle."; mes "You tell me my family do okay."; close; - } else if (checkquest(5034) > -1 && checkquest(5034) < 2) { + } else if (questprogress(5034) == 1) { if (MaxWeight - Weight < 100 || checkweight(5792,1) == 0) { mes "[Fishee]"; mes "You have lots."; @@ -3593,7 +3593,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ completequest 5034; getitem 5792,1; //Fish_Pin close; - } else if (checkquest(5034) == 2) { + } else if (questprogress(5034) == 2) { mes "[Fishee]"; mes "You... I saw. Feeling. I saw. Feeling."; mes "You... Name?"; @@ -3711,7 +3711,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ if (.@npc_hp <= 0) { mes "You won. The unidentified creature is unconscious."; next; - if (checkquest(5016) > -1 && countitem(6385) == 0) { + if (questprogress(5016) && countitem(6385) == 0) { mes "What will you do?"; next; select("Look for the research tools."); @@ -3733,7 +3733,7 @@ mora,114,79,0 script Black Shadow#ep14_muk CLEAR_NPC,{ close2; donpcevent "Black Shadow#ep14_muk::OnDisable"; end; - } else if (checkquest(5017) > -1) { + } else if (questprogress(5017)) { mes "How will you bully the creature?"; next; input .@inputstr$; @@ -4076,7 +4076,7 @@ OnFullon: } - script ???#mora -1,{ - if (checkquest(5019) > -1) { + if (questprogress(5019)) { mes "You find an area emitting a distinct aura."; mes "You may be able to collect bath water samples."; mes "What will you do?"; @@ -4119,8 +4119,8 @@ OnFullon: close2; donpcevent strnpcinfo(0)+"::OnDisable"; end; - } else if (checkquest(5021) > -1 || checkquest(5022) > -1) { - if (checkquest(5021) > -1) { + } else if (questprogress(5021) || questprogress(5022)) { + if (questprogress(5021)) { set .@str$,"tooth"; set .@item,6387; //Teeth_Sample } else { @@ -4191,12 +4191,12 @@ OnTimer60000: donpcevent strnpcinfo(0)+"::OnEnable"; end; OnTouch: - if (checkquest(5034) == 2 || ep14_1_muk == 0 || rand(5)) { + if (questprogress(5034) == 2 || ep14_1_muk == 0 || rand(5)) { percentheal 5,5; end; } - set .@playtime, checkquest(5029,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(5029,PLAYTIME); + if (.@playtime == 1) { percentheal 5,5; end; } else if (.@playtime == 2) { @@ -4225,7 +4225,7 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 setarray .@quest1[1],5024,5025,5026,5027; setarray .@dir$[1],"east","west","south","north"; - if (checkquest(.@quest1[.@i]) > -1) { + if (questprogress(.@quest1[.@i])) { if (countitem(6389) == 0) { mes "This appears to be the puddle to the "+.@dir$[.@i]; mes "that the researcher talked about."; @@ -4259,9 +4259,9 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 deletearray .@quest1[.@i],1; deletearray .@dir$[.@i],1; - if (checkquest(.@quest1[1]) > -1 || checkquest(.@quest1[2]) > -1 || checkquest(.@quest1[3]) > -1) { + if (questprogress(.@quest1[1]) || questprogress(.@quest1[2]) || questprogress(.@quest1[3])) { for(set .@j,1; .@j<=3; set .@j,.@j+1) { - if (checkquest(.@quest1[.@j]) > -1) + if (questprogress(.@quest1[.@j])) break; } mes "This is not the puddle to the "+.@dir$[.@j]+"."; @@ -4272,7 +4272,7 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 set .@quest2[0], .@quest2[.@i]; deletearray .@quest2[.@i],1; - if (ep14_1_goki == 30 && checkquest(.@quest2[0]) > -1) { + if (ep14_1_goki == 30 && questprogress(.@quest2[0])) { mes "You arrived at the puddle to the "+.@dir$[0]+"."; mes "You should look for the unidentified creature's family."; next; @@ -4329,13 +4329,13 @@ mora,118,86,0 duplicate(???#mora) ???#ep14_muk05 CLEAR_NPC,2,2 mes "We okay. Happy. Here. You tell son."; changequest .@quest2[0],5034; close; - } else if (checkquest(5034) > -1 && checkquest(5034) < 2) { + } else if (questprogress(5034) == 1) { mes "[Fishee's Dad]"; mes "Yes... Human give son news."; mes "Thanks. Son,"; mes "We okay. Happy. Here. You tell son."; close; - } else if (checkquest(.@quest2[1]) > -1 || checkquest(.@quest2[2]) > -1 || checkquest(.@quest2[3]) > -1) { + } else if (questprogress(.@quest2[1]) || questprogress(.@quest2[2]) || questprogress(.@quest2[3])) { mes "You arrived at the puddle to the "+.@dir$[0]+"."; mes "You should look for the unidentified creature's family."; next; @@ -4377,8 +4377,8 @@ mora,133,80,6 script Elephantine#pa0829 4_ELEPHANT,{ mes "Why don't you come back when you've grown stronger? I can't give you tasks when you're in your current state."; close; } - set .@playtime, checkquest(12230,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12230,PLAYTIME); + if (.@playtime == 1) { mes "[Elephantine]"; mes "I have no additional tasks available now. If I get some, I'll let you know when you come back."; close; @@ -4485,8 +4485,8 @@ mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{ mes "This place is like a paradise for adventurers. Not for weak ones like you, though."; close; } - set .@playtime, checkquest(12230,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12230,PLAYTIME); + if (!.@playtime) { mes "[Hotcha]"; mes "I see you haven't received"; mes "any tasks yet."; @@ -4504,7 +4504,7 @@ mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{ mes "[Hotcha]"; mes "Once they are removed, go talk to Elephantine and you can receive new tasks."; for(set .@i,12225; .@i<=12229; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12230; @@ -4521,7 +4521,7 @@ mora,115,98,8 script Hotcha#pa0829 4_ELEPHANT,{ next; for(set .@i,12225; .@i<=12229; set .@i,.@i+1) { - if (checkquest(.@i,HUNTING) == 2) { + if (questprogress(.@i,HUNTING) == 2) { mes "[Hotcha]"; mes "Yes, I see you've completed the task. It has been confirmed as completed."; erasequest .@i; @@ -4560,8 +4560,8 @@ mora,119,103,4 script Bow-wow#pa0829 4_M_DOGTRAVELER,{ mes "You really have no clue. What could you do with such a weak body?"; close; } - set .@playtime, checkquest(12241,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12241,PLAYTIME); + if (.@playtime == 1) { mes "[Bow-wow]"; mes "I have no additional tasks available now. If I get some, I'll let you know when you come back."; close; @@ -4668,8 +4668,8 @@ mora,119,118,4 script General Good Dealer#pa0 4_M_RAFLE_GR,{ mes "What could you do with that fragile body? Go get some exercise."; close; } - set .@playtime, checkquest(12241,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12241,PLAYTIME); + if (!.@playtime) { mes "[General Good Dealer]"; mes "I see you haven't received"; mes "any tasks yet."; @@ -4687,7 +4687,7 @@ mora,119,118,4 script General Good Dealer#pa0 4_M_RAFLE_GR,{ mes "[General Good Dealer]"; mes "Once they are removed, go talk to Bow-wow and you can receive new tasks."; for(set .@i,12231; .@i<=12235; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12241; @@ -4716,7 +4716,7 @@ mora,119,118,4 script General Good Dealer#pa0 4_M_RAFLE_GR,{ close; L_CheckQuest: - if (checkquest(getarg(0)) > -1) { + if (questprogress(getarg(0))) { if (countitem(getarg(1)) < getarg(2)) { mes "[General Good Dealer]"; mes "The amount is not enough..."; @@ -4756,8 +4756,8 @@ mora,124,108,7 script Woof-grrr#pa0829 4_M_DOGTRAVELER2,{ mes "This place is not a nursery. Grow up and come back, and I'll gladly give you tasks."; close; } - set .@playtime, checkquest(12242,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12242,PLAYTIME); + if (.@playtime == 1) { mes "[Woof-grrr]"; mes "I have no additional tasks available now. If I get some, I'll let you know when you come back."; close; @@ -4864,8 +4864,8 @@ mora,127,112,4 script Commodities Dealer#pa08 4_F_RAFLE_PK,{ mes "Go away! I can't concentrate on cataloging with you hanging around like that..."; close; } - set .@playtime, checkquest(12242,PLAYTIME); - if (.@playtime == -1) { + .@playtime = questprogress(12242,PLAYTIME); + if (!.@playtime) { mes "[Commodities Dealer]"; mes "I see you haven't received"; mes "any tasks yet."; @@ -4883,7 +4883,7 @@ mora,127,112,4 script Commodities Dealer#pa08 4_F_RAFLE_PK,{ mes "[Commodities Dealer]"; mes "Once they are removed, go talk to Woof-grrr and you can receive new tasks."; for(set .@i,12236; .@i<=12240; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12242; @@ -4912,7 +4912,7 @@ mora,127,112,4 script Commodities Dealer#pa08 4_F_RAFLE_PK,{ close; L_CheckQuest: - if (checkquest(getarg(0)) > -1) { + if (questprogress(getarg(0))) { if (countitem(getarg(1)) < getarg(2)) { mes "[Commodities Dealer]"; mes "The amount is not enough..."; @@ -4952,8 +4952,8 @@ mora,170,101,4 script Soul Guide#pa0829 4_F_DOGTRAVELER,{ mes "You need to have a strong spirit to do this task. I think you need a lot more discipline."; close; } - set .@playtime, checkquest(12253,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(12253,PLAYTIME); + if (.@playtime == 1) { mes "You still have marks of the haunting souls on your body."; next; mes "You'll have to come back when the marks have disappeared."; @@ -4961,7 +4961,7 @@ mora,170,101,4 script Soul Guide#pa0829 4_F_DOGTRAVELER,{ } else if (.@playtime == 2) { mes "You feel your mind has calmed down once again. You now have enough energy to go look for other souls, so talk to the Guide again."; for(set .@i,12243; .@i<=12252; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } erasequest 12253; @@ -5089,7 +5089,7 @@ sec_in02,29,34,5 script Initializing Mora Sanjo 4_MAN_NITT,{ mes "14.1 Initializing all quest window include related daily quest and map and so on"; freeloop(1); for(set .@i,12225; .@i<=12353; set .@i,.@i+1) { - if (checkquest(.@i) > -1) + if (questprogress(.@i)) erasequest .@i; } freeloop(0); @@ -5106,7 +5106,7 @@ function script mora_remains { mes "You have to make space in your inventory."; close; } - if (checkquest(getarg(0)) > -1) { + if (questprogress(getarg(0))) { specialeffect2 EF_BLIND; specialeffect2 EF_BEGINSPELL; progressbar "ffff00",4; @@ -5155,8 +5155,8 @@ mora,118,166,6 script Knights Chief#mo 4_F_RAFLE_VI,{ } mora,116,165,5 script Knights Boss#mo 4_M_RAFLE_VI,{ - set .@playtime, checkquest(1119,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(1119,PLAYTIME); + if (.@playtime == 1) { mes "[Order of the Knights Boss]"; mes "We've run out of Mora Coins."; mes "Come back tomorrow!"; diff --git a/npc/re/quests/quests_morocc.txt b/npc/re/quests/quests_morocc.txt index 480618a70..5632245f0 100644 --- a/npc/re/quests/quests_morocc.txt +++ b/npc/re/quests/quests_morocc.txt @@ -119,15 +119,15 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ warp "moc_prydb1",100,57; end; case 2: - set .@playtime, checkquest(2290,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(2290,PLAYTIME); + if (.@playtime == 1) { mes "[Suspicious Cat]"; mes "Look at that Verit, he's afraid of us! Kyaahaha! We're safe, at least for a while!"; close; } else if (.@playtime == 2) erasequest 2290; - set .@hunting, checkquest(2289,HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(2289,HUNTING); + if (!.@hunting) { mes "[Suspicious Cat]"; mes "Did you know that cats and dogs don't get along?"; next; @@ -157,7 +157,7 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ mes "Pah! You don't care about me? Fine, you traitor!"; close; } - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Suspicious Cat]"; mes "Is Verit's training going well?"; next; @@ -181,15 +181,15 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ close; } case 3: - set .@playtime, checkquest(2291,PLAYTIME); - if (.@playtime == 0 || .@playtime == 1) { + .@playtime = questprogress(2291,PLAYTIME); + if (.@playtime == 1) { mes "[Suspicious Cat]"; mes "Good, I'll make a good use of the time you gained! But I gotta do something about this stomachache first....."; close; } else if (.@playtime == 2) erasequest 2291; - set .@hunting, checkquest(2292,HUNTING); - if (.@hunting == -1) { + .@hunting = questprogress(2292,HUNTING); + if (!.@hunting) { mes "[Suspicious Cat]"; mes "Precious treasures are supposed to be hidden in the deep secret places here!"; mes "I'm sure the mummy's precious treasures are hidden in the second basement level."; @@ -217,7 +217,7 @@ moc_prydn1,94,98,3 script Suspicious Cat#night2 4_CAT_SAILOR4,{ mes "Bah, you're so cold-hearted."; close; } - } else if (.@hunting == 0 || .@hunting == 1) { + } else if (.@hunting == 1) { mes "[Suspicious Cat]"; mes "Is fighting Ancient Mummies going well?"; next; -- cgit v1.2.3-70-g09d2 From b3aef69807e315f71109ee00755087303b5336df Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 22 Oct 2014 04:43:41 +0200 Subject: Deprecated checkmadogear and setmadogear commands Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru --- db/re/item_db.conf | 6 +++--- doc/script_commands.txt | 8 +++++++- npc/custom/breeder.txt | 19 ++++++++++++------- npc/other/turbo_track.txt | 8 ++++---- npc/re/merchants/renters.txt | 6 +++--- src/map/script.c | 4 ++-- 6 files changed, 31 insertions(+), 20 deletions(-) (limited to 'npc') diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 42cd378f1..0f6d51c72 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -80155,7 +80155,7 @@ item_db: ( Job: 0x00000400 Upper: 63 BuyingStore: true - Script: <" if(checkmadogear()) itemheal rand(200,300),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(200,300),0; "> }, { Id: 12393 @@ -80167,7 +80167,7 @@ item_db: ( Job: 0x00000400 Upper: 63 BuyingStore: true - Script: <" if(checkmadogear()) itemheal rand(300,400),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(300,400),0; "> }, { Id: 12394 @@ -80179,7 +80179,7 @@ item_db: ( Job: 0x00000400 Upper: 63 BuyingStore: true - Script: <" if(checkmadogear()) itemheal rand(400,500),0; "> + Script: <" if(checkmount() == MOUNT_MADO) itemheal rand(400,500),0; "> }, { Id: 12395 diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 7e00e50dc..7c4a90003 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3921,7 +3921,13 @@ riding a dragon and 0 if they aren't. *setmadogear {}; *checkmadogear() -[ DEPRECATED - Please use setmount / checkmount] + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @ /!\ This command is deprecated @ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + +This command is deprecated and it should not be used in new scripts, as it +is scheduled to be removed on or after November 30th, 2014. Please consider +using setmount and checkmount() instead. If is 0 this command will remove the mount from the character. Otherwise it gives the invoking character a Mado (if they are a Mechanic). diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index af4a740b4..252511355 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -11,6 +11,8 @@ //============================================================ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ + /* TODO: This can be optimized with just setmount(), as it can + auto-detect the proper mount for the class/skills. */ if (hascashmount()) { message strcharinfo(0),"You must first remove your mount."; end; @@ -24,10 +26,13 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ } else getitem 6124,1; } - else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv("MC_PUSHCART")) { - if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) { - if(select(" ~ Cart: ~ Mado")==1) setcart; - else setmadogear; + else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) { + if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { + if (select(" ~ Cart: ~ Mado") == 1) { + setcart; + } else { + setmount(MOUNT_MADO); + } specialeffect2 EF_TEIHIT3; close; } @@ -38,9 +43,9 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ else if (!checkriding() && getskilllv("KN_RIDING")) { if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) setdragon; else setriding; - } - else if (!checkmadogear() && getskilllv("NC_MADOLICENCE")) setmadogear; - else { + } else if (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { + setmount(MOUNT_MADO); + } else { message strcharinfo(0),"You do not meet requirements to rent."; end; } diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index 5cc10d624..28451f9bb 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -4648,7 +4648,7 @@ OnTouch: setoption Option_Wugrider,0; warp "turbo_room",100,65; } - } else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmadogear()) { + } else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmount() == MOUNT_MADO) { if (MaxWeight-Weight < 20000) { mes "[Helper]"; mes "Magic Gears are prohibited"; @@ -4660,7 +4660,7 @@ OnTouch: warp "alde_gld",183,199; end; } else { - setmadogear 0; + setmount(MOUNT_NONE); warp "turbo_room",100,65; } } else @@ -4730,7 +4730,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ set .@mount$,"Magic Gear"; set .@skill,2255; set .@skill$,"Magic Gear License"; - set .@riding, checkmadogear(); + set .@riding, checkmount() == MOUNT_MADO ? true : false; // FIXME set .@i,3; } else { mes "Thank you for"; @@ -4783,7 +4783,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ switch(.@i) { case 1: setriding; break; case 2: setdragon; break; - case 3: setmadogear; break; + case 3: setmount(MOUNT_MADO); break; } mes .@n$; mes "Thank you for"; diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index 781467e20..e245968f0 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -165,13 +165,13 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ mes "There you go!"; close; case 2: - if (checkmadogear()) { + if (checkmount() == MOUNT_MADO) { mes "[Magic Gear Master]"; mes "I'm sorry, but you're already"; mes "riding a Magic Gear."; close; } - else if (!getskilllv("NC_MADOLICENCE")) { + else if (!getskilllv(NC_MADOLICENCE)) { mes "[Magic Gear Master]"; mes "Please learn the skill to get the Magic Gear License first."; close; @@ -180,7 +180,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ mes "Please remove your cash mount."; close; } - setmadogear; + setmount(MOUNT_MADO); mes "[Magic Gear Master]"; mes "Have fun, and please come again!"; close; diff --git a/src/map/script.c b/src/map/script.c index 1885c3c2c..11fef0f07 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19074,8 +19074,8 @@ void script_parse_builtin(void) { BUILDIN_DEF(setmount,"?"), BUILDIN_DEF(checkmount,""), BUILDIN_DEF(checkwug,""), - BUILDIN_DEF(checkmadogear,""), - BUILDIN_DEF(setmadogear,"?"), + BUILDIN_DEF_DEPRECATED(checkmadogear,""), // Deprecated 2014-10-30 [Haru] + BUILDIN_DEF_DEPRECATED(setmadogear,"?"), // Deprecated 2014-10-30 [Haru] BUILDIN_DEF2(savepoint,"save","sii"), BUILDIN_DEF(savepoint,"sii"), BUILDIN_DEF(gettimetick,"i"), -- cgit v1.2.3-70-g09d2 From a852bdd4c04fd3e6c08e950a320f0e78d61b3673 Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 22 Oct 2014 04:54:29 +0200 Subject: Deprecated checkdragon and setdragon commands Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru --- doc/script_commands.txt | 8 +++++++- npc/custom/breeder.txt | 3 ++- npc/other/turbo_track.txt | 6 +++--- npc/re/merchants/renters.txt | 12 ++++++------ src/map/script.c | 4 ++-- 5 files changed, 20 insertions(+), 13 deletions(-) (limited to 'npc') diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 7c4a90003..c4d313561 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3898,7 +3898,13 @@ riding a bird and 0 if they aren't. *setdragon {}; *checkdragon() -[ DEPRECATED - Please use setmount / checkmount] + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @ /!\ This command is deprecated @ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + +This command is deprecated and it should not be used in new scripts, as it +is scheduled to be removed on or after November 30th, 2014. Please consider +using setmount and checkmount() instead. The 'setdragon' function toggles mounting a dragon for the invoking character. It will return 1 if successful, 0 otherwise. diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index 252511355..cb43091d3 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -41,7 +41,8 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart; else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon; else if (!checkriding() && getskilllv("KN_RIDING")) { - if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) setdragon; + if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) + setmount(MOUNT_DRAGON); else setriding; } else if (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { setmount(MOUNT_MADO); diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index 28451f9bb..ded537086 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -4629,7 +4629,7 @@ OnTouch: getitem 7310,1; //Free_Peco_Ticket } else { if (BaseJob == Job_Knight) - setdragon 0; + setmount(MOUNT_NONE); else setriding 0; } @@ -4716,7 +4716,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ set .@mount$,"Dragon"; set .@skill,63; set .@skill$,"Dragon Training"; - set .@riding, checkdragon(); + set .@riding, checkmount() == MOUNT_DRAGON ? true : false; // FIXME set .@i,2; } else { set .@mount$,"Gryphon"; @@ -4782,7 +4782,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ } switch(.@i) { case 1: setriding; break; - case 2: setdragon; break; + case 2: setmount(MOUNT_DRAGON); break; case 3: setmount(MOUNT_MADO); break; } mes .@n$; diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index e245968f0..c128e1a3d 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -21,8 +21,8 @@ job3_rune01,88,62,5 script Dragon Breeder 8W_SOLDIER,{ next; switch(select("Yes:No")) { case 1: - //if (!getskilllv("RK_DRAGONTRAINING")) { - if (!getskilllv("KN_RIDING")) { + //if (!getskilllv(RK_DRAGONTRAINING)) { + if (!getskilllv(KN_RIDING)) { mes "[Dragon Breeder]"; mes "Please learn how to ride a Dragon first."; close; @@ -36,7 +36,7 @@ job3_rune01,88,62,5 script Dragon Breeder 8W_SOLDIER,{ mes "Please remove your cash mount."; close; } - setdragon; + setmount(MOUNT_DRAGON); close; case 2: mes "[Dragon Breeder]"; @@ -58,8 +58,8 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{ next; switch(select("Yes:No")) { case 1: - //if (!getskilllv("RK_DRAGONTRAINING")) { - if (!getskilllv("KN_RIDING")) { + //if (!getskilllv(RK_DRAGONTRAINING)) { + if (!getskilllv(KN_RIDING)) { mes "[Riding Creature Master]"; mes "Please learn how to ride a Dragon first."; close; @@ -73,7 +73,7 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{ mes "Please remove your cash mount."; close; } - setdragon; + setmount(MOUNT_DRAGON); close; case 2: mes "[Riding Creature Master]"; diff --git a/src/map/script.c b/src/map/script.c index 11fef0f07..547bb1671 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19396,8 +19396,8 @@ void script_parse_builtin(void) { * 3rd-related **/ BUILDIN_DEF(makerune,"i"), - BUILDIN_DEF(checkdragon,""),//[Ind] - BUILDIN_DEF(setdragon,"?"),//[Ind] + BUILDIN_DEF_DEPRECATED(checkdragon,""), // Deprecated 2014-10-30 [Haru] + BUILDIN_DEF_DEPRECATED(setdragon,"?"), // Deprecated 2014-10-30 [Haru] BUILDIN_DEF(hascashmount,""),//[Ind] BUILDIN_DEF(setcashmount,""),//[Ind] BUILDIN_DEF(checkre,"i"), -- cgit v1.2.3-70-g09d2 From c6f102ef8f7a08903617e70135fca5ccfe11b75a Mon Sep 17 00:00:00 2001 From: Haru Date: Wed, 22 Oct 2014 05:20:14 +0200 Subject: Deprecated checkriding and setriding commands Replaced their use in scripts with checkmount and setmount, respectively. Signed-off-by: Haru --- doc/script_commands.txt | 8 ++++- npc/custom/breeder.txt | 33 +++++++++--------- npc/custom/etc/penal_servitude.txt | 4 +-- npc/custom/jobmaster.txt | 4 +-- npc/events/event_skill_reset.txt | 6 ++-- npc/events/halloween_2008.txt | 2 +- npc/jobs/valkyrie.txt | 2 +- npc/merchants/renters.txt | 12 +++---- npc/other/CashShop_Functions.txt | 4 +-- npc/other/turbo_track.txt | 71 ++++++++++++++------------------------ npc/quests/quests_moscovia.txt | 4 +-- npc/re/jobs/3-1/rune_knight.txt | 2 +- npc/re/jobs/3-2/royal_guard.txt | 4 +-- npc/re/merchants/renters.txt | 20 +++++------ src/map/script.c | 4 +-- 15 files changed, 81 insertions(+), 99 deletions(-) (limited to 'npc') diff --git a/doc/script_commands.txt b/doc/script_commands.txt index c4d313561..9d2317942 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3879,7 +3879,13 @@ regardless of color. *setriding {}; *checkriding() -[ DEPRECATED - Please use setmount / checkmount] + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @ /!\ This command is deprecated @ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + +This command is deprecated and it should not be used in new scripts, as it +is scheduled to be removed on or after November 30th, 2014. Please consider +using setmount and checkmount() instead. If is 0 this command will remove the mount from the character. Otherwise it gives the invoking character a PecoPeco (if they are a Knight diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index cb43091d3..40d94d99d 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -16,17 +16,18 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ if (hascashmount()) { message strcharinfo(0),"You must first remove your mount."; end; - } - else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(6124)) { - if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) { - if(select(" ~ Falcon: ~ Warg")==1) setfalcon; - else getitem 6124,1; + } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) { + if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) { + if (select(" ~ Falcon: ~ Warg") == 1) + setfalcon; + else + getitem Wolf's_Flute, 1; specialeffect2 EF_TEIHIT3; close; + } else { + getitem Wolf's_Flute,1; } - else getitem 6124,1; - } - else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) { + } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) { if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { if (select(" ~ Cart: ~ Mado") == 1) { setcart; @@ -35,15 +36,15 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ } specialeffect2 EF_TEIHIT3; close; + } else { + setcart; } - else setcart; - } - else if (!checkcart() && getskilllv("MC_PUSHCART")) setcart; - else if (!checkfalcon() && getskilllv("HT_FALCON") && !checkoption(Option_Wug) && !checkoption(Option_Wugrider)) setfalcon; - else if (!checkriding() && getskilllv("KN_RIDING")) { - if ((eaclass()&EAJ_THIRDMASK) == EAJ_RUNE_KNIGHT) - setmount(MOUNT_DRAGON); - else setriding; + } else if (!checkcart() && getskilllv(MC_PUSHCART)) { + setcart; + } else if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) { + setfalcon; + } else if (checkmount() == MOUNT_PECO && getskilllv(KN_RIDING)) { + setmount; // Peco or Dragon } else if (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { setmount(MOUNT_MADO); } else { diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index e78833b66..b83bf3f83 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -84,9 +84,9 @@ M_Q1: menu "OK, I'll work off!",-, "I love this prison!",M_NO_THANKS; mes "[Saddeus]"; - if(checkcart() || checkfalcon() || checkriding()){ + if(checkcart() || checkfalcon() || checkmount()){ emotion e_hmm; - mes "I'm sorry, you should release your Cart, PecoPeco or Falcon!"; + mes "I'm sorry, you should release your Cart, Mount or Falcon!"; close; } mes "Talk to our overseer, Oliver."; diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt index e476ce2df..ca102ed76 100644 --- a/npc/custom/jobmaster.txt +++ b/npc/custom/jobmaster.txt @@ -24,8 +24,8 @@ prontera,153,193,6 script Job Master 2_F_MAGICMASTER,{ mes "No more jobs are available."; close; } - if (checkfalcon() || checkcart() || checkriding() || hascashmount()) { - mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkriding())?"Peco":"")+((hascashmount())?"mount":"") + if (checkfalcon() || checkcart() || checkmount() || hascashmount()) { + mes "Please remove your "+((checkfalcon())?"falcon":"")+((checkcart())?"cart":"")+((checkmount() || hascashmount())?"mount":"") +" before proceeding."; close; } diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index 15d781bff..ab8805736 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -30,7 +30,7 @@ yuno,138,187,4 script Hypnotist Teacher 4_F_TELEPORTER,{ mes "Please come again soon!"; close; } - if(Weight || checkfalcon() || checkcart() || checkriding()) { + if(Weight || checkfalcon() || checkcart() || checkmount()) { mes "Would you like to reset skills?"; mes "I'm sorry, but..."; next; @@ -43,8 +43,8 @@ yuno,138,187,4 script Hypnotist Teacher 4_F_TELEPORTER,{ mes "Please, drop your cart and we'll continue."; else if(checkfalcon()) mes "Please, free your Falcon and we'll continue."; - else if(checkriding()) - mes "Please, free your PecoPeco and we'll continue."; + else if(checkmount()) + mes "Please, free your mount and we'll continue."; next; mes @npcname$; mes "Come back soon!"; diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index aa2780716..9b80eb798 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -134,7 +134,7 @@ S_Participate: Hallow08Kill = 1; @Hallow08Warp = rand(1,3); percentheal -98,0; - setriding 0; + setmount(MOUNT_NONE); setcart 0; warp "evt_zombie",155,246; end; diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index ad6d5f795..651fd2b65 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -64,7 +64,7 @@ valkyrie,48,86,4 script Valkyrie# 4_F_VALKYRIE,{ mes "begin an entirely new life."; mes "Honor to the warriors!"; next; - if (Weight > 0 || Zeny > 0 || checkcart() != 0 || checkfalcon() != 0 || checkriding() != 0) { + if (Weight > 0 || Zeny > 0 || checkcart() || checkfalcon() || checkmount()) { mes "[Valkyrie]"; mes "There are a few things you must"; mes "do before we start. You must"; diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index cac757f85..255db3e62 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -48,7 +48,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ mes "bankrupt?"; close; } - else if(getskilllv("KN_RIDING") == 0) { + else if(getskilllv(KN_RIDING) == 0) { mes "[Peco Peco Breeder]"; mes "I'm sorry, but you're"; mes "not eligible for this"; @@ -56,7 +56,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ mes "the Peco Peco Ride skill first."; close; } - else if(checkriding()) { + else if(checkmount()) { mes "[Peco Peco Breeder]"; mes "You're already"; mes "mounted on a"; @@ -68,7 +68,7 @@ prontera,55,350,5 script Peco Peco Breeder#knt 8W_SOLDIER,{ close; } Zeny -= .@price; - setriding; + setmount(MOUNT_PECO); close; case 2: mes "[Peco Peco Breeder]"; @@ -112,14 +112,14 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ mes "bring "+.@price+" zeny..."; close; } - else if(getskilllv("KN_RIDING") == 0) { + else if(getskilllv(KN_RIDING) == 0) { mes "[Peco Peco Breeder]"; mes "You must first learn"; mes "to ride a PecoPeco before"; mes "I can rent one to you."; close; } - else if(checkriding()) { + else if(checkmount()) { mes "[Peco Peco Breeder]"; mes "You are already"; mes "mounted on a Peco Peco."; @@ -130,7 +130,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ close; } Zeny -= .@price; - setriding; + setmount(MOUNT_NONE); close; case 2: mes "[PecoPeco Breeder]"; diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 1a2627d02..39bfa3c97 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -59,10 +59,10 @@ function script F_CashPartyCall { // - Reset players skills. Weight must be 0, options must be off. // - No arguments. function script F_CashReset { - if (Class != Job_Novice && Weight == 0 && !checkriding() && !checkfalcon() && !checkcart() && !hascashmount()) { + if (Class != Job_Novice && Weight == 0 && !checkmount() && !checkfalcon() && !checkcart() && !hascashmount()) { resetskill; sc_end SC_ALL; - if (countitem(12213)) delitem 12213,1; + if (countitem(Neuralizer)) delitem Neuralizer,1; } return; } diff --git a/npc/other/turbo_track.txt b/npc/other/turbo_track.txt index ded537086..bb38039a4 100644 --- a/npc/other/turbo_track.txt +++ b/npc/other/turbo_track.txt @@ -4600,10 +4600,10 @@ OnTouch: mes "things using the Kafra Service.^000000"; close; } - if ((BaseJob == Job_Knight || BaseJob == Job_Crusader) && checkriding()) { + if ((BaseJob == Job_Knight || BaseJob == Job_Crusader) && checkmount()) { if (MaxWeight-Weight < 20000) { if (!(eaclass()&EAJL_THIRD)) { - set .@mount$,(BaseJob == Job_Knight)?"Peco Peco":"Grand Peco"; + .@mount$ = (BaseJob == Job_Knight) ? "Peco Peco" : "Grand Peco"; mes "[Helper]"; mes .@mount$+"s are prohibited"; mes "in the Turbo Track Arena."; @@ -4612,7 +4612,7 @@ OnTouch: mes "a Free Ticket for Peco Ride"; mes "for retrieving your "+.@mount$+"."; } else { - set .@mount$,(BaseJob == Job_Knight)?"Dragon":"Gryphon"; + .@mount$ = (BaseJob == Job_Knight) ? "Dragon" : "Gryphon"; mes "[Helper]"; mes .@mount$+"s are prohibited"; mes "in the Turbo Track Arena."; @@ -4625,14 +4625,9 @@ OnTouch: end; } else { if (!(eaclass()&EAJL_THIRD)) { - setriding 0; - getitem 7310,1; //Free_Peco_Ticket - } else { - if (BaseJob == Job_Knight) - setmount(MOUNT_NONE); - else - setriding 0; + getitem Free_Peco_Ticket, 1; } + setmount(MOUNT_NONE); warp "turbo_room",100,65; } } else if ((Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) && checkoption(Option_Wugrider)) { @@ -4648,7 +4643,7 @@ OnTouch: setoption Option_Wugrider,0; warp "turbo_room",100,65; } - } else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmount() == MOUNT_MADO) { + } else if ((Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) && checkmount()) { if (MaxWeight-Weight < 20000) { mes "[Helper]"; mes "Magic Gears are prohibited"; @@ -4689,7 +4684,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ } - script ::MountManager_turbo -1,{ - set .@n$, "["+strnpcinfo(1)+"]"; + .@n$ = "["+strnpcinfo(1)+"]"; mes .@n$; if (hascashmount()) { mes "Please get off of that creature you're riding on."; @@ -4699,39 +4694,27 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ if (BaseJob == Job_Knight || BaseJob == Job_Crusader) { if (!(eaclass()&EAJL_THIRD)) { if (BaseJob == Job_Knight) { - set .@zeny,2500; - set .@zeny$,"2,500"; - set .@mount$,"Peco Peco"; + .@zeny = 2500; + .@zeny$ = "2,500"; + .@mount$ = "Peco Peco"; } else { - set .@zeny,3500; - set .@zeny$,"3,500"; - set .@mount$,"Grand Peco"; + .@zeny = 3500; + .@zeny$ = "3,500"; + .@mount$ = "Grand Peco"; } - set .@skill,63; - set .@skill$,"Peco Peco Ride"; - set .@riding, checkriding(); - set .@i,1; } else { if (BaseJob == Job_Knight) { - set .@mount$,"Dragon"; - set .@skill,63; - set .@skill$,"Dragon Training"; - set .@riding, checkmount() == MOUNT_DRAGON ? true : false; // FIXME - set .@i,2; + .@mount$ = "Dragon"; } else { - set .@mount$,"Gryphon"; - set .@skill,63; - set .@skill$,"Peco Peco Ride"; - set .@riding, checkriding(); - set .@i,1; + .@mount$ = "Gryphon"; } } + .@skill = KN_RIDING; + .@skill$ = "Peco Peco Ride"; } else if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) { - set .@mount$,"Magic Gear"; - set .@skill,2255; - set .@skill$,"Magic Gear License"; - set .@riding, checkmount() == MOUNT_MADO ? true : false; // FIXME - set .@i,3; + .@mount$ = "Magic Gear"; + .@skill = NC_MADOLICENCE; + .@skill$ = "Magic Gear License"; } else { mes "Thank you for"; mes "visiting Al De Baran's"; @@ -4757,7 +4740,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ mes "the "+.@skill$+" skill first."; close; } else { - if (.@riding) { + if (checkmount()) { mes .@n$; mes "You're already"; mes "mounted on a"; @@ -4766,7 +4749,7 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ close; } else { if (.@zeny) { - if (countitem(7310) < 1 && Zeny < .@zeny) { + if (countitem(Free_Peco_Ticket) < 1 && Zeny < .@zeny) { mes .@n$; mes "I'm sorry, but you"; mes "don't have a Free Ticket"; @@ -4774,17 +4757,13 @@ alde_gld,186,199,3 script Turbo Track Guide#Entran 4_F_RACING,{ mes "to use the Peco rental service."; close; } else { - if (countitem(7310) > 0) - delitem 7310,1; //Free_Peco_Ticket + if (countitem(Free_Peco_Ticket) > 0) + delitem Free_Peco_Ticket, 1; else Zeny -= .@zeny; } } - switch(.@i) { - case 1: setriding; break; - case 2: setmount(MOUNT_DRAGON); break; - case 3: setmount(MOUNT_MADO); break; - } + setmount; mes .@n$; mes "Thank you for"; mes "your patronage~"; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 685010f1a..9303eda67 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -6716,7 +6716,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{ warp "mosk_dun01",190,47; end; case 2: - if (!checkriding()) { + if (checkmount() != MOUNT_PECO) { mes "["+ strcharinfo(0) +"]"; mes "...What about the left...?"; next; @@ -6744,7 +6744,7 @@ mosk_dun01,169,162,0 script Mysterious Stone#rus02 HIDDEN_NPC,{ mes "- an unknown force and tries -"; mes "- to run away!! -"; sc_start SC_CURSE,60000,0; - setriding 0; + setmount(MOUNT_NONE); close2; warp "mosk_dun01",190,47; end; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index 7c38c7c25..ceb38a0eb 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -504,7 +504,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 4_M_KNIGHT_SILVER,2,2,{ next; switch(select("Every preparation is done.:I need more time to think.")) { case 1: - if (SkillPoint != 0 || checkriding()) { + if (SkillPoint != 0 || checkmount() == MOUNT_PECO) { mes "[Captain Tigris]"; mes "Weren't you listening?"; next; diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index bf569118d..c8c0346eb 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -32,7 +32,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ mes "Oh you are so young. Keep working hard."; close; } - if (checkriding() || checkcart() || checkfalcon()) { + if (checkmount() || checkcart() || checkfalcon()) { mes "[Middle-aged Gentleman]"; mes "You are dragging something. If you're riding something you better dismount it before proceeding."; close; @@ -340,7 +340,7 @@ glast_01,240,366,5 script Memory of King Schmidtz CLEAR_NPC,{ mes "- and please try again. -"; close; } - if (hascashmount() || checkriding()) { + if (hascashmount() || checkmount()) { mes " Please unequip your riding pet and try again!"; close; } diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index c128e1a3d..4bb929ac4 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -26,8 +26,7 @@ job3_rune01,88,62,5 script Dragon Breeder 8W_SOLDIER,{ mes "[Dragon Breeder]"; mes "Please learn how to ride a Dragon first."; close; - } - else if (checkriding()) { + } else if (checkmount()) { mes "[Dragon Breeder]"; mes "You already have a Dragon."; close; @@ -63,8 +62,7 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{ mes "[Riding Creature Master]"; mes "Please learn how to ride a Dragon first."; close; - } - else if (checkriding()) { + } else if (checkmount()) { mes "[Riding Creature Master]"; mes "You already have a Dragon."; close; @@ -86,12 +84,11 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{ next; switch(select("Yes:No")) { case 1: - if(!getskilllv("KN_RIDING")) { + if(!getskilllv(KN_RIDING)) { mes "[Riding Creature Master]"; mes "Please learn how to ride a Gryphon first."; close; - } - else if (checkriding()) { + } else if (checkmount()) { mes "[Riding Creature Master]"; mes "You already have a Gryphon."; close; @@ -100,7 +97,7 @@ prontera,130,213,5 script Riding Creature Master 8W_SOLDIER,{ mes "Please remove your cash mount."; close; } - setriding; + setmount(MOUNT_PECO); close; case 2: mes "[Riding Creature Master]"; @@ -119,7 +116,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ mes "If you're unable to dismount from a Peco Peco"; mes "for some unknown reason,"; mes "please feel free to use my services."; - if (checkriding()) { + if (checkmount() == MOUNT_PECO) { next; mes "[Soldier]"; mes "You're riding a Peco Peco."; @@ -127,7 +124,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ next; switch(select("Yes:No")) { case 1: - setriding 0; + setmount(MOUNT_NONE); mes "[Soldier]"; mes "Say, how does it feel to"; mes "step on the ground on your own"; @@ -170,8 +167,7 @@ prontera,125,208,5 script Peco Peco Remover 8W_SOLDIER,{ mes "I'm sorry, but you're already"; mes "riding a Magic Gear."; close; - } - else if (!getskilllv(NC_MADOLICENCE)) { + } else if (!getskilllv(NC_MADOLICENCE)) { mes "[Magic Gear Master]"; mes "Please learn the skill to get the Magic Gear License first."; close; diff --git a/src/map/script.c b/src/map/script.c index 547bb1671..05321561e 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -19069,8 +19069,8 @@ void script_parse_builtin(void) { BUILDIN_DEF(checkcart,""), BUILDIN_DEF(setfalcon,"?"), BUILDIN_DEF(checkfalcon,""), - BUILDIN_DEF(setriding,"?"), - BUILDIN_DEF(checkriding,""), + BUILDIN_DEF_DEPRECATED(setriding,"?"), // Deprecated 2014-10-30 [Haru] + BUILDIN_DEF_DEPRECATED(checkriding,""), // Deprecated 2014-10-30 [Haru] BUILDIN_DEF(setmount,"?"), BUILDIN_DEF(checkmount,""), BUILDIN_DEF(checkwug,""), -- cgit v1.2.3-70-g09d2 From 228a826dfdde3581f8e5d757ec458119d6079524 Mon Sep 17 00:00:00 2001 From: Taylor Locke Date: Wed, 29 Oct 2014 23:30:57 -0700 Subject: Added 2014 Halloween Event and made status change parameter optional on montransform. --- db/const.txt | 10 + db/quest_db.txt | 18 + db/re/item_db.conf | 211 ++++ db/re/item_group.conf | 39 + db/re/mob_db.txt | 3 + npc/re/events/halloween_2014.txt | 2556 ++++++++++++++++++++++++++++++++++++++ npc/re/scripts.conf | 3 + src/map/itemdb.h | 1 + src/map/mob.h | 2 +- src/map/pc.c | 4 + src/map/script.c | 23 +- src/map/status.c | 11 + src/map/status.h | 8 +- 13 files changed, 2880 insertions(+), 9 deletions(-) create mode 100644 npc/re/events/halloween_2014.txt (limited to 'npc') diff --git a/db/const.txt b/db/const.txt index 8f649b4f3..c7fff2825 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1263,6 +1263,16 @@ SC__MAELSTROM 576 SC__CHAOS 577 SC__FEINTBOMB_MASTER 578 SC_FALLENEMPIRE 579 +SC_FLASHCOMBO 580 +SC_DEFSET 581 +SC_MDEFSET 582 +SC_NO_SWITCH_EQUIP 583 + +// 2014 Halloween Event +SC_MTF_MHP 584 +SC_MTF_MSP 585 +SC_MTF_PUMPKIN 586 +SC_MTF_HITFLEE 587 e_gasp 0 e_what 1 diff --git a/db/quest_db.txt b/db/quest_db.txt index 42cd3c651..bd23dea69 100644 --- a/db/quest_db.txt +++ b/db/quest_db.txt @@ -2339,6 +2339,24 @@ 14140,0,0,0,0,0,0,0,"To Wuhari" 14141,0,0,0,0,0,0,0,"Ingredients for research" +// 2014 Halloween Event +14450,0,0,0,0,0,0,0,"Let's help the priest" +14451,0,0,0,0,0,0,0,"To Church" +14452,0,0,0,0,0,0,0,"Material of holy stuff" +14453,0,0,0,0,0,0,0,"To Niflheim" +14454,0,0,0,0,0,0,0,"To Lutie" +14455,0,0,0,0,0,0,0,"Back to Church" +14456,0,0,0,0,0,0,0,"Preparing for recall" +14457,0,0,0,0,0,0,0,"Back to Niflheim" +14458,0,0,0,0,0,0,0,"Request of Loru" +14459,0,0,0,0,0,0,0,"Request of Devi" +14460,0,3382,10,0,0,0,0,"Favor of Loru" +14461,0,0,0,0,0,0,0,"Favor of Loru" +14462,0,3381,10,0,0,0,0,"Favor of Devi" +14463,0,1510,20,1507,20,0,0,"Favor of Devi" +14464,82800,0,0,0,0,0,0,"Party is going for a day" +14465,82800,0,0,0,0,0,0,"They are still quiet" + 16000,0,0,0,0,0,0,0,"Metz Brayde's Notice" 16001,0,0,0,0,0,0,0,"First examination" 16002,0,0,0,0,0,0,0,"Fetching Items for Arian -1" diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 0f6d51c72..c5bb01d3e 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -62652,6 +62652,52 @@ item_db: ( Type: 3 Buy: 0 }, +{ + Id: 6913 + AegisName: "Sacred_Rosary" + Name: "Sacred Rosary" + Type: 3 + Trade: { + nodrop: true + notrade: true + noselltonpc: true + nocart: true + nostorage: true + nogstorage: true + nomail: true + noauction: true + } +}, +{ + Id: 6914 + AegisName: "Black_Soul" + Name: "Black Soul" + Type: 3 + Trade: { + nodrop: true + notrade: true + nocart: true + nostorage: true + nogstorage: true + nomail: true + noauction: true + } +}, +{ + Id: 6915 + AegisName: "Captured_Soul" + Name: "Captured Soul" + Type: 3 + Trade: { + nodrop: true + notrade: true + nocart: true + nostorage: true + nogstorage: true + nomail: true + noauction: true + } +}, { Id: 7001 AegisName: "Mould_Powder" @@ -74184,6 +74230,7 @@ item_db: ( Buy: 10 Weight: 40 Upper: 63 + Script: <" percentheal 5,5; "> }, { Id: 11551 @@ -74225,6 +74272,50 @@ item_db: ( Upper: 63 Script: <" itemheal rand(20,30),0; "> }, +{ + Id: 11592 + AegisName: "Trance_Candy_R" + Name: "Red Transform Candy" + Type: 0 + Weight: 30 + Script: <" + itemheal rand(45,65),0; + montransform "Bloody Murderer",600000,SC_MTF_MHP,1000; + "> +}, +{ + Id: 11593 + AegisName: "Trance_Candy_B" + Name: "Blue Transform Candy" + Type: 0 + Weight: 30 + Script: <" + itemheal rand(45,65),0; + montransform "Bathory",600000,SC_MTF_MSP,100; + "> +}, +{ + Id: 11594 + AegisName: "Trance_Candy_Y" + Name: "Yellow Transform Candy" + Type: 0 + Weight: 30 + Script: <" + itemheal rand(45,65),0; + montransform "Jakk",600000,SC_MTF_PUMPKIN,2000; + "> +}, +{ + Id: 11595 + AegisName: "Trance_Candy_G" + Name: "Green Transform Candy" + Type: 0 + Weight: 30 + Script: <" + itemheal rand(45,65),0; + montransform "Quve",600000,SC_MTF_HITFLEE,10,20; + "> +}, { Id: 11701 AegisName: "Girl_Bunch_Of_Flower" @@ -117799,6 +117890,87 @@ item_db: ( OnEquipScript: <" sc_start SC_DECORATION_OF_MUSIC,-1,0; "> OnUnequipScript: <" sc_end SC_DECORATION_OF_MUSIC; "> }, +{ + Id: 19903 + AegisName: "C_Witchs_Hat" + Name: "C Witchs Hat" + Type: 5 + Loc: 1024 + EquipLv: 1 + Refine: false + View: 717 + Script: <" bonus bCastrate,-10; "> +}, +{ + Id: 19917 + AegisName: "C_Gloomy_Pumpkin_Hat" + Name: "C Gloomy Pumpkin Hat" + Type: 5 + Loc: 1024 + EquipLv: 1 + Refine: false + View: 691 + Script: <" bonus bSpeedRate,25; "> +}, +{ + Id: 19918 + AegisName: "C_Lude_Mask" + Name: "C Lude Mask" + Type: 5 + Loc: 6144 + EquipLv: 1 + Refine: false + View: 802 + Script: <" bonus bHealPower2,20; bonus bAddItemHealRate,20; "> +}, +{ + Id: 19919 + AegisName: "C_Cube_Mask_" + Name: "C Cube Mask " + Type: 5 + Loc: 6144 + EquipLv: 1 + Refine: false + View: 472 + Script: <" bonus bAspdRate,10; "> +}, +{ + Id: 19920 + AegisName: "C_Adv_Whisper_Mask" + Name: "C Adv Whisper Mask" + Type: 5 + Loc: 7168 + EquipLv: 1 + Refine: false + View: 458 + Script: <" bonus bFlee,20; "> +}, +{ + Id: 22067 + AegisName: "Witch_Shoes" + Name: "Witch Shoes" + Type: 5 + Buy: 3500 + Weight: 400 + Def: 10 + Job: 0xFFFFFFFE + Loc: 64 + Script: <" + skill ALL_CATCRY, 1; + bonus bUnbreakableShoes,0; + autobonus3 "{ }",1000,7000,"ALL_CATCRY","{ montransform 1505,420000; }"; + "> +}, +{ + Id: 20183 + AegisName: "C_There_Is_Something" + Name: "C There Is Something" + Type: 5 + Loc: 3072 + EquipLv: 1 + Refine: false + View: 1091 +}, { Id: 20500 AegisName: "T_Archangel_Wing" @@ -118019,6 +118191,45 @@ item_db: ( Stack: [20, 1] Script: <" itemskill RK_LUXANIMA,1; "> }, +{ + Id: 22669 + AegisName: "HALLOWEEN_G_BOX" + Name: "Halloween Box" + Type: 2 + Weight: 20 + Script: <" getrandgroupitem 22669,1; "> +}, +{ + Id: 22670 + AegisName: "DARK_INVITATION" + Name: "Invitation of Darkness" + Type: 2 + Buy: 10 + Weight: 10 + Upper: 63 + Script: <" + set .@r, rand(1,3); + if (.@r == 1) { + specialeffect2 EF_DEVIL; + warp "niflheim",193,186; + } else if(.@r == 2) { + heal -500,-1000; + sc_start SC_STUN,3000,0; + } else { + specialeffect2 EF_DEVIL; + warp "niflheim",347,255; + } + "> +}, +{ + Id: 22838 + AegisName: "Something_Candy_Holder" + Name: "Something Candy Holder" + Type: 2 + Buy: 20 + Weight: 10 + Script: <" getrandgroupitem 22838,1; "> +}, { Id: 28200 AegisName: "End_Of_The_Horizon" diff --git a/db/re/item_group.conf b/db/re/item_group.conf index 3d0f138c2..3a25d92b8 100644 --- a/db/re/item_group.conf +++ b/db/re/item_group.conf @@ -4745,3 +4745,42 @@ Lucky_Bag: ( "Big_Luk_Bookmark", ) */ +HALLOWEEN_G_BOX: ( + ("Immortal_Heart", 30), + ("Starsand_Of_Witch", 30), + ("Empty_Bottle", 30), + ("Alchol", 30), + ("Karvodailnirol", 30), + ("Transparent_Cloth", 30), + ("Stem", 30), + ("Poison_Spore", 30), + ("Speed_Up_Potion", 5), + ("Chocolate", 5), + ("Guarana_Candy", 5), + ("Seed_Of_Yggdrasil", 5), + "Old_Blue_Box", + "Old_Card_Album", + "Old_Violet_Box" +) +Something_Candy_Holder: ( + ("Honey", 3), + ("Candy", 7), + ("Well_Baked_Cookie", 2), + "Piece_Of_Cake", + ("Bread", 3), + "Pumpkin_Cake", + ("Pumpkin_Pie", 3), + ("Meat", 5), + "HALLOWEEN_G_BOX", + ("Trance_Candy_R", 3), + ("Trance_Candy_B", 3), + ("Trance_Candy_Y", 3), + ("Trance_Candy_G", 3), + "Old_Blue_Box", + "Yggdrasilberry", + "Old_Card_Album", + "Old_Violet_Box", + "DARK_INVITATION", + "C_There_Is_Something", + "Witch_Shoes" +) diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index b249aba8c..fa10f91c2 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -2262,3 +2262,6 @@ //3107,E_EASTER_BUNNY //3108,JITTERBUG1 //3109,JITTERBUG2 +// 2014 Halloween Event +3381,DARK_SOUL,Dark Soul,Dark Soul,10,20,1,0,0,1,20,20,0,0,1,1,1,1,1,1,0,0,1,6,27,0x81,100,1960,960,504,0,0,0,0,0,0,0,12192,2000,6914,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +3382,WANDERING_SOUL,Wandering Soul,Wandering Soul,1,10,1,0,0,1,10,10,0,0,1,1,1,1,1,1,0,0,1,6,28,0x81,100,912,1248,576,0,0,0,0,0,0,0,12192,2000,6915,4000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt new file mode 100644 index 000000000..1a9635258 --- /dev/null +++ b/npc/re/events/halloween_2014.txt @@ -0,0 +1,2556 @@ +//===== Hercules Script ======================================================== +//= Halloween Event (2014) +//===== By: ==================================================================== +//= Kisuka +//===== Current Version: ======================================================= +//= 1.0.0 +//===== File Encoding ========================================================== +//= CP-949 (EUC-KR compatible). Do NOT read/save it as UTF-8. +//===== Description: =========================================================== +//= The Official 2014 Halloween Event +//= +//= Help an Exhausted Priest collect souls in exchange for Candy Holders. +//= Help some spirits in Niflheim figure out which one among them isn't dead. +//= Collect 10 Red Scarf and 10 Hanging Doll for a spirit by the name of Loru. +//= Hunt 20 Hylozoists and 20 Bloody Murderers for a spirit by the name of Devi. +//===== Additional Comments: =================================================== +//= 1.0.0 Initial Release. [Kisuka] +//============================================================================== + +//= Exhausted Priest +//============================================================================== +- script Exhausted Priest#14hal::Hal14Priest 4_M_MINISTER,{ + if (!checkweight("Orcish_Axe", 3)) { + mes "[Exhausted Priest]"; + mes "Why don't you reduce your weight to catch the soul?"; + mes "They are faster than you think."; + close; + } + if (BaseLevel < 50) { + mes "[Mighty Priest]"; + mes "I..I am too exhausted!"; + mes "Oh..Dear Odin, why have you caused this pain for me..."; + next; + mes "[Mighty Priest]"; + mes "I hope that someone very strong and patient will help me.."; + close; + } else { + if (questprogress(14450) == 2) { + mes "[Mighty Priest]"; + mes ""+(Sex ? "Brother" : "Sister")+", it's good to see you again!"; + mes "came here to see me because of that?"; + next; + mes "[Mighty Priest]"; + mes "You brought the Soul, right?"; + mes "Let's take a look at it."; + next; + if (countitem("Captured_Soul") > 4 && countitem("Black_Soul") > 0) { + + mes "[Mighty Priest]"; + mes "Wow, this is so strong!"; + mes "You may be better than our priests!"; + next; + mes "[Mighty Priest]"; + mes "Let's keep doing this!"; + mes "Here you are. See you next time!"; + close2; + delitem Captured_Soul, 5; + delitem Black_Soul, 1; + getitem Something_Candy_Holder, 1; + getitem DARK_INVITATION, 1; + end; + } else { + mes "[Mighty Priest]"; + mes "oh.. it's weird... Did they run away??"; + mes "You should hold them firmly, or else they will get away."; + next; + mes "[Mighty Priest]"; + mes "Well, can you catch them again?"; + mes "You need to bring ^0000cd5 Captured Souls^000000 from Wandering Soul, and ^0000cd1 Black Soul^000000 from Dark Soul."; + next; + mes "[Mighty Priest]"; + mes "How is that?"; + mes "Too easy, huh?"; + close; + } + } else if (questprogress(14450) == 1) { + if (countitem("Captured_Soul") > 2 && countitem("Black_Soul") > 0) { + mes "[Mighty Priest]"; + mes "Welcome! Did you bring the soul?"; + mes "Let me see~"; + next; + mes "[Mighty Priest]"; + mes "Wow, you captured a crucial one!"; + mes "I knew you would do well!"; + next; + mes "[Mighty Priest]"; + mes "Didn't I say I would give you some gift?"; + mes "Let me give you some snacks from the Order..."; + next; + mes "[Mighty Priest]"; + mes "I feel a bit uncomfortable for this though... oops.. no! It got a lot of sweets!!"; + mes "Please take this invitation too. This is a Niflheim Express Ticket."; + next; + mes "[Mighty Priest]"; + mes "It would be a great chance to go sight seeing there."; + mes "However, I'm too busy to go there myself."; + next; + mes "[Mighty Priest]"; + mes "Oops! I almost forgot to say this."; + mes "If you bring 5 Captured Souls and 1 Black Soul next time, I will give you another invitation and Candy Holder."; + next; + mes "[Mighty Priest]"; + mes "You might think that you got more gifts next time, but it's just not, actually!"; + emotion e_heh, "Exhausted Priest#pron14hal"; + next; + mes "[Mighty Priest]"; + mes "You can get them from any of the other priests in town."; + mes "See you next time!"; + close2; + delitem Captured_Soul, 3; + delitem Black_Soul, 1; + getitem Something_Candy_Holder, 1; + getitem DARK_INVITATION, 1; + completequest 14450; + end; + } else { + mes "[Mighty Priest]"; + mes "Welcome! Did you bring the soul?"; + mes "Let me see~"; + next; + mes "[Mighty Priest]"; + mes "oh.. it's weird... Did they run away??"; + mes "You should hold them firmly, or else they will get away."; + next; + mes "[Mighty Priest]"; + mes "Well, can you catch them again?"; + mes "You need to bring ^0000cd5 Captured Souls^000000 from Wandering Soul, and ^0000cd 1 Black Soul^000000 from Dark Soul."; + next; + mes "[Mighty Priest]"; + mes "How is that?"; + mes "Too easy, huh?"; + close; + } + } else if (!questprogress(14450)) { + mes "[Mighty Priest]"; + mes "Ha... no time to rest!"; + mes "My arms and legs hurt~"; + next; + mes "["+strcharinfo(0)+"]"; + mes "If you're so tired... why don't you heal?"; + next; + mes "[Mighty Priest]"; + mes "Wow!! You're a genius!!!"; + mes "Hold on..."; + next; + mes "[Mighty Priest]"; + mes "Dear Odin, show me your love!"; + mes "Heal me with your love! Great!! Bam!!!!!"; + specialeffect EF_HEAL2,AREA,"Exhausted Priest#pron14hal"; + emotion e_swt, 1; + next; + mes "[Mighty Priest]"; + mes "I feel much better now!"; + mes ""+(Sex ? "Brother" : "Sister")+", thank you so much for waking me up."; + next; + mes "["+strcharinfo(0)+"]"; + mes "What made you so tired?"; + next; + mes "[Mighty Priest]"; + mes ""+(Sex ? "Brother" : "Sister")+", you didn't have any damage yet?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "What happened to you?"; + next; + mes "[Mighty Priest]"; + mes "Ha? You don't know?"; + mes "You don't know about the power of the dead in Niflheim during Halloween?"; + next; + mes "[Mighty Priest]"; + mes "It doesn't matter if just normal dead people came here..."; + next; + mes "[Mighty Priest]"; + mes "But the problem is... dangerous people are coming here too."; + next; + mes "[Mighty Priest]"; + mes "We priests have been given an order to capture all the dangerous one."; + next; + mes "[Mighty Priest]"; + mes "However, our forces are so limited. We're getting very exhausted."; + next; + mes "[Mighty Priest]"; + mes "Oh, right!!"; + mes "Could you maybe help me out?"; + next; + mes "[Mighty Priest]"; + mes "They would not damage you at all, "+(Sex ? "brother" : "sister")+"."; + mes "I would also give you a reward for the trouble."; + next; + mes "[Mighty Priest]"; + mes "What do you think?"; + mes "Do you want to help out this pitiful priest?"; + next; + if(select("Yes I want to help.", "No, I don't think so.") == 2) { + emotion e_sob, "Exhausted Priest#pron14hal"; + mes "[Mighty Priest]"; + mes "Well now..."; + mes "You could have said it more kindly... even if you don't want to..."; + next; + mes "[Mighty Priest]"; + mes "I'm sorry for disturbing you."; + mes "Excuse me while I go capture more dangerous dead people now."; + close; + } + mes "[Mighty Priest]"; + mes "Faith in humanity restored!!"; + mes "So, may I ask a favor of you?"; + next; + mes "[Mighty Priest]"; + mes "Can you find ^0000cdWandering Souls^000000 in the fields? They should not be here."; + next; + mes "[Mighty Priest]"; + mes "They got the fake skin to come to land of the living, so you don't have to capture them directly."; + next; + mes "[Mighty Priest]"; + mes "If you killed them, they will drop a Captured Soul. You need to bring the ^0000cdCaptured Souls^000000."; + mes "Also, if you kill any Black Souls, then you should bring ^0000cdBlack Souls^000000 too."; + next; + mes "[Mighty Priest]"; + mes "Let me see... since this is your first attempt, I want you to bring back only a small amount."; + mes "^0000cd3 Captured Souls, 1 Black Soul^000000!"; + mes "How is that? Can you do this??"; + next; + mes "[Mighty Priest]"; + mes "See you soon! I will wait for your return."; + close2; + setquest 14450; + end; + } + } +} + +alberta,114,66,5 duplicate(Hal14Priest) Exhausted Priest#albe14h 4_M_MINISTER +aldebaran,147,117,3 duplicate(Hal14Priest) Exhausted Priest#alde14h 4_M_MINISTER +geffen,123,75,3 duplicate(Hal14Priest) Exhausted Priest#gef14h 4_M_MINISTER +morocc,150,103,5 duplicate(Hal14Priest) Exhausted Priest#moc14h 4_M_MINISTER +payon,179,107,3 duplicate(Hal14Priest) Exhausted Priest#pay14h 4_M_MINISTER +prontera,156,194,3 duplicate(Hal14Priest) Exhausted Priest#pron14h 4_M_MINISTER +yuno,162,192,3 duplicate(Hal14Priest) Exhausted Priest#yuno14h 4_M_MINISTER + +//= Bolak +//============================================================================== +niflheim,196,185,3 script Bolak#14hal 4_M_DRAKE,{ + if (!checkweight("Orcish_Axe", 3)) { + mes "[Bolak]"; + mes "You have too many items."; + mes "Please come back after making space in your inventory!"; + close; + } + if (BaseLevel < 50) { + mes "[Bolak]"; + mes "Only dead people can be here."; + mes "Or someone strong..."; + next; + mes "[Bolak]"; + mes "It seems you are neither."; + close; + } else { + if (questprogress(14457) == 2) { + mes "[Bolak]"; + mes "Are you enjoying the festival?"; + mes "Maybe it's too hard for you to enjoy?"; + next; + mes "[Bolak]"; + mes "If you come back again later, come and find me."; + mes "I will give you a job."; + close; + } else if (questprogress(14457) == 1) { + mes "[Jack]"; + mes "Someone's Coming!"; + next; + mes "[Bolak]"; + mes "Who?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "I came back!"; + next; + mes "[Bolak]"; + mes "Oh, have you arrived?"; + next; + mes "[Loru]"; + mes "You know, that guy, fake-dead man, he suddenly-"; + next; + mes "[Devi]"; + mes "disappeared."; + next; + mes "[Loru]"; + mes "I was going to say that!"; + mes "Don't interrupt me when I'm speaking!"; + next; + mes "[Jack]"; + mes "I am wondering what have done-"; + next; + mes "[Bolak]"; + mes "yeah, you've done it? right??"; + next; + mes "[Nathan]"; + mes "Aww~"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Yes, I've had help from church this time as well."; + mes "His body is still alive. His soul is not supposed to come here yet."; + next; + mes "[Bolak]"; + mes "Huh, that is great!"; + next; + mes "[Nathan]"; + mes "Mama~"; + next; + mes "[Loru]"; + mes "Are you jealous??"; + next; + mes "[Bolak]"; + mes "No way!"; + next; + mes "[Jack]"; + mes "The suffering continues day in, and day out"; + next; + mes "[Bolak]"; + mes "I like this place, look how peaceful and joyful this place is!"; + next; + mes "[Devi]"; + mes "It seems like you're jealous."; + next; + mes "[Bolak]"; + mes "No, I said no! Anyway, maybe having hard time for good deed."; + next; + mes "["+strcharinfo(0)+"]"; + mes "By the way, that guy.. Richard? Why is he still here?"; + next; + mes "[Loru]"; + mes "Ah.. No need to bother."; + mes "Ah.. Bolak put that thing there, he feels like it is a bit weird without having Richard around here."; + next; + mes "[Devi]"; + mes "He complains that he's fake, but he seems to be attached to him a lot."; + next; + mes "[Jack]"; + mes "Hmm, it is weird-"; + next; + mes "[Bolak]"; + mes "Ah you know, look at us standing now, in a perfect circle."; + mes "If one person is missing, the shape would look weird!!!"; + next; + mes "[Loru]"; + mes "We would just need to move a bit..."; + mes "Don't make excuses."; + next; + mes "[Bolak]"; + mes "Stop saying nonsense!"; + mes "Hey! Give me something of yours!"; + next; + mes "[Loru]"; + mes "Why??"; + next; + mes "[Bolak]"; + mes "We, of course, need to give a reward to this person who had a hard time!"; + next; + mes "[Loru]"; + mes "Are you blackmailing us??"; + next; + mes "[Devi]"; + mes "I don't have much..."; + next; + mes "[Jack]"; + mes "Come empty.. return empty...-"; + next; + mes "[Nathan]"; + mes "Bba...bba..."; + next; + mes "[Bolak]"; + mes "Nathan you are okay, I will do it for you."; + mes "Hey, show what you have!"; + next; + mes "[Loru]"; + mes "The only thing I have is this. Take it."; + next; + mes "[Devi]"; + mes "Yeah, me too."; + next; + mes "[Bolak]"; + mes "Sorry to give you such a small gift, please take this as a sign of our gratitude."; + next; + mes "["+strcharinfo(0)+"]"; + mes "wow... I don't know what to say..."; + next; + mes "[Bolak]"; + mes "It's nothing special, just take it!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Thank you so much, see you around."; + next; + mes "[Loru]"; + mes "Hey, wait!"; + mes "Before you go ^0000cdCome here and talk with me.^000000"; + next; + mes "[Devi]"; + mes "^0000cdYeah, talk with me as well!^000000"; + next; + mes "[Bolak]"; + mes "what are you guys going to talk about?!"; + next; + mes "[Jack]"; + mes "The suffering continues day in, and day out..."; + getitem Something_Candy_Holder, 7; + getitem Trans_Candy_Red, 5; + getitem Trans_Candy_Blue, 5; + getitem Trans_Candy_Yellow, 5; + getitem Trans_Candy_Green, 5; + completequest 14457; + setquest 14458; + setquest 14459; + close; + } else if (questprogress(14456) == 1 || questprogress(14455) == 1 || questprogress(14454) == 1) { + mes "[Bolak]"; + mes "How's it going with the thing?"; + mes "You are not going to run away, are you?"; + next; + mes "[Bolak]"; + mes "I prefer a person who has done their work well."; + mes "and don't want to be in chaos anymore."; + close; + } else if (questprogress(14453) == 1) { + if (countitem("Sacred_Rosary") > 0) { + mes "["+strcharinfo(0)+"]"; + mes "Will this really work...?"; + next; + mes "[Jack]"; + mes "Something is coming.. something fierce..!"; + next; + mes "[Bolak]"; + mes "What is coming?"; + next; + mes "[Nathan]"; + mes "Aww!!!"; + next; + mes "[Bolak]"; + mes "Huh???"; + next; + mes "[Loru]"; + mes "Ah, There! There! that thing working off something weird spirit!"; + next; + mes "[Devi]"; + mes "Go away!! They've brought a ^0000cdhalidom^000000 to kill us!!!"; + mes "Go away!!!"; + emotion e_omg, "Bolak#14hal"; + emotion e_an, "Devi#14hal"; + emotion e_omg, "Nathan#14hal"; + emotion e_omg, "Loru#14hal"; + emotion e_what, "Richard#14hal01"; + emotion e_omg, "Jack#14hal"; + next; + mes "[Bolak]"; + mes "What is your intention bringing us a halidom?!"; + mes "I asked you to way to distinguish dead men with living one!! You are going to kill us!!!"; + next; + mes "[Jack]"; + mes "Dead men are already dead-"; + next; + mes "["+strcharinfo(0)+"]"; + mes "W..Wait, There's a situation!!"; + mes "Calm down..!"; + next; + mes "[Nathan]"; + mes "Aww....A..h....bba..bba!!"; + next; + mes "[Bolak]"; + mes "Whatever situation it is, get that thing out of my sight!!"; + next; + mes "[Richard]"; + mes "What is going on? what happened?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "^0000cdThat man is a living man^000000!!!"; + mes "Living men don't react to a halidom!"; + next; + mes "[Loru]"; + mes "Anyway, get that thing out of my sight!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Okay."; + mes "I will get that thing away from here."; + specialeffect2 EF_SPRINKLESAND; + next; + mes "[Bolak]"; + mes "Much better."; + mes "Anyway, I knew this man was living!"; + next; + mes "[Loru]"; + mes "Well.. that's why he is a bit weird."; + mes "Are you showing off that you are living man?"; + next; + mes "[Devi]"; + mes "Execute him!!!"; + mes "Make him a dead man!!!"; + next; + mes "[Jack]"; + mes "Hey guys, let him talk."; + next; + mes "[Nathan]"; + mes "Mamang....."; + next; + mes "[Richard]"; + mes "This is unfair!!!"; + mes "I.. I came here yesterday!"; + next; + mes "[Richard]"; + mes "Ah... I... I... was dead..."; + mes "I died for sure... I came here... Where strong warriors go..."; + next; + mes "[Richard]"; + mes "I died!! The fact that I am here is proof!"; + mes "Isn't that a fake halidom?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hey, calm down. Thaink clearly."; + next; + mes "[Richard]"; + mes "I was really a dead man..?"; + mes "But how come I died?"; + next; + mes "[Jack]"; + mes "He's speaking nonsense."; + next; + mes "[Bolak]"; + mes "Hey, Do you really think we believe in your poor acting?"; + mes "Do you think we haven't seen a guy like you?"; + next; + mes "[Richard]"; + mes "Really... It's true! Why would I lie to you guys?!"; + mes "I died!!! I'm dead... I came here yesterday!"; + next; + mes "[Jack]"; + mes "If you came here yesterday, there would be ^0000cd someone you might know in living man's country^000000, is that so?"; + next; + mes "[Bolak]"; + mes "True, if you were dead and came here yesterday, there must be, ^0000cdsomeone who knows about you^000000."; + mes "It will be more clear once we ask them."; + next; + mes "[Bolak]"; + mes "But in any case, I am not going to the world of the living."; + mes "Neither is Nathan."; + next; + mes "[Nathan]"; + mes "Da..d?"; + next; + mes "[Loru]"; + mes "Me neither."; + next; + mes "[Devi]"; + mes "Me neither!"; + next; + mes "[Richard]"; + mes "I won't go either! You guys just want to kick me out of this place!!!"; + next; + mes "[Jack]"; + mes "There may be someone we can ask a favor from..."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Why... why are you guys looking at me like that?"; + next; + mes "[Bolak]"; + mes "I am sorry but, you should go there for us."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Why should I?"; + next; + mes "[Loru]"; + mes "Which makes more sense? A living soul goes to the world of the living, or a dead man?"; + next; + mes "[Devi]"; + mes "Totally."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hold on! I am here traveling."; + mes "I'm just trying to have fun!"; + next; + mes "[Jack]"; + mes "You will come here again anyway once you die..."; + next; + mes "[Nathan]"; + mes "Aww~"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hmm... it seems like I have no choice. I'll go, but where am I going?"; + next; + mes "[Richard]"; + mes "I... I... died."; + next; + mes "[Bolak]"; + mes "Hey, you are asking us where to go?"; + mes "Where did you live when you were alive?"; + next; + mes "[Jack]"; + mes "It's ruined..."; + next; + mes "[Richard]"; + mes "a cold place... snow all year long..."; + mes "^0000cdWarm place... behind Lutie Santa Clause..^000000"; + next; + mes "["+strcharinfo(0)+"]"; + mes "I will go find it."; + next; + mes "[Jack]"; + mes "Hey babe, I will be waiting for you~"; + next; + mes "[Loru]"; + mes "What kind of joke is that?"; + next; + mes "[Jack]"; + mes "Just kidding."; + delitem Sacred_Rosary, 1; + erasequest 14453; + setquest 14454; + close; + } else { + mes "[Bolak]"; + mes "Have you been there? Did you find a solution?"; + mes "What have you brought? Nothing?"; + next; + mes "[Bolak]"; + mes "How can you figure out? huh? Is there any way to figure out?"; + close; + } + } else if (questprogress(14452) == 1 || questprogress(14451) == 1) { + mes "[Bolak]"; + mes "Have you been there? did you find a solution?"; + next; + mes "[Jack]"; + mes "I saw... They didn't go any where, they've just been wandering around..."; + next; + mes "[Devi]"; + mes "Don't go to the cathedral but stay here."; + next; + mes "[Bolak]"; + mes "What are you talking about?"; + mes "Go there! I want to have fun at the festival!"; + close; + } else if (!questprogress(14451)) { + mes "[Bolak]"; + mes "Is that you?"; + next; + emotion e_an, "Devi#14hal"; + mes "[Devi]"; + mes "I am not!!! ^0000cdI am not!!!^000000"; + mes "How dare you!"; + next; + mes "[Bolak]"; + mes "Then is that you?"; + next; + emotion e_pif, "Richard#14hal01"; + mes "[Richard]"; + mes "Huh.. I think it's you. I am suspicious when I see someone fussing around all the time."; + next; + emotion e_ok, "Loru#14hal"; + mes "[Loru]"; + mes "That is true!!!"; + next; + mes "[Bolak]"; + mes "It's impossible I am a dead man. I've been dead for ^0000cd568 years^000000!"; + mes "You've been with me this entire time! You know that."; + next; + mes "[Loru]"; + mes "You could be a 'fake'!"; + next; + mes "[Nathan]"; + mes "Da...d¡¦?"; + next; + mes "[Bolak]"; + mes "Nathan!! Even you doubt your own father?"; + mes "Come on!"; + next; + mes "[Nathan]"; + mes "Ma..ma...?"; + next; + mes "[Bolak]"; + mes "No, I am not your mother!"; + mes "I am your father!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "What is all this about?"; + next; + mes "[Loru]"; + mes "Wow, a living man! Isn't that him?"; + next; + mes "[Devi]"; + mes "No, he is different."; + next; + mes "[Bolak]"; + mes "Ah yeah, we can ask to him!"; + mes "As you can see, this place is ^0000cdthe land of the dead^000000."; + next; + mes "[Bolak]"; + mes "During this time of year, there's no boundary between the land of the living and the dead."; + mes "We can come and go freely, but only dead men are accepted here."; + mes "But a foreign substance has come."; + next; + mes "[Jack]"; + mes "We don't call people substances."; + next; + mes "[Devi]"; + mes "There is a ^0000cdliving man^000000 among us."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Who is that?"; + next; + mes "[Loru]"; + mes "If we knew, don't you think we would have done something?"; + next; + mes "[Bolak]"; + mes "Normally it is distinguishable. But we can't figure it out this time."; + mes "They all say they are dead men. I really can't find the truth."; + next; + mes "[Richard]"; + mes "It's really bizarre that a living man is in a group of dead men."; + next; + mes "[Nathan]"; + mes "Aww~"; + next; + mes "[Bolak]"; + mes "You are not, you are my son. I know you've been a dead man for ^0000cd568 years^000000. I know that."; + next; + mes "[Loru]"; + mes "How about that newbie, Richard...?"; + next; + mes "[Richard]"; + mes "No way... I don't have an arm! You are insulting me! I was fighting with ^0000cd17 men and died^000000!"; + next; + mes "[Devi]"; + mes "Hmm well, I have a doubt with Loru. You look like a ^0000cdliving man^000000. Don't you?"; + next; + mes "[Loru]"; + mes "What? Then you are definitely a dead man."; + mes "You look like such a mess."; + next; + mes "[Devi]"; + mes "Are you insulting me?"; + next; + mes "[Jack]"; + mes "Well... What do you think about me?"; + next; + mes "[Bolak]"; + mes "Hey! We've seen each other ^0000cdfor more than 500 years^000000. Come on."; + mes "You want to be a newbie?"; + next; + mes "[Jack]"; + mes "Nah... I am just saying it because nobody has mentioned me.."; + next; + mes "[Bolak]"; + mes "So who do you think is a living soul among us?"; + next; + switch(select("Bolak", "Jack", "Loru", "Devi", "Richard")) { + case 1: + mes "[Bolak]"; + mes "What? You think I am a living soul? This is so humiliating!"; + next; + mes "[Nathan]"; + mes "Da..d....?"; + next; + mes "[Bolak]"; + mes "Nathan, I told you already, I am your father!"; + next; + break; + case 2: + mes "[Jack]"; + mes "It's such an honor to be chosen as a living soul.."; + next; + mes "[Bolak]"; + mes "No! He's not! I can guarantee you!!!"; + next; + break; + case 3: + mes "[Loru]"; + mes "Wow, you are saying I am living soul? Do you think I look that attractive?"; + next; + mes "[Devi]"; + mes "Get away from me!!!!"; + next; + break; + case 4: + mes "[Devi]"; + mes "I am not a living soul!"; + next; + mes "[Loru]"; + mes "You really think Devi is living soul? haha!!"; + next; + break; + case 5: + mes "[Richard]"; + mes "Look at my arm!!!"; + next; + mes "[Jack]"; + mes "True... without his arm, he looks like a undead soul."; + next; + break; + } + mes "["+strcharinfo(0)+"]"; + mes "Hmm.. everyone.. please calm down."; + next; + mes "[Loru]"; + mes "We'll never reach a decision! Never!"; + next; + mes "[Devi]"; + mes "Halloween will be over by the time we finish arguing about this!"; + next; + mes "[Richard]"; + mes "Ah.. I expected so much from Halloween. It's my first Halloween."; + next; + mes "[Nathan]"; + mes "Mo..m....."; + next; + mes "[Bolak]"; + mes "Hey, you adventurer. You figure out how to distinguish ^0000cddead men with living men in living men's country^000000."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Me? why??"; + next; + mes "[Bolak]"; + mes "Because we don't want to leave here, and you know many things as you are a living soul."; + mes "You know many things about the ^0000cdCathedral^000000 as well."; + next; + mes "[Loru]"; + mes "Yeah that is true."; + next; + mes "[Devi]"; + mes "What? Cathedral? It will kill us all!!!!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hmm, okay then I will go and figure this out."; + next; + mes "[Nathan]"; + mes "D..ad..a..-"; + next; + mes "[Jack]"; + mes "Such a good boy. Look after yourself."; + setquest 14451; + close; + } else { + mes "[Bolak]"; + mes "Hmm. Some unpleasant smell..."; + mes "something unpleasant."; + close; + } + } +} + +//= Nathan +//============================================================================== +niflheim,195,183,1 script Nathan#14hal 4_LUDE,{ + mes "[Nathan]"; + mes "Ma?"; + mes "Dada!!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "How cute!!~"; + next; + mes "[Nathan]"; + mes "What are you looking at? Are you look down on me since I look like a baby?"; + next; + mes "[Nathan]"; + mes "I've been living here much more than you."; + next; + mes "[Nathan]"; + mes "Get your hands off and go away before I get really mad."; + close; +} + +//= Jack +//============================================================================== +niflheim,192,182,7 script Jack#14hal 4_JACK,{ + mes "[Jack]"; + mes "Come empty, return empty..."; + mes "The suffering continues, day in, day out."; + next; + mes "[Jack]"; + mes "Don't you want to have a peaceful life here?"; + close; +} + +//= Richard +//============================================================================== +niflheim,190,185,5 script Richard#14hal01 4_M_NFDEADSWDMAN,{ + if (questprogress(14457) > -1) { + mes "A doll which resembles Richard."; + } else { + mes "[Richard]"; + mes "Me having only one arm is like a badge of honor!"; + } + close; +} + +//= Loru +//============================================================================== +niflheim,194,189,3 script Loru#14hal 4_LOLI_RURI,{ + if (!checkweight("Orcish_Axe", 3)) { + mes "[Loru]"; + mes "Why are you carrying so much? If you have something good, give it to me~"; + mes "Or take these things out of my sight!"; + close; + } + if (questprogress(14464) == 1) { + if (!questprogress(14464, PLAYTIME)) { + mes "[Loru]"; + mes "Hmm, why do you come here?"; + mes "Time is not over yet?"; + next; + mes "[Loru]"; + mes "I told you to come again after a day."; + mes "Idiot!"; + close; + } else { + mes "[Loru]"; + mes "You've come here again."; + mes "Well.. Can I ask you one more favor?"; + next; + if(select("Yes", "No") == 2) { + mes "[Loru]"; + mes "Yeah? okay."; + mes "I don't know why you can't accept my favor.. "; + next; + mes "[Loru]"; + mes "Come visit me again if you are willing to accept my favor!"; + close; + } else { + if (BaseLevel < 100) { + mes "[Loru]"; + mes "Wow!!!"; + mes "I like you!! you accept all my favors!"; + next; + mes "[Loru]"; + mes "Then please hunt ^0000cd10 wandering soul^000000!"; + mes "Once you hunt them all, Niflheim comes along as well. get me 10 of them."; + next; + mes "[Loru]"; + mes "Thank you! I will wait for you!"; + erasequest 14464; + setquest 14460; + close; + } else { + mes "[Loru]"; + mes "Wow!!!"; + mes "I like you!! you accept all my favors!"; + next; + mes "[Loru]"; + mes "Please bring me ^0000cd 10 Red Scarf and 10 Hanging Doll!^000000 ?"; + mes "Thank you! I will wait for you!"; + erasequest 14464; + setquest 14461; + close; + } + } + } + } else { + if (questprogress(14461) == 1 || questprogress(14460) == 1) { + if (questprogress(14461) == 1) { + mes "[Loru]"; + mes "Hey you are here. How's going with what I asked??"; + mes "Huh? You are not going to disappoint me, aren't you?"; + next; + if (countitem("Red_Scarf") > 9 && countitem("Hanging_Doll") > 9) { + mes "[Loru]"; + mes "Hmm, let me see.. wow!"; + mes "You bring all I asked?"; + next; + mes "[Loru]"; + mes "In additon, it looks more special and beautiful?"; + mes "You selected beautiful ones for me? huh??"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hmm.. no..t.. really..."; + next; + mes "[Loru]"; + mes "Haha, hey."; + mes "You can just say yes! i did.?"; + next; + mes "[Loru]"; + mes "Anyway, thank you."; + mes "Here's your reward. Then, see you ^0000cd tomorrow^000000!."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Tomorrow? again??"; + next; + mes "[Loru]"; + mes "Ah, you didn't know. Here, we give away decoration when people leave the party."; + mes "We should put new decoration everyday."; + next; + mes "["+strcharinfo(0)+"]"; + mes "I've never heard of it.."; + next; + mes "[Loru]"; + mes "Of course, you haven't. This place is dead man's country."; + mes "Keep what I said in your mind as you will come here someday. Bye!~"; + delitem Red_Scarf, 10; + delitem Hanging_Doll, 10; + getitem Trans_Candy_Yellow, 10; + getitem Trans_Candy_Green, 10; + erasequest 14461; + setquest 14464; + close; + } else { + mes "[Loru]"; + mes "You return empty-handed?"; + mes "Have you forgotten? or are you messing around with me??"; + next; + mes "[Loru]"; + mes "I want to have joyful and luxurious party~"; + mes "So, Please bring me ^0000cd 10 Red Scarf and 10 Hanging Doll^000000."; + close; + } + } else { + if (questprogress(14460, HUNTING) == 2) { + mes "[Loru]"; + mes "Wow~ Welcome!"; + mes "The party gets more excited, thank you!!"; + next; + mes "[Loru]"; + mes "Everyone seems to enjoy the most of it."; + mes "So.. I want to repay your effort."; + next; + mes "[Loru]"; + mes "It's not much but hope you like it! then see you ^0000cdtomorrow^000000 again!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Tomorrow.. again??"; + next; + mes "[Loru]"; + mes "Yeah, when the party is over, everyone will leave."; + mes "They won't come again voluntarily, so we should make them. Then bye bye~"; + erasequest 14460; + setquest 14464; + getitem Trans_Candy_Yellow, 10; + getitem Trans_Candy_Green, 10; + close; + } else { + mes "[Loru]"; + mes "Why so early? you haven't done it yet?"; + mes "You forget what to do?"; + next; + mes "[Loru]"; + mes "^0000cd 10 Wandering Soul!^000000"; + mes "The more people there is, the funnier party will be!"; + next; + mes "[Loru]"; + mes "Please go and find them."; + mes "They will be nice once you hit them a bit."; + close; + } + } + } else if (questprogress(14458) == 1) { + mes "[Loru]"; + mes "You didn't forget to come?"; + mes "Hey.. I have a favor to ask. You seem to be a good. Would you do my favor??"; + next; + if(select("Yes", "No") == 2) { + mes "[Loru]"; + mes "Then why do you come and talk to me?"; + mes "Go!! go away!!!"; + close; + } else { + mes "[Loru]"; + mes "You know, everyone gets really excited because of Halloween?"; + mes "And people here are just gathering around and having fun."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Yes."; + next; + if (BaseLevel < 100) { + mes "[Loru]"; + mes "But people, who were supposed to have party together, have gone to living man's country."; + mes "You know, party is fun when there's many people. so... Could you bring them here."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Who? and how many??"; + next; + mes "[Loru]"; + mes "Oh, You do my favor?? ^0000cd10 Wandering Soul^000000!"; + mes "Once you hunt them all, Niflheim comes along as well. get me 10 of them."; + next; + mes "["+strcharinfo(0)+"]"; + mes "I can do that."; + next; + mes "[Loru]"; + mes "Thank you so much, i will wait for you!"; + erasequest 14458; + setquest 14460; + close; + } else { + mes "[Loru]"; + mes "Look around. It looks so empty."; + mes "Nobody would dance and have fun in a place like this?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "What can I do for you?"; + next; + mes "[Loru]"; + mes "^0000cd 10 Red Scarf and 10 Hanging Doll^000000! Could you bring me all this??"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Are you decorating with those? Your taste...seems...."; + next; + mes "[Loru]"; + mes "What? do you have any problem with that!"; + mes "You don't know nothing about latest trend. you've been living only for decades!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Sorry, I made a mistake."; + mes "so, 10 Red Scarf and 10 Hanging Doll, right??"; + next; + mes "[Loru]"; + mes "Yes! See you!!!"; + erasequest 14458; + setquest 14461; + close; + } + } + } else { + mes "[Loru]"; + mes "Hmm.. I am bored. How come it is so boring! It's Halloween?"; + mes "Boring! Boring!!!"; + close; + } + } +} + +//= Devi +//============================================================================== +niflheim,191,188,5 script Devi#14hal 4_DEVIRUCHI,5,5,{ + if (!checkweight("Orcish_Axe", 3)) { + mes "[Devi]"; + mes "Why do you carry so much? If you have something awesome, give it to me."; + mes "Otherwise, go and organize your inventory!"; + close; + } + if (questprogress(14465) == 1) { + if (!questprogress(14465, PLAYTIME)) { + mes "[Devi]"; + mes "Why? Do you have something to talk about?"; + mes "Hmm, It's not because of what I said yesterday, is it?"; + next; + mes "[Devi]"; + mes "Hey, a day hasn't passed yet"; + mes "I am not a living man but i know what 'a day' means?"; + next; + mes "[Devi]"; + mes "Come back again when you have time."; + close; + } else { + mes "[Devi]"; + mes "Oh, you again."; + mes "You are going to help me like you did yesterday, aren't you?"; + next; + mes "[Devi]"; + mes "That's why you are here for, right??"; + next; + if(select("Yes", "No") == 2) { + mes "[Devi]"; + mes "Yeah? Hmm.. okay."; + mes "Hmm.. it's a shame."; + next; + mes "[Devi]"; + mes "Not me, you! ."; + close; + } else { + mes "[Devi]"; + mes "It seems to be in the middle of chaos, today and yesterday as well."; + next; + if (BaseLevel < 100) { + mes "[Devi]"; + mes "You escape from here and bring troublemakers in living man's country."; + mes "I can't go anywhere as I am too busy."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Okay. I don't want dead men create chaos in living man's country."; + next; + mes "[Devi]"; + mes "You got it. Cool."; + mes "Then please bring ^0000cd 10 Dark Soul^000000. Once you hunt them, they will come here."; + next; + mes "[Devi]"; + mes "Thank you in advance."; + erasequest 14465; + setquest 14462; + close; + } else { + mes "[Devi]"; + mes "Please catch them. they are making a chaos."; + mes "I can't go anywhere as I am too busy."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Okay."; + next; + mes "[Devi]"; + mes "You got it. Cool."; + mes "Then, please bring ^0000cd20 Hylozoist and 20 Bloody Murderer^000000."; + next; + mes "[Devi]"; + mes "Thank you in advance."; + erasequest 14465; + setquest 14463; + close; + } + } + } + } else { + if (questprogress(14463) == 1 || questprogress(14462) == 1) { + mes "[Devi]"; + mes "Oh, it's you."; + mes "You come here earlier than I thought you would."; + next; + if (questprogress(14463) == 1) { + if (questprogress(14463, HUNTING) == 2) { + mes "[Devi]"; + mes "And you've done when you have to do perfectly."; + mes "Good, Very well done."; + next; + mes "[Devi]"; + mes "So, if you are not busy, please come again ^0000cdtomorrow^000000."; + mes "I want you to do this job."; + next; + mes "[Devi]"; + mes "Then, we will see again tomorrow."; + mes "See you."; + erasequest 14463; + setquest 14465; + getitem Trans_Candy_Red, 10; + getitem Trans_Candy_Blue, 10; + close; + } else { + mes "[Devi]"; + mes "But you haven't done what I asked as you rush too much?"; + mes "take your time and get them."; + next; + mes "[Devi]"; + mes "^0000cd20 Hylozoist and 20 Bloody Murderer.^000000"; + mes "It's not a big deal, isn't it?"; + close; + } + } else { + if (questprogress(14462, HUNTING) == 2) { + mes "[Devi]"; + mes "And you've done when you have to do perfectly."; + mes "Good, Very well done."; + next; + mes "[Devi]"; + mes "So, if you are not busy, please come again ^0000cdtomorrow^000000."; + mes "I want you to do this job."; + next; + mes "[Devi]"; + mes "Then, we will see again tomorrow."; + mes "See you."; + erasequest 14462; + setquest 14465; + getitem Trans_Candy_Red, 10; + getitem Trans_Candy_Blue, 10; + close; + } else { + mes "[Devi]"; + mes "But you haven't done what I asked as you rush too much?"; + mes "take your time and get them."; + next; + mes "[Devi]"; + mes "^0000cd 10 Black Soul!^000000"; + mes "It's not a big deal, isn't it?"; + close; + } + } + } else if (questprogress(14459) == 1) { + mes "[Devi]"; + mes "Oh, you really came back. I didn't expect you to come."; + mes "I am just kidding, you know that"; + next; + mes "[Devi]"; + mes "Yes, I have one favor to ask."; + mes "Hope you don't reject it.."; + next; + if(select("Okay", "No, I want to reject.") == 2) { + mes "[Devi]"; + mes "Yeah? Hmm.. okay."; + mes "Hmm.. it's a shame."; + next; + mes "[Devi]"; + mes "Not me! you!"; + close; + } else { + mes "[Devi]"; + mes "Good, very good."; + mes "Apparently, I am kind of a leader here."; + next; + mes "[Devi]"; + mes "You know what it takes."; + mes "It's hard to control when there are too many people in a group."; + next; + if (BaseLevel < 100) { + mes "[Devi]"; + mes "You escape from here and bring troublemakers in living man's country."; + mes "I can't go anywhere as I am too busy."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Okay. I don't want dead men create chaos in living man's country."; + next; + mes "[Devi]"; + mes "You got it. Cool."; + mes "Then please bring ^0000cd 10 Dark Soul^000000. Once you hunt them, they will come here."; + next; + mes "[Devi]"; + mes "Thank you in advance."; + erasequest 14459; + setquest 14462; + close; + } else { + mes "[Devi]"; + mes "Please catch them. they are making a chaos."; + mes "I can't go anywhere as I am too busy."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Okay."; + next; + mes "[Devi]"; + mes "You got it. Cool."; + mes "Then, please bring ^0000cd20 Hylozoist and 20 Bloody Murderer^000000."; + next; + mes "[Devi]"; + mes "Thank you in advance."; + erasequest 14459; + setquest 14463; + close; + } + } + } else { + mes "[Devi]"; + mes "It's hard, really hard.."; + mes "whatever it is,, It is too hard."; + close; + } + } +} + +//= Bonfire +//============================================================================== +niflheim,193,186,6 script Bonfire Spirit#14hal 4_TRACE,{ + mes "[Bonfire Spirit]"; + mes "Ahahah! Don't touch me with such cold hands!!!"; + mes "Fire, fire might die!!!"; + close; + + OnInit: + initnpctimer; + end; + + OnEnable: + stopnpctimer; + initnpctimer; + end; + + OnTimer1000: + OnTimer3000: + OnTimer21000: + OnTimer23000: + OnTimer25000: + specialeffect EF_TORCH,AREA,"Bonfire Spirit#14hal"; + specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal"; + end; + + OnTimer5000: + OnTimer8000: + OnTimer10000: + OnTimer13000: + OnTimer14000: + OnTimer16000: + specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal"; + end; + + OnTimer19000: + npctalk "Oh, No! The fire is dying!!!! Fire!!!!!!!!!!!!"; + specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal"; + end; + + OnTimer20000: + specialeffect EF_SIGHTRASHER,AREA,"Bonfire Spirit#14hal"; + end; + + OnTimer27000: + donpcevent "Bonfire Spirit#14hal::OnEnable"; + end; +} + +//= Sister / Nun +//============================================================================== +prt_church,96,91,4 script Spiritual Sister#14hal 1_F_PRIEST,5,5,{ + if (!checkweight("Orcish_Axe", 3)) { + mes "[Spiritual Sister]"; + mes "What do you carry that so heavily? it looks really heavy."; + mes "When you come here you should empty your body and mind."; + close; + } + if (questprogress(14456) == 1) { + mes "[Sister Haley]"; + mes "Oh? Haven't you left yet?"; + mes "Did you forget what you need to prepare?"; + next; + mes "[Sister Haley]"; + mes "^0000cd1 of Leaf Of Yggdrasil and 1 Live Coal^000000 should be prepared and breathe in the smoke from burning leaves."; + mes "And never forget to pray to the soul to return."; + close; + } else if (questprogress(14455) == 1) { + mes "[Sister Haley]"; + mes "I hope all is well with everyone visiting here~"; + mes "Oh! Is it you, "+(Sex ? "brother" : "sister")+"? How is it going with the thing you need to do?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Well.. I could identify the live ones."; + next; + mes "[Sister Haley]"; + mes "I knew it! Any side effects?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "But then there was another problem."; + mes "this is the reason I came here.."; + next; + mes "[Sister Haley]"; + mes "Oh? What happen?"; + mes "Tell me anything!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "There was a person who did not react on the halidom, but he insisted that he is dead."; + mes "So I went the place he lived, the body is alive. Just in a comma."; + next; + mes "[I told her what happened in Niflheim and story I heard from Rutie.]"; + next; + mes "[Sister Haley]"; + mes "Oh, dear, I can't believe it!!"; + mes "Sometimes the soul is separated from the body if there was some big impact on the body, and ^0000cdsome spirits think they forget they are alive and move to the death's land^000000."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Is there anything I can do about?"; + next; + mes "[Sister Haley]"; + mes "Simple! "; + mes "Make them to realize that they have their living body."; + next; + mes "["+strcharinfo(0)+"]"; + mes "So, How.."; + mes "They believe they are dead, but I should talk to them to make them return?"; + next; + mes "[Sister Haley]"; + mes "Of course not. There are secret method in this church."; + mes "We have been trough lots of stuff, we have all kinds of solution."; + next; + mes "["+strcharinfo(0)+"]"; + mes "So How.."; + next; + mes "[Sister Haley]"; + mes "You know Leaf Of Yggdrasil is good for resurrection?"; + mes "Leaf Of Yggdrasil is a leaf from Yggdrasil and has a strong power of life."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Well, That is like common sense, so just tell me the materials and method to do that.."; + next; + mes "[Sister Haley]"; + mes "There is nothing else than Leaf of Yggdrasil to resurrect the character."; + mes "Even our priest used Leaf Of Yggdrasil!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "so, I mean! tell me the material I need and the method!"; + next; + mes "[Sister Haley]"; + mes "Oh.. My my."; + mes "I just want to explain you how good it is."; + next; + mes "[Sister Haley]"; + mes "the material and the method is quite simple."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Yes, I like simple thing, so tell me briefly."; + next; + mes "[Sister Haley]"; + mes "^0000cd1 Leaf Of Yggdrasil and 1 live Coal^000000 are what you need."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Only that?"; + next; + mes "[Sister Haley]"; + mes "Of course not~ ^0000cdyour prayer^000000 that is so desperate to bring the soul near death to here!"; + mes "Bring these 3 things and burn the Leaf Of Yggdrasil."; + next; + mes "[Sister Haley]"; + mes "Once they breathe in the smoke, they will remember where their bodies are and come back to real life."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Is that all?"; + next; + mes "[Sister Haley]"; + mes "Yes. Indeed~"; + mes "One think you must remember: The longer the soul left their body, the less chance he will get to come back."; + next; + mes "["+strcharinfo(0)+"]"; + mes "You should have told me earlier!"; + next; + mes "[Sister Haley]"; + mes "When you need my help, come and visit me anytime~"; + erasequest 14455; + setquest 14456; + close; + } else if (questprogress(14454) == 1) { + mes "[Sister Haley]"; + mes "Did you experience the holy Rosary effect?"; + mes "We often use it since it is simple. Of course, it make evils not to approach."; + close; + } else if (questprogress(14453) == 1) { + mes "[Sister Haley]"; + mes "How is it? the holy Rosary?"; + mes "did you use it?"; + next; + mes "[Sister Haley]"; + mes "If you have any problem, please come to me any time."; + close; + } else if (questprogress(14452) == 1) { + if ((countitem("Rosary_") > 0 || countitem("Rosary") > 0) && countitem("Holy_Water") > 5) { + mes "[Sister Haley]"; + mes "Did you prepare all?"; + mes "Even if you hide it, I can see it~"; + next; + mes "[Sister Haley]"; + mes "Well.. 6 Rosaries and .... holy .. water.."; + mes "Oops, you spilled the holy water little bit. but that is fine."; + next; + mes "[Sister Haley]"; + mes "This is enough. I can make it soon."; + mes "Odin Crystal power! with Holy light!!!!"; + next; + specialeffect EF_HOLYHIT,AREA,"Spiritual Sister#14hal"; + mes "[Sister Haley]"; + mes "Whoa~ It's done."; + mes "Hold ^0000cd this in your pocket^000000 and go to the crowd with live and dead ones, you will see who is dead or live."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Is that it? Awesome."; + mes "But.. Um.. you know.. is.. it affecting to me.. like in bad way?"; + next; + mes "[Sister Haley]"; + mes "Of course not!"; + mes "if ^0000cdHoly Rosary^000000 were a dangerous stuff, we would not be alive."; + next; + mes "[Sister Haley]"; + mes "But, For those who are dead.. Oh! I don't mean it's deadly threat, but it will give them little bit of pain."; + mes "So use it carefully not to damage the good dead people."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Ok."; + mes "Thank you for making this!"; + next; + mes "[Sister Haley]"; + mes "No worries!"; + mes "Please come back again if you need my help!"; + if (countitem("Rosary") > 0) + delitem Rosary, 1; + else + delitem Rosary_, 1; + delitem Holy_Water, 6; + getitem Sacred_Rosary, 1; + erasequest 14452; + setquest 14453; + close; + } else { + mes "[Sister Haley]"; + mes "Did you prepare all?"; + mes "Even if you hide it, I can see it~"; + next; + mes "[Sister Haley]"; + mes "Oh, Look. You are not ready."; + mes "Please bring ^0000cd 1 Rosary and 6 Holy Water^000000."; + next; + mes "[Sister Haley]"; + mes "With our church's secret, I will make more holy halidom."; + close; + } + } else if (questprogress(14451) == 1) { + mes "[Sister Haley]"; + mes "I hope all is well with everyone visiting here~"; + mes "What makes you come here, "+(Sex ? "brother" : "sister")+"?"; + next; + mes "[I told her what happened in Nifflheim.]"; + next; + mes "["+strcharinfo(0)+"]"; + mes "So I came here."; + mes "But, I cannot tell who is dead and who is alive, is there any way ^0000cdto check that^000000?"; + next; + mes "[Sister Haley]"; + mes "Of course, there is. Very ^0000cdgood method^000000!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Really? I was not sure if I found the right place."; + mes "I think I found well!"; + next; + mes "[Sister Haley]"; + mes "We study everything to make dead and live ones to peace."; + mes "There is secret way to do that, it kept secretly in our church."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Tell me the way.."; + next; + mes "[Sister Haley]"; + mes "That is simple! Make ^0000cdspecial halidom^000000!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "S, so how..?"; + next; + mes "[Sister Haley]"; + mes "How you make it? Bring ^0000cd1 Rosary and 6 Holy Water^000000 to me."; + mes "Then I will make it for you. It's simple"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Y, yes!!"; + erasequest 14451; + setquest 14452; + close; + } else { + mes "[Sister Haley]"; + mes "I hope all is well with everyone visiting here~"; + close; + } + + OnTouch: + if (questprogress(14451) == 1) { + mes "[Sister Haley]"; + mes "I hope all is well with everyone visiting here~"; + mes "If anyone needs help, please come to me~ I will do my best to help you."; + close; + } + end; +} + +//= Richard's Wife +//============================================================================== +xmas_in,160,175,1 script Worried Wife#14hal 4_F_05,{ + if (questprogress(14456) == 1) { + if (countitem("Leaf_Of_Yggdrasil") > 0 && countitem("Live_Coal") > 0) { + mes "[Richard's Daughter]"; + mes "Dad, Dad~ Wake up! It's time to wake up!"; + mes "I even made the stew for you. Wake and eat it."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Everyone, I am here."; + next; + mes "[Richard's Wife]"; + mes "Oh, dear, Adventurer! Welcome!"; + mes "Did you find the way to make him back?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Yes! But I need your help to do this."; + next; + mes "[Richard's Wife]"; + mes "How can I help you?"; + mes "I will do my best to do it!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Just pray hard to get him back."; + next; + mes "[Richard's Daughter]"; + mes "I will do it!"; + mes "I can do it!!!"; + next; + mes "[Richard's Wife]"; + mes "I will pray hard!"; + mes "Please!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Well, So I will burn.. this."; + specialeffect2 EF_TORCH; + sleep2 1000; + specialeffect2 EF_SMOKE; + sleep2 1000; + specialeffect2 EF_SMOKE; + sleep2 1000; + specialeffect2 EF_SMOKE; + next; + mes "["+strcharinfo(0)+"]"; + mes "It's almost ran out.. Why not he wakes up.."; + mes "Oh!!"; + specialeffect EF_RESURRECTION,AREA,"Richard#14hal02"; + next; + mes "[Richard]"; + mes "Uhh.. Umm.."; + mes "My arm.. ugh.."; + emotion e_an, "Richard#14hal02"; + next; + mes "[Richard's Wife]"; + mes "Honey!! Can you see me?"; + next; + mes "[Richard's Daughter]"; + mes "Dad! is it you?"; + mes "Are you really my dad? Are you alright?"; + next; + mes "[Richard]"; + mes "I, I was dead.. where.."; + mes "I was dead.. .."; + next; + mes "[Richard's Wife]"; + mes "You didn't die!"; + mes "This is your house! It's your daughter and I!"; + next; + mes "[Richard's Daughter]"; + mes "Dad! Your home!"; + next; + mes "[Richard]"; + mes "H.. ome..? Home..?"; + mes "am.. I.. alive..?"; + next; + mes "[Richard's Wife]"; + mes "What?"; + mes "maybe.. it's like ...a side effect..?"; + next; + mes "[Richard's Daughter]"; + mes "Dad!!!"; + specialeffect EF_SONICBLOWHIT,AREA,"Richard#14hal02"; + next; + mes "[Richard]"; + mes "O, Ouch!!!"; + mes "I told you not to hit me!"; + next; + mes "[Richard's Daughter]"; + mes "Do you really see me now?"; + mes "It's your home!"; + next; + mes "[Richard]"; + mes "Home.. home!!!"; + mes "what.. what about my arm??"; + next; + mes "[Richard's Wife]"; + mes "You have been injured, but it's okay."; + mes "I am so happy that you are awake! Really.."; + next; + mes "[Richard]"; + mes "I.. came back."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Thank god. Seriously."; + mes "It would have been really dangerous if I was a little late."; + next; + mes "[Richard]"; + mes "You saved me?"; + mes "Thank you! Thank you!"; + next; + mes "[Richard's Daughter]"; + mes "Dad! Mom and I also helped!!"; + next; + mes "[Richard]"; + mes "Yes, yes. You and your mom are the best!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "You can go to Niflheim later."; + mes "Why were you in a rush? You have a family."; + next; + mes "[Richard]"; + mes "I know. How could I forget my family?"; + mes "Anyway I could not even say good bye when I leave.."; + next; + mes "["+strcharinfo(0)+"]"; + mes "I will go and send your regards."; + next; + mes "[Richard]"; + mes "Thank you so much!"; + next; + mes "[Richard's Wife]"; + mes "I am really appreciated. There is no words to thank you on this."; + next; + mes "[Richard's Daughter]"; + mes "Thank you!"; + delitem Live_Coal, 1; + delitem Leaf_Of_Yggdrasil, 1; + erasequest 14456; + setquest 14457; + close; + } else { + mes "[Richard's Daughter]"; + mes "Dad, Dad~ Wake up! It's time to wake up!"; + mes "I even made the stew for you. Wake and eat it."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Everyone, I am here."; + next; + mes "[Richard's Wife]"; + mes "Oh, dear, Adventurer! Welcome!"; + mes "Did you find a way to bring him back?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Yes! Oh, w.wait.."; + mes "There is something missing. I will get it and come back."; + close; + } + } else if (questprogress(14455) == 1) { + mes "[Richard's Wife]"; + mes "How was the meeting with the sister in Prontera?"; + mes "My sweet heart.. can he come back?"; + close; + } else if (questprogress(14454) == 1) { + mes "["+strcharinfo(0)+"]"; + mes "If it's correct, it should be around here.."; + next; + mes "[Richard's Wife]"; + mes "Honey, Wake up."; + mes "It's.. time to wake up."; + emotion e_sob, "Worried Wife#14hal"; + next; + mes "[Richard's Daughter]"; + mes "Dad, I want to see your eyes."; + mes "Play with me~"; + emotion e_sob, "Worried Daughter#14hal"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hi, Is this Richard's house?"; + mes "I think I am right.."; + next; + mes "[Richard's Wife]"; + mes "Who is this?"; + next; + mes "[Richard's Daughter]"; + mes "Who..?"; + next; + mes "[Richard's Wife]"; + mes "Did you find my husband?"; + mes "But he is right now.. he hasn't waken up since after the accident.."; + next; + mes "["+strcharinfo(0)+"]"; + mes "So, he is still alive?"; + mes "And.. his... arm is attached to his body?"; + next; + mes "[Richard's Wife]"; + mes "Huh? Of course.. he is badly injured but ^0000cddidn't lose his arm.^000000"; + mes "But for some reason ^0000cdhe won't wake up.^000000"; + next; + mes "[Richard's Daughter]"; + mes "How can you treat my ^0000cdliving dad^000000 as if he is dead?!"; + mes "You're mean!"; + next; + mes "[Richard's Wife]"; + mes "Is there anything I can help you with..?"; + mes "You seem to know my husband.. Do you know something?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "I think we should find out why he is like this."; + next; + mes "[Richard's Wife]"; + mes "He used to be a swordsman. He had a dream to become the best swordsman in the world."; + mes "But he met me and we had a daughter, so he had to leave his dream for awhile."; + next; + mes "[Richard's Wife]"; + mes "Here, he fixes train rails."; + mes "Whether it is used or not, he did his best."; + next; + mes "[Richard's Wife]"; + mes "But the weather here isn't good."; + mes "There was snow storm coming, and he fell off from the rail."; + next; + mes "[Richard's Wife]"; + mes "I told him not to go, but he eventually went there and did not come back for long time."; + mes "and then.."; + next; + mes "[Richard's Wife]"; + mes "Luckily he only injured his arm, but otherwise he was fine."; + mes "But for some reason, he is not waking up."; + mes "The doctor said it's nothing but a concussion and that he'll wake up soon.."; + next; + mes "["+strcharinfo(0)+"]"; + mes "I see."; + mes "His soul is in Niflhiem. He thinks he is dead."; + next; + mes "[Richard's Daughter]"; + mes "^0000cdNiflhiem?!^000000"; + mes "The strong dead soldier's land?!"; + next; + mes "[Richard's Wife]"; + mes "Oh my god.. Niflhiem.. He always said he want to go there after he died.."; + next; + mes "[Richard's Wife]"; + mes "He wanted to be a swordsman.. He must have wanted it so deeply."; + mes "He never showed it to us.."; + next; + mes "["+strcharinfo(0)+"]"; + mes "It seems he went there even though he is not dead."; + mes "Something must be wrong."; + next; + mes "[Richard's Wife]"; + mes "Can.. can he come back?"; + mes "He is still alive here.."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hmm.. what should I do..?"; + mes "Oh, yes! I should go to ^0000cdProntera Church^000000."; + next; + mes "[Richard's Daughter]"; + mes "Prontera?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "There is ^0000cda nun I get help from sometimes^000000, I should ask if she can help me."; + next; + mes "[Richard's Wife]"; + mes "Please bring him back."; + mes "Please."; + erasequest 14454; + setquest 14455; + close; + } else { + mes "[Richard's Wife]"; + mes "My sweet heart, you are the best husband and dad ever."; + mes "I hope he can smile again."; + close; + } +} + +//= Richard's Daughter +//============================================================================== +xmas_in,163,178,3 script Worried Daughter#14hal 4_F_NFLOSTGIRL,{ + mes "[Richard's Daughter]"; + if (questprogress(14457)) { + mes "Thank you for helping my dad and mom."; + mes "You really are a nice person."; + } else if (questprogress(14456) || questprogress(14455)) { + mes "Can you fix my dad if you go prontera?"; + mes "I wish he could wake up again."; + } else if (questprogress(14454)) { + mes "My dad.. he won't wake up."; + mes "We are waiting for him to wake up..."; + } else { + mes "Dad, wake up and play with me~"; + mes "I even made a paper doll for you."; + } + close; +} + +//= Richard +//============================================================================== +xmas_in,160,178,3 script Richard#14hal02 4_M_DIEMAN,{ + mes "[Richard]"; + if (questprogress(14457) == 2) { + mes "I am happy to hear that everyone is doing well."; + mes "I am doing good here as well with my wife and daughter. Thank god to be alive."; + } else if (questprogress(14457) || questprogress(14456)) { + mes "Please send my regards to everyone in Niflheim."; + mes "I feel like I messed up."; + } else { + mes "......"; + mes "......"; + } + close; +} + +//= Event Monsters +//============================================================================== +gld_dun01_2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld_dun02_2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld_dun03_2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld_dun04_2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld2_ald,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld2_gef,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld2_pay,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld2_prt,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lhz_dun04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +iz_dun05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mal_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dic_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dew_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dew_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dew_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mal_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +iz_dun05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +man_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +man_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +spl_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +spl_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +man_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +spl_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +nyd_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +bra_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +bra_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +bra_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dic_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dic_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dic_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +dic_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +bif_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +bif_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +abbey01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +abbey02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +abbey03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +abyss_01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +abyss_02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +abyss_03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +alde_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +alde_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +alde_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +alde_dun04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ama_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ama_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ama_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ama_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +anthell01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +anthell02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ayo_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ayo_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ayo_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ayo_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +beach_dun,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +beach_dun2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +beach_dun3,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +c_tower1,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +c_tower2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +c_tower3,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +c_tower4,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +cmd_fild09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_fild05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ein_fild09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_dun00,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild00,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild10,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild11,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gef_fild13,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gefenia01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gefenia02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gefenia03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gefenia04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_cas01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_cas02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_church,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_chyard,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_in01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_knt01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_knt02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_prison,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_prison1,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_sew01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_sew02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_sew03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_sew04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_step,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +glast_01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gon_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gon_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gon_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gon_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +hu_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +hu_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +hu_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +hu_fild05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +hu_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ice_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ice_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ice_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +in_sphinx1,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +in_sphinx2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +in_sphinx3,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +in_sphinx4,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +in_sphinx5,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +iz_dun00,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +iz_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +iz_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +iz_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +iz_dun04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +jupe_core,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +juperos_01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +juperos_02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +kh_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +kh_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lhz_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lhz_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lhz_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lhz_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lhz_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lhz_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lou_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lou_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lou_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +lou_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mag_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mag_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +man_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjo_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjo_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjo_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_10,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_11,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +mjolnir_12,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild10,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild11,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild12,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild13,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild14,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild15,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild16,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild17,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_fild18,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_pryd01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_pryd02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_pryd03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_pryd04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_pryd05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_pryd06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +nameless_n,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +nif_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +nif_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +nyd_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +odin_tem01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +odin_tem02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +odin_tem03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +orcsdun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +orcsdun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_dun00,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_dun04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +pay_fild10,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild00,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild10,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild11,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_maze01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_maze02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_maze03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_sewb1,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_sewb2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_sewb3,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_fild05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_fild12,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_san01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_san02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_san03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_san04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ra_san05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +spl_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t10,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t11,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tha_t12,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +thor_v01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +thor_v02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +thor_v03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +treasure01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +treasure02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tur_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tur_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tur_dun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +tur_dun04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +um_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +um_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +um_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +um_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ve_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ve_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ve_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ve_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ve_fild05,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ve_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +xmas_dun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +xmas_dun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +xmas_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild06,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild07,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild08,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild09,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild10,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +yuno_fild12,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ecl_fild01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ecl_tdun01,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ecl_tdun02,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ecl_tdun03,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +ecl_tdun04,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_prydn1,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +moc_prydn2,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild08a,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild08b,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild08c,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +prt_fild08d,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_chyard_,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gl_cas02_,0,0,0,0 monster Dark Soul 3381,2,5000,0,0 +gld_dun01_2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gld_dun02_2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gld_dun03_2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gld_dun04_2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gld2_ald,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gld2_gef,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gld2_pay,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gld2_prt,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lhz_dun04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +iz_dun05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mal_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dic_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dew_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dew_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dew_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mal_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +iz_dun05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +man_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +man_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +spl_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +spl_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +man_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +spl_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +nyd_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +bra_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +bra_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +bra_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dic_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dic_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dic_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +dic_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +bif_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +bif_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +abbey01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +abbey02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +abbey03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +abyss_01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +abyss_02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +abyss_03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +alde_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +alde_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +alde_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +alde_dun04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ama_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ama_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ama_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ama_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +anthell01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +anthell02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ayo_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ayo_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ayo_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ayo_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +beach_dun,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +beach_dun2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +beach_dun3,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +c_tower1,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +c_tower2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +c_tower3,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +c_tower4,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +cmd_fild09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_fild05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ein_fild09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_dun00,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild00,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild10,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild11,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gef_fild13,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gefenia01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gefenia02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gefenia03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gefenia04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_cas01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_cas02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_church,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_chyard,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_in01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_knt01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_knt02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_prison,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_prison1,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_sew01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_sew02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_sew03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_sew04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_step,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +glast_01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gon_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gon_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gon_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gon_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +hu_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +hu_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +hu_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +hu_fild05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +hu_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ice_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ice_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ice_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +in_sphinx1,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +in_sphinx2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +in_sphinx3,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +in_sphinx4,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +in_sphinx5,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +iz_dun00,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +iz_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +iz_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +iz_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +iz_dun04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +jupe_core,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +juperos_01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +juperos_02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +kh_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +kh_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lhz_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lhz_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lhz_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lhz_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lhz_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lhz_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lou_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lou_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lou_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +lou_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mag_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mag_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +man_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjo_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjo_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjo_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_10,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_11,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +mjolnir_12,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild10,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild11,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild12,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild13,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild14,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild15,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild16,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild17,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_fild18,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_pryd01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_pryd02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_pryd03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_pryd04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_pryd05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_pryd06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +nameless_n,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +nif_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +nif_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +nyd_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +odin_tem01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +odin_tem02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +odin_tem03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +orcsdun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +orcsdun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_dun00,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_dun04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +pay_fild10,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild00,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild10,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild11,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_maze01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_maze02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_maze03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_sewb1,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_sewb2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_sewb3,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_fild05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_fild12,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_san01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_san02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_san03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_san04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ra_san05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +spl_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t10,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t11,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tha_t12,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +thor_v01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +thor_v02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +thor_v03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +treasure01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +treasure02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tur_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tur_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tur_dun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +tur_dun04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +um_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +um_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +um_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +um_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ve_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ve_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ve_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ve_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ve_fild05,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ve_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +xmas_dun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +xmas_dun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +xmas_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild06,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild07,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild08,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild09,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild10,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +yuno_fild12,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ecl_fild01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ecl_tdun01,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ecl_tdun02,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ecl_tdun03,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +ecl_tdun04,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_prydn1,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +moc_prydn2,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild08a,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild08b,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild08c,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +prt_fild08d,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_chyard_,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 +gl_cas02_,0,0,0,0 monster Wandering Soul 3382,2,5000,0,0 diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf index 1e5f28ed8..076ffd528 100644 --- a/npc/re/scripts.conf +++ b/npc/re/scripts.conf @@ -18,6 +18,9 @@ npc: npc/re/cities/malaya.txt npc: npc/re/cities/mora.txt npc: npc/re/cities/yuno.txt +// --------------------------- Events --------------------------- +//npc: npc/re/events/halloween_2014.txt + // --------------------------- Guides --------------------------- npc: npc/re/guides/navigation.txt npc: npc/re/guides/guides_alberta.txt diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 198d7a542..72572bb97 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -42,6 +42,7 @@ enum item_itemid { ITEMID_WHITE_POTION = 504, ITEMID_BLUE_POTION = 505, ITEMID_HOLY_WATER = 523, + ITEMID_PUMPKIN = 535, ITEMID_RED_SLIM_POTION = 545, ITEMID_YELLOW_SLIM_POTION = 546, ITEMID_WHITE_SLIM_POTION = 547, diff --git a/src/map/mob.h b/src/map/mob.h index 848bfbb2f..f3937c0d1 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -16,7 +16,7 @@ // Change this to increase the table size in your mob_db to accommodate a larger mob database. // Be sure to note that IDs 4001 to 4048 are reserved for advanced/baby/expanded classes. // Notice that the last 1000 entries are used for player clones, so always set this to desired value +1000 -#define MAX_MOB_DB 4000 +#define MAX_MOB_DB 5000 //The number of drops all mobs have and the max drop-slot that the steal skill will attempt to steal from. #define MAX_MOB_DROP 10 diff --git a/src/map/pc.c b/src/map/pc.c index 85dab4559..840891054 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7633,6 +7633,10 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp) // Recovery Potion if( sd->sc.data[SC_HEALPLUS] ) hp += (int)(hp * sd->sc.data[SC_HEALPLUS]->val1/100.); + + // 2014 Halloween Event : Pumpkin Bonus + if ( sd->sc.data[SC_MTF_PUMPKIN] && itemid == ITEMID_PUMPKIN ) + hp += (int)(hp * sd->sc.data[SC_MTF_PUMPKIN]->val1/100); } if(sp) { bonus = 100 + (sd->battle_status.int_<<1) diff --git a/src/map/script.c b/src/map/script.c index 05321561e..f4c343452 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -17967,6 +17967,7 @@ BUILDIN(montransform) { struct block_list* bl; char msg[CHAT_SIZE_MAX]; int mob_id, val1, val2, val3, val4; + val1 = val2 = val3 = val4 = 0; if( (bl = map->id2bl(st->rid)) == NULL ) return true; @@ -17986,12 +17987,17 @@ BUILDIN(montransform) { } tick = script_getnum(st, 3); - type = (sc_type)script_getnum(st, 4); - val1 = val2 = val3 = val4 = 0; - if( !(type > SC_NONE && type < SC_MAX) ) { - ShowWarning("buildin_montransform: Unsupported status change id %d\n", type); - return false; + if (script_hasdata(st, 4)) + type = (sc_type)script_getnum(st, 4); + else + type = SC_NONE; + + if (script_hasdata(st, 4)) { + if( !(type > SC_NONE && type < SC_MAX) ) { + ShowWarning("buildin_montransform: Unsupported status change id %d\n", type); + return false; + } } if (script_hasdata(st, 5)) @@ -18027,8 +18033,11 @@ BUILDIN(montransform) { clif->ShowScript(&sd->bl, msg); status_change_end(bl, SC_MONSTER_TRANSFORM, INVALID_TIMER); // Clear previous sc_start2(NULL, bl, SC_MONSTER_TRANSFORM, 100, mob_id, type, tick); - sc_start4(NULL, bl, type, 100, val1, val2, val3, val4, tick); + + if (script_hasdata(st, 4)) + sc_start4(NULL, bl, type, 100, val1, val2, val3, val4, tick); } + return true; } @@ -19460,7 +19469,7 @@ void script_parse_builtin(void) { BUILDIN_DEF(stand, "?"), BUILDIN_DEF(issit, "?"), - BUILDIN_DEF(montransform, "vii????"), // Monster Transform [malufett/Hercules] + BUILDIN_DEF(montransform, "vi?????"), // Monster Transform [malufett/Hercules] /* New BG Commands [Hercules] */ BUILDIN_DEF(bg_create_team,"sii"), diff --git a/src/map/status.c b/src/map/status.c index 7ae6606e3..6c1be1029 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -935,13 +935,16 @@ void initChangeTables(void) { status->ChangeFlagTable[SC_INCHITRATE] |= SCB_HIT; status->ChangeFlagTable[SC_INCFLEE] |= SCB_FLEE; status->ChangeFlagTable[SC_INCFLEERATE] |= SCB_FLEE; + status->ChangeFlagTable[SC_MTF_HITFLEE] |= SCB_HIT|SCB_FLEE; status->ChangeFlagTable[SC_CRITICALPERCENT] |= SCB_CRI; status->ChangeFlagTable[SC_INCASPDRATE] |= SCB_ASPD; status->ChangeFlagTable[SC_PLUSAVOIDVALUE] |= SCB_FLEE2; status->ChangeFlagTable[SC_INCMHPRATE] |= SCB_MAXHP; status->ChangeFlagTable[SC_INCMSPRATE] |= SCB_MAXSP; status->ChangeFlagTable[SC_INCMHP] |= SCB_MAXHP; + status->ChangeFlagTable[SC_MTF_MHP] |= SCB_MAXHP; status->ChangeFlagTable[SC_INCMSP] |= SCB_MAXSP; + status->ChangeFlagTable[SC_MTF_MSP] |= SCB_MAXSP; status->ChangeFlagTable[SC_INCATKRATE] |= SCB_BATK|SCB_WATK; status->ChangeFlagTable[SC_INCMATKRATE] |= SCB_MATK; status->ChangeFlagTable[SC_INCDEFRATE] |= SCB_DEF; @@ -4805,6 +4808,8 @@ signed short status_calc_hit(struct block_list *bl, struct status_change *sc, in if(sc->data[SC_INCHIT]) hit += sc->data[SC_INCHIT]->val1; + if(sc->data[SC_MTF_HITFLEE]) + hit += sc->data[SC_MTF_HITFLEE]->val1; if(sc->data[SC_FOOD_BASICHIT]) hit += sc->data[SC_FOOD_BASICHIT]->val1; if(sc->data[SC_TRUESIGHT]) @@ -4856,6 +4861,8 @@ signed short status_calc_flee(struct block_list *bl, struct status_change *sc, i if(sc->data[SC_INCFLEE]) flee += sc->data[SC_INCFLEE]->val1; + if(sc->data[SC_MTF_HITFLEE]) + flee += sc->data[SC_MTF_HITFLEE]->val2; if(sc->data[SC_FOOD_BASICAVOIDANCE]) flee += sc->data[SC_FOOD_BASICAVOIDANCE]->val1; if(sc->data[SC_WHISTLE]) @@ -5700,6 +5707,8 @@ unsigned int status_calc_maxhp(struct block_list *bl, struct status_change *sc, maxhp += maxhp * sc->data[SC_INCMHPRATE]->val1/100; if(sc->data[SC_INCMHP]) maxhp += (sc->data[SC_INCMHP]->val1); + if(sc->data[SC_MTF_MHP]) + maxhp += (sc->data[SC_MTF_MHP]->val1); if(sc->data[SC_APPLEIDUN]) maxhp += maxhp * sc->data[SC_APPLEIDUN]->val2/100; if(sc->data[SC_DELUGE]) @@ -5767,6 +5776,8 @@ unsigned int status_calc_maxsp(struct block_list *bl, struct status_change *sc, maxsp += maxsp * sc->data[SC_INCMSPRATE]->val1/100; if(sc->data[SC_INCMSP]) maxsp += (sc->data[SC_INCMSP]->val1); + if(sc->data[SC_MTF_MSP]) + maxsp += (sc->data[SC_MTF_MSP]->val1); if(sc->data[SC_SERVICEFORYOU]) maxsp += maxsp * sc->data[SC_SERVICEFORYOU]->val2/100; if(sc->data[SC_MER_SP]) diff --git a/src/map/status.h b/src/map/status.h index 623ba7eb3..e96894e9f 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -730,7 +730,7 @@ typedef enum sc_type { SC__FEINTBOMB_MASTER, SC_FALLENEMPIRE, - SC_FLASHCOMBO, + SC_FLASHCOMBO, // 580 //Vellum Weapon reductions SC_DEFSET, @@ -738,6 +738,12 @@ typedef enum sc_type { SC_NO_SWITCH_EQUIP, + // 2014 Halloween Event + SC_MTF_MHP, + SC_MTF_MSP, + SC_MTF_PUMPKIN, + SC_MTF_HITFLEE, + SC_MAX, //Automatically updated max, used in for's to check we are within bounds. } sc_type; -- cgit v1.2.3-70-g09d2 From 9e9bea6f1b9f44cb365c1b520eead64d713e76fd Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 31 Oct 2014 16:54:47 +0100 Subject: Follow-up to c6f102e (fixed a typo) Special thanks to kyeme Signed-off-by: Haru --- npc/merchants/renters.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'npc') diff --git a/npc/merchants/renters.txt b/npc/merchants/renters.txt index 255db3e62..3b6e6c28c 100644 --- a/npc/merchants/renters.txt +++ b/npc/merchants/renters.txt @@ -130,7 +130,7 @@ prontera,232,318,3 script Peco Peco Breeder#cru 8W_SOLDIER,{ close; } Zeny -= .@price; - setmount(MOUNT_NONE); + setmount(MOUNT_PECO); close; case 2: mes "[PecoPeco Breeder]"; -- cgit v1.2.3-70-g09d2 From 6b20c5b6988c889df35b890d93c338f8b87fa430 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 2 Nov 2014 01:30:33 +0100 Subject: Added min() and max() script commands - Special thanks to Streusel, Xgear Signed-off-by: Haru --- doc/script_commands.txt | 12 ++++++++++++ npc/dev/test.txt | 4 ++++ src/map/script.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+) (limited to 'npc') diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 9d2317942..4e28b5b71 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -7586,6 +7586,18 @@ Example: --------------------------------------- +*min({,...}) +*max({,...}) + +Returns the smallest (or biggest) from the set of given numbers. + +Example: + .@minimum = min(1, -6, -2, 8, 2); // .@minimum will be equal to -6 + .@maximum = max(0, 5, 10, 4); // .@maximum will be equal to 10 + .@level = min(BaseLevel, 70); // .@level will be the character's base level, capped to 70 + +--------------------------------------- + *md5("") Returns the md5 checksum of a number or string. diff --git a/npc/dev/test.txt b/npc/dev/test.txt index f9e4fc410..7b498e922 100644 --- a/npc/dev/test.txt +++ b/npc/dev/test.txt @@ -565,6 +565,10 @@ function script HerculesSelfTestHelper { callsub(OnCheck, "array shrink", .@x[1], 0); callsub(OnCheck, "array shrink and getarraysize", getarraysize(.@x), 0); + // min and max + callsub(OnCheck, "min()", min(5, -10, 8, 3, -2, 1000), -10); + callsub(OnCheck, "max()", max(5, -10, 8, 3, -2, 1000), 1000); + // Constants callsub(OnCheck, "'true' constant", true, 1); diff --git a/src/map/script.c b/src/map/script.c index 1516a0234..006f275eb 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -14835,6 +14835,36 @@ BUILDIN(distance) // <--- [zBuffer] List of mathematics commands +BUILDIN(min) +{ + int i, min; + + min = script_getnum(st, 2); + for (i = 3; script_hasdata(st, i); i++) { + int next = script_getnum(st, i); + if (next < min) + min = next; + } + script_pushint(st, min); + + return true; +} + +BUILDIN(max) +{ + int i, max; + + max = script_getnum(st, 2); + for (i = 3; script_hasdata(st, i); i++) { + int next = script_getnum(st, i); + if (next > max) + max = next; + } + script_pushint(st, max); + + return true; +} + BUILDIN(md5) { const char *tmpstr; @@ -19283,6 +19313,8 @@ void script_parse_builtin(void) { BUILDIN_DEF(pow,"ii"), BUILDIN_DEF(distance,"iiii"), // <--- [zBuffer] List of mathematics commands + BUILDIN_DEF(min, "i*"), + BUILDIN_DEF(max, "i*"), BUILDIN_DEF(md5,"s"), // [zBuffer] List of dynamic var commands ---> BUILDIN_DEF(getd,"s"), -- cgit v1.2.3-70-g09d2 From bf4b0a281207e46a9b21a9c9f779aeafaa739b62 Mon Sep 17 00:00:00 2001 From: Haru Date: Sun, 26 Oct 2014 02:06:46 +0100 Subject: Replaced 'set' with direct assignment where applicable (common folder) Signed-off-by: Haru --- npc/airports/airships.txt | 78 +++--- npc/battleground/bg_common.txt | 44 +-- npc/battleground/flavius/flavius01.txt | 82 +++--- npc/battleground/flavius/flavius02.txt | 82 +++--- npc/battleground/kvm/kvm01.txt | 76 +++-- npc/battleground/kvm/kvm02.txt | 72 +++-- npc/battleground/kvm/kvm03.txt | 76 +++-- npc/battleground/kvm/kvm_item_pay.txt | 8 +- npc/battleground/tierra/tierra01.txt | 60 ++-- npc/battleground/tierra/tierra02.txt | 60 ++-- npc/cities/alberta.txt | 8 +- npc/cities/aldebaran.txt | 8 +- npc/cities/amatsu.txt | 8 +- npc/cities/ayothaya.txt | 2 +- npc/cities/comodo.txt | 4 +- npc/cities/geffen.txt | 6 +- npc/cities/gonryun.txt | 2 +- npc/cities/jawaii.txt | 12 +- npc/cities/lighthalzen.txt | 4 +- npc/cities/lutie.txt | 36 +-- npc/cities/manuk.txt | 2 +- npc/cities/morocc.txt | 2 +- npc/cities/niflheim.txt | 21 +- npc/cities/payon.txt | 2 +- npc/cities/prontera.txt | 16 +- npc/cities/rachel.txt | 2 +- npc/events/MemorialDay_2008.txt | 26 +- npc/events/RWC_2011.txt | 60 ++-- npc/events/RWC_2012.txt | 70 ++--- npc/events/StPatrick_2008.txt | 8 +- npc/events/bossnia.txt | 2 +- npc/events/children_week.txt | 4 +- npc/events/christmas_2005.txt | 54 ++-- npc/events/christmas_2008.txt | 26 +- npc/events/easter_2008.txt | 28 +- npc/events/easter_2010.txt | 56 ++-- npc/events/event_skill_reset.txt | 2 +- npc/events/gdevent_aru.txt | 228 ++++++++------- npc/events/gdevent_sch.txt | 232 ++++++++------- npc/events/god_se_festival.txt | 12 +- npc/events/halloween_2006.txt | 20 +- npc/events/halloween_2009.txt | 86 +++--- npc/events/lunar_2008.txt | 16 +- npc/events/nguild/nguild_dunsw.txt | 2 +- npc/events/nguild/nguild_ev_agit.txt | 34 +-- npc/events/nguild/nguild_flags.txt | 2 +- npc/events/nguild/nguild_kafras.txt | 6 +- npc/events/nguild/nguild_managers.txt | 2 +- npc/events/nguild/nguild_treas.txt | 18 +- npc/events/valentinesday_2009.txt | 22 +- npc/events/valentinesday_2012.txt | 22 +- npc/events/xmas.txt | 6 +- npc/guild/agit_controller.txt | 2 +- npc/guild/agit_main.txt | 208 +++++++------- npc/guild/aldeg_cas01.txt | 2 +- npc/guild/aldeg_cas02.txt | 2 +- npc/guild/aldeg_cas03.txt | 2 +- npc/guild/aldeg_cas04.txt | 2 +- npc/guild/aldeg_cas05.txt | 2 +- npc/guild/gefg_cas01.txt | 2 +- npc/guild/gefg_cas02.txt | 2 +- npc/guild/gefg_cas03.txt | 2 +- npc/guild/gefg_cas04.txt | 2 +- npc/guild/gefg_cas05.txt | 2 +- npc/guild/payg_cas01.txt | 2 +- npc/guild/payg_cas02.txt | 2 +- npc/guild/payg_cas03.txt | 2 +- npc/guild/payg_cas04.txt | 2 +- npc/guild/payg_cas05.txt | 2 +- npc/guild/prtg_cas01.txt | 2 +- npc/guild/prtg_cas02.txt | 2 +- npc/guild/prtg_cas03.txt | 2 +- npc/guild/prtg_cas04.txt | 2 +- npc/guild/prtg_cas05.txt | 2 +- npc/guild/trs_rp.txt | 2 +- npc/guild2/agit_main_se.txt | 214 +++++++------- npc/instances/EndlessTower.txt | 126 ++++----- npc/instances/NydhoggsNest.txt | 108 +++---- npc/instances/OrcsMemory.txt | 68 ++--- npc/instances/SealedShrine.txt | 76 ++--- npc/jobs/1-1e/gunslinger.txt | 12 +- npc/jobs/1-1e/ninja.txt | 10 +- npc/jobs/1-1e/taekwon.txt | 10 +- npc/jobs/2-1/assassin.txt | 186 ++++++------ npc/jobs/2-1/blacksmith.txt | 104 +++---- npc/jobs/2-1/hunter.txt | 74 ++--- npc/jobs/2-1/knight.txt | 116 ++++---- npc/jobs/2-1/priest.txt | 44 +-- npc/jobs/2-1/wizard.txt | 144 +++++----- npc/jobs/2-1a/AssassinCross.txt | 4 +- npc/jobs/2-1a/HighPriest.txt | 4 +- npc/jobs/2-1a/HighWizard.txt | 4 +- npc/jobs/2-1a/LordKnight.txt | 4 +- npc/jobs/2-1a/Sniper.txt | 4 +- npc/jobs/2-1a/WhiteSmith.txt | 4 +- npc/jobs/2-1e/StarGladiator.txt | 54 ++-- npc/jobs/2-2/alchemist.txt | 156 +++++------ npc/jobs/2-2/bard.txt | 78 +++--- npc/jobs/2-2/crusader.txt | 122 ++++---- npc/jobs/2-2/dancer.txt | 102 +++---- npc/jobs/2-2/monk.txt | 144 +++++----- npc/jobs/2-2/rogue.txt | 128 ++++----- npc/jobs/2-2/sage.txt | 278 +++++++++--------- npc/jobs/2-2a/Champion.txt | 4 +- npc/jobs/2-2a/Clown.txt | 4 +- npc/jobs/2-2a/Gypsy.txt | 4 +- npc/jobs/2-2a/Paladin.txt | 4 +- npc/jobs/2-2a/Professor.txt | 4 +- npc/jobs/2-2a/Stalker.txt | 4 +- npc/jobs/2-2e/SoulLinker.txt | 22 +- npc/jobs/novice/supernovice.txt | 4 +- npc/jobs/valkyrie.txt | 14 +- npc/kafras/dts_warper.txt | 155 +++++----- npc/kafras/functions_kafras.txt | 2 +- npc/kafras/kafras.txt | 2 +- npc/merchants/advanced_refiner.txt | 12 +- npc/merchants/alchemist.txt | 4 +- npc/merchants/cashheadgear_dye.txt | 38 +-- npc/merchants/clothes_dyer.txt | 14 +- npc/merchants/coin_exchange.txt | 14 +- npc/merchants/dye_maker.txt | 38 +-- npc/merchants/elemental_trader.txt | 14 +- npc/merchants/enchan_arm.txt | 54 ++-- npc/merchants/gemstone.txt | 2 +- npc/merchants/hair_dyer.txt | 60 ++-- npc/merchants/hair_style.txt | 36 +-- npc/merchants/hd_refine.txt | 36 +-- npc/merchants/milk_trader.txt | 6 +- npc/merchants/novice_exchange.txt | 2 +- npc/merchants/old_pharmacist.txt | 10 +- npc/merchants/quivers.txt | 8 +- npc/merchants/refine.txt | 146 +++++----- npc/merchants/renters.txt | 18 +- npc/merchants/socket_enchant.txt | 2 +- npc/merchants/socket_enchant2.txt | 4 +- npc/other/Global_Functions.txt | 166 +++++------ npc/other/acolyte_warp.txt | 16 +- npc/other/arena/arena_aco.txt | 196 ++++++------- npc/other/arena/arena_lvl50.txt | 41 +-- npc/other/arena/arena_lvl60.txt | 41 +-- npc/other/arena/arena_lvl70.txt | 41 +-- npc/other/arena/arena_lvl80.txt | 41 +-- npc/other/arena/arena_party.txt | 93 +++--- npc/other/arena/arena_point.txt | 16 +- npc/other/arena/arena_room.txt | 76 ++--- npc/other/books.txt | 66 ++--- npc/other/card_trader.txt | 24 +- npc/other/comodo_gambling.txt | 498 ++++++++++++++++----------------- npc/other/divorce.txt | 2 +- npc/other/fortune.txt | 18 +- npc/other/gm_npcs.txt | 2 +- npc/other/guildpvp.txt | 4 +- npc/other/gympass.txt | 8 +- npc/other/hugel_bingo.txt | 230 +++++++-------- npc/other/marriage.txt | 34 +-- npc/other/mercenary_rent.txt | 43 +-- npc/other/monster_race.txt | 277 +++++++++--------- npc/other/poring_war.txt | 138 ++++----- npc/other/powernpc.txt | 30 +- npc/other/pvp.txt | 16 +- npc/other/turbo_track.txt | 334 +++++++++++----------- npc/warps/dungeons/mosk_dun.txt | 2 +- npc/warps/other/arena.txt | 2 +- 163 files changed, 3819 insertions(+), 3824 deletions(-) (limited to 'npc') diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 389e3c1ac..3eb84f867 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -51,7 +51,7 @@ OnTimer50000: mapannounce "airplane","We will arrive in Einbroch shortly.",bc_map,"0x00ff00"; end; OnTimer60000: - set $@airplanelocation,1; + $@airplanelocation = 1; donpcevent "#AirshipWarp-1::OnUnhide"; donpcevent "#AirshipWarp-2::OnUnhide"; mapannounce "airplane","Welcome to Einbroch. Have a safe trip.",bc_map,"0x00ff00"; @@ -71,7 +71,7 @@ OnTimer130000: mapannounce "airplane","We will arrive in Lighthalzen shortly.",bc_map,"0x70dbdb"; end; OnTimer140000: - set $@airplanelocation,2; + $@airplanelocation = 2; donpcevent "#AirshipWarp-1::OnUnhide"; donpcevent "#AirshipWarp-2::OnUnhide"; mapannounce "airplane","Welcome to Lighthalzen. Have a safe trip.",bc_map,"0x70dbdb"; @@ -91,7 +91,7 @@ OnTimer210000: mapannounce "airplane","We will arrive in Einbroch shortly.",bc_map,"0x00FF00"; end; OnTimer220000: - set $@airplanelocation,1; + $@airplanelocation = 1; donpcevent "#AirshipWarp-1::OnUnhide"; donpcevent "#AirshipWarp-2::OnUnhide"; mapannounce "airplane","Welcome to Einbroch. Have a safe trip.",bc_map,"0x00ff00"; @@ -111,7 +111,7 @@ OnTimer290000: mapannounce "airplane","We will arrive in Juno shortly.",bc_map,"0xff8200"; end; OnTimer300000: - set $@airplanelocation,0; + $@airplanelocation = 0; donpcevent "#AirshipWarp-1::OnUnhide"; donpcevent "#AirshipWarp-2::OnUnhide"; mapannounce "airplane","Welcome to Juno. Have a safe trip.",bc_map,"0xff8200"; @@ -131,7 +131,7 @@ OnTimer370000: mapannounce "airplane","We will arrive in Hugel shortly.",bc_map,"0xca4bf3"; end; OnTimer380000: - set $@airplanelocation,3; + $@airplanelocation = 3; donpcevent "#AirshipWarp-1::OnUnhide"; donpcevent "#AirshipWarp-2::OnUnhide"; mapannounce "airplane","Welcome to Hugel. Have a safe trip.",bc_map,"0xca4bf3"; @@ -151,7 +151,7 @@ OnTimer450000: mapannounce "airplane","We will arrive in Juno shortly.",bc_map,"0xff8200"; end; OnTimer460000: - set $@airplanelocation,0; + $@airplanelocation = 0; donpcevent "#AirshipWarp-1::OnUnhide"; donpcevent "#AirshipWarp-2::OnUnhide"; mapannounce "airplane","Welcome to Juno. Have a safe trip.",bc_map,"0xff8200"; @@ -476,7 +476,7 @@ airplane,50,66,5 script Apple Merchant#airplane 4_M_04,{ next; while (1) { input .@input; - set .@pay, .@input * 15; + .@pay = .@input * 15; if (.@input == 0) { mes "[Fruitz]"; mes "Thanks for stopping"; @@ -690,7 +690,7 @@ OnTimer50000: mapannounce "airplane_01","We will arrive in Izlude shortly.",bc_map,"0x00ff00"; end; OnTimer60000: - set $@airplanelocation2,1; + $@airplanelocation2 = 1; donpcevent "#AirshipWarp-3::OnUnhide"; donpcevent "#AirshipWarp-4::OnUnhide"; mapannounce "airplane_01","Welcome to Izlude. Have a safe trip.",bc_map,"0x00ff00"; @@ -710,7 +710,7 @@ OnTimer130000: mapannounce "airplane_01","We will arrive in Juno shortly.",bc_map,"0x70dbdb"; end; OnTimer140000: - set $@airplanelocation2,2; + $@airplanelocation2 = 2; donpcevent "#AirshipWarp-3::OnUnhide"; donpcevent "#AirshipWarp-4::OnUnhide"; mapannounce "airplane_01","Welcome to Juno. Have a safe trip.",bc_map,"0x70dbdb"; @@ -730,7 +730,7 @@ OnTimer210000: mapannounce "airplane_01","We will arrive in Rachel shortly.",bc_map,"0xFF8200"; end; OnTimer220000: - set $@airplanelocation2,0; + $@airplanelocation2 = 0; donpcevent "#AirshipWarp-3::OnUnhide"; donpcevent "#AirshipWarp-4::OnUnhide"; mapannounce "airplane_01","Welcome to Rachel. Have a safe trip.",bc_map,"0xFF8200"; @@ -743,13 +743,13 @@ OnTimer240000: donpcevent "#AirshipWarp-4::OnHide"; mapannounce "airplane_01","The Airship is now taking off. Our next destination is Izlude.",bc_map,"0x00ff00"; stopnpctimer; - set .moninv, .moninv + 1; + ++.moninv; if (.moninv == 7) { if (rand(1,3) == 3) { donpcevent "Airship#airplane02::OnEnable"; end; } - set .moninv, 0; + .moninv = 0; } initnpctimer; end; @@ -840,7 +840,7 @@ airplane_01,50,66,5 script Apple Merchant#air01 4_M_04,{ next; while (1) { input .@input; - set .@pay, .@input * 15; + .@pay = .@input * 15; if (.@input == 0) { mes "[Meltz]"; mes "Thanks for stopping"; @@ -1129,26 +1129,26 @@ airplane_01,32,61,4 script Nils#ein 1_M_03,1,1,{ 1740, 1440, 1450; - set .@wordtest, rand(7); + .@wordtest = rand(7); next; mes "[Nils]"; mes .@line1_1$[.@wordtest]; mes .@line1_2$[.@wordtest]; mes .@line1_3$[.@wordtest]; - set .@start_time, gettime(3)*60*60 + gettime(2)*60 + gettime(1); + .@start_time = gettime(3)*60*60 + gettime(2)*60 + gettime(1); next; input .@save1$; - set .@end_time, gettime(3)*60*60 + gettime(2)*60 + gettime(1); - set .@total_time, .@end_time - .@start_time; + .@end_time = gettime(3)*60*60 + gettime(2)*60 + gettime(1); + .@total_time = .@end_time - .@start_time; mes "[Nils]"; mes .@line2_1$[.@wordtest]; mes .@line2_2$[.@wordtest]; - set .@start_time, gettime(3)*60*60 + gettime(2)*60 + gettime(1); + .@start_time = gettime(3)*60*60 + gettime(2)*60 + gettime(1); next; input .@save2$; - set .@end_time, gettime(3)*60*60 + gettime(2)*60 + gettime(1); - set .@total_time, .@total_time + (.@start_time - .@end_time); - set .@tasoo, (.@letters[.@wordtest] / .@total_time) * 6; + .@end_time = gettime(3)*60*60 + gettime(2)*60 + gettime(1); + .@total_time = .@total_time + (.@start_time - .@end_time); + .@tasoo = (.@letters[.@wordtest] / .@total_time) * 6; if ((.@save1$ == .@word1$[.@wordtest]) && (.@save2$ == .@word2$[.@wordtest])) { mes "[Nils]"; mes "Your record is ^ff0000" + .@total_time + " seconds^000000 and"; @@ -1171,8 +1171,8 @@ airplane_01,32,61,4 script Nils#ein 1_M_03,1,1,{ mes "However, ^ff0000" + strcharinfo(0) + "^000000,"; mes "you made the new top record"; mes "this time. Congratulations!"; - set $050320_minus1_typing$, strcharinfo(0); - set $050320_ein_typing, .@tasoo; + $050320_minus1_typing$ = strcharinfo(0); + $050320_ein_typing = .@tasoo; close; } else { @@ -1363,11 +1363,11 @@ function script applegamble { } mes "^3355FF*Rolling and rumbling*^000000"; next; - set .@giveapple, .@amount*2; - set .@table1, rand(1,6); - set .@table2, rand(1,6); - set .@tablesub, .@table1 + .@table2; - set .@tabletotal, .@tablesub; + .@giveapple = .@amount*2; + .@table1 = rand(1,6); + .@table2 = rand(1,6); + .@tablesub = .@table1 + .@table2; + .@tabletotal = .@tablesub; mes "["+getarg(0)+"]"; mes "I got a ^0000FF" + .@table1 + "^000000 and a ^0000FF" + .@table2 + "^000000."; mes "That's a total of ^0000FF" + .@tablesub + "^000000."; @@ -1375,15 +1375,15 @@ function script applegamble { next; select("Cast Dice."); mes "^3355FF*Rolling and rumbling*^000000"; - set .@player1, rand(1,6); - set .@player2, rand(1,6); - set .@playersub, .@player1 + .@player2; + .@player1 = rand(1,6); + .@player2 = rand(1,6); + .@playersub = .@player1 + .@player2; if (.@playersub > 9 && .@amount > 39) { - set .@player1, rand(1,6); - set .@player2, rand(1,6); - set .@playersub, .@player1 + .@player2; + .@player1 = rand(1,6); + .@player2 = rand(1,6); + .@playersub = .@player1 + .@player2; } - set .@playertotal, .@playersub; + .@playertotal = .@playersub; next; mes "["+getarg(0)+"]"; mes "^FF0000" + strcharinfo(0) + "^000000, you have ^FF0000" + .@player1 + "^000000 and ^FF0000" + .@player2 + "^000000. The total is ^FF0000" + .@playersub + "^000000 ."; @@ -1400,8 +1400,8 @@ function script applegamble { switch (select("Cast dice.:Cancel.")) { case 1: mes "^3355FF*Rolling and rumbling*^000000"; - set .@player3, rand(1,6); - set .@playertotal, .@playertotal + .@player3; + .@player3 = rand(1,6); + .@playertotal += .@player3; next; mes "["+getarg(0)+"]"; if (.@playertotal > 12) { @@ -1450,8 +1450,8 @@ function script applegamble { } next; mes "^3355FF*Rolling and rumbling*^000000"; - set .@table3, rand(1,6); - set .@tabletotal, .@tabletotal + .@table3; + .@table3 = rand(1,6); + .@tabletotal += .@table3; next; mes "["+getarg(0)+"]"; if (.@tabletotal > 12) { diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt index 81d41513e..abed7c5a0 100644 --- a/npc/battleground/bg_common.txt +++ b/npc/battleground/bg_common.txt @@ -245,21 +245,21 @@ bat_room,148,150,5 script Teleporter#Battlefield 4_F_TELEPORTER,{ close2; getmapxy(.@mapname$,.@x,.@y,1); if (.@mapname$ == "prontera") - set bat_return,1; + bat_return = 1; else if (.@mapname$ == "moc_ruins") - set bat_return,2; + bat_return = 2; else if (.@mapname$ == "aldebaran") - set bat_return,3; + bat_return = 3; else if (.@mapname$ == "geffen") - set bat_return,4; + bat_return = 4; else if (.@mapname$ == "payon") - set bat_return,5; + bat_return = 5; else if (.@mapname$ == "lighthalzen") - set bat_return,6; + bat_return = 6; else if (.@mapname$ == "rachel") - set bat_return,7; + bat_return = 7; else - set bat_return,1; + bat_return = 1; warp "bat_room",154,150; break; case 2: @@ -324,7 +324,7 @@ bat_room,138,144,4 script Repairman#bg 4_M_04,{ // GM Management NPC //============================================================ bat_room,1,151,3 script Switch#batgnd 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1854,0); + .@i = callfunc("F_GM_NPC",1854,0); if (.@i == -1) { mes "The command has been cancelled."; close; @@ -432,11 +432,11 @@ bat_room,160,150,3 script Erundek 4_M_MANAGER,{ setarray .@Weapons[0],13108,7828,13171,7829,13172,7828,13173,7829,13174,7829; break; } - set .@menu$,""; - for(set .@i,0; .@i= .@items[.@i+1]) { mes "Thank you for exchanging."; delitem .@cost, .@items[.@i+1]; diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index a02752d52..5fc1de8f5 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -26,7 +26,7 @@ OnInit: waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80; end; OnEnterBG: - set $@FlaviusBG1_id1, waitingroom2bg("bat_b01",10,290,"start#bat_b01::OnGuillaumeQuit",""); + $@FlaviusBG1_id1 = waitingroom2bg("bat_b01",10,290,"start#bat_b01::OnGuillaumeQuit",""); end; } @@ -36,7 +36,7 @@ OnInit: waitingroom "Battle Station",11,"start#bat_b01::OnReadyCheck",1,0,80; end; OnEnterBG: - set $@FlaviusBG1_id2, waitingroom2bg("bat_b01",390,10,"start#bat_b01::OnCroixQuit",""); + $@FlaviusBG1_id2 = waitingroom2bg("bat_b01",390,10,"start#bat_b01::OnCroixQuit",""); end; } @@ -58,11 +58,11 @@ OnStop: OnTimer1000: stopnpctimer; initnpctimer; - set .@chk_bat_a01,getmapusers("bat_b01"); + .@chk_bat_a01 = getmapusers("bat_b01"); if (.@chk_bat_a01 < 1) { - set $@FlaviusBG1, 0; - if( $@FlaviusBG1_id1 ) { bg_destroy $@FlaviusBG1_id1; set $@FlaviusBG1_id1, 0; } - if( $@FlaviusBG1_id2 ) { bg_destroy $@FlaviusBG1_id2; set $@FlaviusBG1_id2, 0; } + $@FlaviusBG1 = 0; + if( $@FlaviusBG1_id1 ) { bg_destroy $@FlaviusBG1_id1; $@FlaviusBG1_id1 = 0; } + if( $@FlaviusBG1_id2 ) { bg_destroy $@FlaviusBG1_id2; $@FlaviusBG1_id2 = 0; } donpcevent "start#bat_b01::OnReadyCheck"; } end; @@ -79,18 +79,18 @@ OnInit: OnReadyCheck: if( $@FlaviusBG1 ) end; - set .@Guillaume, getwaitingroomstate(0,"Lieutenant Ator"); - set .@Croix, getwaitingroomstate(0,"Lieutenant Thelokus"); + .@Guillaume = getwaitingroomstate(0,"Lieutenant Ator"); + .@Croix = getwaitingroomstate(0,"Lieutenant Thelokus"); if( !.@Guillaume && !.@Croix ) { donpcevent "#bat_b01_timer::OnStop"; end; } if( .@Guillaume < 10 || .@Croix < 10 ) end; - set $@FlaviusBG1, 1; - set $@FlaviusBG1_Victory, 0; - set $@Croix_ScoreBG1, 0; - set $@Guill_ScoreBG1, 0; + $@FlaviusBG1 = 1; + $@FlaviusBG1_Victory = 0; + $@Croix_ScoreBG1 = 0; + $@Guill_ScoreBG1 = 0; bg_updatescore "bat_b01",$@Guill_ScoreBG1,$@Croix_ScoreBG1; donpcevent "Lieutenant Ator::OnEnterBG"; @@ -160,14 +160,14 @@ OnMyMobDead: if (mobcount("bat_b01","OBJ#bat_b01_a::OnMyMobDead") < 1) { mapannounce "bat_b01", "Guillaume's Crystal has been destroyed.",bc_map,"0xFFCE00"; if ($@Croix_ScoreBG1 > 0) { - set $@FlaviusBG1_Victory,2; - set $@Croix_ScoreBG1,$@Croix_ScoreBG1+1; + $@FlaviusBG1_Victory = 2; + ++$@Croix_ScoreBG1; enablenpc "Guillaume Vintenar#b01_a"; enablenpc "Croix Vintenar#b01_b"; donpcevent "time#bat_b01::OnStop"; } else { - set $@Croix_ScoreBG1,1; + $@Croix_ScoreBG1 = 1; donpcevent "time#bat_b01::OnEnable"; donpcevent "start#bat_b01::OnReset"; } @@ -193,14 +193,14 @@ OnMyMobDead: if (mobcount("bat_b01","OBJ#bat_b01_b::OnMyMobDead") < 1) { mapannounce "bat_b01", "Croix's Crystal has been destroyed.",bc_map,"0xFFCE00"; if ($@Guill_ScoreBG1 > 0) { - set $@FlaviusBG1_Victory,1; - set $@Guill_ScoreBG1,$@Guill_ScoreBG1+1; + $@FlaviusBG1_Victory = 1; + ++$@Guill_ScoreBG1; enablenpc "Guillaume Vintenar#b01_a"; enablenpc "Croix Vintenar#b01_b"; donpcevent "time#bat_b01::OnStop"; } else { - set $@Guill_ScoreBG1,1; + $@Guill_ScoreBG1 = 1; donpcevent "time#bat_b01::OnEnable"; donpcevent "start#bat_b01::OnReset"; } @@ -392,8 +392,8 @@ OnTouch: bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{ if ($@FlaviusBG1_id1 == getcharid(4)) { if ($@FlaviusBG1_Victory == 1) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -412,8 +412,8 @@ bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -444,8 +444,8 @@ OnInit: bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ if ($@FlaviusBG1_id2 == getcharid(4)) { if ($@FlaviusBG1_Victory == 2) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -464,8 +464,8 @@ bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+". Don't be sad."; @@ -574,11 +574,11 @@ bat_b01,336,139,3 script Croix Camp#flag30 1_FLAG_EAGLE,{ end; } bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; } bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{ - set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1; + .@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1; if ($@FlaviusBG1_id1 == getcharid(4)) { if (.@A_B_gap > 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -597,8 +597,8 @@ bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{ } } else if (.@A_B_gap == 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -617,8 +617,8 @@ bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -652,11 +652,11 @@ OnInit: } bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ - set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1; + .@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1; if ($@FlaviusBG1_id2 == getcharid(4)) { if (.@A_B_gap > 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+". Don't be sad."; @@ -675,8 +675,8 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ } } else if (.@A_B_gap == 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+". Don't be sad."; @@ -695,8 +695,8 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -730,7 +730,7 @@ OnInit: } bat_b01,1,10,3 script Release all#b01 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1854,0); + .@i = callfunc("F_GM_NPC",1854,0); if (.@i == -1) { mes "Cancelled."; close; diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt index 79b7b5168..42a0abc42 100644 --- a/npc/battleground/flavius/flavius02.txt +++ b/npc/battleground/flavius/flavius02.txt @@ -27,7 +27,7 @@ OnInit: waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80; end; OnEnterBG: - set $@FlaviusBG2_id1, waitingroom2bg("bat_b02",10,290,"start#bat_b02::OnGuillaumeQuit",""); + $@FlaviusBG2_id1 = waitingroom2bg("bat_b02",10,290,"start#bat_b02::OnGuillaumeQuit",""); end; } @@ -37,7 +37,7 @@ OnInit: waitingroom "Battle Station",11,"start#bat_b02::OnReadyCheck",1,0,80; end; OnEnterBG: - set $@FlaviusBG2_id2, waitingroom2bg("bat_b02",390,10,"start#bat_b02::OnCroixQuit",""); + $@FlaviusBG2_id2 = waitingroom2bg("bat_b02",390,10,"start#bat_b02::OnCroixQuit",""); end; } @@ -59,11 +59,11 @@ OnStop: OnTimer1000: stopnpctimer; initnpctimer; - set .@chk_bat_a01,getmapusers("bat_b02"); + .@chk_bat_a01 = getmapusers("bat_b02"); if (.@chk_bat_a01 < 1) { - set $@FlaviusBG2, 0; - if( $@FlaviusBG2_id1 ) { bg_destroy $@FlaviusBG2_id1; set $@FlaviusBG2_id1, 0; } - if( $@FlaviusBG2_id2 ) { bg_destroy $@FlaviusBG2_id2; set $@FlaviusBG2_id2, 0; } + $@FlaviusBG2 = 0; + if( $@FlaviusBG2_id1 ) { bg_destroy $@FlaviusBG2_id1; $@FlaviusBG2_id1 = 0; } + if( $@FlaviusBG2_id2 ) { bg_destroy $@FlaviusBG2_id2; $@FlaviusBG2_id2 = 0; } donpcevent "start#bat_b02::OnReadyCheck"; } end; @@ -80,18 +80,18 @@ OnInit: OnReadyCheck: if( $@FlaviusBG2 ) end; - set .@Guillaume, getwaitingroomstate(0,"Lieutenant Huvas"); - set .@Croix, getwaitingroomstate(0,"Lieutenant Yukon"); + .@Guillaume = getwaitingroomstate(0,"Lieutenant Huvas"); + .@Croix = getwaitingroomstate(0,"Lieutenant Yukon"); if( !.@Guillaume && !.@Croix ) { donpcevent "#bat_b02_timer::OnStop"; end; } if( .@Guillaume < 10 || .@Croix < 10 ) end; - set $@FlaviusBG2, 1; - set $@FlaviusBG2_Victory, 0; - set $@Croix_ScoreBG2, 0; - set $@Guill_ScoreBG2, 0; + $@FlaviusBG2 = 1; + $@FlaviusBG2_Victory = 0; + $@Croix_ScoreBG2 = 0; + $@Guill_ScoreBG2 = 0; bg_updatescore "bat_b02",$@Guill_ScoreBG2,$@Croix_ScoreBG2; donpcevent "Lieutenant Huvas::OnEnterBG"; @@ -161,14 +161,14 @@ OnMyMobDead: if (mobcount("bat_b02","OBJ#bat_b02_a::OnMyMobDead") < 1) { mapannounce "bat_b02", "Guillaume's Crystal has been destroyed.",bc_map,"0xFFCE00"; if ($@Croix_ScoreBG2 > 0) { - set $@FlaviusBG2_Victory,2; - set $@Croix_ScoreBG2,$@Croix_ScoreBG2+1; + $@FlaviusBG2_Victory = 2; + $@Croix_ScoreBG2 = $@Croix_ScoreBG2+1; enablenpc "Guillaume Vintenar#b02_a"; enablenpc "Croix Vintenar#b02_b"; donpcevent "time#bat_b02::OnStop"; } else { - set $@Croix_ScoreBG2,1; + $@Croix_ScoreBG2 = 1; donpcevent "time#bat_b02::OnEnable"; donpcevent "start#bat_b02::OnReset"; } @@ -194,14 +194,14 @@ OnMyMobDead: if (mobcount("bat_b02","OBJ#bat_b02_b::OnMyMobDead") < 1) { mapannounce "bat_b02", "Croix's Crystal has been destroyed.",bc_map,"0xFFCE00"; if ($@Guill_ScoreBG2 > 0) { - set $@FlaviusBG2_Victory,1; - set $@Guill_ScoreBG2,$@Guill_ScoreBG2+1; + $@FlaviusBG2_Victory = 1; + ++$@Guill_ScoreBG2; enablenpc "Guillaume Vintenar#b02_a"; enablenpc "Croix Vintenar#b02_b"; donpcevent "time#bat_b02::OnStop"; } else { - set $@Guill_ScoreBG2,1; + $@Guill_ScoreBG2 = 1; donpcevent "time#bat_b02::OnEnable"; donpcevent "start#bat_b02::OnReset"; } @@ -393,8 +393,8 @@ OnTouch: bat_b02,10,294,3 script Guillaume Vintenar#b02_a 4_M_RASWORD,{ if ($@FlaviusBG2_id1 == getcharid(4)) { if ($@FlaviusBG2_Victory == 1) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -413,8 +413,8 @@ bat_b02,10,294,3 script Guillaume Vintenar#b02_a 4_M_RASWORD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -445,8 +445,8 @@ OnInit: bat_b02,389,14,3 script Croix Vintenar#b02_b 4_M_RASWORD,{ if ($@FlaviusBG2_id2 == getcharid(4)) { if ($@FlaviusBG2_Victory == 2) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -465,8 +465,8 @@ bat_b02,389,14,3 script Croix Vintenar#b02_b 4_M_RASWORD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+". Don't be sad."; @@ -575,11 +575,11 @@ bat_b02,336,139,3 script Croix Camp#flag41 1_FLAG_EAGLE,{ end; } bat_b02,389,16,3 script Croix Camp#flag42 1_FLAG_EAGLE,{ end; } bat_b02,10,294,3 script Vintenar#bat_b02_aover 4_M_KY_HEAD,{ - set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2; + .@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2; if ($@FlaviusBG2_id1 == getcharid(4)) { if (.@A_B_gap > 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -598,8 +598,8 @@ bat_b02,10,294,3 script Vintenar#bat_b02_aover 4_M_KY_HEAD,{ } } else if (.@A_B_gap == 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -618,8 +618,8 @@ bat_b02,10,294,3 script Vintenar#bat_b02_aover 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -653,11 +653,11 @@ OnInit: } bat_b02,389,14,3 script Vintenar#bat_b02_bover 4_M_CRU_HEAD,{ - set .@A_B_gap,$@Guill_ScoreBG2 - $@Croix_ScoreBG2; + .@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2; if ($@FlaviusBG2_id2 == getcharid(4)) { if (.@A_B_gap > 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+". Don't be sad."; @@ -676,8 +676,8 @@ bat_b02,389,14,3 script Vintenar#bat_b02_bover 4_M_CRU_HEAD,{ } } else if (.@A_B_gap == 0) { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+". Don't be sad."; @@ -696,8 +696,8 @@ bat_b02,389,14,3 script Vintenar#bat_b02_bover 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7829); - set .@medal_gap,500 - .@your_medal; + .@your_medal = countitem(7829); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 8) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -731,7 +731,7 @@ OnInit: } bat_b02,1,10,3 script Release all#b02 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1854,0); + .@i = callfunc("F_GM_NPC",1854,0); if (.@i == -1) { mes "Cancelled."; close; diff --git a/npc/battleground/kvm/kvm01.txt b/npc/battleground/kvm/kvm01.txt index b4888be88..d5ecdfa31 100644 --- a/npc/battleground/kvm/kvm01.txt +++ b/npc/battleground/kvm/kvm01.txt @@ -27,7 +27,7 @@ OnInit: end; OnEnterBG: - set $@KvM01BG_id1, waitingroom2bg("bat_c01",52,129,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie"); + $@KvM01BG_id1 = waitingroom2bg("bat_c01",52,129,"KvM01_BG::OnGuillaumeQuit","KvM01_BG::OnGuillaumeDie"); end; } @@ -41,7 +41,7 @@ OnInit: end; OnEnterBG: - set $@KvM01BG_id2, waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie"); + $@KvM01BG_id2 = waitingroom2bg("bat_c01",147,55,"KvM01_BG::OnCroixQuit","KvM01_BG::OnCroixDie"); end; } @@ -93,7 +93,7 @@ OnDisable: end; OnTouch: - set Bat_Team,1; + Bat_Team = 1; setquest 6025; end; } @@ -114,7 +114,7 @@ OnDisable: end; OnTouch: - set Bat_Team,2; + Bat_Team = 2; setquest 6025; end; } @@ -139,11 +139,10 @@ OnCroixJoin: end; OnGuillaumeQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnGuillaumeDie: - if( $@KvM01BG == 2 ) - { - set .Guillaume_Count, .Guillaume_Count - 1; + if ($@KvM01BG == 2) { + --.Guillaume_Count; bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count; if( .Guillaume_Count < 1 ) donpcevent "KvM01_BG::OnCroixWin"; else { @@ -154,11 +153,10 @@ OnGuillaumeDie: end; OnCroixQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnCroixDie: - if( $@KvM01BG == 2 ) - { - set .Croix_Count, .Croix_Count - 1; + if ($@KvM01BG == 2) { + --.Croix_Count; bg_updatescore "bat_c01",.Guillaume_Count,.Croix_Count; if( .Croix_Count < 1 ) donpcevent "KvM01_BG::OnGuillaumeWin"; else { @@ -171,13 +169,13 @@ OnCroixDie: OnReadyCheck: if( $@KvM01BG ) end; - set .@Guillaume, getwaitingroomstate(0,"KvM01R_Guillaume"); - set .@Croix, getwaitingroomstate(0,"KvM01R_Croix"); + .@Guillaume = getwaitingroomstate(0,"KvM01R_Guillaume"); + .@Croix = getwaitingroomstate(0,"KvM01R_Croix"); if( .@Guillaume < 5 || .@Croix < 5 ) end; - set $@KvM01BG, 1; // Starting + $@KvM01BG = 1; // Starting donpcevent "KvM01R_Croix::OnEnterBG"; donpcevent "KvM01R_Guillaume::OnEnterBG"; donpcevent "KvM01_BG::OnStart"; @@ -186,7 +184,7 @@ OnReadyCheck: OnStart: disablenpc "KVM Officer#KVM01A"; disablenpc "KVM Officer#KVM01B"; - set $@KvM01BG_Victory, 0; + $@KvM01BG_Victory = 0; // Warp Teams bg_warp $@KvM01BG_id1,"bat_c01",53,128; bg_warp $@KvM01BG_id2,"bat_c01",146,55; @@ -239,18 +237,18 @@ OnTimer59000: OnTimer61000: // Team Members - set .Guillaume_Count, bg_get_data($@KvM01BG_id1, 0); - set .Croix_Count, bg_get_data($@KvM01BG_id2, 0); + .Guillaume_Count = bg_get_data($@KvM01BG_id1, 0); + .Croix_Count = bg_get_data($@KvM01BG_id2, 0); if( .Guillaume_Count < 5 || .Croix_Count < 5 ) { - set $@KvM01BG_Victory, 3; - set $@KvM01BG, 3; + $@KvM01BG_Victory = 3; + $@KvM01BG = 3; mapannounce "bat_c01","There are not enough players to start the battle",1,0x696969; stopnpctimer; donpcevent "KvM01_BG::OnStop"; end; } - set $@KvM01BG, 2; // Playing + $@KvM01BG = 2; // Playing bg_warp $@KvM01BG_id1,"bat_c01",61,120; bg_warp $@KvM01BG_id2,"bat_c01",138,63; end; @@ -283,8 +281,8 @@ OnTimer360000: donpcevent "KvM01_BG::OnGuillaumeWin"; else { // Draw Game - set $@KvM01BG, 3; - set $@KvM01BG_Victory, 3; + $@KvM01BG = 3; + $@KvM01BG_Victory = 3; mapannounce "bat_c01", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c01", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c01", "This battle has ended in a draw.",bc_map,"0x00ff00"; @@ -293,8 +291,8 @@ OnTimer360000: end; OnGuillaumeWin: - set $@KvM01BG, 3; - set $@KvM01BG_Victory, 1; + $@KvM01BG = 3; + $@KvM01BG_Victory = 1; mapannounce "bat_c01", "Guillaume wins!",bc_map,"0x00ff00"; mapannounce "bat_c01", "Congratulations to Guillaume members.",bc_map,"0x00ff00"; mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -302,8 +300,8 @@ OnGuillaumeWin: end; OnCroixWin: - set $@KvM01BG, 3; - set $@KvM01BG_Victory, 2; + $@KvM01BG = 3; + $@KvM01BG_Victory = 2; mapannounce "bat_c01", "Croix wins!",bc_map,"0x00ff00"; mapannounce "bat_c01", "Congratulations to Croix members.",bc_map,"0x00ff00"; mapannounce "bat_c01", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -321,17 +319,17 @@ OnStop: end; OnReset: - set .Croix_Count, 0; - set .Guillaume_Count, 0; - set $@KvM01BG_Victory, 0; - if( $@KvM01BG_id1 ) { bg_destroy $@KvM01BG_id1; set $@KvM01BG_id1, 0; } - if( $@KvM01BG_id2 ) { bg_destroy $@KvM01BG_id2; set $@KvM01BG_id2, 0; } + .Croix_Count = 0; + .Guillaume_Count = 0; + $@KvM01BG_Victory = 0; + if( $@KvM01BG_id1 ) { bg_destroy $@KvM01BG_id1; $@KvM01BG_id1 = 0; } + if( $@KvM01BG_id2 ) { bg_destroy $@KvM01BG_id2; $@KvM01BG_id2 = 0; } disablenpc "KVM Officer#KVM01A"; disablenpc "KVM Officer#KVM01B"; mapwarp "bat_c01","bat_room",154,150; maprespawnguildid "bat_c01",0,3; // Just in case someone else bg_updatescore "bat_c01",5,5; - set $@KvM01BG, 0; + $@KvM01BG = 0; donpcevent "KvM01_BG::OnReadyCheck"; // Maybe a game is ready to start end; } @@ -374,14 +372,14 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{ { if( $@KvM01BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 5; + kvm_point += 5; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; mes "You aquire the winning points: 5"; close2; } else { - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; @@ -389,7 +387,7 @@ bat_c01,51,130,5 script KVM Officer#KVM01A 4_M_KY_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } @@ -401,14 +399,14 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{ { if( $@KvM01BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 5; + kvm_point += 5; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; mes "You aquire the winning points: 5"; close2; } else { - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; @@ -416,7 +414,7 @@ bat_c01,148,53,1 script KVM Officer#KVM01B 4_M_CRU_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } diff --git a/npc/battleground/kvm/kvm02.txt b/npc/battleground/kvm/kvm02.txt index 06f3a2dcf..bf41528cc 100644 --- a/npc/battleground/kvm/kvm02.txt +++ b/npc/battleground/kvm/kvm02.txt @@ -29,7 +29,7 @@ OnInit: end; OnEnterBG: - set $@KvM02BG_id1, waitingroom2bg("bat_c02",52,129,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie"); + $@KvM02BG_id1 = waitingroom2bg("bat_c02",52,129,"KvM02_BG::OnGuillaumeQuit","KvM02_BG::OnGuillaumeDie"); end; } @@ -43,7 +43,7 @@ OnInit: end; OnEnterBG: - set $@KvM02BG_id2, waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie"); + $@KvM02BG_id2 = waitingroom2bg("bat_c02",147,55,"KvM02_BG::OnCroixQuit","KvM02_BG::OnCroixDie"); end; } @@ -95,7 +95,7 @@ OnDisable: end; OnTouch: - set Bat_Team,1; + Bat_Team = 1; setquest 6025; end; } @@ -116,7 +116,7 @@ OnDisable: end; OnTouch: - set Bat_Team,2; + Bat_Team = 2; setquest 6025; end; } @@ -141,11 +141,10 @@ OnCroixJoin: end; OnGuillaumeQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnGuillaumeDie: - if( $@KvM02BG == 2 ) - { - set .Guillaume_Count, .Guillaume_Count - 1; + if ($@KvM02BG == 2) { + --.Guillaume_Count; bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count; if( .Guillaume_Count < 1 ) donpcevent "KvM02_BG::OnCroixWin"; else { @@ -156,11 +155,10 @@ OnGuillaumeDie: end; OnCroixQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnCroixDie: - if( $@KvM02BG == 2 ) - { - set .Croix_Count, .Croix_Count - 1; + if ($@KvM02BG == 2) { + --.Croix_Count; bg_updatescore "bat_c02",.Guillaume_Count,.Croix_Count; if( .Croix_Count < 1 ) donpcevent "KvM02_BG::OnGuillaumeWin"; else { @@ -173,13 +171,13 @@ OnCroixDie: OnReadyCheck: if( $@KvM02BG ) end; - set .@Guillaume, getwaitingroomstate(0,"KvM02R_Guillaume"); - set .@Croix, getwaitingroomstate(0,"KvM02R_Croix"); + .@Guillaume = getwaitingroomstate(0,"KvM02R_Guillaume"); + .@Croix = getwaitingroomstate(0,"KvM02R_Croix"); if( .@Guillaume < 5 || .@Croix < 5 ) end; - set $@KvM02BG, 1; // Starting + $@KvM02BG = 1; // Starting donpcevent "KvM02R_Croix::OnEnterBG"; donpcevent "KvM02R_Guillaume::OnEnterBG"; donpcevent "KvM02_BG::OnStart"; @@ -188,7 +186,7 @@ OnReadyCheck: OnStart: disablenpc "KVM Officer#KVM02A"; disablenpc "KVM Officer#KVM02B"; - set $@KvM02BG_Victory, 0; + $@KvM02BG_Victory = 0; // Warp Teams bg_warp $@KvM02BG_id1,"bat_c02",53,128; bg_warp $@KvM02BG_id2,"bat_c02",146,55; @@ -241,18 +239,18 @@ OnTimer59000: OnTimer61000: // Team Members - set .Guillaume_Count, bg_get_data($@KvM02BG_id1, 0); - set .Croix_Count, bg_get_data($@KvM02BG_id2, 0); + .Guillaume_Count = bg_get_data($@KvM02BG_id1, 0); + .Croix_Count = bg_get_data($@KvM02BG_id2, 0); if( .Guillaume_Count < 5 || .Croix_Count < 5 ) { - set $@KvM02BG_Victory, 3; - set $@KvM02BG, 3; + $@KvM02BG_Victory = 3; + $@KvM02BG = 3; mapannounce "bat_c02","There are not enough players to start the battle",1,0x808080; stopnpctimer; donpcevent "KvM02_BG::OnStop"; end; } - set $@KvM02BG, 2; // Playing + $@KvM02BG = 2; // Playing bg_warp $@KvM02BG_id1,"bat_c02",62,119; bg_warp $@KvM02BG_id2,"bat_c02",137,64; end; @@ -285,8 +283,8 @@ OnTimer360000: donpcevent "KvM02_BG::OnGuillaumeWin"; else { // Draw Game - set $@KvM02BG, 3; - set $@KvM02BG_Victory, 3; + $@KvM02BG = 3; + $@KvM02BG_Victory = 3; mapannounce "bat_c02", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c02", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c02", "This battle has ended in a draw.",bc_map,"0x00ff00"; @@ -295,8 +293,8 @@ OnTimer360000: end; OnGuillaumeWin: - set $@KvM02BG, 3; - set $@KvM02BG_Victory, 1; + $@KvM02BG = 3; + $@KvM02BG_Victory = 1; mapannounce "bat_c02", "Guillaume wins!",bc_map,"0x00ff00"; mapannounce "bat_c02", "Congratulations to Guillaume members.",bc_map,"0x00ff00"; mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -304,8 +302,8 @@ OnGuillaumeWin: end; OnCroixWin: - set $@KvM02BG, 3; - set $@KvM02BG_Victory, 2; + $@KvM02BG = 3; + $@KvM02BG_Victory = 2; mapannounce "bat_c02", "Croix wins!",bc_map,"0x00ff00"; mapannounce "bat_c02", "Congratulations to Croix members.",bc_map,"0x00ff00"; mapannounce "bat_c02", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -323,17 +321,17 @@ OnStop: end; OnReset: - set .Croix_Count, 0; - set .Guillaume_Count, 0; - set $@KvM02BG_Victory, 0; - if( $@KvM02BG_id1 ) { bg_destroy $@KvM02BG_id1; set $@KvM02BG_id1, 0; } - if( $@KvM02BG_id2 ) { bg_destroy $@KvM02BG_id2; set $@KvM02BG_id2, 0; } + .Croix_Count = 0; + .Guillaume_Count = 0; + $@KvM02BG_Victory = 0; + if( $@KvM02BG_id1 ) { bg_destroy $@KvM02BG_id1; $@KvM02BG_id1 = 0; } + if( $@KvM02BG_id2 ) { bg_destroy $@KvM02BG_id2; $@KvM02BG_id2 = 0; } disablenpc "KVM Officer#KVM02A"; disablenpc "KVM Officer#KVM02B"; mapwarp "bat_c02","bat_room",154,150; maprespawnguildid "bat_c02",0,3; // Just in case someone else bg_updatescore "bat_c02",5,5; - set $@KvM02BG, 0; + $@KvM02BG = 0; donpcevent "KvM02_BG::OnReadyCheck"; // Maybe a game is ready to start end; } @@ -376,7 +374,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{ { if( $@KvM02BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; @@ -390,7 +388,7 @@ bat_c02,51,130,5 script KVM Officer#KVM02A 4_M_KY_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } @@ -402,7 +400,7 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{ { if( $@KvM02BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; @@ -416,7 +414,7 @@ bat_c02,148,53,1 script KVM Officer#KVM02B 4_M_CRU_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } diff --git a/npc/battleground/kvm/kvm03.txt b/npc/battleground/kvm/kvm03.txt index ea7dc3d47..f4bd49d4f 100644 --- a/npc/battleground/kvm/kvm03.txt +++ b/npc/battleground/kvm/kvm03.txt @@ -28,7 +28,7 @@ OnInit: end; OnEnterBG: - set $@KvM03BG_id1, waitingroom2bg("bat_c03",52,129,"KvM03_BG::OnGuillaumeQuit","KvM03_BG::OnGuillaumeDie"); + $@KvM03BG_id1 = waitingroom2bg("bat_c03",52,129,"KvM03_BG::OnGuillaumeQuit","KvM03_BG::OnGuillaumeDie"); end; } @@ -42,7 +42,7 @@ OnInit: end; OnEnterBG: - set $@KvM03BG_id2, waitingroom2bg("bat_c03",147,55,"KvM03_BG::OnCroixQuit","KvM03_BG::OnCroixDie"); + $@KvM03BG_id2 = waitingroom2bg("bat_c03",147,55,"KvM03_BG::OnCroixQuit","KvM03_BG::OnCroixDie"); end; } @@ -94,7 +94,7 @@ OnDisable: end; OnTouch: - set Bat_Team,1; + Bat_Team = 1; setquest 6025; end; } @@ -115,7 +115,7 @@ OnDisable: end; OnTouch: - set Bat_Team,2; + Bat_Team = 2; setquest 6025; end; } @@ -140,11 +140,10 @@ OnCroixJoin: end; OnGuillaumeQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnGuillaumeDie: - if( $@KvM03BG == 2 ) - { - set .Guillaume_Count, .Guillaume_Count - 1; + if ($@KvM03BG == 2) { + --.Guillaume_Count; bg_updatescore "bat_c03",.Guillaume_Count,.Croix_Count; if( .Guillaume_Count < 1 ) donpcevent "KvM03_BG::OnCroixWin"; else { @@ -155,11 +154,10 @@ OnGuillaumeDie: end; OnCroixQuit: - //set BG_Delay_Tick, gettimetick(2) + 1200; + //BG_Delay_Tick = gettimetick(2) + 1200; OnCroixDie: - if( $@KvM03BG == 2 ) - { - set .Croix_Count, .Croix_Count - 1; + if ($@KvM03BG == 2) { + --.Croix_Count; bg_updatescore "bat_c03",.Guillaume_Count,.Croix_Count; if( .Croix_Count < 1 ) donpcevent "KvM03_BG::OnGuillaumeWin"; else { @@ -172,13 +170,13 @@ OnCroixDie: OnReadyCheck: if( $@KvM03BG ) end; - set .@Guillaume, getwaitingroomstate(0,"KvM03R_Guillaume"); - set .@Croix, getwaitingroomstate(0,"KvM03R_Croix"); + .@Guillaume = getwaitingroomstate(0,"KvM03R_Guillaume"); + .@Croix = getwaitingroomstate(0,"KvM03R_Croix"); if( .@Guillaume < 5 || .@Croix < 5 ) end; - set $@KvM03BG, 1; // Starting + $@KvM03BG = 1; // Starting donpcevent "KvM03R_Croix::OnEnterBG"; donpcevent "KvM03R_Guillaume::OnEnterBG"; donpcevent "KvM03_BG::OnStart"; @@ -187,7 +185,7 @@ OnReadyCheck: OnStart: disablenpc "KVM Officer#KVM03A"; disablenpc "KVM Officer#KVM03B"; - set $@KvM01BG_Victory, 0; + $@KvM01BG_Victory = 0; // Warp Teams bg_warp $@KvM03BG_id1,"bat_c03",53,128; bg_warp $@KvM03BG_id2,"bat_c03",146,55; @@ -240,18 +238,18 @@ OnTimer59000: OnTimer61000: // Team Members - set .Guillaume_Count, bg_get_data($@KvM03BG_id1, 0); - set .Croix_Count, bg_get_data($@KvM03BG_id2, 0); + .Guillaume_Count = bg_get_data($@KvM03BG_id1, 0); + .Croix_Count = bg_get_data($@KvM03BG_id2, 0); if( .Guillaume_Count < 5 || .Croix_Count < 5 ) { - set $@KvM03BG_Victory, 3; - set $@KvM03BG, 3; + $@KvM03BG_Victory = 3; + $@KvM03BG = 3; mapannounce "bat_c03","There are not enough players to start the battle",1,0xC0C0C0; stopnpctimer; donpcevent "KvM03_BG::OnStop"; end; } - set $@KvM03BG, 2; // Playing + $@KvM03BG = 2; // Playing bg_warp $@KvM03BG_id1,"bat_c03",62,119; bg_warp $@KvM03BG_id2,"bat_c03",137,64; end; @@ -284,8 +282,8 @@ OnTimer360000: donpcevent "KvM03_BG::OnGuillaumeWin"; else { // Draw Game - set $@KvM03BG, 3; - set $@KvM03BG_Victory, 3; + $@KvM03BG = 3; + $@KvM03BG_Victory = 3; mapannounce "bat_c03", "The number of Guillaumes is "+.Guillaume_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c03", "The number of Croixes is "+.Croix_Count+".",bc_map,"0x00ff00"; mapannounce "bat_c03", "This battle has ended in a draw.",bc_map,"0x00ff00"; @@ -294,8 +292,8 @@ OnTimer360000: end; OnGuillaumeWin: - set $@KvM03BG, 3; - set $@KvM03BG_Victory, 1; + $@KvM03BG = 3; + $@KvM03BG_Victory = 1; mapannounce "bat_c03", "Guillaume wins!",bc_map,"0x00ff00"; mapannounce "bat_c03", "Congratulations to Guillaume members.",bc_map,"0x00ff00"; mapannounce "bat_c03", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -303,8 +301,8 @@ OnGuillaumeWin: end; OnCroixWin: - set $@KvM03BG, 3; - set $@KvM03BG_Victory, 2; + $@KvM03BG = 3; + $@KvM03BG_Victory = 2; mapannounce "bat_c03", "Croix wins!",bc_map,"0x00ff00"; mapannounce "bat_c03", "Congratulations to Croix members.",bc_map,"0x00ff00"; mapannounce "bat_c03", "Everyone will be moved to the start point.",bc_map,"0x00ff00"; @@ -322,17 +320,17 @@ OnStop: end; OnReset: - set .Croix_Count, 0; - set .Guillaume_Count, 0; - set $@KvM03BG_Victory, 0; - if( $@KvM03BG_id1 ) { bg_destroy $@KvM03BG_id1; set $@KvM03BG_id1, 0; } - if( $@KvM03BG_id2 ) { bg_destroy $@KvM03BG_id2; set $@KvM03BG_id2, 0; } + .Croix_Count = 0; + .Guillaume_Count = 0; + $@KvM03BG_Victory = 0; + if( $@KvM03BG_id1 ) { bg_destroy $@KvM03BG_id1; $@KvM03BG_id1 = 0; } + if( $@KvM03BG_id2 ) { bg_destroy $@KvM03BG_id2; $@KvM03BG_id2 = 0; } disablenpc "KVM Officer#KVM03A"; disablenpc "KVM Officer#KVM03B"; mapwarp "bat_c03","bat_room",154,150; maprespawnguildid "bat_c03",0,3; // Just in case someone else bg_updatescore "bat_c03",5,5; - set $@KvM03BG, 0; + $@KvM03BG = 0; donpcevent "KvM03_BG::OnReadyCheck"; // Maybe a game is ready to start end; } @@ -375,14 +373,14 @@ bat_c03,51,130,5 script KVM Officer#KVM03A 4_M_KY_HEAD,{ { if( $@KvM03BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 2; + kvm_point += 2; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; mes "You aquire the winning points: 2"; close2; } else { - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; @@ -390,7 +388,7 @@ bat_c03,51,130,5 script KVM Officer#KVM03A 4_M_KY_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } @@ -402,14 +400,14 @@ bat_c03,148,53,1 script KVM Officer#KVM03B 4_M_CRU_HEAD,{ { if( $@KvM03BG_Victory == Bat_Team ) { // Victory - set kvm_point,kvm_point + 2; + kvm_point +=2; mes "[KVM Officer]"; mes "Good Game."; mes "May the glory of KVM be with you."; mes "You aquire the winning points: 2"; close2; } else { - set kvm_point,kvm_point + 1; + ++kvm_point; mes "[KVM Officer]"; mes "I am so sorry."; mes "I wish you better luck next time."; @@ -417,7 +415,7 @@ bat_c03,148,53,1 script KVM Officer#KVM03B 4_M_CRU_HEAD,{ close2; } bg_leave; - set Bat_Team,0; + Bat_Team = 0; warp "bat_room",154,150; end; } diff --git a/npc/battleground/kvm/kvm_item_pay.txt b/npc/battleground/kvm/kvm_item_pay.txt index fa14455d6..ed6190690 100644 --- a/npc/battleground/kvm/kvm_item_pay.txt +++ b/npc/battleground/kvm/kvm_item_pay.txt @@ -18,9 +18,9 @@ bat_room,151,144,3 script KVM Logistic Officer#a 4_M_JOB_KNIGHT2,{ if (countitem(7773)) { - set .@pointstoadd,countitem(7773); + .@pointstoadd = countitem(7773); delitem 7773,.@pointstoadd; - set kvm_point,kvm_point+.@pointstoadd; + kvm_point += .@pointstoadd; mes "[Logistics]"; mes "Are those "+getitemname(7773)+"s I see?"; mes "We no longer accept that currency,"; @@ -45,7 +45,7 @@ bat_room,151,144,3 script KVM Logistic Officer#a 4_M_JOB_KNIGHT2,{ mes "be reversed. Please be carefull."; mes "Select the next step please."; next; - set .@name$,strcharinfo(0); + .@name$ = strcharinfo(0); switch(select("Read the KVM Catalogue.:Purchase KVM Items.:Confirm KVM Points.:Explanation of KVM Rewards.:Explanation of KVM Points.")) { case 1: mes "[Logistics]"; @@ -283,7 +283,7 @@ PurchaseItem: break; case 2: if (kvm_point >= .@prices[getarg(1)]) { - set kvm_point,kvm_point-.@prices[getarg(1)]; + kvm_point -= .@prices[getarg(1)]; getitem getarg(0),1; mes "[Logistics]"; mes "You have purchased a "+getitemname(getarg(0))+"."; diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index 2a6d5991a..20f0fe096 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -28,7 +28,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG1_id1, waitingroom2bg("bat_a01",50,374,"start#bat_a01::OnGuillaumeQuit",""); + $@TierraBG1_id1 = waitingroom2bg("bat_a01",50,374,"start#bat_a01::OnGuillaumeQuit",""); end; } @@ -40,7 +40,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG1_id2, waitingroom2bg("bat_a01",42,16,"start#bat_a01::OnCroixQuit",""); + $@TierraBG1_id2 = waitingroom2bg("bat_a01",42,16,"start#bat_a01::OnCroixQuit",""); end; } @@ -59,11 +59,11 @@ OnStop: OnTimer1000: stopnpctimer; initnpctimer; - set .@chk_bat_a01,getmapusers("bat_a01"); + .@chk_bat_a01 = getmapusers("bat_a01"); if (.@chk_bat_a01 < 1) { - set $@TierraBG1,0; set $@TierraBG1_Victory, 0; - if( $@TierraBG1_id1 ) { bg_destroy $@TierraBG1_id1; set $@TierraBG1_id1, 0; } - if( $@TierraBG1_id2 ) { bg_destroy $@TierraBG1_id2; set $@TierraBG1_id2, 0; } + $@TierraBG1 = 0; $@TierraBG1_Victory = 0; + if( $@TierraBG1_id1 ) { bg_destroy $@TierraBG1_id1; $@TierraBG1_id1 = 0; } + if( $@TierraBG1_id2 ) { bg_destroy $@TierraBG1_id2; $@TierraBG1_id2 = 0; } donpcevent "start#bat_a01::OnReadyCheck"; } end; @@ -127,15 +127,15 @@ OnCroixQuit: OnReadyCheck: if( $@TierraBG1 ) end; - set .@Guillaume, getwaitingroomstate(0,"Lieutenant Kalos"); - set .@Croix, getwaitingroomstate(0,"Lieutenant Eyor"); + .@Guillaume = getwaitingroomstate(0,"Lieutenant Kalos"); + .@Croix = getwaitingroomstate(0,"Lieutenant Eyor"); if( !.@Guillaume && !.@Croix ) { donpcevent "#bat_a01_timer::OnStop"; end; } else if( .@Guillaume < 10 || .@Croix < 10 ) end; - set $@TierraBG1,1; + $@TierraBG1 = 1; donpcevent "Lieutenant Kalos::OnEnterBG"; donpcevent "Lieutenant Eyor::OnEnterBG"; donpcevent "start#bat_a01::OnEnable"; @@ -163,7 +163,7 @@ OnMyMobDead: if (mobcount("bat_a01","OBJ#bat_a01_a::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a01_a::OnStop"; donpcevent "Battle Therapist#a01_b::OnStop"; - set $@TierraBG1_Victory, 2; + $@TierraBG1_Victory = 2; enablenpc "Guillaume Vintenar#a01_a"; enablenpc "Croix Vintenar#a01_b"; mapannounce "bat_a01", "Croix Vintenar Swandery: We destroyed Guillaume's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -186,7 +186,7 @@ OnMyMobDead: if (mobcount("bat_a01","OBJ#bat_a01_b::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a01_a::OnStop"; donpcevent "Battle Therapist#a01_b::OnStop"; - set $@TierraBG1_Victory, 1; + $@TierraBG1_Victory = 1; enablenpc "Guillaume Vintenar#a01_a"; enablenpc "Croix Vintenar#a01_b"; mapannounce "bat_a01", "Guillaume Vintenar Axl Rose : We destroyed Croix's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -198,7 +198,7 @@ OnMyMobDead: bat_a01,15,18,3 script barricade#bat_a01_a CLEAR_NPC,{ OnEnable: - for( set .@i,185; .@i < 202; set .@i,.@i+1 ) + for (.@i = 185; .@i < 202; ++.@i) bg_monster $@TierraBG1_id1,"bat_a01",.@i,266,"Barricade",1906,"barricade#bat_a01_a::OnMyMobDead"; setwall "bat_a01",186,266,16,6,1,"bat_a01_c1"; end; @@ -220,7 +220,7 @@ OnMyMobDead: bat_a01,15,19,3 script barricade#bat_a01_b CLEAR_NPC,{ OnEnable: - for( set .@i,169; .@i < 186; set .@i,.@i+1 ) + for (.@i = 169; .@i < 186; ++.@i) bg_monster $@TierraBG1_id2,"bat_a01",.@i,129,"Barricade",1906,"barricade#bat_a01_b::OnMyMobDead"; setwall "bat_a01",170,129,16,6,1,"bat_a01_g1"; end; @@ -681,8 +681,8 @@ bat_a01,348,74,3 script Croix Camp#flag9 1_FLAG_EAGLE,{ end; } bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ if (getcharid(4) == $@TierraBG1_id1) { if ($@TierraBG1_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -701,8 +701,8 @@ bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -723,8 +723,8 @@ bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ } else { if ($@TierraBG1_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -743,8 +743,8 @@ bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -775,8 +775,8 @@ OnInit: bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ if (getcharid(4) == $@TierraBG1_id2) { if ($@TierraBG1_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -795,8 +795,8 @@ bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -817,8 +817,8 @@ bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ } else { if ($@TierraBG1_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -837,8 +837,8 @@ bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -922,7 +922,7 @@ bat_a01,356,326,3 script Guillaume Camp Soldier#bat_a01_guide 4_M_RASWORD,{ */ bat_a01,1,1,3 script Release all#a01 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1854,0); + .@i = callfunc("F_GM_NPC",1854,0); if (.@i == -1) { mes "Cancelled."; close; diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index 129d0ee3e..c79b20845 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -27,7 +27,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG2_id1, waitingroom2bg("bat_a02",50,374,"start#bat_a02::OnGuillaumeQuit",""); + $@TierraBG2_id1 = waitingroom2bg("bat_a02",50,374,"start#bat_a02::OnGuillaumeQuit",""); end; } @@ -39,7 +39,7 @@ OnInit: end; OnEnterBG: - set $@TierraBG2_id2, waitingroom2bg("bat_a02",42,16,"start#bat_a02::OnCroixQuit",""); + $@TierraBG2_id2 = waitingroom2bg("bat_a02",42,16,"start#bat_a02::OnCroixQuit",""); end; } @@ -58,11 +58,11 @@ OnStop: OnTimer1000: stopnpctimer; initnpctimer; - set .@chk_bat_a02,getmapusers("bat_a02"); + .@chk_bat_a02 = getmapusers("bat_a02"); if (.@chk_bat_a02 < 1) { - set $@TierraBG2,0; set $@TierraBG2_Victory, 0; - if( $@TierraBG2_id1 ) { bg_destroy $@TierraBG2_id1; set $@TierraBG2_id1, 0; } - if( $@TierraBG2_id2 ) { bg_destroy $@TierraBG2_id2; set $@TierraBG2_id2, 0; } + $@TierraBG2 = 0; $@TierraBG2_Victory = 0; + if( $@TierraBG2_id1 ) { bg_destroy $@TierraBG2_id1; $@TierraBG2_id1 = 0; } + if( $@TierraBG2_id2 ) { bg_destroy $@TierraBG2_id2; $@TierraBG2_id2 = 0; } donpcevent "start#bat_a02::OnReadyCheck"; } end; @@ -126,15 +126,15 @@ OnCroixQuit: OnReadyCheck: if( $@TierraBG2 ) end; - set .@Guillaume, getwaitingroomstate(0,"Lieutenant Rundel"); - set .@Croix, getwaitingroomstate(0,"Lieutenant Guerrit"); + .@Guillaume = getwaitingroomstate(0,"Lieutenant Rundel"); + .@Croix = getwaitingroomstate(0,"Lieutenant Guerrit"); if( !.@Guillaume && !.@Croix ) { donpcevent "#bat_a02_timer::OnStop"; end; } else if( .@Guillaume < 10 || .@Croix < 10 ) end; - set $@TierraBG2,1; + $@TierraBG2 = 1; donpcevent "Lieutenant Rundel::OnEnterBG"; donpcevent "Lieutenant Guerrit::OnEnterBG"; donpcevent "start#bat_a02::OnEnable"; @@ -162,7 +162,7 @@ OnMyMobDead: if (mobcount("bat_a02","OBJ#bat_a02_a::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a02_a::OnStop"; donpcevent "Battle Therapist#a02_b::OnStop"; - set $@TierraBG2_Victory, 2; + $@TierraBG2_Victory = 2; enablenpc "Guillaume Vintenar#a02_a"; enablenpc "Croix Vintenar#a02_b"; mapannounce "bat_a02", "Croix Vintenar Swandery: We destroyed Guillaume's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -185,7 +185,7 @@ OnMyMobDead: if (mobcount("bat_a02","OBJ#bat_a02_b::OnMyMobDead") < 1) { donpcevent "Battle Therapist#a02_a::OnStop"; donpcevent "Battle Therapist#a02_b::OnStop"; - set $@TierraBG2_Victory, 1; + $@TierraBG2_Victory = 1; enablenpc "Guillaume Vintenar#a02_a"; enablenpc "Croix Vintenar#a02_b"; mapannounce "bat_a02", "Guillaume Vintenar Axl Rose : We destroyed Croix's Food Storage. We won that! Wow!",bc_map,"0xFFCE00"; @@ -197,7 +197,7 @@ OnMyMobDead: bat_a02,15,18,3 script barricade#bat_a02_a CLEAR_NPC,{ OnEnable: - for( set .@i,185; .@i < 202; set .@i,.@i+1 ) + for (.@i = 185; .@i < 202; ++.@i) bg_monster $@TierraBG2_id1,"bat_a02",.@i,266,"Barricade",1906,"barricade#bat_a02_a::OnMyMobDead"; setwall "bat_a02",186,266,16,6,1,"bat_a02_c1"; end; @@ -219,7 +219,7 @@ OnMyMobDead: bat_a02,15,19,3 script barricade#bat_a02_b CLEAR_NPC,{ OnEnable: - for( set .@i,169; .@i < 186; set .@i,.@i+1 ) + for (.@i = 169; .@i < 186; ++.@i) bg_monster $@TierraBG2_id2,"bat_a02",.@i,129,"Barricade",1906,"barricade#bat_a02_b::OnMyMobDead"; setwall "bat_a02",170,129,16,6,1,"bat_a02_g1"; end; @@ -680,8 +680,8 @@ bat_a02,348,74,3 script Croix Camp#flag19 1_FLAG_EAGLE,{ end; } bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ if (getcharid(4) == $@TierraBG2_id1) { if ($@TierraBG2_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -700,8 +700,8 @@ bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -722,8 +722,8 @@ bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ } else { if ($@TierraBG2_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Axl Rose]"; mes "You lost, but you're dedicated to this battle."; @@ -742,8 +742,8 @@ bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Axl Rose]"; mes "Blessed Guillaume!"; @@ -774,8 +774,8 @@ OnInit: bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ if (getcharid(4) == $@TierraBG2_id2) { if ($@TierraBG2_Victory == 2) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -794,8 +794,8 @@ bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -816,8 +816,8 @@ bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ } else { if ($@TierraBG2_Victory == 1) { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 0) { mes "[Swandery]"; mes "Oh, "+strcharinfo(0)+" Don't be sad."; @@ -836,8 +836,8 @@ bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ } } else { - set .@your_medal,countitem(7828); - set .@medal_gap, 500 - .@your_medal; + .@your_medal = countitem(7828); + .@medal_gap = 500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; mes "Blessed Croix!"; @@ -921,7 +921,7 @@ bat_a02,356,326,3 script Guillaume Camp Soldier#bat_a02_guide 4_M_RASWORD,{ */ bat_a02,1,1,3 script Release all#a02 4_DOG01,{ - set .@i, callfunc("F_GM_NPC",1854,0); + .@i = callfunc("F_GM_NPC",1854,0); if (.@i == -1) { mes "Cancelled."; close; diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 232fb5da3..92e249135 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -277,7 +277,7 @@ alberta,195,151,2 script Paul 4_M_04,{ } alberta,190,173,4 script Phelix 4_M_03,{ - set .@weight,MaxWeight-Weight; + .@weight = MaxWeight-Weight; mes "[Phelix]"; if ((.@weight) < 10000) { mes "Wait a moment!!"; @@ -297,7 +297,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ next; mes "[Phelix]"; mes "If you're interested in my offer, get me the stuff I mentioned."; - set @event_zelopy,1; + @event_zelopy = 1; close; } else { mes "Hmm.. you want to exchange jellopies for Red Potions or some Carrots eh? Well.. which one?"; @@ -314,7 +314,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?"; close; } else { - set .@max,countitem(909)/10; + .@max = countitem(909)/10; mes "Hmm, not bad..."; mes "How many potions"; mes "do you want to get?"; @@ -365,7 +365,7 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?"; close; } else { - set .@max,countitem(909)/3; + .@max = countitem(909)/3; mes "Not too bad pansy..."; mes "How many do you want?"; next; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index f4b3662fc..494247912 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -779,7 +779,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ end; } else { - set .@kafrapassmoney,countitem(1084)*2000; + .@kafrapassmoney = countitem(1084)*2000; mes "[Kafra Pavianne]"; mes "Let's see..."; if (countitem(1084) == 1) { @@ -1194,7 +1194,7 @@ function script F_Lottery { mes "How many times do you want the Lottery Machine to spin? You can choose up to 5 times."; next; input @input; - if(@input < 1 || @input > 5) set @input, rand(1,5); //Lupus's fix + if(@input < 1 || @input > 5) @input = rand(1,5); //Lupus's fix callsub sF_Spin; mes "[Kafra]"; mes "Ok~ Let me check the results~ guess what it is?"; @@ -1267,8 +1267,8 @@ sF_Spin: mes "[Lottery Machine]"; mes "(rumble~rumble~rumble~)..."; next; - set @temp, rand(10); - set @input, @input -1; + @temp = rand(10); + --@input; if(@input <= 0) return; goto sF_Spin; } diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index 18ae79bdc..a79c30993 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -339,7 +339,7 @@ amatsu,287,266,3 script Jyaburo#ama 4_M_JPNOJI,{ // Legendary Tree //============================================================ amatsu,269,221,1 script Propose Girl#ama 4_F_JPN,{ - set jap_tree,1; + jap_tree = 1; mes "[Hutari Shioko]"; mes "It is a pleasure to meet you."; mes "My name is Hutari Shioko."; @@ -374,7 +374,7 @@ amatsu,269,221,1 script Propose Girl#ama 4_F_JPN,{ } amatsu,243,202,3 script Drama Teacher#ama 4_F_JPNOBA2,{ - set jap_tree,2; + jap_tree = 2; mes "[Garakame sensei]"; mes "This is a beautiful place"; mes "with everlasting cherry blossoms."; @@ -423,7 +423,7 @@ amatsu,283,203,1 script Bonubonu#ama1 SEE_OTTER,{ } amatsu,283,203,1 script Bonubonu#ama2 HIDDEN_NPC,{ - set jap_tree,3; + jap_tree = 3; emotion e_swt2; mes "[Bonubonu]"; mes "That tree on the hill is"; @@ -453,7 +453,7 @@ amatsu,283,203,1 script Bonubonu#ama2 HIDDEN_NPC,{ } amatsu,274,178,7 script Veterinarian#ama 4_M_JOB_WIZARD,{ - set jap_tree,4; + jap_tree = 4; mes "[Sakura Seiichi]"; mes "Ah... I'm not a weirdo so"; mes "don't panic. I'm just an ordinary"; diff --git a/npc/cities/ayothaya.txt b/npc/cities/ayothaya.txt index a4e214582..a8a114d2d 100644 --- a/npc/cities/ayothaya.txt +++ b/npc/cities/ayothaya.txt @@ -122,7 +122,7 @@ ayothaya,189,120,3 script Young Man#Thang 4_M_THAIONGBAK,{ } ayothaya,171,152,5 script Girl#Lalitha 4_F_THAIAYO,{ - set .@sit,rand(1,5); + .@sit = rand(1,5); if (.@sit > 0 && .@sit < 3) { mes "[Lalitha]"; mes "Hello!"; diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt index f8a3f967f..248af4e50 100644 --- a/npc/cities/comodo.txt +++ b/npc/cities/comodo.txt @@ -198,7 +198,7 @@ cmd_in02,174,126,4 script Loyar#cmd 4_M_01,{ } cmd_in02,57,62,4 script Moo#cmd 4_M_MANAGER,{ - set mooz,rand(1,10); + mooz = rand(1,10); if (mooz == 1) { mes "[Moo]"; mes "Those cheating punks!"; @@ -338,7 +338,7 @@ cmd_fild07,52,280,4 script Hallosu#cmd 4W_SAILOR,{ } cmd_fild07,299,83,4 script Zain#cmd 4W_SAILOR,{ - set .@n$,"["+strnpcinfo(1)+"]"; + .@n$ = "["+strnpcinfo(1)+"]"; mes .@n$; mes "Would you like to"; mes "board a ship on the"; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index 16702126f..a5d3e8354 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -274,7 +274,7 @@ OnTouch: else break; } - set .@Red_potion_hap,.@input * 500; + .@Red_potion_hap = .@input * 500; if (Zeny < .@Red_potion_hap) { mes "[Suspicious Guy]"; mes "Oh maaan~"; @@ -344,7 +344,7 @@ OnTouch: else break; } - set .@Main_gauche_hap,.@input * 9400; + .@Main_gauche_hap = .@input * 9400; if (Zeny < .@Main_gauche_hap) { mes "[Suspicious Guy]"; mes "Short on zeny?"; @@ -396,7 +396,7 @@ OnTouch: else break; } - set .@Hood__hap,.@input * 930; + .@Hood__hap = .@input * 930; if (Zeny < .@Hood__hap) { mes "[Suspicious Guy]"; mes "Oh nuts..."; diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index 9c51dcd48..919d23e20 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -289,7 +289,7 @@ gon_in,73,82,5 script Ji Chung Zhe#gon 4_M_TWTEAMAN,{ close; } if (nakha == 3) { - set cha,1; + cha = 1; mes "[Ji Chung Zhe]"; mes "I am Ji Chung Zhe, a renown brewer"; mes "of teas. Everyday, I put all my"; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 1069cf01c..1cbd51fd5 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -837,7 +837,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{ mes "like to drink?"; next; if (Zeny < 99) { - set .@r_jaw,rand(1,100); + .@r_jaw = rand(1,100); mes "[Bartender]"; if (.@r_jaw > 29) { mes "Hm, I'm sorry"; @@ -867,7 +867,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{ while (1) { switch(select("Follow Bartender's Recommendation.:I want a Gunslinger.:I want a Cobo.:I want a Bomb.:I want a Boogieman.")) { case 1: - set .@roof_jaw,.@roof_jaw+3; + .@roof_jaw += 3; if (.@roof_jaw > 9) { mes "[Bartender]"; mes "Hmmm..."; @@ -1106,7 +1106,7 @@ S_KillChar: end; } if (Zeny > 99) Zeny -= 100; - set .@roof_jaw,.@roof_jaw+getarg(0); + .@roof_jaw += getarg(0); mes "[Bartender]"; mes "There you go."; next; @@ -1254,7 +1254,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{ mes "^3355FF* Gulp Gulp Gulp *^000000"; percentheal -10,0; next; - set .@jaw_roof,1; + .@jaw_roof = 1; mes "[SoloHan]"; mes "So, what do you say?"; mes "Let's go somewhere"; @@ -1280,7 +1280,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{ mes "^3355FF* Gulp Gulp Gulp *^000000"; percentheal -10,0; next; - set .@jaw_roof,.@jaw_roof+2; + .@jaw_roof += 2; mes "[SoloHan]"; if (.@jaw_roof > 8) { mes "Whoa..."; @@ -1330,7 +1330,7 @@ prt_in,173,13,4 script Customer#SoloHan 4_M_04,{ close2; end; } - set .@jaw_roof,.@jaw_roof+3; + .@jaw_roof += 3; mes "[SoloHan]"; mes "Drink, drink!"; mes "That's not enough!"; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 6768da33c..01a5c7404 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -564,7 +564,7 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{ close; } Zeny -= .@input; - set $donatedzeny,$donatedzeny + .@input; + $donatedzeny += .@input; mes "[Lucius]"; mes "So far, I've received"; mes "a total of " + $donatedzeny + " zeny in"; @@ -580,7 +580,7 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{ mes "this small gift as a token of"; mes "my gratitude, adventurer. Bless"; mes "you, youngster and take care."; - set $donatedzeny,0; + $donatedzeny = 0; getitem 603,1; //Old_Blue_Box getitem 12016,1; //Speed_Up_Potion } diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt index def5e03ab..c7ad3a40c 100644 --- a/npc/cities/lutie.txt +++ b/npc/cities/lutie.txt @@ -115,7 +115,7 @@ xmas_in,167,173,4 script Duffle 4_F_05,{ mes "[Duffle]"; mes "Well then..."; mes "Merry Christmas!!"; - set xmas_npc,2; + xmas_npc = 2; close; } else if (xmas_npc > 1) { @@ -182,7 +182,7 @@ xmas_in,27,103,4 script Lenient Aunt 4_F_GODEMOM,{ mes "Now be a dear"; mes "and hurry up."; mes "Come back quickly~"; - set xmas_npc,6; + xmas_npc = 6; close; case 6: mes "[Thachentze]"; @@ -213,7 +213,7 @@ xmas_in,27,103,4 script Lenient Aunt 4_F_GODEMOM,{ mes "Let's see, let's see..."; mes "Thank you dear,Thank you."; next; - set xmas_npc,8; + xmas_npc = 8; mes "^3355FFYou gave her the"; mes "roughest salt in the world.^000000"; next; @@ -296,7 +296,7 @@ xmas,117,304,4 script Poze 4_M_06,{ next; mes "[Poze]"; mes "But that's pretty much all I know. For the actual details, you should ask ^3355FFUncle Hairy Cantata^000000."; - set xmas_npc,4; + xmas_npc = 4; close; } else { mes "[Poze]"; @@ -381,7 +381,7 @@ xmas,176,236,4 script Uncle Hairy 4_M_05,{ next; mes "[Cantata]"; mes "^3355FFThachentze^000000, that lovely pickle maker, knows more about it. So if you're curious, you should go talk to her. Alrighty then, Merry Christmas!"; - set xmas_npc,5; + xmas_npc = 5; close; } else { mes "[Cantata]"; @@ -538,7 +538,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ next; mes "^3355FFSnowysnow is immersed in his deep thoughts, and seems^000000"; mes "^3355FFfixated on Poze's memento.^000000"; - set xmas_npc,3; + xmas_npc = 3; close2; cutin "",255; end; @@ -600,7 +600,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "[Snowysnow]"; mes "Yeah, she's a pickle expert, alright. Oh right, would you give this to her? I've been keeping the roughest salt in the world for her as a bit of a favor."; next; - set xmas_npc,7; + xmas_npc = 7; mes "^3355FFSnowysnow gave you the roughest salt in the world^000000."; next; mes "[Snowysnow]"; @@ -655,11 +655,11 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "^3355FFYou gingerly stir"; mes "your hand around in"; mes "Snowysnow's magical gift bag^000000."; - set .@snownow,rand(1,8); + .@snownow = rand(1,8); next; switch(.@snownow) { case 1: - set xmas_npc,11; + xmas_npc = 11; getitem 529,5; // Candy cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -668,7 +668,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "Congratulations!"; break; case 2: - set xmas_npc,11; + xmas_npc = 11; getitem 529,10; // Candy cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -676,7 +676,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "^3355FF10 Candy^000000!"; break; case 3: - set xmas_npc,11; + xmas_npc = 11; getitem 530,5; // Candy_Striper cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -684,7 +684,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "^3355FF5 Candy Cane^000000!"; break; case 4: - set xmas_npc,11; + xmas_npc = 11; getitem 530,10; // Candy_Striper cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -692,7 +692,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "^3355FF10 Candy Cane^000000!"; break; case 5: - set xmas_npc,11; + xmas_npc = 11; getitem 539,1; // Piece_Of_Cake cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -700,7 +700,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "^3355FF1 Piece Of Cake^000000!"; break; case 6: - set xmas_npc,11; + xmas_npc = 11; getitem 539,2; // Piece_Of_Cake cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -708,7 +708,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "^3355FF2 Piece Of Cake^000000!"; break; case 7: - set xmas_npc,11; + xmas_npc = 11; getitem 538,5; // Well_Baked_Cookie cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -716,7 +716,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ mes "^3355FF5 Cookie^000000!"; break; case 8: - set xmas_npc,11; + xmas_npc = 11; getitem 538,10; // Well_Baked_Cookie cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; @@ -811,7 +811,7 @@ xmas,146,136,4 script Hashokii 4_M_PIERROT,{ next; mes "[Hashokii]"; mes "Why don't you go meet those 2 children? They might tell you the story we've never got the chance to hear. Okay then, good luck~! Bye bye!"; - set xmas_npc,9; + xmas_npc = 9; close; } else { mes "[Hashokii]"; @@ -917,7 +917,7 @@ xmas,208,168,4 script Little Girl 4_F_KID2,{ mes "[Marcell]"; mes "Oh, now I see . . . . ."; mes "You wanna learn all about Snowysnow because you want to become his friend! He'll be so happy to know that! Ooh! Maybe he'll give you a present! Good luck!"; - set xmas_npc,10; + xmas_npc = 10; close; case 10: mes "[Marcell]"; diff --git a/npc/cities/manuk.txt b/npc/cities/manuk.txt index 77c5306ed..b49be1920 100644 --- a/npc/cities/manuk.txt +++ b/npc/cities/manuk.txt @@ -219,7 +219,7 @@ manuk,286,147,3 script Piom#ep13_2_2 4_MAN_PIOM,{ } manuk,183,185,5 script Piom#ep13_2_3 4_MAN_PIOM,{ - set tongyeok,Ring_Of_Wise_King; + tongyeok = Ring_Of_Wise_King; if ((isequipped(2782) == 1) && (ep13_2_rhea == 100)) { mes "[Piom]"; mes "Our lives exist for Saphas."; diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt index cb5b608e9..e2ca328df 100644 --- a/npc/cities/morocc.txt +++ b/npc/cities/morocc.txt @@ -762,7 +762,7 @@ moc_fild16,195,281,4 script Assassin Guardian#1::SinGuard 4_M_MOC_SOLDIER,{ mes "Welcome."; close; } - set .@temp, rand(1,4); + .@temp = rand(1,4); if(.@temp == 1) mes "........"; if(.@temp == 2) mes "Hmmm.........."; if(.@temp == 3) mes "Hmmm... you shouldn't be here....."; diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt index 4e6ba1f97..0bfa9a088 100644 --- a/npc/cities/niflheim.txt +++ b/npc/cities/niflheim.txt @@ -232,17 +232,20 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{ mes "lost to the ages~!"; emotion e_gg; next; - if (select("Clover:Klaatu:Klaytos") == 2) - set .@spell,.@spell+1; - if (select("Verit:Veritas:Verata") == 3) - set .@spell,.@spell+1; - if (select("Necktie:Necklace:Nero:^FFFFFFNictu!!!^000000") == 4) - set .@spell,.@spell+1; + if (select("Clover:Klaatu:Klaytos") == 2) { + ++.@spell; + } + if (select("Verit:Veritas:Verata") == 3) { + ++.@spell; + } + if (select("Necktie:Necklace:Nero:^FFFFFFNictu!!!^000000") == 4) { + ++.@spell; + } if (.@spell == 3) { switch(rand(1,5)) { case 1: if (morison_meat < 15) { - set morrison_meat,15; + morrison_meat = 15; mes "[Ashe Bruce]"; mes "You... You broke the curse!"; mes "How did you know that spell?!"; @@ -262,7 +265,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{ close; case 2: if (thai_head == 1) { - set thai_head,2; + thai_head = 2; mes "[Ashe Bruce]"; mes "What's..."; mes "this feeling?"; @@ -285,7 +288,7 @@ niflheim,350,258,1 script Cursed Spirit#nif 4_NFWISP,{ close; case 3: if (thai_head == 8) { - set thai_head,7; + thai_head = 7; mes "[Ashe Bruce]"; mes "You... You broke the curse!"; mes "Who taught you that spell?!"; diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index 3bbe52908..a5607b412 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -840,7 +840,7 @@ OnTouch: close; } if (BaseLevel > 30) { - set .@oldman_random,rand(1,2); + .@oldman_random = rand(1,2); if (.@oldman_random == 1) { mes "[Guard]"; mes "Hey..."; diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index 792ddc972..43389ff67 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -135,7 +135,7 @@ prontera,216,70,2 script Strife#pront 1_M_02,{ mes "MAGNUM BREAK!"; next; if (select("I wanna be strong too!:Um... Do you best.") == 1) { - set event_prt_nov_dreamtalk,1; + event_prt_nov_dreamtalk = 1; mes "[Strife]"; mes "Wow...!"; mes "That's so awesome!"; @@ -172,7 +172,7 @@ prontera,216,70,2 script Strife#pront 1_M_02,{ mes "that now, I gotta"; mes "train even harder!"; next; - set event_prt_nov_dreamtalk,2; + event_prt_nov_dreamtalk = 2; getitem 2501,1; //Hood mes "[Strife]"; mes "This is, well, for you to help you get even stronger. I guess I want to thank you for being such a good example."; @@ -305,7 +305,7 @@ prt_in,180,20,2 script Bartender#pront 1_M_PUBMASTER,{ mes "[Bartender]"; mes "I can't keep my business busy without my special menu 'Crunch Crunch Sour' and 'Savory Yum Yum'...*Sigh*"; next; - set .@drink,1; + .@drink = 1; while(.@drink) { switch(select("'Cunch Crunch Sour'?:'Savory Yum Yum'?:Cancel.")) { case 1: @@ -330,7 +330,7 @@ prt_in,180,20,2 script Bartender#pront 1_M_PUBMASTER,{ mes "[Bartender]"; mes "Take care of yourself~."; close2; - set .@drink,0; + .@drink = 0; break; } @@ -551,7 +551,7 @@ prt_church,103,76,0 script Garnet#pront 1_F_02,{ mes "[Garnet]"; mes "Go and ahead and ask if you have any questions about skills for Acolytes and Priests."; next; - set .@SkillChat,1; + .@SkillChat = 1; while(.@SkillChat) { switch(select("About Heal:About Cure:About Increase AGI:About Angelus:About Blessing:About Warp Portal:End Conversation")) { case 1: @@ -631,7 +631,7 @@ prt_church,103,76,0 script Garnet#pront 1_F_02,{ mes "Alright, I've"; mes "heard enough."; close2; - set .@SkillChat,0; + .@SkillChat = 0; break; } } @@ -648,7 +648,7 @@ prt_church,103,71,0 script Henson#pront 2_M_PHARMACIST,{ mes "[Henson]"; mes "Did you have any questions about Acolyte and Priest skills?"; next; - set .@SkillChat,1; + .@SkillChat = 1; while(.@SkillChat) { switch(select("About Divine Protection:About Demon Bane:About Decrease AGI:About Signum Crusis :About Pneuma:About Ruwach:About Teleport:End conversation.")) { case 1: @@ -729,7 +729,7 @@ prt_church,103,71,0 script Henson#pront 2_M_PHARMACIST,{ mes "[Henson]"; mes "If you wish to understand more about an Acolyte or Priest skill, you are welcome to visit me at any time."; close2; - set .@SkillChat,0; + .@SkillChat = 0; break; } } diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt index b4beb95af..3538a439d 100644 --- a/npc/cities/rachel.txt +++ b/npc/cities/rachel.txt @@ -306,7 +306,7 @@ rachel,206,30,3 script Freya's Priest#play 4_F_TRAINEE,{ mes "item of yours can do..."; mes "Oh? Oh! That's wonderful!"; close2; - set .@play,rand(1,10); + .@play = rand(1,10); if (.@play < 3) consumeitem 601; //Wing_Of_Fly else if (.@play < 5) diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index 2c64c5b75..a6c09fe80 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -63,7 +63,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ mes "[Mad Sago Lauds]"; mes "Listen closely."; mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000."; - set Memorial08,1; + Memorial08 = 1; close; } @@ -91,7 +91,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ delitem 914,20; getitem 6025,1; getnameditem 6025," + strcharinfo(0) + "; - set Memorial08,2; + Memorial08 = 2; close; } } @@ -114,7 +114,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ mes "[Mad Sago Lauds]"; mes "It seems you're just carrying it without understanding its meaning."; mes "What a shame! You should go speak to ^FF0000Grast in Prontera^000000."; - set Memorial08,3; + Memorial08 = 3; close; } @@ -149,7 +149,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ mes "What? Why are you giving me your garbage!"; mes "Those items are not useful to me at all."; mes "You should be going to the plaque!"; - set Memorial08,8; + Memorial08 = 8; close; } @@ -161,7 +161,7 @@ prontera,182,214,4 script Lauds#Memorial 1_M_MERCHANT,{ } else if (Memorial08 >= 9) { - set .@RandomMsg, rand(1,5); + .@RandomMsg = rand(1,5); if (.@RandomMsg == 1) { mes "[Mad Sago Lauds]"; mes "Don't panic!"; @@ -207,7 +207,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ mes "'This must be what Lauds was talking about.'"; mes "'Let's dust it off with the towel.'"; next; - set Memorial08,9; + Memorial08 = 9; getexp 93750,43750; goto L_CleanPlaque; } @@ -244,7 +244,7 @@ prontera,153,286,4 script Memorial Plaque#Memorial 4_BOARD3,{ mes "- Arthur Ashe -"; if (Memorial08 == 9) { getexp 93750,43750; - set Memorial08,10; + Memorial08 = 10; } close; } @@ -273,7 +273,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "[Grast]"; mes "Please bring me ^FF0000one of each Red Potion, Green Potion, Awakening Potion, and Butterfly Wing^000000."; mes "I'll be waiting for your return."; - set Memorial08,4; + Memorial08 = 4; close; } @@ -303,7 +303,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "[Grast]"; mes "Please bring me ^FF0000one of each Trap, Yggdrasil Leaf, Blue Gemstone, Crystal Mirror, Meat, and Carrot.^000000"; mes "I'll be waiting for your return."; - set Memorial08,5; + Memorial08 = 5; close; } } @@ -330,7 +330,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ next; mes "[Grast]"; mes "Please bring me ^FF0000one of each Pet Incubator, Firecracker, Poring Doll, and Bouquet^000000."; - set Memorial08,6; + Memorial08 = 6; close; } } @@ -376,7 +376,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "You've selected my right hand."; mes "Here's the gift for you."; mes "Now, please bring all these materials to Lauds."; - set Memorial08, 7; + Memorial08 = 7; getitem 617,1; close; } @@ -384,7 +384,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "You've selected my left hand."; mes "Here's the gift for you."; mes "Now, please bring all these materials to Lauds."; - set Memorial08, 7; + Memorial08 = 7; getitem 12109,1; close; } @@ -413,7 +413,7 @@ prontera,150,270,4 script Grast#Memorial 4_M_HUMERCHANT,{ mes "I crushed all the items together into a more compact form for you."; mes "You can thank me later for that extra service."; mes "Please bring them to Lauds."; - set Memorial08,7; + Memorial08 = 7; getitem 7126,1; next; mes "[Grast]"; diff --git a/npc/events/RWC_2011.txt b/npc/events/RWC_2011.txt index 4f0a05b86..f7534af84 100644 --- a/npc/events/RWC_2011.txt +++ b/npc/events/RWC_2011.txt @@ -26,7 +26,7 @@ prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ mes "[New Agent]"; mes "It's RWC time!"; next; - set .@loop,1; + .@loop = 1; while(.@loop) { switch(select("What is RWC?:Are you a New Agent?:I don't care.")) { case 1: @@ -73,7 +73,7 @@ prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ mes "- His brimming small eyes seem to tell you something. ^FF0000Please talk to me again...^000000 -"; close; } - set .@loop,0; + .@loop = 0; break; case 3: mes "[New Agent]"; @@ -148,7 +148,7 @@ prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ next; mes "[New Agent]"; mes "Please help me out!! My life is in your hands!"; - set oversea_event,1; + oversea_event = 1; setquest 13000; close; } else if (oversea_event == 1) { @@ -169,35 +169,35 @@ prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ delitem 7470,1; //BlueCard_W delitem 6012,1; //Blue_Card_C //SavePPL BlueCard_2 - set oversea_event,2; + oversea_event = 2; erasequest 13000; setquest 13001; - set .@i, rand(1,100); - if (.@i == 1) getitem 12690,1; //Old_C_Album_Helm - else if (.@i == 2) getitem 12691,1; //Old_C_Album_Armor - else if (.@i == 3) getitem 12693,1; //Old_C_Album_Garment - else if (.@i == 4) getitem 12694,1; //Old_C_Album_Shoes - else if (.@i == 5) getitem 12698,1; //Old_C_Album_Weapon - else if (.@i == 6) getitem 12695,1; //Old_C_Album_Acc - else if (.@i == 7) getitem 12692,1; //Old_C_Album_Shield - else if (.@i < 28) getitem 547,10; //White_Slim_Potion - else if (.@i < 38) getitem 607,1; //Yggdrasilberry - else if (.@i < 51) getitem 608,1; //Seed_Of_Yggdrasil - else { + .@i = rand(1,100); + if (.@i == 1) getitem 12690,1; //Old_C_Album_Helm + else if (.@i == 2) getitem 12691,1; //Old_C_Album_Armor + else if (.@i == 3) getitem 12693,1; //Old_C_Album_Garment + else if (.@i == 4) getitem 12694,1; //Old_C_Album_Shoes + else if (.@i == 5) getitem 12698,1; //Old_C_Album_Weapon + else if (.@i == 6) getitem 12695,1; //Old_C_Album_Acc + else if (.@i == 7) getitem 12692,1; //Old_C_Album_Shield + else if (.@i < 28) getitem 547,10; //White_Slim_Potion + else if (.@i < 38) getitem 607,1; //Yggdrasilberry + else if (.@i < 51) getitem 608,1; //Seed_Of_Yggdrasil + else { getitem 12696,5; //RWC_Cele_Fire getitem 12697,5; //RWC_Cele_Fire2 - } - mes "[RWC2011 Agent]"; - mes "It's not much but please keep it! Haha, we still have lots of cards to be found. I hope you can help me tomorrow as well."; - next; - mes "[RWC2011 Agent]"; - mes "Thank you!! I can continue working now. Nothing is impossible when we have great adventurers like you in this world!"; - next; - mes "[RWC2011 Agent]"; - mes "ADIOS!"; - next; - mes "- Agent muttered something to himself. -"; - close; + } + mes "[RWC2011 Agent]"; + mes "It's not much but please keep it! Haha, we still have lots of cards to be found. I hope you can help me tomorrow as well."; + next; + mes "[RWC2011 Agent]"; + mes "Thank you!! I can continue working now. Nothing is impossible when we have great adventurers like you in this world!"; + next; + mes "[RWC2011 Agent]"; + mes "ADIOS!"; + next; + mes "- Agent muttered something to himself. -"; + close; } else { mes "[RWC2011 Agent]"; mes "Mmmm~ not yet? We're short-handed... Please help me."; @@ -218,7 +218,7 @@ prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ mes "[RWC2011 Agent]"; mes "Thanks for the last time."; mes "I must keep on promoting the event so I want to ask you again~!"; - set oversea_event,3; + oversea_event = 3; close; } else if (oversea_event == 3) { mes "[RWC2011 Agent]"; @@ -231,7 +231,7 @@ prontera,114,81,5 script RWC2011 Agent#2 4_M_ATEIL,{ mes "It's the same mission as before."; mes "Try to gather blue cards and make the word, ^FF0000R W C 2 0 1 1 ^000000."; mes "Good Luck!"; - set oversea_event,1; + oversea_event = 1; setquest 13000; close; case 2: diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt index 33e3cec84..43b884a0d 100644 --- a/npc/events/RWC_2012.txt +++ b/npc/events/RWC_2012.txt @@ -21,7 +21,7 @@ prontera,147,61,3 script Driller#pron 4_M_BARBER,{ mes "You cannot proceed because you're overweight."; close; } - set .@part, EQI_ACC_L; + .@part = EQI_ACC_L; if (!getequipisequiped(.@part)) { mes "[Driller]"; mes "My job is to drill a card slot into RWC Memorial accessories."; @@ -33,7 +33,7 @@ prontera,147,61,3 script Driller#pron 4_M_BARBER,{ mes "[Driller]"; mes "My job is to drill a card slot into RWC Memorial accessories. Moreover, I only treat ^ff0000pure items^000000, or those which have not been enchanted."; next; - set .@equip_id, getequipid(.@part); + .@equip_id = getequipid(.@part); if (.@equip_id != 2966 && .@equip_id != 2968) { mes "[Driller]"; mes "However, I can see that the accessory you are wearing on the right side cannot be treated. Please equip a RWC Memorial accessory."; @@ -48,13 +48,13 @@ prontera,147,61,3 script Driller#pron 4_M_BARBER,{ close; } if (.@equip_id == 2966) { - set .@slotted, 2967; //RWC_2012_Ring_ - set .@name$,"RWC 2012 Memorial Ring"; - set .@str$,"ring"; + .@slotted = 2967; //RWC_2012_Ring_ + .@name$ = "RWC 2012 Memorial Ring"; + .@str$ = "ring"; } else if (.@equip_id == 2968) { - set .@slotted, 2969; //RWC_2012_Pendant_ - set .@name$,"RWC 2012 Memorial Pendant"; - set .@str$,"pendant"; + .@slotted = 2969; //RWC_2012_Pendant_ + .@name$ = "RWC 2012 Memorial Pendant"; + .@str$ = "pendant"; } else { mes "[Driller]"; mes "I can't identify the accessory item you're wearing on your right hand. I can't work on it."; @@ -93,25 +93,25 @@ prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{ mes "[Goldberg]"; mes "Hello! I am in charge of enchanting RWC Memorial accessories with some mystic powers."; next; - set .@part, EQI_ACC_L; + .@part = EQI_ACC_L; if (!getequipisequiped(.@part)) { mes "[Goldberg]"; mes "I'm sorry but you don't have any item equipped on your right accessory position."; close; } - set .@equip_id, getequipid(.@part); + .@equip_id = getequipid(.@part); if (.@equip_id < 2966 || .@equip_id > 2969) { mes "[Goldberg]"; mes "However, I can see that the accessory you are wearing is not something I can work on. Please equip a RWC Memorial accessory."; close; } - set .@select, select("Sorry, not interested.:Please, empower my accessory.:Remove the Enchant.")-1; + .@select = select("Sorry, not interested.:Please, empower my accessory.:Remove the Enchant.")-1; if (.@select == 0) { mes "[Goldberg]"; mes "Alright, then, see you next time..."; close; } - set .@equip_refine, getequiprefinerycnt(.@part); + .@equip_refine = getequiprefinerycnt(.@part); setarray .@equip_card[0], getequipcardid(.@part,0),getequipcardid(.@part,1),getequipcardid(.@part,2),getequipcardid(.@part,3); if (.@select == 1) { switch(getequipid(.@part)) { @@ -133,10 +133,10 @@ prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{ mes "If you have equipped your RWC Memorial accessory on the left side, try to swap it to the right side."; close; } - for(set .@i,3; .@i>=0; set .@i,.@i-1) { + for(.@i = 3; .@i >= 0; --.@i) { if (.@equip_card[.@i] == 0) { - set .@slot, .@i; - set .@op_type, .@option[.@i]; + .@slot = .@i; + .@op_type = .@option[.@i]; break; } } @@ -146,25 +146,25 @@ prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{ mes "Which enchantment would you like to infuse?"; next; setarray .@enchant_select[0],1,2,3,4; - set .@i, select("Cancel:Fighting Spirit:ATK (%):Max HP:HP")-2; + .@i = select("Cancel:Fighting Spirit:ATK (%):Max HP:HP")-2; break; case 3: setarray .@enchant_select[0],5,6,7; - set .@i, select("Cancel:Spell:MATK (%):SP")-2; + .@i = select("Cancel:Spell:MATK (%):SP")-2; break; case 2: mes "[Goldberg]"; mes "^ff0000Be careful! There is about a 25% chance that the enchantment will fail. If this happens, the item will be destroyed.^000000 Which enchantment would you like to infuse?"; next; setarray .@enchant_select[0],8,9,10,11,12,13,14; - set .@i, select("Cancel:STR:AGI:VIT:INT:DEX:LUK:SP")-2; + .@i = select("Cancel:STR:AGI:VIT:INT:DEX:LUK:SP")-2; break; case 1: mes "[Goldberg]"; mes "^ff0000There is about a 25% chance that the enchantment will fail. If this happens, the item will be destroyed.^000000 Which enchantment would you like to infuse?"; next; setarray .@enchant_select[0],8,9,10,11,12,13,15,16; - set .@i, select("Cancel:STR:AGI:VIT:INT:DEX:LUK:MHP:HP")-2; + .@i = select("Cancel:STR:AGI:VIT:INT:DEX:LUK:MHP:HP")-2; break; case 0: mes "[Goldberg]"; @@ -184,7 +184,7 @@ prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{ mes "Alright, then, see you next time..."; close; } - set .@enchant_type, .@enchant_select[.@i]; + .@enchant_type = .@enchant_select[.@i]; if (!getequipisequiped(.@part)) { mes "[Goldberg]"; mes "Do not take off your equipment while I'm working, okay?"; @@ -246,25 +246,25 @@ prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{ } if (.@enchant_type < 8) - set .@i, rand(1,300); // 0% break chance. + .@i = rand(1,300); // 0% break chance. else - set .@i, rand(1,400); // 25% break chance. + .@i = rand(1,400); // 25% break chance. - if (.@i < 151) set .@enchant, .@enc[0]; - else if (.@i < 251) set .@enchant, .@enc[1]; - else if (.@i < 301) set .@enchant, .@enc[2]; - else set .@enchant,9; + if (.@i < 151) .@enchant = .@enc[0]; + else if (.@i < 251) .@enchant = .@enc[1]; + else if (.@i < 301) .@enchant = .@enc[2]; + else .@enchant = 9; - set .@equip_card[.@slot], .@enchant; + .@equip_card[.@slot] = .@enchant; if (.@slot == 2 && .@enchant == 0) { - set .@equip_card[3],0; + .@equip_card[3] = 0; } else if (.@slot == 1 && .@enchant == 0) { - set .@equip_card[2],0; - set .@equip_card[3],0; + .@equip_card[2] = 0; + .@equip_card[3] = 0; } else if (.@slot == 0 && .@enchant == 0) { - set .@equip_card[1],0; - set .@equip_card[2],0; - set .@equip_card[3],0; + .@equip_card[1] = 0; + .@equip_card[2] = 0; + .@equip_card[3] = 0; } delequip .@part; @@ -315,9 +315,9 @@ prontera,147,59,3 script Goldberg#pron 4_M_OILMAN,{ delequip .@part; // GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3] - for(set .@i,0; .@i<4; set .@i,.@i+1) { + for(.@i = 0; .@i < 4; ++.@i) { if (.@equip_card[.@i] >= 4700) // Armor Enchant System - set .@equip_card[.@i],0; + .@equip_card[.@i] = 0; } getitem2 .@equip_id,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@equip_card[2],.@equip_card[3]; diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt index c1816374f..a0b5fda61 100644 --- a/npc/events/StPatrick_2008.txt +++ b/npc/events/StPatrick_2008.txt @@ -99,7 +99,7 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{ mes "[O'Riley the Leprechaun]"; mes "Ye might try some Firecrackers."; mes "Course, Ye would need a great number of them, Ye would need at least ^FF0000200 Firecreackers^000000"; - set StPatrick2008,1; + StPatrick2008 = 1; close; } else if (StPatrick2008 == 1) { @@ -136,7 +136,7 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{ mes "[O'Riley the Leprechaun]"; mes "When ye have had a moment to rest ye legs, come talk to me again and we may speak again"; close2; - set StPatrick2008,3; + StPatrick2008 = 3; getexp 200000,70000; delitem 7721,1; end; @@ -153,7 +153,7 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 4_M_PATRICK,{ mes "I would be so generous to give you some of my famous brew if you would bring me the ill-gotten gains carried by those vile snakes"; next; mes "And if you find one of the treasures of my kin please bring me those coins so that the snakes don't get them."; - set StPatrick2008,4; + StPatrick2008 = 4; close; } else if (StPatrick2008 == 4) { @@ -229,7 +229,7 @@ OnTouch: mes "This box must contain O'Riley's valuables."; mes "Let's bring the box to O'Riley."; close2; - set StPatrick2008,2; + StPatrick2008 = 2; delitem 12018,200; getitem 7721,1; } diff --git a/npc/events/bossnia.txt b/npc/events/bossnia.txt index 8bb48661c..432c8e391 100644 --- a/npc/events/bossnia.txt +++ b/npc/events/bossnia.txt @@ -67,7 +67,7 @@ prontera,132,125,4 script Bossnia Staff#1 4_M_PHILMAN,{ mes "Would you really like to take the challenge?"; mes "Ok, just choose the course."; next; - set .@i, select("First","Second","Third","Fourth"); + .@i = select("First","Second","Third","Fourth"); mes "[Riss]"; mes "Take care, boy~"; mes "Don't hold a grudge against me."; diff --git a/npc/events/children_week.txt b/npc/events/children_week.txt index 48e9231d6..3ba99ebd2 100644 --- a/npc/events/children_week.txt +++ b/npc/events/children_week.txt @@ -40,7 +40,7 @@ prontera,146,91,5 script Pandit chacha#child07 1_M_PUBMASTER,{ mes "Whenever come back again if you want it..."; close; } - set oversea_event9,1; + oversea_event9 = 1; getitem 11705,10; //Special_White_Potion mes "[Pandit chacha]"; mes "Look. This is a child Potion."; @@ -68,7 +68,7 @@ prontera,146,91,5 script Pandit chacha#child07 1_M_PUBMASTER,{ close2; delitem 745,1; //Wedding_Bouquet delitem 748,1; //Witherless_Rose - set oversea_event9,2; + oversea_event9 = 2; getitem 11705,50; //Special_White_Potion end; } diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index eb80e6be1..c782e3b9d 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -261,7 +261,7 @@ prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{ next; mes "["+ strcharinfo(0) +"]"; mes "Let's punish!!!!!!!!!!!!!!!!!!!!!!!!!!!"; - set christ_solo05,1; + christ_solo05 = 1; close; case 2: mes "[Enjoy]"; @@ -287,8 +287,8 @@ prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{ mes "Get lost,you devil!!!!!!"; specialeffect EF_BEGINASURA; specialeffect2 EF_HIT2; - set Hp,Hp/2; - set Hp,Hp/2; + Hp /= 2; + Hp /= 2; close2; warp "prontera",155,230; end; @@ -397,7 +397,7 @@ prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{ donpcevent "Event#event02::OnCommandEmotion"; misceffect EF_HITLINE2; delitem 604,5; //Branch_of_Dead_Tree - set christ_solo05,6; + christ_solo05 = 6; donpcevent "Happymerry#happymerry02::OnCommandOff"; donpcevent "Christ#christ02::OnCommandOff"; donpcevent "Mas#mas02::OnCommandOff"; @@ -458,7 +458,7 @@ prontera,155,285,3 script Enjoy#enjoy 4_M_MONK,{ mes "Cheer up everybody!!!"; mes "Let's rock till you get happy~!"; mes ""; - set christ_solo05,0; + christ_solo05 = 0; close; } @@ -636,7 +636,7 @@ prontera,188,177,4 script Happymerry#happymerry 4_M_LGTMAN,{ mes "Call him for me!"; mes "I'll go ahead with my bags packed up."; mes "See ya!"; - set christ_solo05,2; + christ_solo05 = 2; close; } else if (christ_solo05 > 1) { @@ -716,7 +716,7 @@ prontera,62,339,3 script Christ#christ 4_M_PECOKNIGHT,{ mes "Go tell ^0000FFMas^000000"; mes "about this!!!"; mes "See ya~~!"; - set christ_solo05,3; + christ_solo05 = 3; close; } else if (christ_solo05 > 2) { @@ -807,7 +807,7 @@ prontera,163,66,7 script Mas#mas 4_M_ALCHE_A,{ mes "Well,bye~."; mes "I'll meet you there!!..."; mes "Herbs~?! Couples?! Whatever~~"; - set christ_solo05,4; + christ_solo05 = 4; close; } else if (christ_solo05 > 3) { @@ -888,7 +888,7 @@ prontera,35,209,5 script Event#event 4_M_SITDOWN,{ mes "Now I should get my ^0000FFBranch of Dead Tree^000000s packed up"; mes "and go punish singles!!!"; mes "Hahahaha.."; - set christ_solo05,5; + christ_solo05 = 5; close; } else if (christ_solo05 > 4) { @@ -1052,7 +1052,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Well then, hope you a good luck!!!"; mes " "; emotion e_no1; - set christ_carol05,1; + christ_carol05 = 1; close; case 4: mes "[Oholy]"; @@ -1186,7 +1186,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 12130,7;//Cookie_Bag close; case 2: @@ -1198,7 +1198,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 529,20;//Candy close; case 3: @@ -1210,7 +1210,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 530,15;//Candy_Striper close; case 4: @@ -1222,7 +1222,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 539,5;//Piece_of_Cake close; case 5: @@ -1234,7 +1234,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 538,10;//Well_baked_Cookie close; case 6: @@ -1246,7 +1246,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 743,1;//Spore_Doll close; case 7: @@ -1258,7 +1258,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 750,1;//Baphomet_Doll close; case 8: @@ -1270,7 +1270,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 751,1;//Osiris_Doll close; case 9: @@ -1282,7 +1282,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 752,1;//Grasshopper_Doll close; @@ -1295,7 +1295,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 753,1;//Monkey_Doll close; case 11: @@ -1307,7 +1307,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 754,1;//Raccoondog_Doll close; case 12: @@ -1320,7 +1320,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 7206,1;//Black_Kitty_Doll close; case 13: @@ -1331,7 +1331,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 7212,1;//Hanging_Doll close; case 14: @@ -1344,7 +1344,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 7277,1;//Munak_Doll close; case 15: @@ -1356,7 +1356,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "Merry Christmas!"; emotion e_heh; delitem 1097,1;//Worn_Out_Page - set christ_carol05,3; + christ_carol05 = 3; getitem 2236,1;//Santa's_Hat close; } @@ -1381,7 +1381,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ mes "[Oholy]"; mes "Let's think about the neighbors"; mes "and do a good deed during Christmas!"; - set christ_carol05,0; + christ_carol05 = 0; close; } } @@ -1423,7 +1423,7 @@ function script F_carol_devi { mes "Sledge... Reindeer..."; mes "Hmm, I think I got what I need."; mes "Let's go back to Ms.Oholy."; - set christ_carol05,2; + christ_carol05 = 2; getitem 1097,1; //Worn_Out_Page close; case 2: diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 192bf25ec..2b6d67eca 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -236,7 +236,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ mes "[Caroller]"; mes "They're definitely as harsh as their name."; mes "Go on please!"; - set iROxmas08carol,1; + iROxmas08carol = 1; close; case 4: @@ -338,7 +338,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ next; delitem 6092,6; emotion e_ok; - set iROxmas08carol,2; + iROxmas08carol = 2; mes "[Caroller]"; mes "Those are all needed."; mes "Isn't that easy?"; @@ -424,7 +424,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ delitem 7312,1; delitem 938,10; delitem 732,1; - set iROxmas08carol,3; + iROxmas08carol = 3; mes "[Caroller]"; mes "Thanks a lot."; mes "Merry Christmas!"; @@ -510,8 +510,8 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ mes "Please visit me after the one hour has passed."; close; } - set .@SantaCardTurn,0; - set .@SantaCardWins,0; + .@SantaCardTurn = 0; + .@SantaCardWins = 0; mes "[Santa Claus]"; mes "Wow! You're so cool!"; next; @@ -557,27 +557,27 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ case 1: mes "["+strcharinfo(0)+"]"; mes "Um...I choose Poring!"; - set .@SantaCardP,1; + .@SantaCardP = 1; next; break; case 2: mes "["+strcharinfo(0)+"]"; mes "Um...I choose Angeling!"; - set .@SantaCardP,2; + .@SantaCardP = 2; next; break; case 3: mes "["+strcharinfo(0)+"]"; mes "Um...I choose Ghostring!"; - set .@SantaCardP,3; + .@SantaCardP = 3; next; } mes "[Santa Claus]"; mes "Let's see!!"; mes "One! Two! Three!"; - set .@SantaCardNpc, rand(1,3); + .@SantaCardNpc = rand(1,3); next; mes "[Santa Claus]"; mes "Let's see!!"; @@ -592,9 +592,9 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card } next; - set .@SantaCardTurn,.@SantaCardTurn+1; + ++.@SantaCardTurn; if (.@SantaCardP == .@SantaCardNpc) { - set .@SantaCardWins,.@SantaCardWins+1; + ++.@SantaCardWins; emotion e_gasp; emotion e_ic,1; cutin "",255; @@ -626,7 +626,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ mes "[Santa Claus]"; mes "Now this gift is for you."; mes "Put your hand into the bag and pick only one."; - set .@SantaCardPrize, rand(1,12); + .@SantaCardPrize = rand(1,12); next; if (.@SantaCardPrize == 1) { getitem 12354,2; @@ -664,7 +664,7 @@ prontera,226,306,4 script Caroller#iROxmas08 1_F_PRIEST,{ else if (.@SantaCardPrize == 12) { getitem 594,3; } - set SantaCardTime,gettimetick(2)+3600; + SantaCardTime = gettimetick(2)+3600; mes "[Santa Claus]"; mes "Good job! Thanks for playing the card game with me!"; mes "Merry Christmas!"; diff --git a/npc/events/easter_2008.txt b/npc/events/easter_2008.txt index 79dfc4cce..5b53831a4 100644 --- a/npc/events/easter_2008.txt +++ b/npc/events/easter_2008.txt @@ -90,7 +90,7 @@ prontera,111,99,5 script Egg Salesman#prt::EggVendor 4W_M_02,{ next; } else { - set .@egg_zeny,.@input*500; + .@egg_zeny = .@input*500; if (Zeny < .@egg_zeny) { mes "[Egg Salesman]"; mes "You don't have enough Zeny."; @@ -173,7 +173,7 @@ prontera,108,96,5 script Cantankerous Geezer#prt::EggGeezer 4_M_SEAMAN,{ mes "giving to them in return?"; close2; if (easter2008 < 1) { - set easter2008,1; + easter2008 = 1; } end; } @@ -341,7 +341,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "more, then why don't you"; mes "bring me 10 Holy Eggs?"; mes "That is my condition."; - set easter2008,2; + easter2008 = 2; close; case 2: mes "[Corps Member]"; @@ -388,7 +388,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "for joining us. Now, I can"; mes "tell you about what we do."; delitem 12019,10; //Holy_Egg - set easter2008,3; + easter2008 = 3; getitem 644,2; //Gift_Box next; mes "[Corps Member]"; @@ -441,7 +441,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "Go and bring me"; mes "33 Holy Eggs! I shall be"; mes "waiting here for your return..."; - set easter2008,4; + easter2008 = 4; close; } else if (easter2008 == 4) { @@ -468,7 +468,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "Sacrifice the Holy Eggs there,"; mes "and then return to me. Now..."; mes "Go, and bring him back to life!"; - set easter2008,5; + easter2008 = 5; close; } else if ((BaseLevel > 40) && (BaseLevel < 61)) { @@ -479,7 +479,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "at the entrance to the 4th"; mes "level. Sacrifice the Holy Eggs"; mes "there, and return him to life!"; - set easter2008,6; + easter2008 = 6; close; } else if ((BaseLevel > 60) && (BaseLevel < 81)) { @@ -490,7 +490,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "Sacrifice the Holy Eggs as soon"; mes "as you get to the 3rd floor."; mes "Go, and bring him back to life!"; - set easter2008,7; + easter2008 = 7; close; } else { @@ -501,7 +501,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "2nd floor. A hero perished"; mes "there, but you shall bring"; mes "him back to the living!"; - set easter2008,8; + easter2008 = 8; close; } } @@ -593,7 +593,7 @@ morocc,131,26,5 script Secret Corps#egg 4_M_MASKMAN,{ mes "and then try again next year."; mes "Farewell, my friend, and I hope"; mes "that you'll assist us again."; - set easter2008,10; + easter2008 = 10; if (BaseLevel < 41) { getexp 5000,0; getexp 5000,0; @@ -658,7 +658,7 @@ pay_dun00,22,127,0 script Trace#egg1 CLEAR_NPC,{ mes "him know that it didn't work."; close2; delitem 12019,33; //Holy_Egg - set easter2008,9; + easter2008 = 9; end; } else { @@ -710,7 +710,7 @@ iz_dun02,340,346,0 script Trace#egg CLEAR_NPC,{ mes "him know that it didn't work."; close2; delitem 12019,33; //Holy_Egg - set easter2008,9; + easter2008 = 9; end; } else { @@ -762,7 +762,7 @@ mjo_dun03,308,256,0 script Trace#egg2 CLEAR_NPC,{ mes "him know that it didn't work."; close2; delitem 12019,33; //Holy_Egg - set easter2008,9; + easter2008 = 9; end; } else { @@ -814,7 +814,7 @@ gl_prison,157,176,0 script Trace#egg3 CLEAR_NPC,{ mes "him know that it didn't work."; close2; delitem 12019,33; //Holy_Egg - set easter2008,9; + easter2008 = 9; end; } else { diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt index 8276e0774..70ebbe4fa 100644 --- a/npc/events/easter_2010.txt +++ b/npc/events/easter_2010.txt @@ -184,10 +184,10 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ else if (oversea_event9 == 197) playbgm "94.mp3"; // Theme of Rachel else { switch(rand(1,4)) { - case 1: playbgm "13.mp3"; set oversea_event2,520; break; - case 2: playbgm "59.mp3"; set oversea_event3,270; break; - case 3: playbgm "70.mp3"; set oversea_event6,245; break; - case 4: playbgm "94.mp3"; set oversea_event9,197; break; + case 1: playbgm "13.mp3"; oversea_event2 = 520; break; + case 2: playbgm "59.mp3"; oversea_event3 = 270; break; + case 3: playbgm "70.mp3"; oversea_event6 = 245; break; + case 4: playbgm "94.mp3"; oversea_event9 = 197; break; } } } @@ -234,28 +234,28 @@ prontera,202,297,3 script Rina#Easter 4_F_JOB_HUNTER,{ getitem 5852,1; //Easter_Egg_Shell .@BaseExp = (BaseLevel * (BaseLevel / 4)) * ((BaseLevel / 29) + (BaseLevel / 6)) + (5 * BaseLevel / 2); if (ADVJOB == 0) { - if (BaseLevel < 40) set .@nBaseExp, .@BaseExp; - else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel); - else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20)); - else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); - else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); - else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); - else if (BaseLevel < 99) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); - else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2); + if (BaseLevel < 40) .@nBaseExp = .@BaseExp; + else if (BaseLevel < 50) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel); + else if (BaseLevel < 60) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 20)); + else if (BaseLevel < 70) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); + else if (BaseLevel < 80) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); + else if (BaseLevel < 90) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); + else if (BaseLevel < 99) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); + else .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2) * 2); - set .@nJobExp, (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2; + .@nJobExp = (JobLevel * (JobLevel - 3) * (JobLevel / 25 + 1) + (16 - (JobLevel * 2))) * 2; } else { - if (BaseLevel < 30) set .@nBaseExp, .@BaseExp; - else if (BaseLevel < 40) set .@nBaseExp, .@BaseExp + (BaseLevel * 10); - else if (BaseLevel < 50) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * 2); - else if (BaseLevel < 60) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); - else if (BaseLevel < 70) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); - else if (BaseLevel < 80) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); - else if (BaseLevel < 90) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); - else if (BaseLevel < 98) set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel); - else set .@nBaseExp, .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2); + if (BaseLevel < 30) .@nBaseExp = .@BaseExp; + else if (BaseLevel < 40) .@nBaseExp = .@BaseExp + (BaseLevel * 10); + else if (BaseLevel < 50) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * 2); + else if (BaseLevel < 60) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 10)); + else if (BaseLevel < 70) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 5)); + else if (BaseLevel < 80) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 3)); + else if (BaseLevel < 90) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * (BaseLevel / 2)); + else if (BaseLevel < 98) .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * BaseLevel); + else .@nBaseExp = .@BaseExp + (BaseLevel * BaseLevel * BaseLevel * 2); - set .@nJobExp, (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3; + .@nJobExp = (JobLevel * JobLevel * (JobLevel / 5 + 2) + (20 - JobLevel)) * 3; } getexp .@nBaseExp,.@nJobExp; mes "[Rina]"; @@ -348,13 +348,13 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{ case 1: if (ADVJOB == 0) { if (BaseLevel < 70) - set .@nCharge,400000; + .@nCharge = 400000; else if (BaseLevel < 90) - set .@nCharge,450000; + .@nCharge = 450000; else - set .@nCharge,480000; + .@nCharge = 480000; } else - set .@nCharge,500000; + .@nCharge = 500000; if (countitem(574) < 1 || countitem(1001) < 20 || Zeny < .@nCharge) { mes "[Rina's Little Friend]"; mes "Hmm."; @@ -381,7 +381,7 @@ prontera,204,297,3 script Rina's Little Friend 4_DRAGON_EGG,{ delitem 574,1; //Egg delitem 1001,20; //Sparkling_Dust Zeny -= .@nCharge; - set .@nPercentage, rand(1,100); + .@nPercentage = rand(1,100); if (.@nPercentage <= 41) { mes "[Rina's Little Friend]"; mes "Life is given to the egg."; diff --git a/npc/events/event_skill_reset.txt b/npc/events/event_skill_reset.txt index ab8805736..4b0d2b2a7 100644 --- a/npc/events/event_skill_reset.txt +++ b/npc/events/event_skill_reset.txt @@ -14,7 +14,7 @@ //= Each 1 BaseLv need 20.000 Zeny, so be careful to use skill. //============================================================ yuno,138,187,4 script Hypnotist Teacher 4_F_TELEPORTER,{ - set @npcname$,"[^D5A500Hypnotist^000000]"; + @npcname$ = "[^D5A500Hypnotist^000000]"; mes @npcname$; if(MISC_QUEST & 1024){ diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 1a69fea76..7b68eb980 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -29,7 +29,7 @@ OnTimer3600000: arug_dun01,1,2,1 script Monster Controler1#aru 4_DOG01,{ OnEnable: - set .@callwhere,rand(1,4); + .@callwhere = rand(1,4); if (.@callwhere == 1) { monster "arug_dun01",150,340,"Kublin",1980,1,"Monster Controler1#aru::OnMyMobDead"; } @@ -67,8 +67,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ .@chk_yourgdname$ = getguildname(getcharid(2)); if ($@gdeventv_a1 == 0) { if ($@gdevents_a$ == "") { - set $@gdeventv_a1,1; - set $@gdevents_a$,.@chk_yourgdname$; + $@gdeventv_a1 = 1; + $@gdevents_a$ = .@chk_yourgdname$; mes "[Dwarf]"; mes "Help me!"; mes "Please, help me!"; @@ -141,8 +141,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ next; switch(select("Wait! I'm not ready yet.:Let's go!")) { case 1: - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; mes "[Morestone]"; mes "Take your time, and find a place to gather your friends."; close; @@ -152,8 +152,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; delitem 6010,1; //Pickaxe - set $@gdeventv_a1,1; - set $@gdevents_a$,.@chk_yourgdname$; + $@gdeventv_a1 = 1; + $@gdevents_a$ = .@chk_yourgdname$; close2; setquest 2144; warp "arug_que01",103,133; @@ -161,16 +161,16 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ } } else { - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; mes "[Morestone]"; mes "I will tell you how to find him."; mes "Kublin wears a ridiculous golden hat, It should be easy to recognise him by that."; close; } case 2: - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; emotion e_sob; mes "[Dwarf]"; mes "Ahhh..."; @@ -199,8 +199,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ } } else { - set $@gdeventv_a1,1; - set $@gdevents_a$,.@chk_yourgdname$; + $@gdeventv_a1 = 1; + $@gdevents_a$ = .@chk_yourgdname$; mes "[Dwarf]"; mes "Help me!"; mes "Please, help me!"; @@ -273,8 +273,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ next; switch(select("Wait! I'm not ready yet.:Let's go!")) { case 1: - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; mes "[Morestone]"; mes "Take your time, and find a place to gather your friends."; close; @@ -284,8 +284,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; delitem 6010,1; //Pickaxe - set $@gdeventv_a1,1; - set $@gdevents_a$,.@chk_yourgdname$; + $@gdeventv_a1 = 1; + $@gdevents_a$ = .@chk_yourgdname$; close2; setquest 2144; warp "arug_que01",103,133; @@ -293,16 +293,16 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ } } else { - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; mes "[Morestone]"; mes "I will tell you how to find him."; mes "Kublin wears a ridiculous golden hat, It should be easy to recognise him by that."; close; } case 2: - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; emotion e_sob; mes "[Dwarf]"; mes "Ah...."; @@ -342,8 +342,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ } } else { - set $@gdeventv_a1,1; - set $@gdevents_a$,.@chk_yourgdname$; + $@gdeventv_a1 = 1; + $@gdevents_a$ = .@chk_yourgdname$; mes "[Dwarf]"; mes "Help me!"; mes "Please, help me!"; @@ -416,8 +416,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ next; switch(select("Wait! I'm not ready yet.:Let's go!")) { case 1: - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; mes "[Morestone]"; mes "Take your time, and find a place to gather you friends."; close; @@ -427,8 +427,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; delitem 6010,1; //Pickaxe - set $@gdeventv_a1,1; - set $@gdevents_a$,.@chk_yourgdname$; + $@gdeventv_a1 = 1; + $@gdevents_a$ = .@chk_yourgdname$; close2; setquest 2144; warp "arug_que01",103,133; @@ -436,16 +436,16 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ } } else { - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; mes "[Morestone]"; mes "I will tell you how to find him."; mes "Kublin wears a ridiculous golden hat, It should be easy to recognise him by that."; close; } case 2: - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; emotion e_sob; mes "[Dwarf]"; mes "Ah...."; @@ -465,8 +465,8 @@ arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ OnInit: disablenpc "Dwarf#aru_gd"; - set $@gdeventv_a1,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdevents_a$ = ""; end; OnEnable: @@ -476,7 +476,7 @@ OnEnable: arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ specialeffect EF_POISONHIT; - set .@sprchg_gd,rand(1,5); + .@sprchg_gd = rand(1,5); if (.@sprchg_gd == 1) { setnpcdisplay "Pierrot Pier#aru_gd", 4_GHOSTRING; } @@ -502,7 +502,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ } if (strcharinfo(0) == getguildmaster(getcharid(2))) { if ($@gdeventv_a2 == 0) { - set .@que_2143,questprogress(2143,PLAYTIME); + .@que_2143 = questprogress(2143,PLAYTIME); if (!.@que_2143) { setnpcdisplay "Pierrot Pier#aru_gd", 4_M_PIERROT; mes "A lonely clown is juggling."; @@ -657,7 +657,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let the game.. Begin!"; mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; - set $@gdeventv_a2,1; + $@gdeventv_a2 = 1; donpcevent "Controller#gdevent_a::OnGame_start"; erasequest 2143; close; @@ -674,7 +674,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; - set $@gdeventv_a2,3; + $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -759,7 +759,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let the game.. Begin!"; mapannounce "arug_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; - set $@gdeventv_a2,10; + $@gdeventv_a2 = 10; donpcevent "Controller#gdevent_a::OnGame_start"; close; } @@ -782,7 +782,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mapannounce "arug_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00"; mapannounce "arug_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00"; donpcevent "eff_mvp#aru_gd::OnMVP"; - set $@gdeventv_a2,5; + $@gdeventv_a2 = 5; getitem 14596,10; //Pierre_Treasurebox close; } @@ -815,7 +815,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; - set $@gdeventv_a2,3; + $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -925,7 +925,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; - set $@gdeventv_a2,3; + $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -989,7 +989,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_a::OnStop"; - set $@gdeventv_a2,3; + $@gdeventv_a2 = 3; donpcevent "eff_mvp#aru_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -1018,7 +1018,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ arug_que01,10,10,3 script Controller#gdevent_a 4_DOG01,{ OnInit: - set $@gdeventv_a2,0; + $@gdeventv_a2 = 0; end; OnWin: @@ -1036,7 +1036,7 @@ OnGame_start: donpcevent "paper_sp_7_a::OnEnable"; donpcevent "paper_sp_8_a::OnEnable"; donpcevent "paper_sp_9_a::OnEnable"; - set .@roulette_where,rand(1,9); + .@roulette_where = rand(1,9); if (.@roulette_where == 1) { donpcevent "paper_sp_1_a::OnBingo"; } @@ -1078,7 +1078,7 @@ OnTimer60000: mapannounce "arug_que01", "Pierrot Pier: Time is up!",bc_map,"0x99CC00"; mapwarp "arug_que01","arug_que01",100,79; enablenpc "removepp_aru_gd"; - set $@gdeventv_a2,2; + $@gdeventv_a2 = 2; end; OnTimer63000: @@ -1090,23 +1090,22 @@ arug_que01,87,93,0 script paper_sp_1_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while1,0; + .@paper_while1 = 0; while(1) { if (.@paper_while1 == 100) { break; - } - else { - set .@paper_while1,.@paper_while1+1; - set .@paper_x1,rand(81,95); - set .@paper_y1,rand(87,100); + } else { + ++.@paper_while1; + .@paper_x1 = rand(81,95); + .@paper_y1 = rand(87,100); makeitem 6030,1,"arug_que01",.@paper_x1,.@paper_y1; //Glitering_PaperA } } end; OnBingo: - set .@paper_x1,rand(81,95); - set .@paper_y1,rand(87,100); + .@paper_x1 = rand(81,95); + .@paper_y1 = rand(87,100); makeitem 6031,1,"arug_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB end; } @@ -1115,23 +1114,22 @@ arug_que01,102,93,0 script paper_sp_2_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while2,0; + .@paper_while2 = 0; while(1) { if (.@paper_while2 == 100) { break; - } - else { - set .@paper_while2,.@paper_while2+1; - set .@paper_x2,rand(96,110); - set .@paper_y2,rand(87,100); + } else { + ++.@paper_while2; + .@paper_x2 = rand(96,110); + .@paper_y2 = rand(87,100); makeitem 6030,1,"arug_que01",.@paper_x2,.@paper_y2; //Glitering_PaperA } } end; OnBingo: - set .@paper_x2,rand(96,110); - set .@paper_y2,rand(87,100); + .@paper_x2 = rand(96,110); + .@paper_y2 = rand(87,100); makeitem 6031,1,"arug_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB end; } @@ -1140,23 +1138,22 @@ arug_que01,117,93,0 script paper_sp_3_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while3,0; + .@paper_while3 = 0; while(1) { if (.@paper_while3 == 100) { break; - } - else { - set .@paper_while3,.@paper_while3+1; - set .@paper_x3,rand(111,124); - set .@paper_y3,rand(87,100); + } else { + ++.@paper_while3; + .@paper_x3 = rand(111,124); + .@paper_y3 = rand(87,100); makeitem 6030,1,"arug_que01",.@paper_x3,.@paper_y3; //Glitering_PaperA } } end; OnBingo: - set .@paper_x3,rand(111,124); - set .@paper_y3,rand(87,100); + .@paper_x3 = rand(111,124); + .@paper_y3 = rand(87,100); makeitem 6031,1,"arug_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB end; } @@ -1165,23 +1162,23 @@ arug_que01,87,80,0 script paper_sp_4_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while4,0; + .@paper_while4 = 0; while(1) { if (.@paper_while4 == 100) { break; } else { - set .@paper_while4,.@paper_while4+1; - set .@paper_x4,rand(81,95); - set .@paper_y4,rand(73,86); + ++.@paper_while4; + .@paper_x4 = rand(81,95); + .@paper_y4 = rand(73,86); makeitem 6030,1,"arug_que01",.@paper_x4,.@paper_y4; //Glitering_PaperA } } end; OnBingo: - set .@paper_x4,rand(81,95); - set .@paper_y4,rand(73,86); + .@paper_x4 = rand(81,95); + .@paper_y4 = rand(73,86); makeitem 6031,1,"arug_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB end; } @@ -1190,23 +1187,22 @@ arug_que01,102,80,0 script paper_sp_5_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while5,0; + .@paper_while5 = 0; while(1) { if (.@paper_while5 == 100) { break; - } - else { - set .@paper_while5,.@paper_while5+1; - set .@paper_x5,rand(96,110); - set .@paper_y5,rand(73,86); + } else { + ++.@paper_while5; + .@paper_x5 = rand(96,110); + .@paper_y5 = rand(73,86); makeitem 6030,1,"arug_que01",.@paper_x5,.@paper_y5; //Glitering_PaperA } } end; OnBingo: - set .@paper_x5,rand(96,110); - set .@paper_y5,rand(73,86); + .@paper_x5 = rand(96,110); + .@paper_y5 = rand(73,86); makeitem 6031,1,"arug_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB end; } @@ -1215,23 +1211,22 @@ arug_que01,117,80,0 script paper_sp_6_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while6,0; + .@paper_while6 = 0; while(1) { if (.@paper_while6 == 100) { break; - } - else { - set .@paper_while6,.@paper_while6+1; - set .@paper_x6,rand(111,124); - set .@paper_y6,rand(73,86); + } else { + ++.@paper_while6; + .@paper_x6 = rand(111,124); + .@paper_y6 = rand(73,86); makeitem 6030,1,"arug_que01",.@paper_x6,.@paper_y6; //Glitering_PaperA } } end; OnBingo: - set .@paper_x6,rand(111,124); - set .@paper_y6,rand(73,86); + .@paper_x6 = rand(111,124); + .@paper_y6 = rand(73,86); makeitem 6031,1,"arug_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB end; } @@ -1240,23 +1235,22 @@ arug_que01,87,65,0 script paper_sp_7_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while7,0; + .@paper_while7 = 0; while(1) { if (.@paper_while7 == 100) { break; - } - else { - set .@paper_while7,.@paper_while7+1; - set .@paper_x7,rand(81,95); - set .@paper_y7,rand(59,72); + } else { + ++.@paper_while7; + .@paper_x7 = rand(81,95); + .@paper_y7 = rand(59,72); makeitem 6030,1,"arug_que01",.@paper_x7,.@paper_y7; //Glitering_PaperA } } end; OnBingo: - set .@paper_x7,rand(81,95); - set .@paper_y7,rand(59,72); + .@paper_x7 = rand(81,95); + .@paper_y7 = rand(59,72); makeitem 6031,1,"arug_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB end; } @@ -1265,23 +1259,23 @@ arug_que01,102,65,0 script paper_sp_8_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while8,0; + .@paper_while8 = 0; while(1) { if (.@paper_while8 == 100) { break; } else { - set .@paper_while8,.@paper_while8+1; - set .@paper_x8,rand(96,110); - set .@paper_y8,rand(59,72); + ++.@paper_while8; + .@paper_x8 = rand(96,110); + .@paper_y8 = rand(59,72); makeitem 6030,1,"arug_que01",.@paper_x8,.@paper_y8; //Glitering_PaperA } } end; OnBingo: - set .@paper_x8,rand(96,110); - set .@paper_y8,rand(59,72); + .@paper_x8 = rand(96,110); + .@paper_y8 = rand(59,72); makeitem 6031,1,"arug_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB end; } @@ -1290,23 +1284,23 @@ arug_que01,117,65,0 script paper_sp_9_a HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while9,0; + .@paper_while9 = 0; while(1) { if (.@paper_while9 == 100) { break; } else { - set .@paper_while9,.@paper_while9+1; - set .@paper_x9,rand(111,124); - set .@paper_y9,rand(59,72); + ++.@paper_while9; + .@paper_x9 = rand(111,124); + .@paper_y9 = rand(59,72); makeitem 6030,1,"arug_que01",.@paper_x9,.@paper_y9; //Glitering_PaperA } } end; OnBingo: - set .@paper_x9,rand(111,124); - set .@paper_y9,rand(59,72); + .@paper_x9 = rand(111,124); + .@paper_y9 = rand(59,72); makeitem 6031,1,"arug_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB end; } @@ -1319,8 +1313,8 @@ OnInit: end; OnTouch2: - set .@paper_aru_gd,countitem(6030); - set .@spaper_aru_gd,countitem(6031); + .@paper_aru_gd = countitem(6030); + .@spaper_aru_gd = countitem(6031); if ((.@paper_aru_gd > 0) || (.@spaper_aru_gd > 0)) { delitem 6030,.@paper_aru_gd; //Glitering_PaperA delitem 6031,.@spaper_aru_gd; //Glitering_PaperB @@ -1444,7 +1438,7 @@ OnEnable: OnMyMobDead: if (mobcount("arug_que01","treg#aru_gd::OnMyMobDead") == 0) { mapannounce "arug_que01", "Pierrot Pier: Beep! Oh, you already opened the gift? You sure are fast now, beep!",bc_map,"0x99CC00"; - set $@gdeventv_a2,5; + $@gdeventv_a2 = 5; } end; } @@ -1522,9 +1516,9 @@ arug_dun01,5,5,1 script Event controller#aru_gd 4_DOG01,{ donpcevent "Monster Controler1#aru::OnControler1#aru_gd"; donpcevent "Monster Controler1#aru::OnControler1#aru_gd"; disablenpc "Dwarf#aru_gd"; - set $@gdeventv_a1,0; - set $@gdeventv_a2,0; - set $@gdevents_a$,""; + $@gdeventv_a1 = 0; + $@gdeventv_a2 = 0; + $@gdevents_a$ = ""; close; case 2: mes "Good bye~"; diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index a6df13889..22b70836e 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -29,7 +29,7 @@ OnTimer3600000: schg_dun01,1,2,1 script Monster Controler1#sch 4_DOG01,{ OnEnable: - set .@callwhere,rand(1,4); + .@callwhere = rand(1,4); if (.@callwhere == 1) { monster "schg_dun01",164,236,"Kublin",1980,1,"Monster Controler1#sch::OnMyMobDead"; } @@ -67,8 +67,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ .@chk_yourgdname$ = getguildname(getcharid(2)); if ($@gdeventv_s1 == 0) { if ($@gdevents_s$ == "") { - set $@gdeventv_s1,1; - set $@gdevents_s$,.@chk_yourgdname$; + $@gdeventv_s1 = 1; + $@gdevents_s$ = .@chk_yourgdname$; mes "[Dwarf]"; mes "Help me!"; mes "Please, help me!"; @@ -141,8 +141,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ next; switch(select("Wait! I'm not ready yet.:Let's go!")) { case 1: - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; mes "[Morestone]"; mes "Take your time, and find a place to gather your friends."; close; @@ -152,8 +152,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; delitem 6010,1; //Pickaxe - set $@gdeventv_s1,1; - set $@gdevents_s$,.@chk_yourgdname$; + $@gdeventv_s1 = 1; + $@gdevents_s$ = .@chk_yourgdname$; close2; setquest 2144; warp "schg_que01",103,133; @@ -161,16 +161,16 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } } else { - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; mes "[Morestone]"; mes "I will tell you how to find him."; mes "Kublin wears a ridiculous golden hat, It should be easy to recognise him by that."; close; } case 2: - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; emotion e_sob; mes "[Dwarf]"; mes "Ahhh..."; @@ -199,8 +199,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } } else { - set $@gdeventv_s1,1; - set $@gdevents_s$,.@chk_yourgdname$; + $@gdeventv_s1 = 1; + $@gdevents_s$ = .@chk_yourgdname$; mes "[Dwarf]"; mes "Help me!"; mes "Please, help me!"; @@ -273,8 +273,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ next; switch(select("Wait! I'm not ready yet.:Let's go!")) { case 1: - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; mes "[Morestone]"; mes "Take your time, and find a place to gather your friends."; close; @@ -284,8 +284,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; delitem 6010,1; //Pickaxe - set $@gdeventv_s1,1; - set $@gdevents_s$,.@chk_yourgdname$; + $@gdeventv_s1 = 1; + $@gdevents_s$ = .@chk_yourgdname$; close2; setquest 2144; warp "schg_que01",103,133; @@ -293,16 +293,16 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } } else { - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; mes "[Morestone]"; mes "I will tell you how to find him."; mes "Kublin wears a ridiculous golden hat, It should be easy to recognise him by that."; close; } case 2: - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; emotion e_sob; mes "[Dwarf]"; mes "Ah...."; @@ -341,8 +341,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } } else { - set $@gdeventv_s1,1; - set $@gdevents_s$,.@chk_yourgdname$; + $@gdeventv_s1 = 1; + $@gdevents_s$ = .@chk_yourgdname$; mes "[Dwarf]"; mes "Help me!"; mes "Please, help me!"; @@ -415,8 +415,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ next; switch(select("Wait! I'm not ready yet.:Let's go!")) { case 1: - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; mes "[Morestone]"; mes "Take your time, and find a place to gather you friends."; close; @@ -426,8 +426,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ mes "If your friends visit me again later, I will guide them to that area again."; mes "Don't forget, dwarves are grateful beings! Hahaha!"; delitem 6010,1; //Pickaxe - set $@gdeventv_s1,1; - set $@gdevents_s$,.@chk_yourgdname$; + $@gdeventv_s1 = 1; + $@gdevents_s$ = .@chk_yourgdname$; close2; setquest 2144; warp "schg_que01",103,133; @@ -435,16 +435,16 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ } } else { - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; mes "[Morestone]"; mes "I will tell you how to find him."; mes "Kublin wears a ridiculous golden hat, It should be easy to recognise him by that."; close; } case 2: - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; emotion e_sob; mes "[Dwarf]"; mes "Ah...."; @@ -464,8 +464,8 @@ schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ OnInit: disablenpc "Dwarf#sch_gd"; - set $@gdeventv_s1,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdevents_s$ = ""; end; OnEnable: @@ -475,7 +475,7 @@ OnEnable: schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ specialeffect EF_POISONHIT; - set .@sprchg_gd,rand(1,5); + .@sprchg_gd = rand(1,5); if (.@sprchg_gd == 1) { setnpcdisplay "Pierrot Pier#sch_gd", 4_GHOSTRING; } @@ -656,7 +656,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let the game.. Begin!"; mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; - set $@gdeventv_s2,1; + $@gdeventv_s2 = 1; donpcevent "Controller#gdevent_s::OnGame_start"; erasequest 2143; close; @@ -673,7 +673,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; - set $@gdeventv_s2,3; + $@gdeventv_s2 = 3; donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -758,7 +758,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mes "[Pierrot Pier]"; mes "Let the game.. Begin!"; mapannounce "schg_que01", "Pierrot Pier: Let the game.. Begin!",bc_map,"0x99CC00"; - set $@gdeventv_s2,10; + $@gdeventv_s2 = 10; donpcevent "Controller#gdevent_s::OnGame_start"; close; } @@ -781,7 +781,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mapannounce "schg_que01", "Pierrot Pier: You've completeled an unbelievable task, I will give you the wonderful gift my master has prepared!! Ha!",bc_map,"0x99CC00"; mapannounce "schg_que01", "Pierrot Pier: Here, take Pierre's Treasure Boxes.",bc_map,"0x99CC00"; donpcevent "eff_mvp#sch_gd::OnMVP"; - set $@gdeventv_s2,5; + $@gdeventv_s2 = 5; getitem 14596,10; //Pierre_Treasurebox close; } @@ -814,7 +814,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; - set $@gdeventv_s2,3; + $@gdeventv_s2 = 3; donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -924,7 +924,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; - set $@gdeventv_s2,3; + $@gdeventv_s2 = 3; donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -988,7 +988,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ next; if (countitem(6031) > 0) { donpcevent "Controller#gdevent_s::OnStop"; - set $@gdeventv_s2,3; + $@gdeventv_s2 = 3; donpcevent "eff_mvp#sch_gd::OnMVP"; mes "[Pierrot Pier]"; mes "Wow~~!!"; @@ -1017,7 +1017,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ schg_que01,10,10,3 script Controller#gdevent_s 4_DOG01,{ OnInit: - set $@gdeventv_s2,0; + $@gdeventv_s2 = 0; end; OnWin: @@ -1035,7 +1035,7 @@ OnGame_start: donpcevent "paper_sp_7_s::OnEnable"; donpcevent "paper_sp_8_s::OnEnable"; donpcevent "paper_sp_9_s::OnEnable"; - set .@roulette_where,rand(1,9); + .@roulette_where = rand(1,9); if (.@roulette_where == 1) { donpcevent "paper_sp_1_s::OnBingo"; } @@ -1077,7 +1077,7 @@ OnTimer60000: mapannounce "schg_que01", "Pierrot Pier: Time is up!",bc_map,"0x99CC00"; mapwarp "schg_que01","schg_que01",100,79; enablenpc "removepp_sch_gd"; - set $@gdeventv_s2,2; + $@gdeventv_s2 = 2; end; OnTimer63000: @@ -1089,23 +1089,22 @@ schg_que01,87,93,0 script paper_sp_1_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while1,0; + .@paper_while1 = 0; while(1) { if (.@paper_while1 == 100) { break; - } - else { - set .@paper_while1,.@paper_while1+1; - set .@paper_x1,rand(81,95); - set .@paper_y1,rand(87,100); + } else { + ++.@paper_while1; + .@paper_x1 = rand(81,95); + .@paper_y1 = rand(87,100); makeitem 6030,1,"schg_que01",.@paper_x1,.@paper_y1; //Glitering_PaperA } } end; OnBingo: - set .@paper_x1,rand(81,95); - set .@paper_y1,rand(87,100); + .@paper_x1 = rand(81,95); + .@paper_y1 = rand(87,100); makeitem 6031,1,"schg_que01",.@paper_x1,.@paper_y1; //Glitering_PaperB end; } @@ -1114,23 +1113,22 @@ schg_que01,102,93,0 script paper_sp_2_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while2,0; + .@paper_while2 = 0; while(1) { if (.@paper_while2 == 100) { break; - } - else { - set .@paper_while2,.@paper_while2+1; - set .@paper_x2,rand(96,110); - set .@paper_y2,rand(87,100); + } else { + ++.@paper_while2; + .@paper_x2 = rand(96,110); + .@paper_y2 = rand(87,100); makeitem 6030,1,"schg_que01",.@paper_x2,.@paper_y2; //Glitering_PaperA } } end; OnBingo: - set .@paper_x2,rand(96,110); - set .@paper_y2,rand(87,100); + .@paper_x2 = rand(96,110); + .@paper_y2 = rand(87,100); makeitem 6031,1,"schg_que01",.@paper_x2,.@paper_y2; //Glitering_PaperB end; } @@ -1139,23 +1137,22 @@ schg_que01,117,93,0 script paper_sp_3_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while3,0; + .@paper_while3 = 0; while(1) { if (.@paper_while3 == 100) { break; - } - else { - set .@paper_while3,.@paper_while3+1; - set .@paper_x3,rand(111,124); - set .@paper_y3,rand(87,100); + } else { + ++.@paper_while3; + .@paper_x3 = rand(111,124); + .@paper_y3 = rand(87,100); makeitem 6030,1,"schg_que01",.@paper_x3,.@paper_y3; //Glitering_PaperA } } end; OnBingo: - set .@paper_x3,rand(111,124); - set .@paper_y3,rand(87,100); + .@paper_x3 = rand(111,124); + .@paper_y3 = rand(87,100); makeitem 6031,1,"schg_que01",.@paper_x3,.@paper_y3; //Glitering_PaperB end; } @@ -1164,23 +1161,22 @@ schg_que01,87,80,0 script paper_sp_4_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while4,0; + .@paper_while4 = 0; while(1) { if (.@paper_while4 == 100) { break; - } - else { - set .@paper_while4,.@paper_while4+1; - set .@paper_x4,rand(81,95); - set .@paper_y4,rand(73,86); + } else { + ++.@paper_while4; + .@paper_x4 = rand(81,95); + .@paper_y4 = rand(73,86); makeitem 6030,1,"schg_que01",.@paper_x4,.@paper_y4; //Glitering_PaperA } } end; OnBingo: - set .@paper_x4,rand(81,95); - set .@paper_y4,rand(73,86); + .@paper_x4 = rand(81,95); + .@paper_y4 = rand(73,86); makeitem 6031,1,"schg_que01",.@paper_x4,.@paper_y4; //Glitering_PaperB end; } @@ -1189,23 +1185,23 @@ schg_que01,102,80,0 script paper_sp_5_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while5,0; + .@paper_while5 = 0; while(1) { if (.@paper_while5 == 100) { break; } else { - set .@paper_while5,.@paper_while5+1; - set .@paper_x5,rand(96,110); - set .@paper_y5,rand(73,86); + ++.@paper_while5; + .@paper_x5 = rand(96,110); + .@paper_y5 = rand(73,86); makeitem 6030,1,"schg_que01",.@paper_x5,.@paper_y5; //Glitering_PaperA } } end; OnBingo: - set .@paper_x5,rand(96,110); - set .@paper_y5,rand(73,86); + .@paper_x5 = rand(96,110); + .@paper_y5 = rand(73,86); makeitem 6031,1,"schg_que01",.@paper_x5,.@paper_y5; //Glitering_PaperB end; } @@ -1214,23 +1210,22 @@ schg_que01,117,80,0 script paper_sp_6_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while6,0; + .@paper_while6 = 0; while(1) { if (.@paper_while6 == 100) { break; - } - else { - set .@paper_while6,.@paper_while6+1; - set .@paper_x6,rand(111,124); - set .@paper_y6,rand(73,86); + } else { + ++.@paper_while6; + .@paper_x6 = rand(111,124); + .@paper_y6 = rand(73,86); makeitem 6030,1,"schg_que01",.@paper_x6,.@paper_y6; //Glitering_PaperA } } end; OnBingo: - set .@paper_x6,rand(111,124); - set .@paper_y6,rand(73,86); + .@paper_x6 = rand(111,124); + .@paper_y6 = rand(73,86); makeitem 6031,1,"schg_que01",.@paper_x6,.@paper_y6; //Glitering_PaperB end; } @@ -1239,23 +1234,22 @@ schg_que01,87,65,0 script paper_sp_7_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while7,0; + .@paper_while7 = 0; while(1) { if (.@paper_while7 == 100) { break; - } - else { - set .@paper_while7,.@paper_while7+1; - set .@paper_x7,rand(81,95); - set .@paper_y7,rand(59,72); + } else { + ++.@paper_while7; + .@paper_x7 = rand(81,95); + .@paper_y7 = rand(59,72); makeitem 6030,1,"schg_que01",.@paper_x7,.@paper_y7; //Glitering_PaperA } } end; OnBingo: - set .@paper_x7,rand(81,95); - set .@paper_y7,rand(59,72); + .@paper_x7 = rand(81,95); + .@paper_y7 = rand(59,72); makeitem 6031,1,"schg_que01",.@paper_x7,.@paper_y7; //Glitering_PaperB end; } @@ -1264,23 +1258,22 @@ schg_que01,102,65,0 script paper_sp_8_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while8,0; + .@paper_while8 = 0; while(1) { if (.@paper_while8 == 100) { break; - } - else { - set .@paper_while8,.@paper_while8+1; - set .@paper_x8,rand(96,110); - set .@paper_y8,rand(59,72); + } else { + ++.@paper_while8; + .@paper_x8 = rand(96,110); + .@paper_y8 = rand(59,72); makeitem 6030,1,"schg_que01",.@paper_x8,.@paper_y8; //Glitering_PaperA } } end; OnBingo: - set .@paper_x8,rand(96,110); - set .@paper_y8,rand(59,72); + .@paper_x8 = rand(96,110); + .@paper_y8 = rand(59,72); makeitem 6031,1,"schg_que01",.@paper_x8,.@paper_y8; //Glitering_PaperB end; } @@ -1289,23 +1282,22 @@ schg_que01,117,65,0 script paper_sp_9_s HIDDEN_WARP_NPC,{ end; OnEnable: - set .@paper_while9,0; + .@paper_while9 = 0; while(1) { if (.@paper_while9 == 100) { break; - } - else { - set .@paper_while9,.@paper_while9+1; - set .@paper_x9,rand(111,124); - set .@paper_y9,rand(59,72); + } else { + ++.@paper_while9; + .@paper_x9 = rand(111,124); + .@paper_y9 = rand(59,72); makeitem 6030,1,"schg_que01",.@paper_x9,.@paper_y9; //Glitering_PaperA } } end; OnBingo: - set .@paper_x9,rand(111,124); - set .@paper_y9,rand(59,72); + .@paper_x9 = rand(111,124); + .@paper_y9 = rand(59,72); makeitem 6031,1,"schg_que01",.@paper_x9,.@paper_y9; //Glitering_PaperB end; } @@ -1318,8 +1310,8 @@ OnInit: end; OnTouch2: - set .@paper_sch_gd,countitem(6030); - set .@spaper_sch_gd,countitem(6031); + .@paper_sch_gd = countitem(6030); + .@spaper_sch_gd = countitem(6031); if ((.@paper_sch_gd > 0) || (.@spaper_sch_gd > 0)) { delitem 6030,.@paper_sch_gd; //Glitering_PaperA delitem 6031,.@spaper_sch_gd; //Glitering_PaperB @@ -1443,7 +1435,7 @@ OnEnable: OnMyMobDead: if (mobcount("schg_que01","treg#sch_gd::OnMyMobDead") == 0) { mapannounce "schg_que01", "Pierrot Pier: Beep! Oh, you already opened the gift? You sure are fast now, beep!",bc_map,"0x99CC00"; - set $@gdeventv_s2,5; + $@gdeventv_s2 = 5; } end; } @@ -1521,9 +1513,9 @@ schg_dun01,5,5,1 script Event controller#sch_gd 4_DOG01,{ donpcevent "Monster Controler1#sch::OnControler1#sch_gd"; donpcevent "Monster Controler1#sch::OnControler1#sch_gd"; disablenpc "Dwarf#sch_gd"; - set $@gdeventv_s1,0; - set $@gdeventv_s2,0; - set $@gdevents_s$,""; + $@gdeventv_s1 = 0; + $@gdeventv_s2 = 0; + $@gdevents_s$ = ""; close; case 2: mes "Good bye~"; diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 54bf2b6d3..3b7dd50e8 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -45,7 +45,7 @@ yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{ } yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ - set .@GID, getcharid(2); + .@GID = getcharid(2); if (countitem(7840) > 0) { mes "[Rmimi Ravies]"; mes "This is the flower."; @@ -166,7 +166,7 @@ OnDisable: OnStart: initnpctimer; - set $@gqse_festival,1; + $@gqse_festival = 1; end; OnCall: @@ -197,7 +197,7 @@ OnCall: OnOver: killmonster "yuno","Rmimi Ravies#gq_fes01::OnMyMobDead"; - set $@gqse_festival,0; + $@gqse_festival = 0; stopnpctimer; end; @@ -423,7 +423,7 @@ rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{ } rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ - set .@GID, getcharid(2); + .@GID = getcharid(2); if (countitem(7840) > 0) { mes "[Rhehe Ravies]"; mes "A flower!!"; @@ -548,7 +548,7 @@ OnDisable: OnStart: initnpctimer; - set $@gqse_festival,1; + $@gqse_festival = 1; end; OnCall: @@ -579,7 +579,7 @@ OnCall: OnOver: killmonster "rachel","Rhehe Ravies#gq_fes03::OnMyMobDead"; - set $@gqse_festival,0; + $@gqse_festival = 0; stopnpctimer; end; diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt index 06c101529..426bff65b 100644 --- a/npc/events/halloween_2006.txt +++ b/npc/events/halloween_2006.txt @@ -296,7 +296,7 @@ geffen,145,132,3 script Hoirin#06_hw 4_F_NOVICE,{ mes "[Hoirin]"; mes "Just Bring Pumpkin Mojo, Pumpkin, and a Egg."; mes "Leave the rest for me..You'll get to try the best pumkin pie!"; - set halloween, 100; + halloween = 100; close; } mes "[Hoirin]"; @@ -355,7 +355,7 @@ geffen,145,132,3 script Hoirin#06_hw 4_F_NOVICE,{ if (select("Send me.:It's ok.") == 1) { mes "[Hoirin]"; mes "Ok, go get the eggs."; - set halloween, 101; + halloween = 101; close2; warp "nif_fild01", 162, 113; end; @@ -434,7 +434,7 @@ nif_in,19,32,3 script Deviruchi#06_hw 4_DEVIRUCHI,{ mes "Hmm...This would be good."; mes "Here take this, and thanks again~"; delitem 12192, 1;//Pumpkin_Pie - set @hw_temp,rand(1,3); + @hw_temp = rand(1,3); if (@hw_temp == 2) getitem 12130,1; //Cookie_Bag else getitem 7460,3; //Nifl_Express_Ticket close; @@ -518,7 +518,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ mes "Thanks."; mes "Here are the eggs."; Zeny -= 2000; - set halloween, 102; + halloween = 102; getitem 574,2; //Egg close; } @@ -534,7 +534,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ mes "Thanks."; mes "Here are the eggs."; Zeny -= 1000; - set halloween, 102; + halloween = 102; getitem 574,1; //Egg close; } @@ -614,7 +614,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ else break; } - set .@hw_egg, .@input * 1000; + .@hw_egg = .@input * 1000; if (Zeny < @hw_egg) { mes "[Chicken Masta]"; mes "You don't seem to have enough zeny."; @@ -626,7 +626,7 @@ nif_fild01,165,115,3 script Chicken Masta#06_hw 4_M_NFDEADMAN2,{ mes "If you want more eggs, find me more chickens."; Zeny -= @hw_egg; getitem 574, @input;//Egg - set halloween, 102; + halloween = 102; close; } else { @@ -656,7 +656,7 @@ nif_fild01,167,113,3 script Masta's chicken#06_hw01 4_NFCOCK,{ emotion e_omg; specialeffect EF_TELEPORTATION; mes "The magic spell has been casted."; - set halloween, 103; + halloween = 103; disablenpc "Masta's chicken#"+strnpcinfo(1); close2; sleep 180000; @@ -676,7 +676,7 @@ nif_fild01,167,113,3 script Masta's chicken#06_hw01 4_NFCOCK,{ } - script HwChicken2::HwChicken2 -1,{ - set @egg_temp,rand(1,4); + @egg_temp = rand(1,4); if( @egg_temp == 3) { mes "As soon as you got close to the chicken and touched it, it disappeared completely."; mes "You got an 'egg' in the place where the chicken disappeared."; @@ -692,7 +692,7 @@ nif_fild01,167,113,3 script Masta's chicken#06_hw01 4_NFCOCK,{ } - script HwChicken3::HwChicken3 -1,{ - set @egg_temp,rand(1,4); + @egg_temp = rand(1,4); if( @egg_temp == 3) { mes "As soon as you got close to the chicken and touched it, it disappeared completely."; mes "You got an 'egg' in the place where the chicken disappeared."; diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt index 95b3e2a11..f67841c15 100644 --- a/npc/events/halloween_2009.txt +++ b/npc/events/halloween_2009.txt @@ -246,80 +246,80 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2 if (.@mapname$ == "prontera") { switch(select("Geffen:Payon:Alberta:Aldebaran")) { case 1: - set .@HallowTown,3; + .@HallowTown = 3; break; case 2: - set .@HallowTown,2; + .@HallowTown = 2; break; case 3: - set .@HallowTown,4; + .@HallowTown = 4; break; case 4: - set .@HallowTown,5; + .@HallowTown = 5; break; } } else if (.@mapname$ == "payon") { switch(select("Prontera:Geffen:Alberta:Aldebaran")) { case 1: - set .@HallowTown,1; + .@HallowTown = 1; break; case 2: - set .@HallowTown,3; + .@HallowTown = 3; break; case 3: - set .@HallowTown,4; + .@HallowTown = 4; break; case 4: - set .@HallowTown,5; + .@HallowTown = 5; break; } } else if (.@mapname$ == "geffen") { switch(select("Prontera:Payon:Alberta:Aldebaran")) { case 1: - set .@HallowTown,1; + .@HallowTown = 1; break; case 2: - set .@HallowTown,2; + .@HallowTown = 2; break; case 3: - set .@HallowTown,4; + .@HallowTown = 4; break; case 4: - set .@HallowTown,5; + .@HallowTown = 5; break; } } else if (.@mapname$ == "alberta") { switch(select("Prontera:Geffen:Payon:Aldebaran")) { case 1: - set .@HallowTown,1; + .@HallowTown = 1; break; case 2: - set .@HallowTown,3; + .@HallowTown = 3; break; case 3: - set .@HallowTown,2; + .@HallowTown = 2; break; case 4: - set .@HallowTown,5; + .@HallowTown = 5; break; } } else if (.@mapname$ == "aldebaran") { switch(select("Prontera:Geffen:Payon:Alberta")) { case 1: - set .@HallowTown,1; + .@HallowTown = 1; break; case 2: - set .@HallowTown,3; + .@HallowTown = 3; break; case 3: - set .@HallowTown,2; + .@HallowTown = 2; break; case 4: - set .@HallowTown,4; + .@HallowTown = 4; break; } } @@ -347,14 +347,14 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2 break; } else { - set .@fabric,countitem(1059); - set .@jack,countitem(1062); - set .@worn,countitem(6299); - set .@crushed,countitem(6298); - set .@whispers,0; - set .@darklords,0; + .@fabric = countitem(1059); + .@jack = countitem(1062); + .@worn = countitem(6299); + .@crushed = countitem(6298); + .@whispers = 0; + .@darklords = 0; - set .@total,.@fabric + .@jack + .@worn + .@crushed; + .@total = .@fabric + .@jack + .@worn + .@crushed; if(.@total < .@input) { mes "[Halloween Wizard]"; @@ -367,49 +367,49 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2 if(.@fabric > 0) { if(.@fabric >= .@input) { delitem 1059,.@input; - set .@whispers,.@whispers+.@input; - set .@input,0; + .@whispers += .@input; + .@input = 0; } else{ delitem 1059,.@fabric; - set .@input,.@input - .@fabric; - set .@whispers,.@whispers+.@fabric; + .@input -= .@fabric; + .@whispers += .@fabric; } } if(.@worn > 0 && .@input != 0) { if(.@worn >= .@input) { delitem 6299,.@input; - set .@whispers,.@whispers+.@input; - set .@input,0; + .@whispers += .@input; + .@input = 0; } else{ delitem 6299,.@worn; - set .@input,.@input - .@worn; - set .@whispers,.@whispers+.@worn; + .@input -= .@worn; + .@whispers += .@worn; } } if(.@jack > 0 && .@input != 0) { if(.@jack >= .@input) { delitem 1062,.@input; - set .@darklords,.@darklords+.@input; - set .@input,0; + .@darklords += .@input; + .@input = 0; } else{ delitem 1062,.@jack; - set .@input,.@input - .@jack; - set .@darklords,.@darklords+.@jack; + .@input -= .@jack; + .@darklords += .@jack; } } if(.@crushed > 0 && .@input != 0) { if(.@crushed >= .@input) { delitem 6298,.@input; - set .@darklords,.@darklords+.@input; - set .@input,0; + .@darklords += .@input; + .@input = 0; } else{ delitem 6298,.@crushed; - set .@input,.@input - .@crushed; - set .@darklords,.@darklords+.@crushed; + .@input -= .@crushed; + .@darklords += .@crushed; } } if (.@input > 0) { diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt index 6c81d0d38..0b51f468b 100644 --- a/npc/events/lunar_2008.txt +++ b/npc/events/lunar_2008.txt @@ -50,7 +50,7 @@ payon_in01,193,30,4 script Rice Mill Grandma#rat 1_F_ORIENT_04,{ mes "think you can help me?"; next; if (select("Of course.:I don't even know you.") == 1) { - set lunar_rat,1; + lunar_rat = 1; mes "[" + strcharinfo(0)+"]"; mes "Of course."; mes "What can I do?"; @@ -93,7 +93,7 @@ payon_in01,193,30,4 script Rice Mill Grandma#rat 1_F_ORIENT_04,{ mes "Please wait here a moment,"; mes "and I'll make you some pastry~"; delitem 7770,1; //Sweet_rice - set lunar_rat,3; + lunar_rat = 3; close; } else if (lunar_rat == 4) { @@ -104,7 +104,7 @@ payon_in01,193,30,4 script Rice Mill Grandma#rat 1_F_ORIENT_04,{ mes "Please wait here a moment,"; mes "and I'll make you some pastry~"; delitem 7770,1; //Sweet_rice - set lunar_rat,5; + lunar_rat = 5; close; } mes "Oh, where are all the"; @@ -127,15 +127,15 @@ payon_in01,193,30,4 script Rice Mill Grandma#rat 1_F_ORIENT_04,{ mes "Would you mind being"; mes "a dear, and delivering"; mes "that to my son for me?"; - set lunar_rat,2; + lunar_rat = 2; close; } else if (lunar_rat == 3 || lunar_rat == 5) { - set .@reward,rand(1,100); + .@reward = rand(1,100); if (.@reward <= 5) { if (lunar_rat == 3) { getitem 9038,1; // New_Year_Doll_Egg - set lunar_rat,4; + lunar_rat = 4; } else if (lunar_rat == 5) { getitem 668,1; // Red_Envelope @@ -152,8 +152,8 @@ payon_in01,193,30,4 script Rice Mill Grandma#rat 1_F_ORIENT_04,{ // After getting the egg there is a chance to get an envelope with each turn in if (rand(1,20) <= 5 && lunar_rat == 4) getitem 668,1; // Red_Envelope // Set the quest accordingly for repeat turn-ins. - if (lunar_rat == 3) set lunar_rat,2; - else if (lunar_rat == 5) set lunar_rat,4; + if (lunar_rat == 3) lunar_rat = 2; + else if (lunar_rat == 5) lunar_rat = 4; mes "It's not nearly enough"; mes "to repay you for what you've"; mes "done for me, but I'd like"; diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 9b24c50b6..f768405d7 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -14,7 +14,7 @@ //================================================== function script F_GldDunSw { - set .@GID, getcastledata(getarg(0),1); + .@GID = getcastledata(getarg(0),1); if (.@GID == 0) { mes "[ Echoing Voice ]"; mes " ' The one who can overcome an ordeal and show true bravery... will find the way... ' "; diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index 097abb53c..5461bb975 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -16,10 +16,10 @@ // Function for OnAgitStart ========================================= function script F_AgitStart { - set .@map$, getarg(0); - set .@castle$, getarg(1); - set .@empx, getarg(2); - set .@empy, getarg(3); + .@map$ = getarg(0); + .@castle$ = getarg(1); + .@empx = getarg(2); + .@empy = getarg(3); maprespawnguildid .@map$,getcastledata(.@map$,1),2; monster .@map$,.@empx,.@empy,"Emperium",1288,1,"Agit_"+.@castle$+"::OnAgitBreak"; @@ -30,8 +30,8 @@ function script F_AgitStart { // Function for OnGuildBreak ====================================== function script F_GuildBreak { - set .@map$, getarg(0); - set .@castle$, getarg(1); + .@map$ = getarg(0); + .@castle$ = getarg(1); killmonsterall .@map$; @@ -44,18 +44,18 @@ function script F_GuildBreak { // Function for OnAgitBreak ====================================== function script F_AgitBreak { - set .@map$, getarg(0); - set .@castle$, getarg(1); + .@map$ = getarg(0); + .@castle$ = getarg(1); - set .@GID,getcharid(2); + .@GID = getcharid(2); if (.@GID <= 0) return; - set .@Economy,getcastledata(.@map$,2) - 5; - if (.@Economy < 0) set .@Economy, 0; + .@Economy = getcastledata(.@map$,2) - 5; + if (.@Economy < 0) .@Economy = 0; setcastledata .@map$, 2, .@Economy; - set .@defence,getcastledata(.@map$,3) - 5; - if (.@defence < 0) set .@defence, 0; + .@defence = getcastledata(.@map$,3) - 5; + if (.@defence < 0) .@defence = 0; setcastledata .@map$, 3, .@defence; setcastledata .@map$,1, .@GID; @@ -66,12 +66,12 @@ function script F_AgitBreak { disablenpc "Kafra Staff#"+.@castle$; // remove investment data and kafra - for( set .@i, 4; .@i <= 9; set .@i, .@i+1 ) + for (.@i = 4; .@i <= 9; ++.@i) setcastledata .@map$, .@i, 0; // if the new guild doesn't have Guardian Research, erase guardians if( getgdskilllv(.@GID,10002) == 0 ) - for( set .@i, 10; .@i <= 17; set .@i, .@i+1 ) + for (.@i = 10; .@i <= 17; ++.@i) setcastledata .@map$, .@i, 0; return; @@ -80,8 +80,8 @@ function script F_AgitBreak { // Function for OnAgitEnd ====================================== function script F_AgitEnd { - set .@map$, getarg(0); - set .@castle$, getarg(1); + .@map$ = getarg(0); + .@castle$ = getarg(1); gvgoff .@map$; // Disable the following if statment to keep empty diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index 8c629adf9..dcd3dbc14 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -16,7 +16,7 @@ /// Flag Function //============================================================ function script F_Flags { - set .@GID, getcastledata(getarg(1),1); + .@GID = getcastledata(getarg(1),1); if (getarg(5) == 0) return; if (.@GID == 0) { mes " [ Edict of the Divine Rune Midgard Kingdom ]"; diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index 100751f7a..89570fe6d 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -16,7 +16,7 @@ function script F_GKafra { cutin "kafra_01",2; - set @GID, getcastledata(getarg(0),1); + @GID = getcastledata(getarg(0),1); if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG; mes "[Kafra Service]"; @@ -24,8 +24,8 @@ function script F_GKafra { cutin "",255; close; L_StartG: - set @wrpP[0], 200; - set @wrpD$[0], getarg(1); + @wrpP[0] = 200; + @wrpD$[0] = getarg(1); setarray @wrpC$[0], @wrpD$[0]+" ^880000"+@wrpP[0]+"^000000 z", "Cancel", "", "", "",""; callfunc "F_Kafra",2,0,0,0,800; end; diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index 039ba9ee1..015ef20fd 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -23,7 +23,7 @@ //============================================== function script F_GldManager { - set @GID, getcastledata(getarg(1),1); + @GID = getcastledata(getarg(1),1); mes "[ "+getarg(0)+" ]"; if (@GID == 0){ mes "I am waiting for my master. Brave adventurer, follow your destiny!"; diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt index 750eab88a..7a7cd64c8 100644 --- a/npc/events/nguild/nguild_treas.txt +++ b/npc/events/nguild/nguild_treas.txt @@ -39,7 +39,7 @@ function script F_GldTreas { //sets the counter variable = to the box number amount set getarg(3), getarg(2); } - for (set .@i,1; .@i <= getarg(3) ; set .@i,.@i+1) { + for (.@i = 1; .@i <= getarg(3); ++.@i) { // set treasure box ID set getarg(4), getarg(5) + (.@i+1) % 2; areamonster getarg(0),getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied"; @@ -71,13 +71,13 @@ OnRecvCastleN01: end; OnInit: if($boxNumN01 == 0) end; - set $@bxN01, $boxNumN01; + $@bxN01 = $boxNumN01; callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324+rand(10),114,218,123,227,1; end; OnDied: mapannounce "nguild_alde","Treasure Chest Broken Open",17; - set $boxNumN01, $boxNumN01 -1; + --$boxNumN01; if($boxNumN01 == 0) mapannounce "nguild_alde", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0; end; } @@ -97,13 +97,13 @@ OnRecvCastleN02: end; OnInit: if($boxNumN02 == 0) end; - set $@bxN02, $boxNumN02; + $@bxN02 = $boxNumN02; callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334+rand(10),150,108,158,114,1; end; OnDied: mapannounce "nguild_gef","Treasure Chest Broken Open",17; - set $boxNumN02, $boxNumN02 -1; + --$boxNumN02; if($boxNumN02 == 0) mapannounce "nguild_gef", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0; end; } @@ -122,13 +122,13 @@ OnRecvCastleN03: end; OnInit: if($boxNumN03 == 0) end; - set $@bxN03, $boxNumN03; + $@bxN03 = $boxNumN03; callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344+rand(10),286,4,295,13,1; end; OnDied: mapannounce "nguild_pay","Treasure Chest Broken Open",17; - set $boxNumN03, $boxNumN03 -1; + --$boxNumN03; if($boxNumN03 == 0) mapannounce "nguild_pay", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0; end; } @@ -147,13 +147,13 @@ OnRecvCastleN04: end; OnInit: if($boxNumN04 == 0) end; - set $@bxN04, $boxNumN04; + $@bxN04 = $boxNumN04; callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354+rand(10),6,204,15,213,1; end; OnDied: mapannounce "nguild_prt","Treasure Chest Broken Open",17; - set $boxNumN04, $boxNumN04 -1; + --$boxNumN04; if($boxNumN04 == 0) mapannounce "nguild_prt", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0; end; } diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index edb151c6e..56195d06a 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -75,7 +75,7 @@ prontera,164,174,4 script Trader#Val09 1_M_MERCHANT,{ mes "Please use the Kafra Services."; close; } - set .@price, .@input * 5000; + .@price = .@input * 5000; if (Zeny < .@price) { mes "[Marco Bassinio]"; mes "Looks like you don't have enough zeny with ya."; @@ -195,7 +195,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "Please use the Kafra Services."; close; } - set .@price, .@input * 200; + .@price = .@input * 200; if (Zeny < .@price) { mes "[Packs Trader]"; mes "You don't have enough money."; @@ -236,7 +236,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "Please use the Kafra Services."; close; } - set .@price, .@input * 200; + .@price = .@input * 200; if (Zeny < .@price) { mes "[Packs Trader]"; mes "You don't have enough money."; @@ -277,7 +277,7 @@ prontera,147,171,5 script Packs Trader#Val09 1_M_MERCHANT,{ mes "Please use the Kafra Services."; close; } - set .@price, .@input * 600; + .@price = .@input * 600; if (Zeny < .@price) { mes "[Packs Trader]"; mes "You don't have enough money."; @@ -377,7 +377,7 @@ prontera,154,185,5 script Event Ring Maker#Val09 4_F_KAFRA7,{ delitem 7174,1; delitem 7948,1; Zeny -= 1000; - set iROval09ring,1; + iROval09ring = 1; if (Sex) { getnameditem 12742,strcharinfo(0); } else { @@ -457,10 +457,10 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{ mes "I'll take those silver rings, and count the votes for you."; mes "Thank you for participating."; delitem 7947,.@input; - set Val09Rings,Val09Rings+.@input; + Val09Rings += .@input; if (Val09Rings > $Val09votes_M) { - set $Val09votes_M,Val09Rings; - set $Val09name_M$,strcharinfo(0); + $Val09votes_M = Val09Rings; + $Val09name_M$ = strcharinfo(0); } next; break; @@ -485,10 +485,10 @@ prontera,157,185,4 script Valentine Vote Manager#v 4_F_KAFRA5,{ mes "I'll take those gold rings, and count the votes for you."; mes "Thank you for participating."; delitem 7946,.@input; - set Val09Rings,Val09Rings+.@input; + Val09Rings += .@input; if (Val09Rings > $Val09votes_F) { - set $Val09votes_F,Val09Rings; - set $Val09name_F$,strcharinfo(0); + $Val09votes_F = Val09Rings; + $Val09name_F$ = strcharinfo(0); } next; break; diff --git a/npc/events/valentinesday_2012.txt b/npc/events/valentinesday_2012.txt index 2d74cb1a5..d113bd480 100644 --- a/npc/events/valentinesday_2012.txt +++ b/npc/events/valentinesday_2012.txt @@ -13,9 +13,9 @@ //============================================================ mosk_in,21,246,5 script Pinkamenia 1_F_LIBRARYGIRL,{ - set .@n$,"^0000FF[Pinkamenia]^000000"; + .@n$ = "^0000FF[Pinkamenia]^000000"; if (#V_QUE12==3) { - set .@LFlowerID,7864; + .@LFlowerID = 7864; setarray .@SweetsID[0],538,558,539,573,559,560,12062,596,597,12414,12319; setarray .@SweetsCost[0],1,2,5,10,10,10,15,15,15,20,20; mes .@n$; @@ -29,10 +29,10 @@ mosk_in,21,246,5 script Pinkamenia 1_F_LIBRARYGIRL,{ mes .@n$; mes "Select an item."; mes "The amount of Love Flowers you'll need is in brackets."; - for(set .@i,0; .@i < getarraysize(.@SweetsID); set .@i,.@i+1) - set .@menu$, .@menu$+"^00AA00["+.@SweetsCost[.@i]+"]^000000 "+getitemname(.@SweetsID[.@i])+":"; + for(.@i = 0; .@i < getarraysize(.@SweetsID); ++.@i) + .@menu$ += "^00AA00["+.@SweetsCost[.@i]+"]^000000 "+getitemname(.@SweetsID[.@i])+":"; next; - set .@choice, select(.@menu$)-1; + .@choice = select(.@menu$)-1; mes .@n$; if (countitem(.@LFlowerID) < .@SweetsCost[.@choice]) { mes "You'll need more Love Flowers if you want that!"; @@ -40,8 +40,8 @@ mosk_in,21,246,5 script Pinkamenia 1_F_LIBRARYGIRL,{ } mes "Are you sure you want to trade ^00aa00"+.@SweetsCost[.@choice]+"x Love Flower ^000000 for ^0055FF"+getitemname(.@SweetsID[.@choice])+"^000000?"; if(select("No, I've changed my mind.:Yes, trade!") == 1) close; - set .@new, .@LFlowerID - .@SweetsCost[.@choice]; - if (.@new < 0) set .@new, 0; + .@new = .@LFlowerID - .@SweetsCost[.@choice]; + if (.@new < 0) .@new = 0; delitem .@LFlowerID, .@SweetsCost[.@choice]; getitem .@SweetsID[.@choice],1; mes "Have fun with your item!"; @@ -68,7 +68,7 @@ mosk_in,21,246,5 script Pinkamenia 1_F_LIBRARYGIRL,{ mes "Flowers, you can exchange"; mes "them for some sweets here."; mes "See you soon!"; - set #V_QUE12,3; + #V_QUE12 = 3; close; } else if (#V_QUE12==1) { mes .@n$; @@ -91,7 +91,7 @@ mosk_in,21,246,5 script Pinkamenia 1_F_LIBRARYGIRL,{ mes "to bring a +8 Cake Hat"; mes "to the Baker Extraordinaire, who"; mes "is standing right next to me!"; - set #V_QUE12,1; + #V_QUE12 = 1; close; } mes .@n$; @@ -105,7 +105,7 @@ OnInit: } mosk_in,21,244,3 script Baker Extraordinaire 4_M_NOVELIST,{ - set .@n$,"^0000FF[Baker Extraordinaire]^000000"; + .@n$ = "^0000FF[Baker Extraordinaire]^000000"; if(#V_QUE12==3) { mes .@n$; mes "Exchange your Love Flowers with Pinkamenia!"; @@ -139,7 +139,7 @@ mosk_in,21,244,3 script Baker Extraordinaire 4_M_NOVELIST,{ mes "our chocolates. Now get"; mes "15 Love Flowers and bring"; mes "them to Pinkamenia!"; - set #V_QUE12,2; + #V_QUE12 = 2; close; } else { mes "Sorry, but where is your"; diff --git a/npc/events/xmas.txt b/npc/events/xmas.txt index 72048985d..e420f9e6d 100644 --- a/npc/events/xmas.txt +++ b/npc/events/xmas.txt @@ -22,13 +22,13 @@ xmas_in,100,96,4 script Santa Claus::Santa2 4_M_SANTA,{ mes "[Santa Claus]"; - if(xmas_npc==0) set xmas_npc, 1; // For Lutie & Bard quest + if(xmas_npc==0) xmas_npc = 1; // For Lutie & Bard quest if(#event_xmas > 0 && #event_xmas < 30 ) goto L_Start; mes "Merry Christmas!"; if(Class==0 || #event_xmas>=30 ) close; //anti exploit protection mes "I have a gift for you! Ho Ho Ho!"; getitem rand(664,667),1; //gives one of 4 gift boxes - set #event_xmas,#event_xmas+1; + ++#event_xmas; close; L_Start: @@ -84,7 +84,7 @@ L_Start: mes "fake Santas. Keep it up!"; next; getitem 644,1; //Gift Box Prototype - set #event_xmas,#event_xmas+1; + ++#event_xmas; mes "[Santa Claus]"; mes "There's your reward."; mes "If you get 3 more, I'll give you another."; diff --git a/npc/guild/agit_controller.txt b/npc/guild/agit_controller.txt index de55029fc..8d038c322 100644 --- a/npc/guild/agit_controller.txt +++ b/npc/guild/agit_controller.txt @@ -71,7 +71,7 @@ S_DisplayOwners: setarray .@maps$[5],"gefg_cas01","gefg_cas02","gefg_cas03","gefg_cas04","gefg_cas05"; setarray .@maps$[10],"payg_cas01","payg_cas02","payg_cas03","payg_cas04","payg_cas05"; setarray .@maps$[15],"prtg_cas01","prtg_cas02","prtg_cas03","prtg_cas04","prtg_cas05"; - for( set .@i, 0; .@i <= 19; set .@i, .@i+1 ) { + for (.@i = 0; .@i <= 19; ++.@i) { if (getcastledata(.@maps$[.@i],1)) announce "The [" + getcastlename(.@maps$[.@i]) + "] castle has been conquered by the [" + getguildname(getcastledata(.@maps$[.@i],1)) + "] guild.",bc_all|bc_woe; else diff --git a/npc/guild/agit_main.txt b/npc/guild/agit_main.txt index dc799a21f..527bebce4 100644 --- a/npc/guild/agit_main.txt +++ b/npc/guild/agit_main.txt @@ -98,21 +98,21 @@ OnStartArena: // The Emperium has been broken. OnAgitBreak: - set .@GID,getcharid(2); + .@GID = getcharid(2); // Show and log error if an unguilded player breaks the Emperium. (Should NEVER happen) if (.@GID <= 0) { - set .@notice$,"Character "+strcharinfo(0)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(2)+" while guildless. No data will be saved and Emperium respawned."; + .@notice$ = "Character "+strcharinfo(0)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(2)+" while guildless. No data will be saved and Emperium respawned."; logmes .@notice$; debugmes .@notice$; donpcevent "Agit#"+strnpcinfo(2)+"::OnStartArena"; end; } // Adjust Economy Invest Level for Castle - set .@Economy,getcastledata(strnpcinfo(2),2) - 5; - if (.@Economy < 0) set .@Economy, 0; + .@Economy = getcastledata(strnpcinfo(2),2) - 5; + if (.@Economy < 0) .@Economy = 0; setcastledata strnpcinfo(2), 2, .@Economy; // Adjust Defense Invest Level for Castle - set .@defence,getcastledata(strnpcinfo(2),3) - 5; - if (.@defence < 0) set .@defence, 0; + .@defence = getcastledata(strnpcinfo(2),3) - 5; + if (.@defence < 0) .@defence = 0; setcastledata strnpcinfo(2), 3, .@defence; // Set new Castle Occupant @@ -125,12 +125,12 @@ OnAgitBreak: // Refresh castle data, disable Kafra and reset Invest information. donpcevent strnpcinfo(0)+"::OnRecvCastle"; disablenpc "Kafra Staff#"+strnpcinfo(2); - for( set .@i, 4; .@i <= 9; set .@i, .@i+1 ) { + for (.@i = 4; .@i <= 9; ++.@i) { setcastledata strnpcinfo(2), .@i, 0; } // Erase Guardian Database information if the new owners do not have Guardian Research. if( getgdskilllv(.@GID,10002) == 0 ) { - for( set .@i, 10; .@i <= 17; set .@i, .@i+1 ) { + for (.@i = 10; .@i <= 17; ++.@i) { setcastledata strnpcinfo(2), .@i, 0; } } @@ -169,7 +169,7 @@ OnAgitInit: OnRecvCastle: if (strnpcinfo(0) == "Gld_Agit_Manager") end; // Spawn Monsters if the castle is empty. - set .@GID, getcastledata(strnpcinfo(2),1); + .@GID = getcastledata(strnpcinfo(2),1); if (.@GID == 0) { killmonsterall strnpcinfo(2); if (compare(strnpcinfo(2),"aldeg")) { @@ -316,7 +316,7 @@ OnRecvCastle: //============================================================ - script Kafra Staff#woe::guildkafra -1,{ - set .@GID,getcastledata(strnpcinfo(2),1); + .@GID = getcastledata(strnpcinfo(2),1); if (compare(strnpcinfo(2),"aldeg")) { setarray .@destination$[0],"Al De Baran","aldebaran"; @@ -384,7 +384,7 @@ OnRecvCastle: end; } Zeny -= 200; - set RESRVPTS,RESRVPTS+2; + RESRVPTS += 2; close2; warp .@destination$[1],.@coordinates[0],.@coordinates[1]; end; @@ -434,7 +434,7 @@ OnRecvCastle: cutin "",255; end; } - set RESRVPTS,RESRVPTS+8; + RESRVPTS += 8; Zeny -= 800; setcart; close2; @@ -465,7 +465,7 @@ OnRecvCastle: //============================================================ - script Castle Manager#cm::cm -1,{ - set .@GID,getcastledata(strnpcinfo(2),1); + .@GID = getcastledata(strnpcinfo(2),1); // .@guardiantype = Defines the types of guardians per castle basis. // 1 - Soldier Guardian, 2 - Archer Guardian, 3 - Knight Guardian @@ -634,30 +634,30 @@ OnRecvCastle: mes "That's all I have to report, Master."; close; case 2: - set .@Economy,getcastledata(strnpcinfo(2),2); - if (.@Economy < 6) { set .@eco_invest,5000; } - else if ((.@Economy >= 6) && (.@Economy <= 10)) { set .@eco_invest,10000; } - else if ((.@Economy >= 11) && (.@Economy <= 15)) { set .@eco_invest,20000; } - else if ((.@Economy >= 16) && (.@Economy <= 20)) { set .@eco_invest,35000; } - else if ((.@Economy >= 21) && (.@Economy <= 25)) { set .@eco_invest,55000; } - else if ((.@Economy >= 26) && (.@Economy <= 30)) { set .@eco_invest,80000; } - else if ((.@Economy >= 31) && (.@Economy <= 35)) { set .@eco_invest,110000; } - else if ((.@Economy >= 36) && (.@Economy <= 40)) { set .@eco_invest,145000; } - else if ((.@Economy >= 41) && (.@Economy <= 45)) { set .@eco_invest,185000; } - else if ((.@Economy >= 46) && (.@Economy <= 50)) { set .@eco_invest,230000; } - else if ((.@Economy >= 51) && (.@Economy <= 55)) { set .@eco_invest,280000; } - else if ((.@Economy >= 56) && (.@Economy <= 60)) { set .@eco_invest,335000; } - else if ((.@Economy >= 61) && (.@Economy <= 65)) { set .@eco_invest,395000; } - else if ((.@Economy >= 66) && (.@Economy <= 70)) { set .@eco_invest,460000; } - else if ((.@Economy >= 71) && (.@Economy <= 75)) { set .@eco_invest,530000; } - else if ((.@Economy >= 76) && (.@Economy <= 80)) { set .@eco_invest,605000; } - else if ((.@Economy >= 81) && (.@Economy <= 85)) { set .@eco_invest,685000; } - else if ((.@Economy >= 86) && (.@Economy <= 90)) { set .@eco_invest,770000; } - else if ((.@Economy >= 91) && (.@Economy <= 95)) { set .@eco_invest,860000; } - else if ((.@Economy >= 96) && (.@Economy <= 100)) { set .@eco_invest,955000; } + .@Economy = getcastledata(strnpcinfo(2),2); + if (.@Economy < 6) { .@eco_invest = 5000; } + else if ((.@Economy >= 6) && (.@Economy <= 10)) { .@eco_invest = 10000; } + else if ((.@Economy >= 11) && (.@Economy <= 15)) { .@eco_invest = 20000; } + else if ((.@Economy >= 16) && (.@Economy <= 20)) { .@eco_invest = 35000; } + else if ((.@Economy >= 21) && (.@Economy <= 25)) { .@eco_invest = 55000; } + else if ((.@Economy >= 26) && (.@Economy <= 30)) { .@eco_invest = 80000; } + else if ((.@Economy >= 31) && (.@Economy <= 35)) { .@eco_invest = 110000; } + else if ((.@Economy >= 36) && (.@Economy <= 40)) { .@eco_invest = 145000; } + else if ((.@Economy >= 41) && (.@Economy <= 45)) { .@eco_invest = 185000; } + else if ((.@Economy >= 46) && (.@Economy <= 50)) { .@eco_invest = 230000; } + else if ((.@Economy >= 51) && (.@Economy <= 55)) { .@eco_invest = 280000; } + else if ((.@Economy >= 56) && (.@Economy <= 60)) { .@eco_invest = 335000; } + else if ((.@Economy >= 61) && (.@Economy <= 65)) { .@eco_invest = 395000; } + else if ((.@Economy >= 66) && (.@Economy <= 70)) { .@eco_invest = 460000; } + else if ((.@Economy >= 71) && (.@Economy <= 75)) { .@eco_invest = 530000; } + else if ((.@Economy >= 76) && (.@Economy <= 80)) { .@eco_invest = 605000; } + else if ((.@Economy >= 81) && (.@Economy <= 85)) { .@eco_invest = 685000; } + else if ((.@Economy >= 86) && (.@Economy <= 90)) { .@eco_invest = 770000; } + else if ((.@Economy >= 91) && (.@Economy <= 95)) { .@eco_invest = 860000; } + else if ((.@Economy >= 96) && (.@Economy <= 100)) { .@eco_invest = 955000; } //Quadruple the cost of investing if you've already invested once. if (getcastledata(strnpcinfo(2),4)) { - set .@eco_invest,.@eco_invest*4; + .@eco_invest *= 4; } mes "["+strnpcinfo(1)+"]"; mes "If you invest in commercial growth, the quantity of goods made by the guild will increase. Therfore, if you consider our future, investments will be a necessity."; @@ -700,30 +700,30 @@ OnRecvCastle: close; } case 3: - set .@defence,getcastledata(strnpcinfo(2),3); - if (.@defence < 6) { set .@def_invest,10000; } - else if ((.@defence >= 6) && (.@defence <= 10)) { set .@def_invest,20000; } - else if ((.@defence >= 11) && (.@defence <= 15)) { set .@def_invest,40000; } - else if ((.@defence >= 16) && (.@defence <= 20)) { set .@def_invest,70000; } - else if ((.@defence >= 21) && (.@defence <= 25)) { set .@def_invest,110000; } - else if ((.@defence >= 26) && (.@defence <= 30)) { set .@def_invest,160000; } - else if ((.@defence >= 31) && (.@defence <= 35)) { set .@def_invest,220000; } - else if ((.@defence >= 36) && (.@defence <= 40)) { set .@def_invest,290000; } - else if ((.@defence >= 41) && (.@defence <= 45)) { set .@def_invest,370000; } - else if ((.@defence >= 46) && (.@defence <= 50)) { set .@def_invest,460000; } - else if ((.@defence >= 51) && (.@defence <= 55)) { set .@def_invest,560000; } - else if ((.@defence >= 56) && (.@defence <= 60)) { set .@def_invest,670000; } - else if ((.@defence >= 61) && (.@defence <= 65)) { set .@def_invest,790000; } - else if ((.@defence >= 66) && (.@defence <= 70)) { set .@def_invest,920000; } - else if ((.@defence >= 71) && (.@defence <= 75)) { set .@def_invest,1060000; } - else if ((.@defence >= 76) && (.@defence <= 80)) { set .@def_invest,1210000; } - else if ((.@defence >= 81) && (.@defence <= 85)) { set .@def_invest,1370000; } - else if ((.@defence >= 86) && (.@defence <= 90)) { set .@def_invest,1540000; } - else if ((.@defence >= 91) && (.@defence <= 95)) { set .@def_invest,1720000; } - else if ((.@defence >= 96) && (.@defence <= 100)) { set .@def_invest,1910000; } + .@defence = getcastledata(strnpcinfo(2),3); + if (.@defence < 6) { .@def_invest = 10000; } + else if ((.@defence >= 6) && (.@defence <= 10)) { .@def_invest = 20000; } + else if ((.@defence >= 11) && (.@defence <= 15)) { .@def_invest = 40000; } + else if ((.@defence >= 16) && (.@defence <= 20)) { .@def_invest = 70000; } + else if ((.@defence >= 21) && (.@defence <= 25)) { .@def_invest = 110000; } + else if ((.@defence >= 26) && (.@defence <= 30)) { .@def_invest = 160000; } + else if ((.@defence >= 31) && (.@defence <= 35)) { .@def_invest = 220000; } + else if ((.@defence >= 36) && (.@defence <= 40)) { .@def_invest = 290000; } + else if ((.@defence >= 41) && (.@defence <= 45)) { .@def_invest = 370000; } + else if ((.@defence >= 46) && (.@defence <= 50)) { .@def_invest = 460000; } + else if ((.@defence >= 51) && (.@defence <= 55)) { .@def_invest = 560000; } + else if ((.@defence >= 56) && (.@defence <= 60)) { .@def_invest = 670000; } + else if ((.@defence >= 61) && (.@defence <= 65)) { .@def_invest = 790000; } + else if ((.@defence >= 66) && (.@defence <= 70)) { .@def_invest = 920000; } + else if ((.@defence >= 71) && (.@defence <= 75)) { .@def_invest = 1060000; } + else if ((.@defence >= 76) && (.@defence <= 80)) { .@def_invest = 1210000; } + else if ((.@defence >= 81) && (.@defence <= 85)) { .@def_invest = 1370000; } + else if ((.@defence >= 86) && (.@defence <= 90)) { .@def_invest = 1540000; } + else if ((.@defence >= 91) && (.@defence <= 95)) { .@def_invest = 1720000; } + else if ((.@defence >= 96) && (.@defence <= 100)) { .@def_invest = 1910000; } //Quadruple the cost of investing if you've already invested once. if (getcastledata(strnpcinfo(2),5)) { - set .@def_invest,.@def_invest*4; + .@def_invest *= 4; } mes "["+strnpcinfo(1)+"]"; mes "If you raise Castle Defenses, the durability of Guardians and the Emperium will increase. Therefore, if you consider our coming battles, some investment in this area will be required."; @@ -770,10 +770,10 @@ OnRecvCastle: mes "Will you summon a Guardian? It'll be a protector to defend us loyally."; mes "Please select a guardian to defend us."; next; - for( set .@i, 0; .@i <= 7 ; set .@i, .@i+1 ) { - if (.@guardiantype[.@i] == 1) { set .@type$,"Guardian Soldier"; } - else if (.@guardiantype[.@i] == 2) { set .@type$,"Guardian Archer"; } - else { set .@type$,"Guardian Knight"; } + for (.@i = 0; .@i <= 7; ++.@i) { + if (.@guardiantype[.@i] == 1) { .@type$ = "Guardian Soldier"; } + else if (.@guardiantype[.@i] == 2) { .@type$ = "Guardian Archer"; } + else { .@type$ = "Guardian Knight"; } if (guardianinfo(strnpcinfo(2),.@i,0)) { setarray .@gname$[.@i], .@type$ + " - Implemented (" + guardianinfo(strnpcinfo(2),.@i,2) + "/" + guardianinfo(strnpcinfo(2),.@i,1) + ")"; } @@ -781,8 +781,8 @@ OnRecvCastle: setarray .@gname$[.@i], .@type$ + " - Not Implemented"; } } - set .@menu$,.@gname$[0]+":"+.@gname$[1]+":"+.@gname$[2]+":"+.@gname$[3]+":"+.@gname$[4]+":"+.@gname$[5]+":"+.@gname$[6]+":"+.@gname$[7]; - set .@GDnum,select(.@menu$)+9; + .@menu$ = .@gname$[0]+":"+.@gname$[1]+":"+.@gname$[2]+":"+.@gname$[3]+":"+.@gname$[4]+":"+.@gname$[5]+":"+.@gname$[6]+":"+.@gname$[7]; + .@GDnum = select(.@menu$)+9; mes "["+strnpcinfo(1)+"]"; mes "Will you summon the chosen guardian? 10,000 zeny are required to summon a Guardian."; next; @@ -805,10 +805,10 @@ OnRecvCastle: } Zeny -= 10000; setcastledata strnpcinfo(2),.@GDnum,1; // mark as 'installed' - set .@UseGID,.@GDnum - 10; - if (.@guardiantype[.@UseGID] == 1) { set .@type,1287; } - else if (.@guardiantype[.@UseGID] == 2) { set .@type,1285; } - else { set .@type,1286; } + .@UseGID = .@GDnum - 10; + if (.@guardiantype[.@UseGID] == 1) { .@type = 1287; } + else if (.@guardiantype[.@UseGID] == 2) { .@type = 1285; } + else { .@type = 1286; } guardian strnpcinfo(2),.@guardianposx[.@UseGID],.@guardianposy[.@UseGID],strmobinfo(2,.@type),.@type,"Guardian#"+strnpcinfo(2)+"::OnGuardianDied",.@UseGID; mes "["+strnpcinfo(1)+"]"; mes "We completed the summoning of the Guardian. Our defenses are now increased with it in place."; @@ -917,7 +917,7 @@ OnRecvCastle: //============================================================ - script Lever#gd::gdlever -1,{ - set .@GID,getcastledata(strnpcinfo(2),1); + .@GID = getcastledata(strnpcinfo(2),1); if (.@GID == 0) { mes "[Ringing Voice]"; @@ -926,7 +926,7 @@ OnRecvCastle: } if (compare(strnpcinfo(2),"aldeg")) { - set .@destination$,"gld_dun02"; + .@destination$ = "gld_dun02"; if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],32,122; else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],79,30; else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],165,38; @@ -934,7 +934,7 @@ OnRecvCastle: else if (compare(strnpcinfo(2),"cas05")) setarray .@coordinates[0],103,169; } else if (compare(strnpcinfo(2),"gefg")) { - set .@destination$,"gld_dun04"; + .@destination$ = "gld_dun04"; if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],39,258; else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],125,270; else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],268,251; @@ -942,7 +942,7 @@ OnRecvCastle: else if (compare(strnpcinfo(2),"cas05")) setarray .@coordinates[0],230,35; } else if (compare(strnpcinfo(2),"payg")) { - set .@destination$,"gld_dun01"; + .@destination$ = "gld_dun01"; if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],186,165; else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],54,165; else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],54,39; @@ -950,7 +950,7 @@ OnRecvCastle: else if (compare(strnpcinfo(2),"cas05")) setarray .@coordinates[0],223,202; } else if (compare(strnpcinfo(2),"prtg")) { - set .@destination$,"gld_dun03"; + .@destination$ = "gld_dun03"; if (compare(strnpcinfo(2),"cas01")) setarray .@coordinates[0],28,251; else if (compare(strnpcinfo(2),"cas02")) setarray .@coordinates[0],164,268; else if (compare(strnpcinfo(2),"cas03")) setarray .@coordinates[0],164,179; @@ -1107,11 +1107,11 @@ OnSpawnGuardians: // This should prevent duplicating Guardians when char Server disconnects. killmonster strnpcinfo(2),strnpcinfo(0)+"::OnGuardianDied"; - for( set .@i, 0; .@i <= 7 ; set .@i, .@i+1 ) { - set .@UseGID,.@i + 10; - if (.@guardiantype[.@i] == 1) { set .@type,1287; } - else if (.@guardiantype[.@i] == 2) { set .@type,1285; } - else { set .@type,1286; } + for (.@i = 0; .@i <= 7; ++.@i) { + .@UseGID = .@i + 10; + if (.@guardiantype[.@i] == 1) { .@type = 1287; } + else if (.@guardiantype[.@i] == 2) { .@type = 1285; } + else { .@type = 1286; } if (getcastledata(strnpcinfo(2),.@UseGID)) { guardian strnpcinfo(2),.@guardianposx[.@i],.@guardianposy[.@i],strmobinfo(2,.@type),.@type,"Guardian#"+strnpcinfo(2)+"::OnGuardianDied",.@i; } @@ -1131,112 +1131,112 @@ OnClock0001: // Do nothing if this script is the template. if (strnpcinfo(1) == "Gld_Trea_Spawn") end; - set .@GID, getcastledata(strnpcinfo(2),1); + .@GID = getcastledata(strnpcinfo(2),1); // If there is no owner, do nothing. if (!.@GID) end; // Is there Economy in this castle? - set .@Treasure,getcastledata(strnpcinfo(2),2)/5+4; + .@Treasure = getcastledata(strnpcinfo(2),2)/5+4; // Set information if (strnpcinfo(2) == "aldeg_cas01") { - set .@treasurebox,1324; + .@treasurebox = 1324; setarray .@treasurex[0],115,122,115,122,116,117,118,119,120,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116; setarray .@treasurey[0],226,226,219,219,225,225,225,225,225,225,224,223,222,221,220,220,220,220,220,220,221,222,223,224; } else if (strnpcinfo(2) == "aldeg_cas02") { - set .@treasurebox,1326; + .@treasurebox = 1326; setarray .@treasurex[0],134,135,135,134,132,133,134,135,136,137,137,137,137,137,137,136,135,134,133,132,132,132,132,132; setarray .@treasurey[0],231,231,230,230,233,233,233,233,233,233,232,231,230,229,228,228,228,228,228,228,229,230,231,232; } else if (strnpcinfo(2) == "aldeg_cas03") { - set .@treasurebox,1328; + .@treasurebox = 1328; setarray .@treasurex[0],224,225,225,224,222,223,224,225,226,227,227,227,227,227,227,226,225,224,223,222,222,222,222,222; setarray .@treasurey[0],269,269,268,268,271,271,271,271,271,271,270,269,268,267,266,266,266,266,266,266,267,268,269,270; } else if (strnpcinfo(2) == "aldeg_cas04") { - set .@treasurebox,1330; + .@treasurebox = 1330; setarray .@treasurex[0],84,85,85,84,82,83,84,85,86,87,87,87,87,87,87,86,85,84,83,82,82,82,82,82; setarray .@treasurey[0],13,13,12,12,15,15,15,15,15,15,14,13,12,11,10,10,10,10,10,10,11,12,13,14; } else if (strnpcinfo(2) == "aldeg_cas05") { - set .@treasurebox,1332; + .@treasurebox = 1332; setarray .@treasurex[0],61,62,62,61,59,60,61,62,63,64,64,64,64,64,64,63,62,61,60,59,59,59,59,59; setarray .@treasurey[0],12,12,11,11,14,14,14,14,14,14,13,12,11,10,9,9,9,9,9,9,10,11,12,13; } else if (strnpcinfo(2) == "gefg_cas01") { - set .@treasurebox,1334; + .@treasurebox = 1334; setarray .@treasurex[0],153,154,154,153,151,152,153,154,155,156,156,156,156,156,156,155,154,153,152,151,151,151,151,151; setarray .@treasurey[0],113,113,112,112,115,115,115,115,115,115,114,113,112,111,110,110,110,110,110,110,111,112,113,114; } else if (strnpcinfo(2) == "gefg_cas02") { - set .@treasurebox,1336; + .@treasurebox = 1336; setarray .@treasurex[0],139,140,140,139,137,138,139,140,141,142,142,142,142,142,142,141,140,139,138,137,137,137,137,137; setarray .@treasurey[0],115,115,114,114,117,117,117,117,117,117,116,115,114,113,112,112,112,112,112,112,113,114,115,116; } else if (strnpcinfo(2) == "gefg_cas03") { - set .@treasurebox,1338; + .@treasurebox = 1338; setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267; setarray .@treasurey[0],291,291,290,290,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288,288,289,290,291,292; } else if (strnpcinfo(2) == "gefg_cas04") { - set .@treasurebox,1340; + .@treasurebox = 1340; setarray .@treasurex[0],115,116,116,115,113,114,115,116,117,118,118,118,118,118,118,117,116,115,114,113,113,113,113,113; setarray .@treasurey[0],119,119,118,118,121,121,121,121,121,121,120,119,118,117,116,116,116,116,116,116,117,118,119,120; } else if (strnpcinfo(2) == "gefg_cas05") { - set .@treasurebox,1342; + .@treasurebox = 1342; setarray .@treasurex[0],143,144,144,143,141,142,143,144,145,146,146,146,146,146,146,145,144,143,142,141,141,141,141,141; setarray .@treasurey[0],110,110,109,109,112,112,112,112,112,112,111,110,109,108,107,107,107,107,107,107,108,109,110,111; } else if (strnpcinfo(2) == "payg_cas01") { - set .@treasurebox,1344; + .@treasurebox = 1344; setarray .@treasurex[0],289,292,292,289,288,289,290,291,292,293,293,293,293,293,293,292,291,290,289,288,288,288,288,288; setarray .@treasurey[0],10,10,7,7,11,11,11,11,11,11,10,9,8,7,6,6,6,6,6,6,7,8,9,10; } else if (strnpcinfo(2) == "payg_cas02") { - set .@treasurebox,1346; + .@treasurebox = 1346; setarray .@treasurex[0],143,146,146,143,142,143,144,145,146,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142; setarray .@treasurey[0],146,146,143,143,147,147,147,147,147,147,146,145,144,143,142,142,142,142,142,142,143,144,145,146; } else if (strnpcinfo(2) == "payg_cas03") { - set .@treasurebox,1348; + .@treasurebox = 1348; setarray .@treasurex[0],158,159,159,158,156,157,158,159,160,161,161,161,161,161,161,160,159,158,157,156,156,156,156,156; setarray .@treasurey[0],169,169,168,168,171,171,171,171,171,171,170,169,168,167,166,166,166,166,166,166,167,168,169,170; } else if (strnpcinfo(2) == "payg_cas04") { - set .@treasurebox,1350; + .@treasurebox = 1350; setarray .@treasurex[0],146,147,147,146,144,145,146,147,148,149,149,149,149,149,149,148,147,146,145,144,144,144,144,144; setarray .@treasurey[0],48,48,47,47,50,50,50,50,50,50,49,48,47,46,45,45,45,45,45,45,46,47,48,49; } else if (strnpcinfo(2) == "payg_cas05") { - set .@treasurebox,1352; + .@treasurebox = 1352; setarray .@treasurex[0],155,158,158,155,154,155,156,157,158,159,159,159,159,159,159,158,157,156,155,154,154,154,154,154; setarray .@treasurey[0],134,134,131,131,135,135,135,135,135,135,134,133,132,131,130,130,130,130,130,130,131,132,133,134; } else if (strnpcinfo(2) == "prtg_cas01") { - set .@treasurebox,1354; + .@treasurebox = 1354; setarray .@treasurex[0],10,11,11,10,8,9,10,11,12,13,13,13,13,13,13,12,11,10,9,8,8,8,8,8; setarray .@treasurey[0],209,209,208,208,211,211,211,211,211,211,210,209,208,207,206,206,206,206,206,206,207,208,209,210; } else if (strnpcinfo(2) == "prtg_cas02") { - set .@treasurebox,1356; + .@treasurebox = 1356; setarray .@treasurex[0],201,202,202,201,199,200,201,202,203,204,204,204,204,204,204,203,202,201,200,199,199,199,199,199; setarray .@treasurey[0],228,228,227,227,230,230,230,230,230,230,229,228,227,226,225,225,225,225,225,225,226,227,228,229; } else if (strnpcinfo(2) == "prtg_cas03") { - set .@treasurebox,1358; + .@treasurebox = 1358; setarray .@treasurex[0],187,188,188,187,185,186,187,188,189,190,190,190,190,190,190,189,188,187,186,185,185,185,185,185; setarray .@treasurey[0],132,132,131,131,134,134,134,134,134,134,133,132,131,130,129,129,129,129,129,129,130,131,132,133; } else if (strnpcinfo(2) == "prtg_cas04") { - set .@treasurebox,1360; + .@treasurebox = 1360; setarray .@treasurex[0],269,270,270,269,267,268,269,270,271,272,272,272,272,272,272,271,270,269,268,267,267,267,267,267; setarray .@treasurey[0],162,162,161,161,164,164,164,164,164,164,163,162,161,160,159,159,159,159,159,159,160,161,162,163; } else if (strnpcinfo(2) == "prtg_cas05") { - set .@treasurebox,1362; + .@treasurebox = 1362; setarray .@treasurex[0],275,276,276,275,273,274,275,276,277,278,278,278,278,278,278,277,276,275,274,273,273,273,273,273; setarray .@treasurey[0],178,178,177,177,180,180,180,180,180,180,179,178,177,176,175,175,175,175,175,175,176,177,178,179; } @@ -1248,12 +1248,12 @@ OnClock0001: // Apply investment to Eco. and Def. Only happens if there were investments made. // Permanent Development can only happen once per day. if (getcastledata(strnpcinfo(2),4)) { - set .@Economy,getcastledata(strnpcinfo(2),2); + .@Economy = getcastledata(strnpcinfo(2),2); setcastledata strnpcinfo(2),2,.@Economy + getcastledata(strnpcinfo(2),4) + (rand(2) && getgdskilllv(.@GID,10014)); if (getcastledata(strnpcinfo(2),2) > 100) setcastledata strnpcinfo(2),2,100; } if (getcastledata(strnpcinfo(2),5)) { - set .@defence,getcastledata(strnpcinfo(2),3); + .@defence = getcastledata(strnpcinfo(2),3); setcastledata strnpcinfo(2),3,.@defence + getcastledata(strnpcinfo(2),5); if (getcastledata(strnpcinfo(2),3) > 100) setcastledata strnpcinfo(2),3,100; } @@ -1262,10 +1262,10 @@ OnClock0001: setcastledata strnpcinfo(2),5,0; // Spawn boxes in proper order. - for (set .@i,0; .@i < .@Treasure ; set .@i,.@i+1) { + for (.@i = 0; .@i < .@Treasure ; ++.@i) { // set treasure box ID - set .@boxid, .@treasurebox + (.@i+2) % 2; - set .@box,1 << .@i; + .@boxid = .@treasurebox + (.@i+2) % 2; + .@box = 1 << .@i; // Spawn or do not spawn chests if one already exists. if ((getd("$@"+strnpcinfo(2)+"_treasure") & .@box) == 0) { monster strnpcinfo(2),.@treasurex[.@i],.@treasurey[.@i],"Treasure Chest",.@boxid,1,"Treasure#"+strnpcinfo(2)+"::OnTreasureDied"+.@i; diff --git a/npc/guild/aldeg_cas01.txt b/npc/guild/aldeg_cas01.txt index 82b09d608..e72b121c5 100644 --- a/npc/guild/aldeg_cas01.txt +++ b/npc/guild/aldeg_cas01.txt @@ -16,7 +16,7 @@ //============================================================ - script Neuschwanstein#1::OutsideFlagsA1 GUILD_FLAG,{ - set .@GID, getcastledata("aldeg_cas01",1); + .@GID = getcastledata("aldeg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/aldeg_cas02.txt b/npc/guild/aldeg_cas02.txt index fe98f22a8..938e511da 100644 --- a/npc/guild/aldeg_cas02.txt +++ b/npc/guild/aldeg_cas02.txt @@ -16,7 +16,7 @@ //============================================================ - script Hohenschwangau#1::OutsideFlagsA2 GUILD_FLAG,{ - set .@GID, getcastledata("aldeg_cas02",1); + .@GID = getcastledata("aldeg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/aldeg_cas03.txt b/npc/guild/aldeg_cas03.txt index d5aa3535c..c595a8681 100644 --- a/npc/guild/aldeg_cas03.txt +++ b/npc/guild/aldeg_cas03.txt @@ -16,7 +16,7 @@ //============================================================ - script Nuernberg#1::OutsideFlagsA3 GUILD_FLAG,{ - set .@GID, getcastledata("aldeg_cas03",1); + .@GID = getcastledata("aldeg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/aldeg_cas04.txt b/npc/guild/aldeg_cas04.txt index 4f6bb1265..6a6b9d7ec 100644 --- a/npc/guild/aldeg_cas04.txt +++ b/npc/guild/aldeg_cas04.txt @@ -16,7 +16,7 @@ //============================================================ - script Wuerzburg#1::OutsideFlagsA4 GUILD_FLAG,{ - set .@GID, getcastledata("aldeg_cas04",1); + .@GID = getcastledata("aldeg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/aldeg_cas05.txt b/npc/guild/aldeg_cas05.txt index 8712d314a..93a78d7fb 100644 --- a/npc/guild/aldeg_cas05.txt +++ b/npc/guild/aldeg_cas05.txt @@ -16,7 +16,7 @@ //============================================================ - script Rothenburg#1::OutsideFlagsA5 GUILD_FLAG,{ - set .@GID, getcastledata("aldeg_cas05",1); + .@GID = getcastledata("aldeg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/gefg_cas01.txt b/npc/guild/gefg_cas01.txt index 71a227173..6127e62f9 100644 --- a/npc/guild/gefg_cas01.txt +++ b/npc/guild/gefg_cas01.txt @@ -16,7 +16,7 @@ //============================================================ - script Repherion#1::OutsideFlagsG1 GUILD_FLAG,{ - set .@GID, getcastledata("gefg_cas01",1); + .@GID = getcastledata("gefg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/gefg_cas02.txt b/npc/guild/gefg_cas02.txt index 8aa183045..45530849a 100644 --- a/npc/guild/gefg_cas02.txt +++ b/npc/guild/gefg_cas02.txt @@ -16,7 +16,7 @@ //============================================================ - script Eeyorbriggar#1::OutsideFlagsG2 GUILD_FLAG,{ - set .@GID, getcastledata("gefg_cas02",1); + .@GID = getcastledata("gefg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/gefg_cas03.txt b/npc/guild/gefg_cas03.txt index 50ba0005b..a206c8bac 100644 --- a/npc/guild/gefg_cas03.txt +++ b/npc/guild/gefg_cas03.txt @@ -16,7 +16,7 @@ //============================================================ - script Yesnelph#1::OutsideFlagsG3 GUILD_FLAG,{ - set .@GID, getcastledata("gefg_cas03",1); + .@GID = getcastledata("gefg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/gefg_cas04.txt b/npc/guild/gefg_cas04.txt index 67c490baf..06d37361a 100644 --- a/npc/guild/gefg_cas04.txt +++ b/npc/guild/gefg_cas04.txt @@ -16,7 +16,7 @@ //============================================================ - script Bergel#1::OutsideFlagsG4 GUILD_FLAG,{ - set .@GID, getcastledata("gefg_cas04",1); + .@GID = getcastledata("gefg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/gefg_cas05.txt b/npc/guild/gefg_cas05.txt index aa802ea15..81ebd3905 100644 --- a/npc/guild/gefg_cas05.txt +++ b/npc/guild/gefg_cas05.txt @@ -16,7 +16,7 @@ //============================================================ - script Mersetzdeitz#1::OutsideFlagsG5 GUILD_FLAG,{ - set .@GID, getcastledata("gefg_cas05",1); + .@GID = getcastledata("gefg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/payg_cas01.txt b/npc/guild/payg_cas01.txt index 2b172929b..1deee9a4f 100644 --- a/npc/guild/payg_cas01.txt +++ b/npc/guild/payg_cas01.txt @@ -18,7 +18,7 @@ //============================================================ - script Bright Arbor#1::OutsideFlagsPA1 GUILD_FLAG,{ - set .@GID, getcastledata("payg_cas01",1); + .@GID = getcastledata("payg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/payg_cas02.txt b/npc/guild/payg_cas02.txt index cb7403c6a..92db92c09 100644 --- a/npc/guild/payg_cas02.txt +++ b/npc/guild/payg_cas02.txt @@ -19,7 +19,7 @@ //============================================================ - script Scarlet Palace#1::OutsideFlagsPA2 GUILD_FLAG,{ - set .@GID, getcastledata("payg_cas02",1); + .@GID = getcastledata("payg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/payg_cas03.txt b/npc/guild/payg_cas03.txt index 54c69087e..e0e649308 100644 --- a/npc/guild/payg_cas03.txt +++ b/npc/guild/payg_cas03.txt @@ -18,7 +18,7 @@ //============================================================ - script Holy Shadow#1::OutsideFlagsPA3 GUILD_FLAG,{ - set .@GID, getcastledata("payg_cas03",1); + .@GID = getcastledata("payg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/payg_cas04.txt b/npc/guild/payg_cas04.txt index 265ace62f..498bc1aed 100644 --- a/npc/guild/payg_cas04.txt +++ b/npc/guild/payg_cas04.txt @@ -19,7 +19,7 @@ //============================================================ - script Sacred Altar#1::OutsideFlagsPA4 GUILD_FLAG,{ - set .@GID, getcastledata("payg_cas04",1); + .@GID = getcastledata("payg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/payg_cas05.txt b/npc/guild/payg_cas05.txt index ec616656e..7b667c4ca 100644 --- a/npc/guild/payg_cas05.txt +++ b/npc/guild/payg_cas05.txt @@ -18,7 +18,7 @@ //============================================================ - script Bamboo Grove Hill#1::OutsideFlagsPA5 GUILD_FLAG,{ - set .@GID, getcastledata("payg_cas05",1); + .@GID = getcastledata("payg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/prtg_cas01.txt b/npc/guild/prtg_cas01.txt index a99f37ac9..961453ccd 100644 --- a/npc/guild/prtg_cas01.txt +++ b/npc/guild/prtg_cas01.txt @@ -18,7 +18,7 @@ //============================================================ - script Kriemhild#1::OutsideFlagsPR1 GUILD_FLAG,{ - set .@GID, getcastledata("prtg_cas01",1); + .@GID = getcastledata("prtg_cas01",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/prtg_cas02.txt b/npc/guild/prtg_cas02.txt index ceaae4821..315478ba1 100644 --- a/npc/guild/prtg_cas02.txt +++ b/npc/guild/prtg_cas02.txt @@ -18,7 +18,7 @@ //============================================================ - script Swanhild#1::OutsideFlagsPR2 GUILD_FLAG,{ - set .@GID, getcastledata("prtg_cas02",1); + .@GID = getcastledata("prtg_cas02",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/prtg_cas03.txt b/npc/guild/prtg_cas03.txt index b0e0515ec..4b52dbb7f 100644 --- a/npc/guild/prtg_cas03.txt +++ b/npc/guild/prtg_cas03.txt @@ -18,7 +18,7 @@ //============================================================ - script Fadhgridh#1::OutsideFlagsPR3 GUILD_FLAG,{ - set .@GID, getcastledata("prtg_cas03",1); + .@GID = getcastledata("prtg_cas03",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/prtg_cas04.txt b/npc/guild/prtg_cas04.txt index 08f1522db..8936b8451 100644 --- a/npc/guild/prtg_cas04.txt +++ b/npc/guild/prtg_cas04.txt @@ -18,7 +18,7 @@ //============================================================ - script Skoegul#1::OutsideFlagsPR4 GUILD_FLAG,{ - set .@GID, getcastledata("prtg_cas04",1); + .@GID = getcastledata("prtg_cas04",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/prtg_cas05.txt b/npc/guild/prtg_cas05.txt index 69ac3eb32..3b9652783 100644 --- a/npc/guild/prtg_cas05.txt +++ b/npc/guild/prtg_cas05.txt @@ -18,7 +18,7 @@ //============================================================ - script Gondul#1::OutsideFlagsPR5 GUILD_FLAG,{ - set .@GID, getcastledata("prtg_cas05",1); + .@GID = getcastledata("prtg_cas05",1); if (.@GID == 0) { mes "[ Edict of the Divine Rune-Midgarts Kingdom ]"; diff --git a/npc/guild/trs_rp.txt b/npc/guild/trs_rp.txt index 260aa6162..d96bd694e 100644 --- a/npc/guild/trs_rp.txt +++ b/npc/guild/trs_rp.txt @@ -16,7 +16,7 @@ OnTouch: // Store the Guild ID of castle occupant. - set .@GID, getcastledata(strnpcinfo(2),1); + .@GID = getcastledata(strnpcinfo(2),1); if (strcharinfo(0) != getguildmaster(.@GID)) { if (compare(strnpcinfo(2),"aldeg")) warp "aldebaran",143,112; diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 77e8cdd7c..bad6b27f7 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -51,7 +51,7 @@ OnAgitStart2: gvgon strnpcinfo(2); donpcevent strnpcinfo(0)+"::OnStart"; } - else for(set .@i,0; .@i<4; set .@i,.@i+1) + else for(.@i = 0; .@i<4; ++.@i) donpcevent "RL"+.@i+"#"+strnpcinfo(2)+"::OnDisable"; end; @@ -59,7 +59,7 @@ OnAgitEnd2: if (strnpcinfo(2) == "template") end; gvgoff strnpcinfo(2); if (getcastledata(strnpcinfo(2),1)) { - set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); + .@str$ = substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); killmonster strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena"; donpcevent strnpcinfo(0)+"::OnReset"; donpcevent "Steward#"+.@str$+"::OnStop"; @@ -86,12 +86,12 @@ OnStart: setarray getd("$agit_"+substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9)+"[0]"),0,0,0,0,0,0; donpcevent "df1#"+strnpcinfo(2)+"::OnEnable"; donpcevent "df2#"+strnpcinfo(2)+"::OnEnable"; - for(set .@i,0; .@i<4; set .@i,.@i+1) + for (.@i = 0; .@i<4; ++.@i) donpcevent "RL"+.@i+"#"+strnpcinfo(2)+"::OnEnable"; } OnEmpSpawn: - set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); + .@str$ = substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); if (mobcount(strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena")) end; if (compare(strnpcinfo(2),"arug")) { if (strnpcinfo(2) == "arug_cas01") setarray .@i[0],87,219; @@ -107,23 +107,23 @@ OnEmpSpawn: end; OnReset: - set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); + .@str$ = substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); donpcevent "df1#"+strnpcinfo(2)+"::OnDisable"; donpcevent "df2#"+strnpcinfo(2)+"::OnDisable"; donpcevent "gard1#"+strnpcinfo(2)+"::OnReset"; donpcevent "gard2#"+strnpcinfo(2)+"::OnReset"; donpcevent "1st Guardian Stone#"+.@str$+"::OnDisable"; donpcevent "2nd Guardian Stone#"+.@str$+"::OnDisable"; - for(set .@i,1; .@i<4; set .@i,.@i+1) + for(.@i = 1; .@i<4; ++.@i) donpcevent "Control Device0"+.@i+"#"+.@str$+"::OnDisable"; - for(set .@i,0; .@i<4; set .@i,.@i+1) + for(.@i = 0; .@i<4; ++.@i) donpcevent "RL"+.@i+"#"+strnpcinfo(2)+"::OnDisable"; if (agitcheck2()) setarray getd("$agit_"+substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9)+"[0]"),0,0,1,1,1,0; end; OnChange: - set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); + .@str$ = substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9); setarray getd("$agit_"+.@str$+"[0]"),2,2,1,1,2,0; donpcevent strnpcinfo(0)+"::OnEmpSpawn"; donpcevent "Control Device03#"+.@str$+"::OnEnable"; @@ -137,59 +137,59 @@ OnClock0001: if (!getcastledata(strnpcinfo(2),1)) end; killmonster strnpcinfo(2),strnpcinfo(0)+"::OnTreasureDied"; if (getcastledata(strnpcinfo(2),4)) { - set .@Economy,getcastledata(strnpcinfo(2),2); + .@Economy = getcastledata(strnpcinfo(2),2); setcastledata strnpcinfo(2),2,.@Economy+getcastledata(strnpcinfo(2),4)+(rand(2) && getgdskilllv(getcastledata(strnpcinfo(2),1),10014)); if (getcastledata(strnpcinfo(2),2) > 100) setcastledata strnpcinfo(2),2,100; setcastledata strnpcinfo(2),4,0; } if (getcastledata(strnpcinfo(2),5)) { - set .@defence,getcastledata(strnpcinfo(2),3); + .@defence = getcastledata(strnpcinfo(2),3); setcastledata strnpcinfo(2),3,.@defence+getcastledata(strnpcinfo(2),5); if (getcastledata(strnpcinfo(2),3) > 100) setcastledata strnpcinfo(2),3,100; setcastledata strnpcinfo(2),5,0; } - set .@Treasure,getcastledata(strnpcinfo(2),2)/5+4; + .@Treasure = getcastledata(strnpcinfo(2),2)/5+4; if (!.@Treasure) end; freeloop(1); if (compare(strnpcinfo(2),"arug")) { if (strnpcinfo(2) == "arug_cas01") { - set .@treasurebox,1943; + .@treasurebox = 1943; setarray .@treasurex[0],251,252,253,254,255,256,257,258,251,252,253,254,255,256,257,258,251,252,253,254,255,256,257,258; setarray .@treasurey[0],369,369,369,369,368,368,368,368,367,367,367,367,366,366,366,366,365,365,365,365,364,364,364,364; } else if (strnpcinfo(2) == "arug_cas02") { - set .@treasurebox,1944; + .@treasurebox = 1944; setarray .@treasurex[0],382,383,384,385,386,387,384,385,386,387,388,389,382,383,384,385,386,387,384,385,386,387,388,389; setarray .@treasurey[0],231,231,231,231,231,231,230,230,230,230,230,230,225,225,225,225,225,225,224,224,224,224,224,224; } else { // Castles 3,4,5 are identical, except 4's treasure. - set .@treasurebox,(strnpcinfo(2) == "arug_cas04")?1946:1945; + .@treasurebox = (strnpcinfo(2) == "arug_cas04")?1946:1945; setarray .@treasurex[0],291,292,293,294,295,296,293,294,295,296,297,298,291,292,293,294,295,296,293,294,295,296,297,298; setarray .@treasurey[0],276,276,276,276,276,276,274,274,274,274,274,274,272,272,272,272,272,272,269,269,269,269,269,269; } } else { if (strnpcinfo(2) == "schg_cas02") { - set .@treasurebox,1939; + .@treasurebox = 1939; setarray .@treasurex[0],249,250,251,252,253,246,247,248,249,250,250,251,252,253,246,247,248,249,250,249,250,251,252,253; setarray .@treasurey[0],378,378,378,378,378,376,376,376,376,376,374,374,374,374,372,372,372,372,372,370,370,370,370,370; } else if (strnpcinfo(2) == "schg_cas03") { - set .@treasurebox,1940; + .@treasurebox = 1940; setarray .@treasurex[0],189,190,191,192,193,194,189,190,191,192,193,194,189,190,191,192,193,194,189,190,191,192,193,194; setarray .@treasurey[0], 21, 21, 21, 21, 21, 21, 19, 19, 19, 19, 19, 19, 17, 17, 17, 17, 17, 17, 15, 15, 15, 15, 15, 15; } else { // Castles 1,4,5 are identical, except treasures. - if (strnpcinfo(2) == "schg_cas01") set .@treasurebox,1938; - else if (strnpcinfo(2) == "schg_cas04") set .@treasurebox,1941; - else set .@treasurebox,1942; + if (strnpcinfo(2) == "schg_cas01") .@treasurebox = 1938; + else if (strnpcinfo(2) == "schg_cas04") .@treasurebox = 1941; + else .@treasurebox = 1942; setarray .@treasurex[0],388,388,388,387,386,385,384,384,384,384,384,384,385,386,387,388,389,390,390,390,389,388,387,386; setarray .@treasurey[0],388,389,390,390,390,390,389,388,387,386,385,384,384,384,384,384,384,384,385,386,386,386,386,386; } } - for(set .@i,0; .@i<4; set .@i,.@i+1) + for(.@i = 0; .@i<4; ++.@i) monster strnpcinfo(2),.@treasurex[.@i],.@treasurey[.@i],"Treasure Chest",(.@i%2)?.@treasurebox:1324,1,strnpcinfo(0)+"::OnTreasureDied"; - for(set .@i,4; .@i<24; set .@i,.@i+1) { + for(.@i = 4; .@i<24; ++.@i) { if (.@Treasure < .@i+1) break; monster strnpcinfo(2),.@treasurex[.@i],.@treasurey[.@i],"Treasure Chest",(.@i%2)?.@treasurebox:1324,1,strnpcinfo(0)+"::OnTreasureDied"; } @@ -203,7 +203,7 @@ OnTreasureDied: // Guild Manager //============================================================ - script Steward#template -1,{ - set .@GID, getcastledata(strnpcinfo(4),1); + .@GID = getcastledata(strnpcinfo(4),1); if (!.@GID) { mes "[ Steward ]"; mes "I await for the master"; @@ -251,18 +251,19 @@ OnTreasureDied: mes "That is all, master."; close; case 2: - set .@Economy,getcastledata(strnpcinfo(4),2); + .@Economy = getcastledata(strnpcinfo(4),2); setarray .@cost[0],5000,10000,20000,35000,55000,80000,110000,145000,185000,230000,280000,335000,395000,460000,530000,605000,685000,770000,860000,955000; - set .@j,0; - for(set .@i,6; .@i<101; set .@i,.@i+5) { + .@j = 0; + for(.@i = 6; .@i<101; .@i += 5) { if (.@Economy < .@i) { - set .@eco_invest,.@cost[.@j]; + .@eco_invest = .@cost[.@j]; break; } - set .@j, .@j+1; + ++.@j; } // Quadruple the cost of investing if you've already invested once. - if (getcastledata(strnpcinfo(4),4)) set .@eco_invest,.@eco_invest*4; + if (getcastledata(strnpcinfo(4),4)) + .@eco_invest *= 4; mes "[ Steward ]"; mes "Raising the stronghold's"; mes "commercial growth will"; @@ -344,18 +345,19 @@ OnTreasureDied: close; } case 3: - set .@defence,getcastledata(strnpcinfo(4),3); + .@defence = getcastledata(strnpcinfo(4),3); setarray .@cost[0],10000,20000,40000,70000,110000,160000,220000,290000,370000,460000,560000,670000,790000,920000,1060000,1210000,1370000,1540000,1720000,1910000; - set .@j,0; - for(set .@i,6; .@i<101; set .@i,.@i+5) { + .@j = 0; + for(.@i = 6; .@i<101; .@i += 5) { if (.@defence < .@i) { - set .@def_invest,.@cost[.@j]; + .@def_invest = .@cost[.@j]; break; } - set .@j, .@j+1; + ++.@j; } // Quadruple the cost of investing if you've already invested once. - if (getcastledata(strnpcinfo(4),5)) set .@def_invest,.@def_invest*4; + if (getcastledata(strnpcinfo(4),5)) + .@def_invest *= 4; mes "[ Steward ]"; mes "Investing in our stronghold's"; mes "defense will enhance the"; @@ -600,20 +602,20 @@ OnStop: end; OnStartArena: - set .@GID,getcharid(2); - set .@region$, (compare(strnpcinfo(4),"arug"))?"Valfreyja":"Nithafjoll"; + .@GID = getcharid(2); + .@region$ = (compare(strnpcinfo(4),"arug"))?"Valfreyja":"Nithafjoll"; // Lower castle Economy - set .@Economy,getcastledata(strnpcinfo(4),2)-5; - if (.@Economy < 0) set .@Economy, 0; + .@Economy = getcastledata(strnpcinfo(4),2)-5; + if (.@Economy < 0) .@Economy = 0; setcastledata strnpcinfo(4),2,.@Economy; // Lower Castle Defence - set .@defence,getcastledata(strnpcinfo(4),3)-5; - if (.@defence < 0) set .@defence, 0; + .@defence = getcastledata(strnpcinfo(4),3)-5; + if (.@defence < 0) .@defence = 0; setcastledata strnpcinfo(4),3,.@defence; // Set new owner setcastledata strnpcinfo(4),1,.@GID; // Clear castle's data. - for(set .@i,4; .@i<10; set .@i,.@i+1) + for(.@i = 4; .@i<10; ++.@i) setcastledata strnpcinfo(4),.@i,0; // Disable Kafra disablenpc "Kafra Employee#"+strnpcinfo(2); @@ -635,8 +637,8 @@ OnStartArena: // Castle Guardians //============================================================ - script Guardian#template -1,{ - set .@GID, getcastledata(strnpcinfo(4),1); - set .@n$, "["+strnpcinfo(1)+"]"; + .@GID = getcastledata(strnpcinfo(4),1); + .@n$ = "["+strnpcinfo(1)+"]"; if (!.@GID) { mes .@n$; mes "Great job. Now, all you"; @@ -836,7 +838,7 @@ OnInit: //============================================================ - script Kafra#template -1,{ cutin "kafra_01",2; - set .@GID, getcastledata(strnpcinfo(4),1); + .@GID = getcastledata(strnpcinfo(4),1); if (getcharid(2) == .@GID && getgdskilllv(.@GID,10001)) { mes "[Kafra Employee]"; mes "Welcome, proud member"; @@ -948,9 +950,9 @@ OnInit: // Guardian Stones (2) //============================================================ - script Guardian Stone#template -1,{ - set .@GID, getcastledata(strnpcinfo(4),1); - set .@num, atoi(charat(strnpcinfo(1),0)); - set .@var$,"$agit_"+strnpcinfo(2); + .@GID = getcastledata(strnpcinfo(4),1); + .@num = atoi(charat(strnpcinfo(1),0)); + .@var$ = "$agit_"+strnpcinfo(2); if (getcharid(2) == .@GID) { mes "^3355FFYou will need the"; mes "following materials to"; @@ -978,19 +980,19 @@ OnInit: mes "rebuild the Guardian Stone.^000000"; next; setarray .@stone$[0],"Elunium","Oridecon","Stones"; - set .@i, select("Elunium:Oridecon:Stone")-1; - if (.@i == 2) set .@nice,.@nice+10; + .@i = select("Elunium:Oridecon:Stone")-1; + if (.@i == 2) .@nice += 10; mes "^3355FF"+.@stone$[.@i]+" has been"; mes "placed in the center.^000000"; next; - set .@i, select("Elunium:Oridecon:Stone")-1; - if (.@i == 0) set .@nice,.@nice+10; + .@i = select("Elunium:Oridecon:Stone")-1; + if (.@i == 0) .@nice += 10; mes "^3355FFYou have lined the"; mes "outside of the center"; mes "with some "+.@stone$[.@i]+".^000000"; next; - set .@i, select("Elunium:Oridecon:Stone")-1; - if (.@i == 1) set .@nice,.@nice+10; + .@i = select("Elunium:Oridecon:Stone")-1; + if (.@i == 1) .@nice += 10; mes "^3355FFYou covered the"; mes "rest of the materials"; mes "with some "+.@stone$[.@i]+".^000000"; @@ -1005,14 +1007,14 @@ OnInit: setarray .@color$[0],"Red","Yellow","Blue"; while(1) { if (.@roof0 > 7) break; - set .@i, rand(3); + .@i = rand(3); specialeffect .@effect[.@i]; mes "^3355FFThe Gemstones must"; mes "be arranged in the correct"; mes "order according to their"; mes "magic properties and power.^000000"; next; - set .@j, select("Red Gemstone:Yellow Gemstone:Blue Gemstone")-1; + .@j = select("Red Gemstone:Yellow Gemstone:Blue Gemstone")-1; mes "^3355FFYou placed the "+.@color$[.@j]+" Gemstone.^000000"; if (.@i == .@j) { mes "^3355FFHowever, the Guardian Stone"; @@ -1020,8 +1022,8 @@ OnInit: mes "of a magic power conflict.^000000"; close; } - set .@nice,.@nice+10; - set .@roof0,.@roof0+1; + .@nice += 10; + ++.@roof0; specialeffect EF_STEAL; next; } @@ -1055,7 +1057,7 @@ OnInit: specialeffect EF_ICECRASH; disablenpc strnpcinfo(0); setd .@var$+"["+(.@num-1)+"]",0; - set .@df_all,getd(.@var$+"[0]")+getd(.@var$+"[1]"); + .@df_all = getd(.@var$+"[0]")+getd(.@var$+"[1]"); if (!.@df_all) { mapannounce strnpcinfo(4),"Both Guardian Stones have been erected, bolstering this stronghold's defenses!",bc_map,"0x00ff00"; donpcevent "RL0#"+strnpcinfo(4)+"::OnEnable"; @@ -1102,9 +1104,9 @@ OnEnable: // Control Devices (3) //============================================================ - script Control#template -1,{ - set .@GID, getcastledata(strnpcinfo(4),1); - set .@num, atoi(charat(strnpcinfo(1),15)); - set .@var$,"$agit_"+strnpcinfo(2); + .@GID = getcastledata(strnpcinfo(4),1); + .@num = atoi(charat(strnpcinfo(1),15)); + .@var$ = "$agit_"+strnpcinfo(2); if (getcharid(2) == .@GID) { if (strcharinfo(0) == getguildmaster(.@GID)) { if (getd(.@var$+"["+(.@num+1)+"]") == 2) { @@ -1127,7 +1129,7 @@ OnEnable: mes "Emveretarcon to basically"; mes "hold everything together.^000000"; next; - set .@ro_of01,rand(10,15); + .@ro_of01 = rand(10,15); while(1) { if (.@ro_of02 == .@ro_of01) break; else { @@ -1142,8 +1144,8 @@ OnEnable: case 1: mes "^3355FFThe frame has been"; mes "reinforced with wood.^000000"; - set .@rp_temp,.@rp_temp+1; - set .@ro_of02,.@ro_of02+1; + ++.@rp_temp; + ++.@ro_of02; specialeffect2 EF_REPAIRWEAPON; next; break; @@ -1176,7 +1178,7 @@ OnEnable: case 1: mes "^3355FFYou tried using wood"; mes "to reinforce the gate.^000000"; - set .@ro_of02,.@ro_of02+1; + ++.@ro_of02; next; break; case 2: @@ -1195,8 +1197,8 @@ OnEnable: mes "^3355FFYou hammered the"; mes "oridecon: it looks"; mes "like this will work.^000000"; - set .@rp_temp,.@rp_temp+1; - set .@ro_of02,.@ro_of02+1; + ++.@rp_temp; + ++.@ro_of02; specialeffect2 EF_REPAIRWEAPON; next; break; @@ -1219,8 +1221,8 @@ OnEnable: mes "^3355FFYou used steel to weld"; mes "all the cracks: the gate is"; mes "is starting to look more solid.^000000"; - set .@rp_temp,.@rp_temp+1; - set .@ro_of02,.@ro_of02+1; + ++.@rp_temp; + ++.@ro_of02; specialeffect2 EF_REPAIRWEAPON; next; break; @@ -1260,8 +1262,8 @@ OnEnable: mes "^3355FFYou successfully used"; mes "the emveretarcon to repair"; mes "much of the gate's damage.^000000"; - set .@rp_temp,.@rp_temp+1; - set .@ro_of02,.@ro_of02+1; + ++.@rp_temp; + ++.@ro_of02; specialeffect2 EF_REPAIRWEAPON; next; break; @@ -1296,9 +1298,9 @@ OnEnable: close2; donpcevent "RL"+.@num+"#"+strnpcinfo(4)+"::OnEnable"; disablenpc strnpcinfo(0); - if (.@num == 1) set .@str$,"1st"; - else if (.@num == 2) set .@str$,"2nd"; - else if (.@num == 3) set .@str$,"3rd"; + if (.@num == 1) .@str$ = "1st"; + else if (.@num == 2) .@str$ = "2nd"; + else if (.@num == 3) .@str$ = "3rd"; mapannounce strnpcinfo(4),"The "+.@str$+" Fortress Gate has been reconstructed!",bc_map,"0x00ff00"; if (.@num == 1) setd .@var$+"[2]",0; else { @@ -1382,9 +1384,10 @@ OnEnable: setarray .y[0], 18, 44,22, 40,20,40,43, 48, 18, 32, 37, 22, 47, 18, 15, 42, 43, 15, 42, 22, 28, 18; } } - if (charat(strnpcinfo(1),4) == "2") set .@z,11; + if (charat(strnpcinfo(1),4) == "2") + .@z = 11; freeloop(1); - set .@defence,getcastledata(strnpcinfo(2),3); + .@defence = getcastledata(strnpcinfo(2),3); callsub OnSummon,.@z; if (.@defence > 70) set getd(".MyMobCount_"+charat(strnpcinfo(1),4)+strnpcinfo(2)),5; else if (.@defence > 50) set getd(".MyMobCount_"+charat(strnpcinfo(1),4)+strnpcinfo(2)),4; @@ -1394,10 +1397,10 @@ OnEnable: guardian strnpcinfo(2),.@w[4],.@w[5],"Guardian Soldier",1899,strnpcinfo(0)+"::OnGuardianDied"; else if (.@defence < 11) { set getd(".MyMobCount_"+charat(strnpcinfo(1),4)+strnpcinfo(2)),2; - set .@i,(.@z)?2:0; + .@i = (.@z)?2:0; guardian strnpcinfo(2),.@w[.@i],.@w[.@i+1],"Guardian Soldier",1899,strnpcinfo(0)+"::OnGuardianDied"; } - else for(set .@i,1; .@i