Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,7 @@ stds.wow = {
"GetItemQualityByID",
"GetItemQualityColor",
"GetItemSpell",
"GetItemStats",
"GetItemSubClassInfo",
"GetItemUpgradeInfo",
"IsCosmeticItem",
Expand Down
6 changes: 3 additions & 3 deletions Initialization.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local VERSION_TEXT = "1.9.2 b";
local VERSION_DATE = 1778800000;
local VERSION_TEXT = "1.9.2 c";
local VERSION_DATE = 1779500000;


local addonName, addon = ...
Expand Down Expand Up @@ -570,7 +570,7 @@ do

addon.IS_MOP = C_AddOns.GetAddOnMetadata(addonName, "X-Expansion") == "MOP";

addon.IS_12_0_5 = IsToCVersionEqualOrNewerThan(120005);
addon.IS_12_0_7 = IsToCVersionEqualOrNewerThan(120007);


function addon.GetLastLoginTime()
Expand Down
31 changes: 31 additions & 0 deletions Modules/ControlCenter/Changelog/enUS.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,37 @@ local changelogs = addon.ControlCenter.changelogs;


changelogs[10902] = {
{
type = "date",
versionText = "1.9.2 c",
timestamp = 1779500000,
},

{
type = "p",
bullet = true,
text = "Loot Window: Added a highlight effect to looted pets and equipment with bonus tertiary stats.",
},

{
type = "p",
bullet = true,
text = "Expansion Summary: Fixed a text display issue for \"Prey\" while on the quest \"Preferential Killing.\"",
},

{
type = "p",
bullet = true,
text = "Tooltips: Vendor location instructions now only display when hovering over items in your bags, rather than on all tooltip sources.",
},

{
type = "br",
},
{
type = "br",
},

{
type = "date",
versionText = "1.9.2 b",
Expand Down
2 changes: 1 addition & 1 deletion Modules/ExpansionLandingPage/Basic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1718,7 +1718,7 @@ do --Expansion Select
local CurrentExpansionID;
local ExpansionData = {
[11] = {name = EXPANSION_NAME10}, --TWW
[12] = {name = EXPANSION_NAME11, isWIP = true}, --MID
[12] = {name = EXPANSION_NAME11, isWIP = false}, --MID
[5] = {name = EXPANSION_NAME4}, --MOP
};

Expand Down
8 changes: 4 additions & 4 deletions Modules/ExpansionLandingPage/FactionUtil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ local OverrideFactionInfo = {
do --Layout MID
local MajorFactionLayout = {
[1] = {
--{factionID = 2792}, --Ritual Sites
{factionID = 2792}, --Ritual Sites
{factionID = 2764}, --Prey S1
{factionID = 2742, --Delves S1
subFactions = {
Expand All @@ -184,9 +184,9 @@ do --Layout MID

LandingPageUtil.AddExpansionData(12, "factionLayout", MajorFactionLayout);

if addon.IS_12_0_5 then --For PTR
table.insert(MajorFactionLayout[1], 1, {factionID = 2792});
end
--if addon.IS_12_0_7 then --For PTR
--table.insert(MajorFactionLayout[1], 1, {factionID = 2792});
--end
end


Expand Down
4 changes: 2 additions & 2 deletions Modules/ExpansionLandingPage/Retail/MID_Activity.lua
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ do
--]]

function SetupFuncs.HuntTable(listButton)
local activeQuestID = C_QuestLog.GetActivePreyQuest();
if activeQuestID then
local activeQuestID = C_QuestLog.GetActivePreyQuest() or 91277; -- Prey: Preferential Killing
if C_QuestLog.IsOnQuest(activeQuestID) then
listButton:SetQuest(activeQuestID);
listButton.flagQuest = activeQuestID;
listButton.completed = C_QuestLog.IsQuestFlaggedCompleted(activeQuestID);
Expand Down
5 changes: 5 additions & 0 deletions Modules/GameTooltip_VendorLocation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ do

if self.enabled then
if ItemData[itemID] and not InCombatLockdown() then
local info = tooltip.processingInfo;
if not (info and info.getterName == "GetBagItem") then
return false;
end

local data = ItemData[itemID];
self.currentData = data;

Expand Down
49 changes: 43 additions & 6 deletions Modules/LootUI_Main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -571,12 +571,20 @@ do --UI ItemButton

function ItemFrameMixin:SetItem(data)
self.singleItemID = data.id;
self:SetNameByQuality(data.name, data.quality);

local showGlow, subtitle = IsRareItem(data);

if subtitle then
self:SetNameByQuality(string.format("%s\n|cff19ff19%s|r", data.name, subtitle), data.quality);
else
self:SetNameByQuality(data.name, data.quality);
end

self:SetIcon(data.icon, data);
self:SetCount(data);
self:Layout();

if IsRareItem(data) then
if showGlow then
self:ShowGlow(true);
else
self:ShowGlow(false);
Expand Down Expand Up @@ -1995,12 +2003,41 @@ do --Rare Items
[224025] = true, --Crackling Shard
};

local TertiaryStats = {
"ITEM_MOD_CR_LIFESTEAL_SHORT",
"ITEM_MOD_CR_AVOIDANCE_SHORT",
"ITEM_MOD_CR_SPEED_SHORT",
"ITEM_MOD_CR_STURDINESS_SHORT",
--"ITEM_MOD_STAMINA_SHORT", -- debug
};

local ItemStatExclusion = {
-- Items that come with tertiaries
[251783] = "ITEM_MOD_CR_SPEED_SHORT", -- Lost Idol of the Hash'ey
[262754] = "ITEM_MOD_CR_SPEED_SHORT", -- Void Pearl of Haste
};

function IsRareItem(data)
if RareItems[data.id] then
return true
elseif data.classID == 15 and data.subclassID == 5 then
--Mount
return true
return true;
elseif data.classID == 15 and (data.subclassID == 2 or data.subclassID == 5) then
-- CompanionPet/Mount
return true;
elseif data.classID == 17 then
-- Battlepet
return true;
elseif data.classID == 2 or data.classID == 4 and data.link and C_Item.GetItemStats then
-- Equipment with tertiary stats. Retail only.
local stats = C_Item.GetItemStats(data.link);
if stats then
local excludeStat = ItemStatExclusion[data.id];
for _, k in ipairs(TertiaryStats) do
if stats[k] and k ~= excludeStat then
local subtitle = _G[k];
return true, subtitle;
end
end
end
end
end
end
Expand Down