From ddf429eece793b860bbc40465824e6e92f41b56c Mon Sep 17 00:00:00 2001 From: zorba Date: Thu, 6 Aug 2009 14:57:38 -0700 Subject: [PATCH] ugh 3.2 --- db_get.lua | 4 ++-- filter_base.lua | 2 ++ tracker.lua | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/db_get.lua b/db_get.lua index 75d8426..51728eb 100644 --- a/db_get.lua +++ b/db_get.lua @@ -8,7 +8,7 @@ local dev_mode = (QuestHelper_File["db_get.lua"] == "Development Version") local QHDB_temp = QHDB QHDB = nil local QHDB = QHDB_temp]] -QuestHelper: Assert(#QHDB == 4) +QuestHelper: Assert(dev_mode or #QHDB == 4) local weak_v = { __mode = 'v' } local weak_k = { __mode = 'k' } @@ -154,7 +154,7 @@ function DB_GetItem(group, id, silent, register) end for k, v in pairs(srctab) do - QuestHelper: Assert(not ite[k]) + QuestHelper: Assert(not ite[k] or k == "used") ite[k] = v end end diff --git a/filter_base.lua b/filter_base.lua index 1e3fa48..9f30993 100755 --- a/filter_base.lua +++ b/filter_base.lua @@ -119,6 +119,8 @@ local filter_quest_wintergrasp = QH_MakeFilter("filter_quest_wintergrasp", funct if QuestHelper.collect_rc and QuestHelper.collect_rz and QuestHelper_IndexLookup[QuestHelper.collect_rc] and QuestHelper_IndexLookup[QuestHelper.collect_rc][QuestHelper.collect_rz] == 74 then return end + --print(obj.loc.p, obj.type_quest.variety, PVP, obj.type_quest.variety == PVP, obj.loc.p == 74 and obj.type_quest.variety == PVP) + if obj.loc.p == 74 and obj.type_quest.variety == PVP then return true end end, {friendly_reason = QHText("FILTERED_WINTERGRASP"), friendly_name = "wintergrasp"}) diff --git a/tracker.lua b/tracker.lua index 7d7075b..0964cc7 100644 --- a/tracker.lua +++ b/tracker.lua @@ -348,10 +348,11 @@ local function addItem(objective, y, meta) item.specitem:SetParent(item) item.specitem:SetPoint("TOPRIGHT", item, "TOPLEFT", 0, 0) - local _, tex = GetQuestLogSpecialItemInfo(objective.type_quest.index) + local _, tex, charges = GetQuestLogSpecialItemInfo(objective.type_quest.index) item.specitem:SetID(objective.type_quest.index) SetItemButtonTexture(item.specitem, tex) item.specitem.rangeTimer = -1 -- This makes the little dot go away. Why does it do that? + item.specitem.charges = charges item.specitem:Show() -- 2.11.4.GIT