From c4a05bf89e2a9bc040e925bd030065a761b7d139 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 16 Jun 2019 18:48:49 -0300 Subject: Sequence error --- npc/024-16/generals.txt | 81 +++++++++++++++++++++++++------------------------ 1 file changed, 41 insertions(+), 40 deletions(-) (limited to 'npc/024-16') diff --git a/npc/024-16/generals.txt b/npc/024-16/generals.txt index 3d169ade3..625afeb93 100644 --- a/npc/024-16/generals.txt +++ b/npc/024-16/generals.txt @@ -4,6 +4,46 @@ // Description: // Generals +// FrostiaTaskMaster(lvl) +function script FrostiaTaskMaster { + .@q=General_MobHunting4; + .@q1=getq(General_MobHunting4); + .@q2=getq2(General_MobHunting4); + .@q3=getq3(General_MobHunting4); + .@d=gettimeparam(GETTIME_DAYOFMONTH); + .@lv=getarg(0, 1); + // It's a new day, so we must generate a new quest! + if (.@q1 != .@d) { + .@q1=.@d; + .@q2=any(Moggun, IcedFluffy, Fluffy, Pollet, BlueSlime, WhiteSlime, SantaSlime, AzulSlime, RudolphSlime); // WaterFairy + setq .@q, .@q1, .@q2, 0; + } + + // Maybe you finished the quest? + if (.@q3 >= 100) { + mesn; + mesq l("Good job, you've killed the 100 @@ and reported back in time!", getmonsterlink(.@q2)); + next; + mesn; + mesq l("It's not much of a reward, but doesn't it feels great to help others in need?! HAHAHA!"); + Zeny+=.@lv; + getexp BaseLevel*.@lv, .@lv; + setq2 .@q, 0; + return false; + } + + // Maybe there is no monster to kill + if (!.@q2) { + mesn; + mesq l("You've already completed this quest today. Try again tomorrow."); + return true; + } + + mesn; + mesq l("So, please kill @@/100 @@ for us and make the world a safer place!", .@q3, getmonsterlink(.@q2)); + return false; +} + // FrostiaGeneralQuest( Skillname ) function script FrostiaGeneralQuest { .@at$=getarg(0); @@ -49,46 +89,7 @@ function script FrostiaGeneralQuest { close; } -// FrostiaTaskMaster(lvl) -function script FrostiaTaskMaster { - .@q=General_MobHunting4; - .@q1=getq(General_MobHunting4); - .@q2=getq2(General_MobHunting4); - .@q3=getq3(General_MobHunting4); - .@d=gettimeparam(GETTIME_DAYOFMONTH); - .@lv=getarg(0, 1); - // It's a new day, so we must generate a new quest! - if (.@q1 != .@d) { - .@q1=.@d; - .@q2=any(Moggun, IcedFluffy, Fluffy, Pollet, BlueSlime, WhiteSlime, SantaSlime, AzulSlime, RudolphSlime); // WaterFairy - setq .@q, .@q1, .@q2, 0; - } - - // Maybe you finished the quest? - if (.@q3 >= 100) { - mesn; - mesq l("Good job, you've killed the 100 @@ and reported back in time!", getmonsterlink(.@q2)); - next; - mesn; - mesq l("It's not much of a reward, but doesn't it feels great to help others in need?! HAHAHA!"); - Zeny+=.@lv; - getexp BaseLevel*.@lv, .@lv; - setq2 .@q, 0; - return false; - } - - // Maybe there is no monster to kill - if (!.@q2) { - mesn; - mesq l("You've already completed this quest today. Try again tomorrow."); - return true; - } - - mesn; - mesq l("So, please kill @@/100 @@ for us and make the world a safer place!", .@q3, getmonsterlink(.@q2)); - return false; -} - +////////////////////////////////////////////////////////////////////// 024-16,29,21,0 script Wizard General NPC_BLUESABER,{ .@q=getq(General_Narrator); if (.@q == 14) -- cgit v1.2.3-60-g2f50