Skip to content

Commit

Permalink
9.0.07
Browse files Browse the repository at this point in the history
  • Loading branch information
LanceDH committed Mar 10, 2021
1 parent d4f7b58 commit b89fe33
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 77 deletions.
2 changes: 1 addition & 1 deletion Callings/CallingsBoard.lua
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function WQT_CallingsBoardMixin:UpdateCovenant()
end

self.covenantID = covenantID;
local data = C_Covenants.GetCovenantData(4);
local data = C_Covenants.GetCovenantData(covenantID);
self.covenantData = data;
if (data) then
for k, display in ipairs(self.Displays) do
Expand Down
13 changes: 4 additions & 9 deletions Data.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1425,16 +1425,11 @@ end

-- This is just easier to maintain than changing the entire string every time
_V["PATCH_NOTES"] = {
{["version"] = "9.0.06",
["minor"] = 4,
["changes"] = {
"Moved the pin fade setting to the Quest List category and renamed it to Fade Irrelevant Pins to better reflect its functionality.",
"Calling board tooltips will now include a progress bar if it's that type of an objective (\"X Defended\")."
},
{["version"] = "9.0.07",
["intro"] = { "9.0.5 compatibility and fixes." },
["fixes"] = {
"Fixed an error when shift-clicking the callings board.",
"Fixed an issue preventing tracked quests to be set as your current objective (yellow minimap arrow).",
"Fixed right-click tracking not always setting the quest as the current objective"
"Fixed the calling board always showing as Necrolord rather than the player's covenant.",
"Fixed pin highlights lagging behind when the world quest tab isn't visible.",
},
},
{["version"] = "9.0.06",
Expand Down
3 changes: 3 additions & 0 deletions Locals.lua
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,8 @@ L["PIN_DISABLE"] = "停用任務點更改"
L["PIN_DISABLE_TT"] = "防止世界任務追蹤更改地圖任務點。"
L["PIN_ELITE_RING"] = "精英環"
L["PIN_ELITE_RING_TT"] = "用尖刺環替代暴雪的精英龍。"
L["PIN_FADE_ON_PING"] = "突顯後淡出"
L["PIN_FADE_ON_PING_TT"] = "當一個地圖任務點被突顯時,淡出其他所有任務點以提高可視性。"
L["PIN_RARITY_ICON"] = "任務稀有度圖示"
L["PIN_RARITY_ICON_TT"] = "稀有任務的任務點添加稀有圖示。"
L["PIN_REWARD_TT"] = "使用主要獎勵的材質。"
Expand Down Expand Up @@ -674,6 +676,7 @@ L["TOMTOM_AUTO_ARROW"] = "追蹤的路徑點"
L["TOMTOM_AUTO_ARROW_TT"] = "Shift+點擊以試圖追蹤一個任務。或者使用下拉選單中的選項,將自動建立一個TomTom的路徑點。"
L["TOMTOM_CLICK_ARROW"] = "點擊建立路徑點"
L["TOMTOM_CLICK_ARROW_TT"] = "為最後點擊的世界任務創建一個TomTom路徑點和箭頭。刪除以此方式添加的先前的路徑點。"
L["TOMTOM_PIN"] = "TomTom點"
L["TYPE_EMISSARY"] = "特使任務"
L["TYPE_EMISSARY_TT"] = "只顯示當前選擇特使的任務。此過濾覆寫其他所有過濾。"
L["TYPE_INVASION"] = "入侵"
Expand Down
72 changes: 37 additions & 35 deletions MapPinProvider.lua
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,15 @@ end
------------------------------------
-- DataProvider
------------------------------------
-- Init()
-- RemoveAllData()
-- RefreshAllData()
-- FixOverlaps(canvasRatio, isFlightMap)
-- UpdateAllPlacements()
-- UpdateQuestPings()
-- SetQuestIDPinged(questId, shouldPing)

WQT_PinDataProvider = {};

function WQT_PinDataProvider:Init()
self.frame = CreateFrame("FRAME");
self.frame:SetScript("OnEvent", function(frame, ...) self:OnEvent(...); end);
self.frame:RegisterEvent("SUPER_TRACKING_CHANGED");
self.frame:RegisterEvent("QUEST_WATCH_LIST_CHANGED");

self.pinPool = CreateFramePool("BUTTON", nil, "WQT_PinTemplate", OnPinRelease);
self.activePins = {};
self.pingedQuests = {};
Expand All @@ -136,6 +134,14 @@ function WQT_PinDataProvider:Init()
self.pinClusterLookup = {};
end

function WQT_PinDataProvider:OnEvent(event, ...)
if (event == "SUPER_TRACKING_CHANGED") then
self:UpdateAllVisuals();
elseif (event == "QUEST_WATCH_LIST_CHANGED") then
self:UpdateAllVisuals();
end
end

function WQT_PinDataProvider:RemoveAllData()
self.pinPool:ReleaseAll();
wipe(self.activePins);
Expand Down Expand Up @@ -334,6 +340,12 @@ function WQT_PinDataProvider:UpdateAllPlacements()
end
end

function WQT_PinDataProvider:UpdateAllVisuals()
for pin in self.pinPool:EnumerateActive() do
pin:UpdateVisuals();
end
end

function WQT_PinDataProvider:UpdateQuestPings()
local settingPinFadeOnPing = WQT_Utils:GetSetting("pin", "fadeOnPing");
local fadeOthers = false;
Expand Down Expand Up @@ -416,22 +428,6 @@ end
------------------------------------
-- Pin
------------------------------------
-- OnLoad()
-- SetupCanvasType(pinType, parentMapFrame, isWatched)
-- Setup(questInfo, index, x, y, pinType, parentMapFrame)
-- OnUpdate(elapsed)
-- UpdatePinTime()
-- UpdatePlacement()
-- OnEnter()
-- OnLeave()
-- OnClick(button)
-- ApplyScaledPosition(manualScale)
-- Focus(playPing)
-- ClearFocus()
-- FadeIn()
-- FadeOut()
-- GetNudgedPosition()
-- SetNudge(x, y)

WQT_PinMixin = {};

Expand Down Expand Up @@ -493,13 +489,7 @@ function WQT_PinMixin:Setup(questInfo, index, x, y, pinType, parentMapFrame)
self.questId = questInfo.questId;

local scale = WQT_Utils:GetSetting("pin", "scale")
local settingCenterType = WQT_Utils:GetSetting("pin", "centerType");
local _, _, _, timeStringShort = WQT_Utils:GetQuestTimeString(questInfo);
local tagInfo = questInfo:GetTagInfo();
local questQuality = tagInfo and tagInfo.quality;
local questType = tagInfo and tagInfo.worldQuestType;
local isDisliked = questInfo:IsDisliked();


self.scale = scale
self:SetScale(scale);
self.currentScale = scale;
Expand All @@ -509,7 +499,22 @@ function WQT_PinMixin:Setup(questInfo, index, x, y, pinType, parentMapFrame)
self.posX = x;
self.posY = y;
self.baseFrameLevel = PIN_FRAME_LEVEL_BASE;


self:UpdateVisuals();
WQT_WorldQuestFrame:TriggerCallback("MapPinInitialized", self);
end

function WQT_PinMixin:UpdateVisuals()
local questInfo = self.questInfo;
local settingCenterType = WQT_Utils:GetSetting("pin", "centerType");
local _, _, _, timeStringShort = WQT_Utils:GetQuestTimeString(questInfo);
local tagInfo = questInfo:GetTagInfo();
local questQuality = tagInfo and tagInfo.quality;
local questType = tagInfo and tagInfo.worldQuestType;
local isDisliked = questInfo:IsDisliked();
local typeAtlas, typeAtlasWidth, typeAtlasHeight = WQT_Utils:GetCachedTypeIconData(questInfo);
local isWatched = QuestUtils_IsQuestWatched(questInfo.questId);

-- Ring coloration
local ringType = WQT_Utils:GetSetting("pin", "ringType");
local now = time();
Expand Down Expand Up @@ -678,8 +683,7 @@ function WQT_PinMixin:Setup(questInfo, index, x, y, pinType, parentMapFrame)
self.Icon:SetDesaturated(true);
end
self.CustomTypeIcon:SetDesaturated(isDisliked);
self.CustomTypeIcon:SetDesaturated(isDisliked);


-- Time
local settingPinTimeLabel = WQT_Utils:GetSetting("pin", "timeLabel");
local showTimeString = settingPinTimeLabel and timeStringShort ~= "";
Expand All @@ -694,8 +698,6 @@ function WQT_PinMixin:Setup(questInfo, index, x, y, pinType, parentMapFrame)
self:SetIconsDesaturated(isDisliked);
self:UpdatePinTime();
self:UpdatePlacement();

WQT_WorldQuestFrame:TriggerCallback("MapPinInitialized", self);
end

function WQT_PinMixin:OnUpdate(elapsed)
Expand Down
17 changes: 2 additions & 15 deletions WorldQuestTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2044,9 +2044,6 @@ function WQT_CoreMixin:OnLoad()
self:RegisterEvent("PLAYER_LOGOUT");

self:SetScript("OnEvent", function(self, event, ...)
--if (self.dataProvider) then
-- self.dataProvider:OnEvent(event, ...);
--end
if (self[event]) then
self[event](self, ...)
else
Expand Down Expand Up @@ -2207,12 +2204,6 @@ function WQT_CoreMixin:OnLoad()
tab:SetPoint(point, relativeTo, relativePoint, x, y + 2);
end)


-- Show hightlight in list when hovering over official map pinDataProvider
--hooksecurefunc("TaskPOI_OnEnter", function(self)
--
-- end)

hooksecurefunc("TaskPOI_OnLeave", function(self)
if (WQT.settings.pin.disablePoI) then return; end

Expand Down Expand Up @@ -2256,7 +2247,7 @@ function WQT_CoreMixin:OnLoad()
end
end);

local LFGParent = GetBuildInfo() < "9.0.5" and LFGListSearchPanelScrollFrame or LFGListSearchPanelScrollFrameScrollChild;
local LFGParent = LFGListSearchPanelScrollFrameScrollChild;
LFGParent.StartGroupButton:HookScript("OnClick", function()
-- If we are creating a group because we couldn't find one, show the info on the create frame
if InCombatLockdown() then return; end
Expand All @@ -2276,7 +2267,6 @@ function WQT_CoreMixin:OnLoad()
WQT_GroupSearch:Show();
end
end)


hooksecurefunc("TaskPOI_OnEnter", function(poi)
if (WQT.settings.pin.disablePoI) then return; end
Expand Down Expand Up @@ -2594,10 +2584,7 @@ function WQT_CoreMixin:PLAYER_LOGOUT()
end

function WQT_CoreMixin:QUEST_WATCH_LIST_CHANGED(...)
local questId, added = ...;

self.ScrollFrame:DisplayQuestList();
WQT_WorldQuestFrame.pinDataProvider:RefreshAllData();
end

function WQT_CoreMixin:TAXIMAP_OPENED(system)
Expand Down Expand Up @@ -2709,6 +2696,7 @@ function WQT_CoreMixin:SelectTab(tab)
if self.selectedTab ~= tab then
ADD:CloseAll();
PlaySound(SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON);
WQT_WorldQuestFrame.pinDataProvider:RefreshAllData();
end
self.selectedTab = tab;

Expand All @@ -2720,7 +2708,6 @@ function WQT_CoreMixin:SelectTab(tab)
WQT_TabWorld.Hider:Show();

-- Hide/show when quest details are shown
WQT_WorldQuestFrame.pinDataProvider:RefreshAllData();
QuestMapFrame_UpdateQuestSessionState(QuestMapFrame);
self:HideOverlayFrame();

Expand Down
21 changes: 4 additions & 17 deletions WorldQuestTab.xml
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@
<Layer level="ARTWORK">
<Texture parentKey="Icon">
<Anchors>
<Anchor point="TOPLEFT" x="4" y="-4"/>
<Anchor point="BOTTOMRIGHT" x="-4" y="4"/>
<Anchor point="TOPLEFT" x="5" y="-5"/>
<Anchor point="BOTTOMRIGHT" x="-5" y="5"/>
</Anchors>
</Texture>
<MaskTexture parentKey="CircleMask" file="Interface\CharacterFrame\TempPortraitAlphaMask" hWrapMode="CLAMPTOBLACKADDITIVE" vWrapMode="CLAMPTOBLACKADDITIVE">
Expand All @@ -224,28 +224,15 @@
<Color r="0" g="0" b="0" a="0.5"/>
</Texture>
</Layer>

<Layer level="OVERLAY">
<Texture parentKey="Ring" atlas="jailerstower-wayfinder-rewardcircle" useAtlasSize="false" desaturated="true">
<Anchors>
<Anchor point="TOPLEFT" x="3" y="-3"/>
<Anchor point="BOTTOMRIGHT" x="-3" y="3"/>
<Anchor point="TOPLEFT" x="2" y="-2"/>
<Anchor point="BOTTOMRIGHT" x="-2" y="2"/>
</Anchors>
<Color r="0.55" g="0.45" b="0.45"/>
</Texture>
</Layer>

<!-- 9.0.05
<Layer level="OVERLAY">
<Texture parentKey="Ring" atlas="jailerstower-wayfinder-rewardcircle" useAtlasSize="false" desaturated="true">
<Anchors>
<Anchor point="TOPLEFT" x="2" y="-2"/>
<Anchor point="BOTTOMRIGHT" x="-2" y="2"/>
</Anchors>
<Color r="0.55" g="0.45" b="0.45"/>
</Texture>
</Layer>
-->
</Layers>
<Scripts>
<OnEnter>
Expand Down

0 comments on commit b89fe33

Please sign in to comment.