Skip to content

Commit 08f738e

Browse files
committed
Midnight: Fix display of reagent quality icons
1 parent edd54c7 commit 08f738e

File tree

5 files changed

+18
-19
lines changed

5 files changed

+18
-19
lines changed

Source/Groups/ViewItem.lua

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,18 +95,17 @@ end
9595

9696
-- Adds Dragonflight (10.0) crafting quality icon for reagents on retail only
9797
function AuctionatorGroupsViewItemMixin:ApplyQualityIcon(itemLink)
98-
if C_TradeSkillUI and C_TradeSkillUI.GetItemReagentQualityByItemInfo then
99-
local quality = C_TradeSkillUI.GetItemReagentQualityByItemInfo(itemLink)
100-
if quality ~= nil then
98+
if C_TradeSkillUI and C_TradeSkillUI.GetItemReagentQualityInfo then
99+
local info = C_TradeSkillUI.GetItemReagentQualityInfo(itemLink)
100+
if info ~= nil then
101101
if not self.ProfessionQualityOverlay then
102102
self.ProfessionQualityOverlay = self:CreateTexture(nil, "OVERLAY");
103103
self.ProfessionQualityOverlay:SetPoint("TOPLEFT", -2, 2);
104104
self.ProfessionQualityOverlay:SetDrawLayer("OVERLAY", 7);
105105
end
106106
self.ProfessionQualityOverlay:Show()
107107

108-
local atlas = ("Professions-Icon-Quality-Tier%d-Inv"):format(quality);
109-
self.ProfessionQualityOverlay:SetAtlas(atlas, TextureKitConstants.UseAtlasSize);
108+
self.ProfessionQualityOverlay:SetAtlas(info.iconInventory, TextureKitConstants.UseAtlasSize);
110109
else
111110
self:HideQualityIcon()
112111
end

Source/Tabs/Shopping/Mixins/Item.lua

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@ local function InitializeTierDropDown(dropDown)
2525
table.insert(tierIDs, NO_QUALITY)
2626

2727
if Auctionator.Constants.IsRetail then
28-
for tier = 1, 3 do
29-
table.insert(tierStrings, Auctionator.Utilities.GetCraftingQualityMarkup(tier))
28+
for tier = 1, 2 do
29+
table.insert(tierStrings, CreateAtlasMarkup("Professions-ChatIcon-Quality-12-Tier" .. tier) .. "/" .. CreateAtlasMarkup("Professions-Icon-Quality-Tier" .. tier .. "-Small", 17, 17))
30+
table.insert(tierIDs, tostring(tier))
31+
end
32+
do
33+
table.insert(tierStrings, CreateAtlasMarkup("Professions-Icon-Quality-Tier" .. 3 .. "-Small", 17, 17))
3034
table.insert(tierIDs, tostring(tier))
3135
end
3236
end

Source/Tooltips/Main.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ function Auctionator.Tooltip.AddReagentsAuctionTip(tooltipFrame, allReagents)
364364
local auctionAge = Auctionator.Database:GetPriceAge(key)
365365
local qualitySuffix = ""
366366
if reagent.quality then
367-
qualitySuffix = " " .. Auctionator.Utilities.GetCraftingQualityMarkup(reagent.quality)
367+
qualitySuffix = " " .. CreateAtlasMarkup(C_TradeSkillUI.GetItemReagentQualityInfo(reagent.itemID).iconChat, 17, 17)
368368
end
369369
local countString = ""
370370
if showStackPrices then

Source_ModernAH/Tabs/DataProviders/ItemKeyLoading.lua

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,12 @@ function AuctionatorItemKeyLoadingMixin:ProcessItemKey(rowEntry, itemKeyInfo)
1919
itemKeyInfo,
2020
false
2121
)
22-
local icon
2322
if C_TradeSkillUI and C_TradeSkillUI.GetItemReagentQualityByItemInfo then
24-
local quality = C_TradeSkillUI.GetItemReagentQualityByItemInfo(rowEntry.itemKey.itemID)
25-
if quality then
26-
icon = Auctionator.Utilities.GetCraftingQualityMarkup(quality)
23+
local info = C_TradeSkillUI.GetItemReagentQualityInfo(rowEntry.itemKey.itemID)
24+
if info then
25+
text = text .. " " .. CreateAtlasMarkup(info.iconChat, 17, 17)
2726
end
2827
end
29-
if icon then
30-
text = text .. " " .. icon
31-
end
3228

3329
rowEntry.itemName = text
3430
rowEntry.plainItemName = itemKeyInfo.itemName

Source_ModernAH/Tabs/Selling/Mixins/SaleItem.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,13 +316,13 @@ end
316316
-- The exact item name is only loaded when needed as it slows down loading the
317317
-- bag items too much to do in BagDataProvider.
318318
function AuctionatorSaleItemMixin:SetItemName()
319-
local reagentQuality
319+
local reagentQualityInfo
320320
if Auctionator.Constants.IsRetail then
321-
reagentQuality = C_TradeSkillUI.GetItemReagentQualityByItemInfo(self.itemInfo.itemID)
321+
reagentQualityInfo = C_TradeSkillUI.GetItemReagentQualityInfo(self.itemInfo.itemID)
322322
end
323323
local itemName = self.itemInfo.itemName
324-
if reagentQuality then
325-
itemName = itemName .. " " .. Auctionator.Utilities.GetCraftingQualityMarkup(reagentQuality)
324+
if reagentQualityInfo then
325+
itemName = itemName .. " " .. CreateAtlasMarkup(reagentQualityInfo.iconChat, 17, 17)
326326
elseif self.itemInfo.itemLevel then
327327
itemName = AUCTIONATOR_L_ITEM_NAME_X_ITEM_LEVEL_X:format(itemName, self.itemInfo.itemLevel)
328328
elseif self.itemInfo.itemLink:find("battlepet", nil, true) then

0 commit comments

Comments
 (0)