Skip to content

Commit

Permalink
9.0.02
Browse files Browse the repository at this point in the history
9.0.02
New:
New map pin option: Zone Map Pins (default All). Which quests should be allowed to show map pins on zone maps. (None, Tracked, or All)
New map pin option: Continent Map Pins (default None). Which quests should be allowed to show map pins on continent maps. (None, Tracked, or All)

Changes
The 'Pins On Continent' setting has been replaced by the new 'Continent Map Pins'. Its value has been transfered over.
Moved the settings and 'What's new' options from the filters to a separate button.

Fixes
Fixed Ally Quests in Nazjatar not showing the daily quest icon on their map pins.
Fixed the missing backdrop in the debug dump window.
'Fixed' the quest log counter.
Fixed an error that could occur when trying to right-click certain quests.
Fixed flickering of the quest list background when it's being reloaded
Fixed being able to add daily quests to the quest watch list, as the official API doesn't support them.
  • Loading branch information
LanceDH committed Oct 27, 2020
1 parent 0d5ebc9 commit ea79b9c
Show file tree
Hide file tree
Showing 8 changed files with 196 additions and 123 deletions.
7 changes: 5 additions & 2 deletions Data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1213,8 +1213,6 @@ for k, v in pairs(_V["WQT_FACTION_DATA"]) do
end
end



