Skip to content

Commit

Permalink
Code cleanup and added the command /wqt debug
Browse files Browse the repository at this point in the history
  • Loading branch information
Tercioo committed Nov 30, 2020
1 parent 98e3e9c commit 0188170
Show file tree
Hide file tree
Showing 12 changed files with 436 additions and 432 deletions.
39 changes: 22 additions & 17 deletions .vscode/bookmarks.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,32 @@
"path": "$ROOTPATH$\\WorldQuestTracker_Core.lua",
"bookmarks": [
{
"line": 953,
"line": 942,
"column": 30,
"label": ""
},
{
"line": 1982,
"line": 1971,
"column": 23,
"label": ""
},
{
"line": 2100,
"line": 2089,
"column": 0,
"label": ""
},
{
"line": 2213,
"line": 2202,
"column": 96,
"label": ""
},
{
"line": 2302,
"line": 2291,
"column": 25,
"label": ""
},
{
"line": 2633,
"line": 2622,
"column": 4,
"label": ""
}
Expand Down Expand Up @@ -98,22 +98,22 @@
"path": "$ROOTPATH$\\WorldQuestTracker_ZoneMap.lua",
"bookmarks": [
{
"line": 443,
"line": 434,
"column": 15,
"label": ""
},
{
"line": 1128,
"line": 1115,
"column": 59,
"label": ""
},
{
"line": 1174,
"line": 1161,
"column": 4,
"label": ""
},
{
"line": 1492,
"line": 1479,
"column": 97,
"label": ""
}
Expand All @@ -123,17 +123,17 @@
"path": "$ROOTPATH$\\WorldQuestTracker_MapAPI.lua",
"bookmarks": [
{
"line": 262,
"line": 268,
"column": 132,
"label": ""
},
{
"line": 738,
"line": 747,
"column": 0,
"label": ""
},
{
"line": 796,
"line": 805,
"column": 4,
"label": ""
}
Expand All @@ -143,22 +143,22 @@
"path": "$ROOTPATH$\\WorldQuestTracker_WorldMap.lua",
"bookmarks": [
{
"line": 358,
"line": 347,
"column": 41,
"label": ""
},
{
"line": 660,
"line": 649,
"column": 31,
"label": ""
},
{
"line": 886,
"line": 883,
"column": 18,
"label": ""
},
{
"line": 1058,
"line": 1055,
"column": 0,
"label": ""
}
Expand All @@ -167,6 +167,11 @@
{
"path": "f:\\World of Warcraft\\_retail_\\Interface\\AddOns\\WorldQuestsList\\WorldQuestsList.lua",
"bookmarks": [
{
"line": 4858,
"column": 19,
"label": ""
},
{
"line": 7920,
"column": 2,
Expand Down
69 changes: 36 additions & 33 deletions WorldQuestTracker.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,33 +36,11 @@ local WorldQuestTracker = WorldQuestTrackerAddon
local ff = WorldQuestTrackerFinderFrame
local rf = WorldQuestTrackerRareFrame

-- 219978
-- /run SetSuperTrackedQuestID(44033);
-- TaskPOI_OnClick


local GameCooltip = GameCooltip2
--local Saturate = Saturate
local floor = floor
--local ceil = ceil
--local ipairs = ipairs
local GetItemInfo = GetItemInfo
local GetCurrentMapZone = GetCurrentMapZone
local GetQuestsForPlayerByMapID = C_TaskQuest.GetQuestsForPlayerByMapID
local HaveQuestData = HaveQuestData
local QuestMapFrame_IsQuestWorldQuest = QuestMapFrame_IsQuestWorldQuest or QuestUtils_IsQuestWorldQuest
local GetNumQuestLogRewardCurrencies = GetNumQuestLogRewardCurrencies
local GetQuestLogRewardInfo = GetQuestLogRewardInfo
local GetQuestLogRewardCurrencyInfo = GetQuestLogRewardCurrencyInfo
local GetQuestLogRewardMoney = GetQuestLogRewardMoney
local GetNumQuestLogRewards = GetNumQuestLogRewards
local isWorldQuest = QuestUtils_IsQuestWorldQuest
local GetQuestInfoByQuestID = C_TaskQuest.GetQuestInfoByQuestID
local GetQuestTimeLeftMinutes = C_TaskQuest.GetQuestTimeLeftMinutes

local MapRangeClamped = DF.MapRangeClamped
local FindLookAtRotation = DF.FindLookAtRotation
local GetDistance_Point = DF.GetDistance_Point

local _

WorldQuestTracker.QuestTrackList = {} --place holder until OnInit is triggered
Expand Down Expand Up @@ -405,9 +383,9 @@ function WorldQuestTracker:OnInit()

--> Court of Farondis 42420
--> The Dreamweavers 42170
--print ("world quest:", questID, QuestMapFrame_IsQuestWorldQuest (questID), XP, gold)
--print ("world quest:", questID, isWorldQuest(questID), XP, gold)

if (QuestMapFrame_IsQuestWorldQuest (questID)) then
if (isWorldQuest(questID)) then
--print (event, questID, XP, gold)
--QUEST_TURNED_IN 44300 0 772000
-- QINFO: 0 nil nil Petrified Axe Haft true 370
Expand All @@ -417,7 +395,7 @@ function WorldQuestTracker:OnInit()

FlashClientIcon()

if (QuestMapFrame_IsQuestWorldQuest (questID)) then --wait, is this inception?
if (isWorldQuest(questID)) then --wait, is this inception?
local title, factionID, tagID, tagName, worldQuestType, rarity, isElite, tradeskillLineIndex, tagID, tagName, worldQuestType, rarity, isElite, tradeskillLineIndex, allowDisplayPastCritical, gold, goldFormated, rewardName, rewardTexture, numRewardItems, itemName, itemTexture, itemLevel, quantity, quality, isUsable, itemID, isArtifact, artifactPower, isStackable, stackAmount = WorldQuestTracker.GetOrLoadQuestData (questID)

--print (title, questType, texture, factionID, tagID, tagName, worldQuestType, rarity, isElite, tradeskillLineIndex)
Expand Down Expand Up @@ -576,7 +554,7 @@ function WorldQuestTracker:OnInit()

function WorldQuestTracker:QUEST_LOOT_RECEIVED (event, questID, item, amount, ...)
--print ("LOOT", questID, item, amount, ...)
if (QuestMapFrame_IsQuestWorldQuest (questID)) then
if (isWorldQuest(questID)) then
-- local title, questType, texture, factionID, tagID, tagName, worldQuestType, rarity, isElite, tradeskillLineIndex, selected, isSpellTarget, timeLeft, isCriteria, gold, goldFormated, rewardName, rewardTexture, numRewardItems, itemName, itemTexture, itemLevel, quantity, quality, isUsable, itemID, isArtifact, artifactPower, isStackable = WorldQuestTracker:GetQuestFullInfo (questID)
-- print ("QINFO:", goldFormated, rewardName, numRewardItems, itemName, isArtifact, artifactPower)
end
Expand Down Expand Up @@ -635,13 +613,19 @@ end
--pega os dados da quest
function WorldQuestTracker.GetQuest_Info(questID)
if (not HaveQuestData(questID)) then
if (WorldQuestTracker.__debug) then
WorldQuestTracker:Msg("no HaveQuestData(1) for quest", questID)
end
return
end

local title, factionID = GetQuestInfoByQuestID(questID)

local tagInfo = C_QuestLog.GetQuestTagInfo(questID)
if (not tagInfo) then
if (WorldQuestTracker.__debug) then
WorldQuestTracker:Msg("no tagInfo(3) for quest", questID)
end
return
end

Expand All @@ -650,12 +634,11 @@ end
local worldQuestType = tagInfo.worldQuestType
local rarity = tagInfo.quality
local isElite = tagInfo.isElite
--local quality = tagInfo.quality

return title, factionID, tagID, tagName, worldQuestType, rarity, isElite
end

--pega o icone para as quest que dao goild
--pega o icone para as quest que dao gold
local goldCoords = {0, 1, 0, 1}
function WorldQuestTracker.GetGoldIcon()
return [[Interface\AddOns\WorldQuestTracker\media\icon_gold]], goldCoords
Expand Down Expand Up @@ -967,8 +950,6 @@ hooksecurefunc ("QuestMapFrame_Close", function()
WorldQuestTracker.NeedUpdateLoadingIconAnchor()
end)


--C_Timer.NewTicker (5, function()WorldQuestTracker.PlayLoadingAnimation()end)
function WorldQuestTracker.CreateLoadingIcon()
local f = CreateFrame ("frame", nil, WorldMapFrame, "BackdropTemplate")
f:SetSize (48, 48)
Expand Down Expand Up @@ -1064,7 +1045,28 @@ SLASH_WQTRACKER2 = "/worldquesttracker"

function SlashCmdList.WQTRACKER (msg, editbox)

if (msg == "statusbar") then
if (msg == "reinstall") then
local b = CreateFrame("button", "WQTResetConfigButton", UIParent, "OptionsButtonTemplate")
tinsert(UISpecialFrames, "WQTResetConfigButton")

b:SetSize (250, 40)
b:SetText ("REINSTALL")
b:SetScript ("OnClick", function()
WQTrackerDB = {}
WQTrackerDBChr = {}
ReloadUI()
end)
b:SetPoint ("center", UIParent, "center", 0, 0)

elseif (msg == "debug") then
WorldQuestTracker.__debug = not WorldQuestTracker.__debug
if (WorldQuestTracker.__debug) then
WorldQuestTracker:Msg("debug is now enabled.")
else
WorldQuestTracker:Msg("debug is disabled.")
end

elseif (msg == "statusbar") then
WorldQuestTracker.db.profile.bar_visible = true
WorldQuestTracker.RefreshStatusBarVisibility()
return
Expand Down Expand Up @@ -1173,7 +1175,8 @@ function SlashCmdList.WQTRACKER (msg, editbox)

end


else
WorldQuestTracker:Msg("version:", WQT_VERSION)

end
end
Expand Down
15 changes: 2 additions & 13 deletions WorldQuestTracker_Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,7 @@ WorldQuestTracker.WorldSummary = CreateFrame ("frame", "WorldQuestTrackerWorldSu
local DEV_VERSION_STR = DF:CreateLabel (worldFramePOIs, "")

local _
local QuestMapFrame_IsQuestWorldQuest = QuestMapFrame_IsQuestWorldQuest or QuestUtils_IsQuestWorldQuest
local GetNumQuestLogRewardCurrencies = GetNumQuestLogRewardCurrencies
local GetQuestLogRewardInfo = GetQuestLogRewardInfo
local GetQuestLogRewardCurrencyInfo = GetQuestLogRewardCurrencyInfo
local GetQuestLogRewardMoney = GetQuestLogRewardMoney
local GetNumQuestLogRewards = GetNumQuestLogRewards
local GetQuestInfoByQuestID = C_TaskQuest.GetQuestInfoByQuestID

local MapRangeClamped = DF.MapRangeClamped
local FindLookAtRotation = DF.FindLookAtRotation
local GetDistance_Point = DF.GetDistance_Point

local isWorldQuest = QuestUtils_IsQuestWorldQuest
local GameCooltip = GameCooltip2

local LibWindow = LibStub ("LibWindow-1.1")
Expand Down Expand Up @@ -1289,7 +1278,7 @@ WorldQuestTracker.OnToggleWorldMap = function (self)
else
--desligou o tracker do tomtom
for questID, t in pairs (WorldQuestTracker.TomTomUIDs) do
if (type (questID) == "number" and QuestMapFrame_IsQuestWorldQuest (questID)) then
if (type (questID) == "number" and isWorldQuest(questID)) then
--procura o bot�o da quest
for _, widget in ipairs (WorldQuestTracker.WorldMapWidgets) do
if (widget.questID == questID) then
Expand Down
10 changes: 0 additions & 10 deletions WorldQuestTracker_FrameAPI.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,8 @@ end
local ff = WorldQuestTrackerFinderFrame

local _
local QuestMapFrame_IsQuestWorldQuest = QuestMapFrame_IsQuestWorldQuest or QuestUtils_IsQuestWorldQuest
local GetNumQuestLogRewardCurrencies = GetNumQuestLogRewardCurrencies
local GetQuestLogRewardInfo = GetQuestLogRewardInfo
local GetQuestLogRewardCurrencyInfo = GetQuestLogRewardCurrencyInfo
local GetQuestLogRewardMoney = GetQuestLogRewardMoney
local GetNumQuestLogRewards = GetNumQuestLogRewards
local GetQuestInfoByQuestID = C_TaskQuest.GetQuestInfoByQuestID

local MapRangeClamped = DF.MapRangeClamped
local FindLookAtRotation = DF.FindLookAtRotation
local GetDistance_Point = DF.GetDistance_Point

--debug: print to the chat all quests being tracked
function WorldQuestTracker.DumpTrackingList()
local t = WorldQuestTracker.table.dump (WorldQuestTracker.QuestTrackList)
Expand Down
17 changes: 12 additions & 5 deletions WorldQuestTracker_GroupFinder.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ local GameCooltip = GameCooltip2

local _
local C_TaskQuest = _G.C_TaskQuest
local QuestMapFrame_IsQuestWorldQuest = _G.QuestMapFrame_IsQuestWorldQuest or _G.QuestUtils_IsQuestWorldQuest
local isWorldQuest = QuestUtils_IsQuestWorldQuest
local GetNumQuestLogRewardCurrencies = _G.GetNumQuestLogRewardCurrencies
local GetQuestLogRewardInfo = _G.GetQuestLogRewardInfo
local GetQuestLogRewardCurrencyInfo = _G.GetQuestLogRewardCurrencyInfo
Expand Down Expand Up @@ -1141,13 +1141,16 @@ ff:SetScript ("OnEvent", function (self, event, questID, arg2, arg3)

local tagInfo = C_QuestLog.GetQuestTagInfo(questID)
if (not tagInfo) then
if (WorldQuestTracker.__debug) then
WorldQuestTracker:Msg("no tagInfo(1) for quest", questID)
end
return
end
local tagID = tagInfo.tagID
local rarity = tagInfo.rarity or 1
local isElite = tagInfo.isElite

local isWorldQuest = QuestMapFrame_IsQuestWorldQuest(questID)
local isWorldQuest = isWorldQuest(questID)

if ((isWorldQuest and isInArea) or allAssaultQuests[questID] or tagID == 112 or (isElite and rarity == LE_WORLD_QUEST_QUALITY_EPIC)) then
--FlashClientIcon()
Expand All @@ -1168,6 +1171,10 @@ ff:SetScript ("OnEvent", function (self, event, questID, arg2, arg3)
ff.CurrentWorldQuest = questID
ff:PlayerEnteredWorldQuestZone (questID)
end
else
if (WorldQuestTracker.__debug and not HaveQuestData(questID)) then
WorldQuestTracker:Msg("no HaveQuestData(2) for quest", questID)
end
end

elseif (event == "ZONE_CHANGED_NEW_AREA") then
Expand All @@ -1188,7 +1195,7 @@ ff:SetScript ("OnEvent", function (self, event, questID, arg2, arg3)


elseif (event == "QUEST_TURNED_IN") then
local isWorldQuest = QuestMapFrame_IsQuestWorldQuest (questID)
local isWorldQuest = isWorldQuest(questID)
if (isWorldQuest) then
ff.WorldQuestFinished (questID)

Expand Down Expand Up @@ -1357,7 +1364,7 @@ end

function ff.HandleBTrackerBlock (questID, block)
if (not ff.BQuestTrackerUsedWidgets [block]) then
if (type (questID) == "number" and HaveQuestData (questID) and QuestMapFrame_IsQuestWorldQuest (questID)) then
if (type (questID) == "number" and HaveQuestData (questID) and isWorldQuest(questID)) then
local title, factionID, tagID, tagName, worldQuestType, rarity, isElite, tradeskillLineIndex = WorldQuestTracker.GetQuest_Info (questID)
if (not ff.cannot_group_quest [worldQuestType] and not WorldQuestTracker.MapData.GroupFinderIgnoreQuestList [questID]) then
--> give a button for this block
Expand All @@ -1366,7 +1373,7 @@ function ff.HandleBTrackerBlock (questID, block)
end
else
local isInArea, isOnMap, numObjectives = GetTaskInfo (questID) -- or not isInArea
if (type (questID) ~= "number" or not HaveQuestData (questID) or not QuestMapFrame_IsQuestWorldQuest (questID)) then
if (type (questID) ~= "number" or not HaveQuestData (questID) or not isWorldQuest(questID)) then
--> remove the button from this block
ff.RemoveButtonFromBBlock (block)
else
Expand Down
Loading

0 comments on commit 0188170

Please sign in to comment.