Commit c1e5ba06 authored by TOM_RUS's avatar TOM_RUS
Browse files

WOW-29352patch8.1.5_PTR

parent 6cbb7b3e
......@@ -6,6 +6,20 @@ local AccountInfo =
Functions =
{
{
Name = "GetIDFromBattleNetAccountGUID",
Type = "Function",
Arguments =
{
{ Name = "battleNetAccountGUID", Type = "string", Nilable = false },
},
Returns =
{
{ Name = "battleNetAccountID", Type = "number", Nilable = false },
},
},
{
Name = "IsGUIDBattleNetAccountType",
Type = "Function",
......
......@@ -956,6 +956,7 @@ local Calendar =
{ Name = "difficultyName", Type = "string", Nilable = false },
{ Name = "dontDisplayBanner", Type = "bool", Nilable = false },
{ Name = "dontDisplayEnd", Type = "bool", Nilable = false },
{ Name = "clubID", Type = "string", Nilable = false },
},
},
{
......
......@@ -35,6 +35,52 @@ local QuestLog =
{ Name = "maxNumQuestsCanAccept", Type = "number", Nilable = false },
},
},
{
Name = "GetNextWaypoint",
Type = "Function",
Arguments =
{
{ Name = "questID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "mapID", Type = "number", Nilable = false },
{ Name = "x", Type = "number", Nilable = false },
{ Name = "y", Type = "number", Nilable = false },
},
},
{
Name = "GetNextWaypointForMap",
Type = "Function",
Arguments =
{
{ Name = "questID", Type = "number", Nilable = false },
{ Name = "uiMapID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "x", Type = "number", Nilable = false },
{ Name = "y", Type = "number", Nilable = false },
},
},
{
Name = "GetNextWaypointText",
Type = "Function",
Arguments =
{
{ Name = "questID", Type = "number", Nilable = false },
},
Returns =
{
{ Name = "titleText", Type = "string", Nilable = false },
},
},
{
Name = "GetNumQuestObjectives",
Type = "Function",
......
......@@ -18,7 +18,7 @@ function AzeriteEmpoweredItemPowerMixin:Setup(owningTierFrame, azeriteItemDataSo
self.IconOff:SetAtlas("Azerite-CenterTrait-Off", true);
self.IconDesaturated:SetAtlas("Azerite-CenterTrait-On", true);
else
local spellTexture = GetSpellTexture(self:GetSpellID());
local spellTexture = GetSpellTexture(self:GetSpellID());
self.IconOn:SetTexture(spellTexture);
self.IconOff:SetTexture(spellTexture);
self.IconDesaturated:SetTexture(spellTexture);
......@@ -54,7 +54,7 @@ function AzeriteEmpoweredItemPowerMixin:OnEvent(event, ...)
local forceUpdate = true;
self:SetupModelScene(forceUpdate);
elseif event == "AZERITE_EMPOWERED_ITEM_EQUIPPED_STATUS_CHANGED" then
self.isHeartOfAzerothEquipped = ...;
self.isHeartOfAzerothEquipped = ...;
self:SetPowerButtonState();
self:UpdateStyle();
end
......@@ -217,13 +217,13 @@ function AzeriteEmpoweredItemPowerMixin:PlayTransitionAnimation()
self.TransitionAnimation.Effect:SetFromAlpha(self.CanSelectEffect:GetAlpha());
self.TransitionAnimation.Effect:SetToAlpha(self:GetCanSelectEffectAlphaValue());
self.TransitionAnimation.Desaturation:SetFromAlpha(self.IconDesaturated:GetAlpha());
self.TransitionAnimation.Desaturation:SetToAlpha(self:GetDesaturationValue());
self.TransitionAnimation.BorderSelectable:SetFromAlpha(self.IconBorderSelectable:GetAlpha());
self.TransitionAnimation.BorderSelectable:SetToAlpha(self:GetBorderSelectableAlphaValue());
self.TransitionAnimation.IconBorder:SetFromAlpha(self.IconBorder:GetAlpha());
self.TransitionAnimation.IconBorder:SetToAlpha(self:GetBorderAlphaValue());
......@@ -318,8 +318,8 @@ function AzeriteEmpoweredItemPowerMixin:GetBorderAlphaValue()
end
function AzeriteEmpoweredItemPowerMixin:GetIconNotSelectableOverlayAlphaValue()
if not self.isHeartOfAzerothEquipped then
return 1;
if not self.isHeartOfAzerothEquipped then
return 1;
end
if self.azeriteItemDataSource:IsPreviewSource() then
......@@ -428,23 +428,23 @@ function AzeriteEmpoweredItemPowerMixin:SetFinalPowerTooltipDescriptions(tooltip
local WRAP = true;
local type = nil;
local finalPowerSelected = false;
local base = Enum.AzeritePowerLevel.Base;
if(self:IsSelected()) then
type = Enum.AzeritePowerLevel.Downgraded;
finalPowerSelected = true;
else
type = Enum.AzeritePowerLevel.Upgraded;
end
tooltip:AddLine(" ");
local base = Enum.AzeritePowerLevel.Base;
if(self:IsSelected()) then
type = Enum.AzeritePowerLevel.Downgraded;
finalPowerSelected = true;
else
type = Enum.AzeritePowerLevel.Upgraded;
end
tooltip:AddLine(" ");
for powerIndex, powerID in ipairs(finalPowers) do
local powerInfoModified = C_AzeriteEmpoweredItem.GetPowerText(empoweredItemLocation, powerID, type);
GameTooltip_AddColoredLine(tooltip,DASH_WITH_TEXT:format(powerInfoModified.name), HIGHLIGHT_FONT_COLOR, WRAP);
local powerInfoBase = C_AzeriteEmpoweredItem.GetPowerText(empoweredItemLocation, powerID, base);
if(finalPowerSelected) then
if(finalPowerSelected) then
GameTooltip_AddNormalLine(tooltip, GetHighlightedNumberDifferenceString(powerInfoModified.description, powerInfoBase.description), WRAP, TOOLTIP_INDENT_OFFSET);
else
else
GameTooltip_AddNormalLine(tooltip, GetHighlightedNumberDifferenceString(powerInfoBase.description, powerInfoModified.description), WRAP, TOOLTIP_INDENT_OFFSET);
end
end
......@@ -541,10 +541,11 @@ end
function AzeriteEmpoweredItemPowerMixin:OnClick()
if IsModifiedClick("CHATLINK") then
ChatEdit_InsertLink(GetSpellLink(self:GetSpellID()));
local spellLink = GetSpellLink(self:GetSpellID());
ChatEdit_InsertLink(spellLink);
return;
end
if self.azeriteItemDataSource:IsPreviewSource() then
UIErrorsFrame:AddExternalErrorMessage(AZERITE_POWER_UNSELECTABLE_IN_PREVIEW);
return;
......@@ -573,8 +574,8 @@ function AzeriteEmpoweredItemPowerMixin:OnClick()
return;
end
if not self.isHeartOfAzerothEquipped then
return;
if not self.isHeartOfAzerothEquipped then
return;
end
assert(self:CanBeSelected());
......@@ -670,7 +671,7 @@ function AzeriteEmpoweredItemPowerMixin:PrepareForRevealAnimation()
self.IconNotSelectableOverlay:SetAlpha(0);
self.IconBorderSelectable:SetAlpha(0);
self.CanSelectEffect:SetAlpha(0);
self.SwirlContainer:Show();
end
......
......@@ -330,7 +330,7 @@ function MountListDragButton_OnClick(self, button)
local spellName = GetSpellInfo(id);
ChatEdit_InsertLink(spellName);
else
local spellLink = GetSpellLink(id)
local spellLink = GetSpellLink(id);
ChatEdit_InsertLink(spellLink);
end
else
......@@ -350,7 +350,7 @@ function MountListItem_OnClick(self, button)
local spellName = GetSpellInfo(id);
ChatEdit_InsertLink(spellName);
else
local spellLink = GetSpellLink(id)
local spellLink = GetSpellLink(id);
ChatEdit_InsertLink(spellLink);
end
elseif ( self.spellID ~= MountJournal.selectedSpellID ) then
......
......@@ -592,7 +592,8 @@ function PetJournal_UpdatePetLoadOut(forceSceneChange)
loadoutPlate.requirement.str:SetText(GetAchievementLink(UNLOCK_REQUIREMENTS[i].id));
loadoutPlate.requirement.achievementID = UNLOCK_REQUIREMENTS[i].id;
elseif (UNLOCK_REQUIREMENTS[i].requirement == "SPELL" and UNLOCK_REQUIREMENTS[i].id) then
loadoutPlate.requirement.str:SetText(GetSpellLink(UNLOCK_REQUIREMENTS[i].id));
local spellLink = GetSpellLink(UNLOCK_REQUIREMENTS[i].id);
loadoutPlate.requirement.str:SetText(spellLink);
loadoutPlate.requirement.spellID = UNLOCK_REQUIREMENTS[i].id;
end
loadoutPlate.helpFrame.text:SetText(_G["BATTLE_PET_UNLOCK_HELP_"..i]);
......
......@@ -711,6 +711,10 @@ local SET_MODEL_PAN_AND_ZOOM_LIMITS = {
["MagharOrc3"] = { maxZoom = 3.2960524559021, panMaxLeft = -0.22763830423355, panMaxRight = 0.32022559642792, panMaxTop = -0.038521766662598, panMaxBottom = -2.0473554134369 },
["DarkIronDwarf2"] = { maxZoom = 2.9605259895325, panMaxLeft = -0.50352156162262, panMaxRight = 0.4159924685955, panMaxTop = -0.07211934030056, panMaxBottom = -1.4946432113648 },
["DarkIronDwarf3"] = { maxZoom = 2.8947370052338, panMaxLeft = -0.37057432532311, panMaxRight = 0.43383255600929, panMaxTop = -0.084960877895355, panMaxBottom = -1.7173190116882 },
["KulTiran2"] = { maxZoom = 1.71052598953247, panMaxLeft = -0.667941331863403, panMaxRight = 0.589463412761688, panMaxTop = -0.373320609331131, panMaxBottom = -2.7329957485199 },
["KulTiran3"] = { maxZoom = 2.22368383407593, panMaxLeft = -0.43183308839798, panMaxRight = 0.445900857448578, panMaxTop = -0.303212702274323, panMaxBottom = -2.49550628662109 },
["ZandalariTroll2"] = { maxZoom = 2.1710512638092, panMaxLeft = -0.487841755151749, panMaxRight = 0.561356604099274, panMaxTop = -0.385127544403076, panMaxBottom = -2.78562784194946 },
["ZandalariTroll3"] = { maxZoom = 3.32894563674927, panMaxLeft = -0.376705944538116, panMaxRight = 0.488780438899994, panMaxTop = -0.20890490710735, panMaxBottom = -2.67064166069031 },
};
function WardrobeCollectionFrame_SetContainer(parent)
......@@ -2892,7 +2896,7 @@ local IN_PROGRESS_FONT_COLOR_CODE = "|cff40c040";
WardrobeSetsDataProviderMixin = {};
function WardrobeSetsDataProviderMixin:SortSets(sets, reverseUIOrder)
function WardrobeSetsDataProviderMixin:SortSets(sets, reverseUIOrder, ignorePatchID)
local comparison = function(set1, set2)
local groupFavorite1 = set1.favoriteSetID and true;
local groupFavorite2 = set2.favoriteSetID and true;
......@@ -2905,8 +2909,10 @@ function WardrobeSetsDataProviderMixin:SortSets(sets, reverseUIOrder)
if ( set1.expansionID ~= set2.expansionID ) then
return set1.expansionID > set2.expansionID;
end
if ( set1.patchID ~= set2.patchID ) then
return set1.patchID > set2.patchID;
if not ignorePatchID then
if ( set1.patchID ~= set2.patchID ) then
return set1.patchID > set2.patchID;
end
end
if ( set1.uiOrder ~= set2.uiOrder ) then
if ( reverseUIOrder ) then
......@@ -2981,7 +2987,9 @@ function WardrobeSetsDataProviderMixin:GetVariantSets(baseSetID)
if ( baseSet ) then
tinsert(variantSets, baseSet);
end
self:SortSets(variantSets, true);
local reverseUIOrder = true;
local ignorePatchID = true;
self:SortSets(variantSets, reverseUIOrder, ignorePatchID);
end
end
return variantSets;
......
......@@ -1686,10 +1686,12 @@ function Blizzard_CombatLog_SpellMenuClick(action, spellName, spellId, eventType
v.eventList[eventType] = false;
end
elseif ( action == "LINK" ) then
local spellLink = GetSpellLink(spellId);
if ( ChatEdit_GetActiveWindow() ) then
ChatEdit_InsertLink(GetSpellLink(spellId));
ChatEdit_InsertLink(spellLink);
else
ChatFrame_OpenChat(GetSpellLink(spellId));
ChatFrame_OpenChat(spellLink);
end
return;
end
......@@ -3480,7 +3482,8 @@ function SetItemRef(link, text, button, chatFrame)
if ( IsModifiedClick("CHATLINK") ) then
if ( spellId > 0 ) then
if ( ChatEdit_InsertLink(GetSpellLink(spellId, glyphId)) ) then
local spellLink = GetSpellLink(spellId, glyphId);
if ( ChatEdit_InsertLink(spellLink) ) then
return;
end
else
......
......@@ -3,7 +3,7 @@ function CommunitiesGuildPerksFrame_OnLoad(self)
self.Container.update = function ()
CommunitiesGuildPerks_Update(self);
end;
HybridScrollFrame_CreateButtons(self.Container, "CommunitiesGuildPerksButtonTemplate", 8, 0, "TOPLEFT", "TOPLEFT", 0, 0, "TOP", "BOTTOM");
end
......@@ -20,7 +20,9 @@ end
function CommunitiesGuildPerksButton_OnEnter(self)
self:GetParent().activeButton = self;
GameTooltip:SetOwner(self, "ANCHOR_RIGHT", 36, 0);
GameTooltip:SetHyperlink(GetSpellLink(self.spellID));
local spellLink = GetSpellLink(self.spellID);
GameTooltip:SetHyperlink(spellLink);
end
function CommunitiesGuildPerksButton_OnLeave(self)
......@@ -30,7 +32,8 @@ end
function CommunitiesGuildPerksButton_OnClick(self)
if ( IsModifiedClick("CHATLINK") ) then
ChatEdit_LinkItem(nil, GetSpellLink(self.spellID));
local spellLink = GetSpellLink(self.spellID);
ChatEdit_LinkItem(nil, spellLink);
end
end
......
......@@ -510,6 +510,10 @@ function FrameStackTooltip_IsShowHiddenEnabled()
return GetCVarBool("fstack_showhidden");
end
function FrameStackTooltip_IsHighlightEnabled()
return GetCVarBool("fstack_showhighlight");
end
function FrameStackTooltip_IsShowRegionsEnabled()
return GetCVarBool("fstack_showregions");
end
......@@ -712,6 +716,18 @@ function FrameStackTooltip_Hide(self)
FrameStackHighlight:Hide();
end
function FrameStackTooltip_ToggleDefaults()
local tooltip = FrameStackTooltip;
if ( tooltip:IsVisible() ) then
FrameStackTooltip_Hide(tooltip);
else
local showHidden = FrameStackTooltip_IsShowHiddenEnabled();
local showRegions = FrameStackTooltip_IsShowRegionsEnabled();
local showAnchors = FrameStackTooltip_IsShowAnchorsEnabled();
FrameStackTooltip_Show(tooltip, showHidden, showRegions, showAnchors);
end
end
function FrameStackTooltip_Toggle(showHidden, showRegions, showAnchors)
local tooltip = FrameStackTooltip;
if ( tooltip:IsVisible() ) then
......@@ -778,10 +794,11 @@ function FrameStackTooltip_OnUpdate(self)
self.nextUpdate = now + FRAMESTACK_UPDATE_TIME;
self.highlightFrame = self:SetFrameStack(self.showHidden, self.showRegions, self.highlightIndexChanged);
self.highlightIndexChanged = 0;
if self.highlightFrame then
if self.highlightFrame and FrameStackTooltip_IsHighlightEnabled() then
FrameStackHighlight:HighlightFrame(self.highlightFrame, self.showAnchors);
end
end
end
function FrameStackTooltip_OnShow(self)
......
......@@ -22,4 +22,6 @@ end
-- PVP changes
do
InActiveBattlefield = C_PvP.IsActiveBattlefield;
HasInspectHonorData = function() return true; end;
RequestInspectHonorData = function() return; end;
end
\ No newline at end of file
......@@ -219,10 +219,7 @@ function GuildFrame_OpenAchievement(button, achievementID)
end
function GuildFrame_LinkItem(button, itemID, itemLink)
local _;
if ( not itemLink ) then
_, itemLink = GetItemInfo(itemID);
end
itemLink = itemLink or select(2, GetItemInfo(itemID));
if ( itemLink ) then
if ( ChatEdit_GetActiveWindow() ) then
ChatEdit_InsertLink(itemLink);
......@@ -464,7 +461,8 @@ end
function GuildPerksButton_OnEnter(self)
GuildPerksContainer.activeButton = self;
GameTooltip:SetOwner(self, "ANCHOR_RIGHT", 36, 0);
GameTooltip:SetHyperlink(GetSpellLink(self.spellID));
local spellLink = GetSpellLink(self.spellID);
GameTooltip:SetHyperlink(spellLink);
end
function GuildPerks_Update()
......
......@@ -207,7 +207,8 @@
</OnLeave>
<OnClick>
if ( IsModifiedClick("CHATLINK") ) then
GuildFrame_LinkItem(_, _, GetSpellLink(self.spellID));
local spellLink = GetSpellLink(self.spellID);
GuildFrame_LinkItem(button, nil, spellLink);
end
</OnClick>
</Scripts>
......
......@@ -64,11 +64,6 @@ end
function InspectPVPFrame_OnShow()
ButtonFrameTemplate_HideButtonBar(InspectFrame);
InspectPVPFrame_Update();
if ( not HasInspectHonorData() ) then
RequestInspectHonorData();
else
InspectPVPFrame_Update();
end
end
function InspectPVPFrame_OnHide(self)
......@@ -83,7 +78,7 @@ end
function InspectPVPFrame_Update()
local parent = InspectPVPFrame:GetParent();
local factionGroup = UnitFactionGroup(INSPECTED_UNIT);
local _, _, _, _, lifetimeHKs, _ = GetInspectHonorData();
local _, _, _, _, lifetimeHKs, _, honorLevel = GetInspectHonorData();
local level = UnitLevel(INSPECTED_UNIT);
InspectPVPFrame.HKs:SetFormattedText(INSPECT_HONORABLE_KILLS, lifetimeHKs);
......@@ -97,7 +92,7 @@ function InspectPVPFrame_Update()
end
else
InspectPVPFrame.SmallWreath:SetShown(false);
InspectPVPFrame.HonorLevel:SetFormattedText(HONOR_LEVEL_LABEL, UnitHonorLevel(INSPECTED_UNIT));
InspectPVPFrame.HonorLevel:SetFormattedText(HONOR_LEVEL_LABEL, honorLevel);
InspectPVPFrame.HonorLevel:Show();
local rating, played, won = GetInspectRatedBGData();
InspectPVPFrame.RatedBG.Rating:SetText(rating);
......
......@@ -19,6 +19,7 @@ OBJECTIVE_TRACKER_COLOR = {
["Complete"] = { r = 0.6, g = 0.6, b = 0.6 },
["TimeLeft"] = { r = DIM_RED_FONT_COLOR.r, g = DIM_RED_FONT_COLOR.g, b = DIM_RED_FONT_COLOR.b },
["TimeLeftHighlight"] = { r = RED_FONT_COLOR.r, g = RED_FONT_COLOR.g, b = RED_FONT_COLOR.b },
["Waypoint"] = { r = GREEN_FONT_COLOR.r, g = GREEN_FONT_COLOR.g, b = GREEN_FONT_COLOR.b },
};
OBJECTIVE_TRACKER_COLOR["Normal"].reverse = OBJECTIVE_TRACKER_COLOR["NormalHighlight"];
OBJECTIVE_TRACKER_COLOR["NormalHighlight"].reverse = OBJECTIVE_TRACKER_COLOR["Normal"];
......@@ -286,7 +287,7 @@ OBJECTIVE_DASH_STYLE_SHOW = 1;
OBJECTIVE_DASH_STYLE_HIDE = 2;
OBJECTIVE_DASH_STYLE_HIDE_AND_COLLAPSE = 3;
function DEFAULT_OBJECTIVE_TRACKER_MODULE:AddObjective(block, objectiveKey, text, lineType, useFullHeight, dashStyle, colorStyle, adjustForNoText)
function DEFAULT_OBJECTIVE_TRACKER_MODULE:AddObjective(block, objectiveKey, text, lineType, useFullHeight, dashStyle, colorStyle, adjustForNoText, overrideHeight)
local line = self:GetLine(block, objectiveKey, lineType);
-- width
if ( block.lineWidth ~= line.width ) then
......@@ -316,7 +317,8 @@ function DEFAULT_OBJECTIVE_TRACKER_MODULE:AddObjective(block, objectiveKey, text
end
-- set the text
local height = self:SetStringText(line.Text, text, useFullHeight, colorStyle, block.isHighlighted);
local textHeight = self:SetStringText(line.Text, text, useFullHeight, colorStyle, block.isHighlighted);
local height = overrideHeight or textHeight;
line:SetHeight(height);
local yOffset;
......
QUEST_TRACKER_MODULE = ObjectiveTracker_GetModuleInfoTable();
QUEST_TRACKER_MODULE.updateReasonModule = OBJECTIVE_TRACKER_UPDATE_MODULE_QUEST;
QUEST_TRACKER_MODULE.updateReasonEvents = OBJECTIVE_TRACKER_UPDATE_QUEST + OBJECTIVE_TRACKER_UPDATE_QUEST_ADDED;
QUEST_TRACKER_MODULE.updateReasonEvents = OBJECTIVE_TRACKER_UPDATE_QUEST + OBJECTIVE_TRACKER_UPDATE_QUEST_ADDED + OBJECTIVE_TRACKER_UPDATE_SUPER_TRACK_CHANGED;
QUEST_TRACKER_MODULE.usedBlocks = { };
QUEST_TRACKER_MODULE.buttonOffsets = {
......@@ -24,8 +24,8 @@ end
function QUEST_TRACKER_MODULE:OnFreeTypedLine(line)
line.block = nil;
line.Check:Hide();
if ( line.state ) then
line.Check:Hide();
line.state = nil;
line.Glow.Anim:Stop();
line.Glow:SetAlpha(0);
......@@ -91,6 +91,7 @@ function QUEST_TRACKER_MODULE:OnBlockHeaderClick(block, mouseButton)
end
local LINE_TYPE_ANIM = { template = "QuestObjectiveAnimLineTemplate", freeLines = { } };
local LINE_TYPE_WAYPOINT = { template = "QuestObjectiveWaypointLineTemplate", freeLines = { } };
-- *****************************************************************************************************
-- ***** ANIMATIONS
......@@ -242,6 +243,7 @@ function QuestObjectiveTracker_UpdatePOIs()
-- see if we already have a block for this quest
local block = QUEST_TRACKER_MODULE:GetExistingBlock(questID);
if ( block ) then
local isSuperTracked = questID == GetSuperTrackedQuestID();
if ( isComplete and isComplete < 0 ) then
isComplete = false;
elseif ( numObjectives == 0 and playerMoney >= requiredMoney and not startEvent ) then
......@@ -255,6 +257,8 @@ function QuestObjectiveTracker_UpdatePOIs()
numPOINumeric = numPOINumeric + 1;
poiButton = QuestPOI_GetButton(ObjectiveTrackerFrame.BlocksFrame, questID, "numeric", numPOINumeric);
end
elseif ( isSuperTracked and C_QuestLog.GetNextWaypoint(questID) ~= nil ) then
poiButton = QuestPOI_GetButton(ObjectiveTrackerFrame.BlocksFrame, questID, "waypoint", nil);
elseif ( isComplete ) then
poiButton = QuestPOI_GetButton(ObjectiveTrackerFrame.BlocksFrame, questID, "remote", nil);
end
......@@ -384,6 +388,7 @@ function QUEST_TRACKER_MODULE:Update()
end
if ( showQuest ) then
local isSuperTracked = questID == GetSuperTrackedQuestID();
local isSequenced = IsQuestSequenced(questID);
local existingBlock = QUEST_TRACKER_MODULE:GetExistingBlock(questID);
local block = QUEST_TRACKER_MODULE:GetBlock(questID);
......@@ -416,6 +421,13 @@ function QUEST_TRACKER_MODULE:Update()
else
QUEST_TRACKER_MODULE:AddObjective(block, "QuestComplete", QUEST_WATCH_QUEST_READY, nil, nil, OBJECTIVE_DASH_STYLE_HIDE, OBJECTIVE_TRACKER_COLOR["Complete"]);
end
if ( isSuperTracked ) then
local waypointTitle = C_QuestLog.GetNextWaypointText(questID);
if ( waypointTitle ~= nil ) then
QUEST_TRACKER_MODULE:AddObjective(block, "Waypoint", waypointTitle, LINE_TYPE_WAYPOINT, nil, OBJECTIVE_DASH_STYLE_HIDE, OBJECTIVE_TRACKER_COLOR["Waypoint"], nil, 20);
end
end
end
end
elseif ( questFailed ) then
......@@ -426,6 +438,14 @@ function QUEST_TRACKER_MODULE:Update()
local text = GetMoneyString(playerMoney).." / "..GetMoneyString(requiredMoney);
QUEST_TRACKER_MODULE:AddObjective(block, "Money", text);
end
if ( isSuperTracked ) then
local waypointTitle = C_QuestLog.GetNextWaypointText(questID);
if ( waypointTitle ~= nil ) then
QUEST_TRACKER_MODULE:AddObjective(block, "Waypoint", waypointTitle, LINE_TYPE_WAYPOINT, nil, OBJECTIVE_DASH_STYLE_HIDE, OBJECTIVE_TRACKER_COLOR["Waypoint"], nil, 20);
end
end
-- timer bar
if ( failureTime and block.currentLine ) then
local currentLine = block.currentLine;
......@@ -460,6 +480,8 @@ function QUEST_TRACKER_MODULE:Update()
numPOINumeric = numPOINumeric + 1;
poiButton = QuestPOI_GetButton(ObjectiveTrackerFrame.BlocksFrame, questID, "numeric", numPOINumeric);
end
elseif ( isSuperTracked and C_QuestLog.GetNextWaypoint(questID) ~= nil ) then
poiButton = QuestPOI_GetButton(ObjectiveTrackerFrame.BlocksFrame, questID, "waypoint", nil);
elseif ( isComplete ) then
poiButton = QuestPOI_GetButton(ObjectiveTrackerFrame.BlocksFrame, questID, "remote", nil);
end
......
......@@ -79,4 +79,24 @@
</AnimationGroup>
</Animations>
</Frame>
<Frame name="QuestObjectiveWaypointLineTemplate" inherits="ObjectiveTrackerLineTemplate" virtual="true">
<Size x="200" y="0"/>
<Layers>
<Layer level="ARTWORK">
<Texture parentKey="Icon" atlas="poi-traveldirections-arrow">
<Size x="13" y="17"/>
<Anchors>
<Anchor point="TOPLEFT" x="10" y="-4"/>
</Anchors>
</Texture>
</Layer>
</Layers>
<Scripts>
<OnLoad>
self.Text:ClearAllPoints();
self.Text:SetPoint("LEFT", self.Icon, "RIGHT", 2, 1);
</OnLoad>