From da5f569fb5b9f9aa58cecdf6daf5d7bd4d303b3c Mon Sep 17 00:00:00 2001 From: Tekkub Stoutwrithe Date: Tue, 16 Oct 2007 07:59:43 +0000 Subject: [PATCH] TourGuide - Kill now completes on the same conditionals as Note git-svn-id: https://tekkub-wow.googlecode.com/svn/trunk/TourGuide@643 86fe6d9a-1522-0410-a387-bf9db416f0a0 --- QuestTracking.lua | 2 +- StatusFrame.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/QuestTracking.lua b/QuestTracking.lua index 2168e08..71d1707 100644 --- a/QuestTracking.lua +++ b/QuestTracking.lua @@ -88,7 +88,7 @@ function TourGuide:CHAT_MSG_LOOT(event, msg) self:Debug(10, event, action, quest, lootitem, lootqty, itemid, name) if action == "BUY" and name and name == quest - or (action == "BUY" or action == "NOTE") and lootitem and itemid == lootitem and (GetItemCount(lootitem) + 1) >= lootqty then + or (action == "BUY" or action == "KILL" or action == "NOTE") and lootitem and itemid == lootitem and (GetItemCount(lootitem) + 1) >= lootqty then return self:SetTurnedIn() end end diff --git a/StatusFrame.lua b/StatusFrame.lua index 036bede..2d279b5 100644 --- a/StatusFrame.lua +++ b/StatusFrame.lua @@ -138,9 +138,9 @@ function TourGuide:UpdateStatusFrame() self:Debug(11, "UpdateStatusFrame", i, action, name, note, logi, complete, turnedin, quest, useitem, optional, lootitem, lootqty, lootitem and GetItemCount(lootitem) or 0, level, needlevel) local hasuseitem = useitem and self:FindBagSlot(useitem) - if action == "NOTE" and not optional and lootitem and GetItemCount(lootitem) >= lootqty then return self:SetTurnedIn(i, true) end - if action == "KILL" or action == "NOTE" then + if not optional and lootitem and GetItemCount(lootitem) >= lootqty then return self:SetTurnedIn(i, true) end + local quest, questtext = self:GetObjectiveTag("Q", i), self:GetObjectiveTag("QO", i) if quest and questtext then local qi = self:GetQuestLogIndexByName(quest) @@ -155,7 +155,7 @@ function TourGuide:UpdateStatusFrame() if action == "ACCEPT" then incomplete = (not optional or hasuseitem) and not logi elseif action == "TURNIN" then incomplete = not optional or logi and complete elseif action == "COMPLETE" then incomplete = not complete and (not optional or logi) - elseif action == "NOTE" then incomplete = not optional or lootitem and GetItemCount(lootitem) >= lootqty or needlevel + elseif action == "NOTE" or action == "KILL" then incomplete = not optional or lootitem and GetItemCount(lootitem) >= lootqty or needlevel elseif action == "GRIND" then incomplete = needlevel else incomplete = not logi end -- 2.11.4.GIT