Index: scripts/zones/Heavens_Tower/npcs/Chumimi.lua =================================================================== --- scripts/zones/Heavens_Tower/npcs/Chumimi.lua (revision 1711) +++ scripts/zones/Heavens_Tower/npcs/Chumimi.lua (working copy) @@ -18,13 +18,22 @@ ----------------------------------- function onTrade(player,npc,trade) + theThreeMagi = player:getQuestStatus(WINDURST,THE_THREE_MAGI); + recollections = player:getQuestStatus(WINDURST,RECOLLECTIONS); - if(player:getQuestStatus(WINDURST,THE_THREE_MAGI) == QUEST_ACCEPTED) then - if(trade:hasItemQty(1104,1) and trade:getItemCount() == 1) then -- Trade Glowstone + if(theThreeMagi == QUEST_ACCEPTED) then + count = trade:getItemCount(); + if(trade:hasItemQty(1104,1) and count == 1) then -- Trade Glowstone player:startEvent(0x010d); -- Finish Quest "The Three Magi" end + elseif (recollections == QUEST_ACCEPTED) then + count = trade:getItemCount(); + bagOfSeeds = trade:hasItemQty(1105,1); + + if (bagOfSeeds == true and count == 1) then + player:startEvent(0x010F); + end end - end; ----------------------------------- @@ -34,20 +43,30 @@ function onTrigger(player,npc) theThreeMagi = player:getQuestStatus(WINDURST,THE_THREE_MAGI); + recollections = player:getQuestStatus(WINDURST,RECOLLECTIONS); mLvl = player:getMainLvl(); mJob = player:getMainJob(); - if(theThreeMagi == QUEST_AVAILABLE and mJob == 4 and mLvl >= 40) then + if (theThreeMagi == QUEST_AVAILABLE and mJob == 4 and mLvl >= 40) then player:startEvent(0x0104,0,613,0,0,0,1104); -- Start Quest "The Three Magi" --- NOTE: 5th parameter is "Meteorites" but he doesn't exist --- - elseif(theThreeMagi == QUEST_ACCEPTED) then + elseif (theThreeMagi == QUEST_ACCEPTED) then player:startEvent(0x0105,0,0,0,0,0,1104); -- During Quest "The Three Magi" - elseif(theThreeMagi == QUEST_COMPLETED and (mJob == 4 and mLvl < 50 or mJob ~= 4)) then + elseif (theThreeMagi == QUEST_COMPLETED and mJob == 4 and mLvl < 50 or mJob ~= 4) then player:startEvent(0x010c); -- New standard dialog after "The Three Magi" + elseif (theThreeMagi == QUEST_COMPLETED and mJob == 4 and mLvl >= 50) then + if (recollections == QUEST_AVAILABLE) then + player:startEvent(0x010E); + elseif (recollections == QUEST_ACCEPTED) then + foeFinderMK1 = player:hasKeyItem(181); + if (foeFinderMK1 == true) then + player:startEvent(0x0113); + end + end else player:startEvent(0x0103); -- Standard dialog end - + end; ----------------------------------- @@ -92,6 +111,16 @@ player:addFame(WINDURST,WIN_FAME*30); player:completeQuest(WINDURST,THE_THREE_MAGI); end + elseif (csid == 0x010E) then + player:addQuest(WINDURST,RECOLLECTIONS); + elseif (csid == 0x0113) then + if (player:getFreeSlotsCount() == 0) then + player:messageSpecial(ITEM_CANNOT_BE_OBTAINED,14092); + else + player:completeQuest(WINDURST,RECOLLECTIONS); + player:addItem(14092,1); + player:messageSpecial(ITEM_OBTAINED,14092); + end end end; \ No newline at end of file Index: scripts/zones/RuLude_Gardens/npcs/Laityn.lua =================================================================== --- scripts/zones/RuLude_Gardens/npcs/Laityn.lua (revision 1711) +++ scripts/zones/RuLude_Gardens/npcs/Laityn.lua (working copy) @@ -18,7 +18,12 @@ ----------------------------------- function onTrigger(player,npc) - player:startEvent(0x2716); + recollections = player:getQuestStatus(WINDURST,RECOLLECTIONS); + if (recollections == QUEST_ACCEPTED) then + player:startEvent(0x2713); + else + player:startEvent(0x2716); + end end; -----------------------------------