-- This is just easier to maintain than changing the entire string every time
_V["PATCH_NOTES"] = {
{["version"] = "9.0.02"
Expand All @@ -1224,10 +1222,15 @@ _V["PATCH_NOTES"] = {
}
,["changes"] = {
"The 'Pins On Continent' setting has been replaced by the new 'Continent Map Pins'. Its value has been transfered over."
,"Moved the settings and 'What's new' options from the filters to a separate button."
}
,["fixes"] = {
"Fixed Ally Quests in Nazjatar not showing the daily quest icon on their map pins."
,"Fixed the missing backdrop in the debug dump window."
,"'Fixed' the quest log counter."
,"Fixed an error that could occur when trying to right-click certain quests."
,"Fixed flickering of the quest list background when it's being reloaded"
,"Fixed being able to add daily quests to the quest watch list, as the official API doesn't support them."
}
}
,{["version"] = "9.0.01"
Expand Down
6 changes: 2 additions & 4 deletions Dataprovider.lua
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ function QuestInfoMixin:Init(questId, isDaily, isCombatAllyQuest, alwaysHide, po
self.isValid = HaveQuestData(self.questId);
self.time.seconds = WQT_Utils:GetQuestTimeString(self); -- To check if expired or never had a time limit
self.passedFilter = true;
--self.isCriteria = WorldMapFrame.overlayFrames[_V["WQT_BOUNDYBOARD_OVERLAYID"]]:IsWorldQuestCriteriaForSelectedBounty(questId);
--self.isCriteriaAny =


self:LoadRewards();

return self.hasRewardData;
Expand Down Expand Up @@ -233,7 +231,7 @@ function QuestInfoMixin:LoadRewards()
end
-- Gold
if (GetQuestLogRewardMoney(self.questId) > 0) then
local numItems = floor(abs(GetQuestLogRewardMoney(self.questId) / 10000))
local numItems = floor(abs(GetQuestLogRewardMoney(self.questId)))
self:AddReward(WQT_REWARDTYPE.gold, numItems, 133784, 1, _V["WQT_COLOR_GOLD"]);
end
-- Currency
Expand Down
3 changes: 2 additions & 1 deletion Debug.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ local function bts(bool)
end

local function GetQuestDump()
local counted, limit = WQT_Utils:GetQuestLogInfo()
local removedQuests = {};
local counted, limit = WQT_Utils:GetQuestLogInfo(removedQuests);
local output = FORMAT_QUEST_HEADER:format(counted, limit);

local numEntries = C_QuestLog.GetNumQuestLogEntries();
Expand Down
8 changes: 6 additions & 2 deletions Locals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ L["PIN_VISIBILITY_CONTINENT_TT"] = "Which quests should be allowed to show map p
L["PRECISE_FILTER"] = "Precise Filter"
L["PRECISE_FILTER_TT"] = "Filtering only shows quests matching all filter categories, rather than just any of the categories."
L["QUEST_COUNTER"] = "Quest Log Counter"
L["QUEST_COUNTER_INFO"] = "Following |cFFFFd100%d|r hidden quests count to your quest cap and can't be abandoned. This is an issue on Blizzard's end."
L["QUEST_COUNTER_TITLE"] = "Hidden quests"
L["QUEST_COUNTER_INFO"] = "This number is an aproximation as the value from the official API isn't guaranteed to be correct.\nSome quests might be hidden yet still count."
L["QUEST_COUNTER_TITLE"] = "Quest Log Limit"
L["QUEST_COUNTER_TT"] = "Show the number of quests in your default quest log."
L["QUEST_LIST"] = "Quest List"
L["SAVE_SETTINGS"] = "Save Filters/Sort"
Expand Down Expand Up @@ -369,6 +369,10 @@ L["DEFAULT_TAB_TT"] = [=[將WQT設定為預設啟用標籤。
這不適用於等級110以下角色。]=]
L["EMISSARY_COUNTER"] = "特使任務計數器"
L["EMISSARY_COUNTER_TT"] = "在特使標籤添加計數以指示你每個特使任務的進度。"
L["EMISSARY_REWARD"] = "特使獎勵圖示"
L["EMISSARY_REWARD_TT"] = "在特使標籤頁加上圖示,顯示所提供的獎勵類型。"
L["EMISSARY_SELECTED_ONLY"] = "只有選擇的特使"
L["EMISSARY_SELECTED_ONLY_TT"] = "只標記目前所選特使的任務,關閉此選項時會標示任何現有特使的任務。點一下特使標籤頁仍然只會顯示指定特使相關的任務。"
L["FILTER_PINS"] = "過濾地圖顯示"
L["FILTER_PINS_TT"] = "將過濾套用到地圖上的任務點"
L["FORMAT_GROUP_CREATE"] = "輸入|cFFFFFFFF%d|r 為此任務建立一個隊伍。 或輸入其名稱:|cFFFFFFFF%s|r。考慮兩者兼用,讓沒有插件的玩家也可以找到你的隊伍。"
Expand Down
46 changes: 33 additions & 13 deletions Templates.lua
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,20 @@ function WQT_Utils:RemoveTomTomArrowbyQuestId(questId)
end
end

function WQT_Utils:QuestIncorrectlyCounts(questLogIndex)
local questInfo = C_QuestLog.GetInfo(questLogIndex);
if (questInfo.isHeader or questInfo.isTask or questInfo.isBounty) then
return false, questInfo.isHidden;
end

local tagInfo = C_QuestLog.GetQuestTagInfo(questInfo.questID);

if (tagInfo and tagInfo.tagID == 102) then
return true, questInfo.isHidden;
end

end

function WQT_Utils:QuestCountsToCap(questLogIndex)
local questInfo = C_QuestLog.GetInfo(questLogIndex);

Expand All @@ -592,22 +606,21 @@ function WQT_Utils:QuestCountsToCap(questLogIndex)
return counts, questInfo.isHidden;
end

-- Count quests counting to the quest log cap and collect hidden ones that can't be abandoned
function WQT_Utils:GetQuestLogInfo(hiddenList)
local _, numEntries = C_QuestLog.GetNumQuestLogEntries();
-- Count quests counting to the quest log cap and collect the ones that shouldn't count
function WQT_Utils:GetQuestLogInfo(list)
local numEntries, questCount = C_QuestLog.GetNumQuestLogEntries();
local maxQuests = C_QuestLog.GetMaxNumQuestsCanAccept();
local questCount = 0;
if (hiddenList) then
wipe(hiddenList);

if (list) then
wipe(list);
end

for questLogIndex = 1, numEntries do
local counts, isHidden = WQT_Utils:QuestCountsToCap(questLogIndex);
if (counts) then
questCount = questCount + 1;

-- hidden quest counting to the cap
if (isHidden and hiddenList) then
tinsert(hiddenList, questLogIndex);
-- Remove the ones that shouldn't be counted
if (WQT_Utils:QuestIncorrectlyCounts(questLogIndex)) then
questCount = questCount - 1;
if (list) then
tinsert(list, questLogIndex);
end
end
end
Expand Down Expand Up @@ -701,6 +714,13 @@ function WQT_Utils:GetQuestRewardIcon(questID)
end
end

function WQT_Utils:CalculateWarmodeAmount(rewardType, amount)
if (C_PvP.IsWarModeDesired() and _V["WARMODE_BONUS_REWARD_TYPES"][rewardType]) then
amount = amount + floor(amount * C_PvP.GetWarModeRewardBonus() / 100);
end
return amount;
end

function WQT_Utils:DeepWipeTable(t)
for k, v in pairs(t) do
if (type(v) == "table") then
Expand Down
Loading

0 comments on commit ea79b9c

Please sign in to comment.