Merge branch 'dev'

ls- · Jan 29, 2023 · 3888cc0 · 3888cc0
2 parents 55b22f3 + 43ce655
commit 3888cc0
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 11 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -52,6 +52,7 @@ read_globals = {
 	"C_QuestLog",
 	"C_Scenario",
 	"C_TaskQuest",
+	"C_Texture",
 	"C_Timer",
 	"C_ToyBox",
 	"C_TradeSkillUI",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## Version 100005.01
+
+- Added 10.0.5 support.
+
+### Loot (Common)
+
+- Added support for reagent ranks.
+
+### Loot (Currency)
+
+- Updated the currency blacklist.
+
 ## Version 100002.02
 
 - Fixed "10.0 Dragonrider PVP - Whirling Surge Dismounts" spam.

diff --git a/ls_Toasts/core/changelog.lua b/ls_Toasts/core/changelog.lua
@@ -6,7 +6,13 @@ local _G = getfenv(0)
 
 -- Mine
 E.CHANGELOG = [[
-- Fixed "10.0 Dragonrider PVP - Whirling Surge Dismounts" spam.
-- Updated French translation. Translated by agstegiel@Curse and Braincell1980@Curse.
-- Updated German translation. Translated by MrKimab@Curse.
+- Added 10.0.5 support.
+
+### Loot (Common)
+
+- Added support for reagent ranks.
+
+### Loot (Currency)
+
+- Updated the currency blacklist.
 ]]
diff --git a/ls_Toasts/ls_Toasts.toc b/ls_Toasts/ls_Toasts.toc
@@ -1,6 +1,6 @@
-## Interface: 100002
+## Interface: 100005
 ## Author: lightspark
-## Version: 100002.02
+## Version: 100005.01
 ## Title: LS: |cff1a9fc0Toasts|r
 ## Notes: Better toasts, cheers!
 ## SavedVariables: LS_TOASTS_GLOBAL_CONFIG

diff --git a/ls_Toasts/systems/loot_common.lua b/ls_Toasts/systems/loot_common.lua
@@ -103,14 +103,14 @@ local function Toast_SetUp(event, link, quantity)
 	end
 
 	if isNew then
-		local name, quality, icon, _, classID, subClassID, bindType, isQuestItem
+		local name, quality, icon, _, classID, subClassID, bindType, isQuestItem, isCraftingReagent
 
 		if linkType == "battlepet" then
 			local _, speciesID, _, breedQuality, _ = s_split(":", originalLink)
 			name, icon = C_PetJournal.GetPetInfoBySpeciesID(speciesID)
 			quality = tonumber(breedQuality)
 		else
-			name, _, quality, _, _, _, _, _, _, icon, _, classID, subClassID, bindType = GetItemInfo(originalLink)
+			name, _, quality, _, _, _, _, _, _, icon, _, classID, subClassID, bindType, _, _, isCraftingReagent = GetItemInfo(originalLink)
 			isQuestItem = bindType == 4 or (classID == 12 and subClassID == 0)
 		end
 
@@ -155,6 +155,16 @@ local function Toast_SetUp(event, link, quantity)
 				end
 			end
 
+			if isCraftingReagent then
+				local reagentQuality = C_TradeSkillUI.GetItemReagentQualityByItemInfo(itemID)
+				if reagentQuality then
+					reagentQuality = C_Texture.GetCraftingReagentQualityChatIcon(reagentQuality)
+					if reagentQuality then
+						name = name .. " " .. reagentQuality
+					end
+				end
+			end
+
 			if not toast.IconHL.isHidden then
 				toast.IconHL:SetShown(isQuestItem)
 			end
@@ -246,6 +256,12 @@ local function Test()
 		Toast_SetUp("COMMON_LOOT_TEST", link, m_random(9, 99))
 	end
 
+	-- item, Hochenblume, Rank 3
+	_, link = GetItemInfo(191462)
+	if link then
+		Toast_SetUp("COMMON_LOOT_TEST", link, m_random(9, 99))
+	end
+
 	-- battlepet, Anubisath Idol
 	Toast_SetUp("COMMON_LOOT_TEST", "battlepet:1155:25:3:1725:276:244:0000000000000000", 1)
 end

diff --git a/ls_Toasts/systems/loot_currency.lua b/ls_Toasts/systems/loot_currency.lua
@@ -164,8 +164,8 @@ local BLACKLIST = {
 	[2152] = true, -- Red Whelp (Sleepy Ruby Warmth)
 	[2153] = true, -- Red Whelp (Under Red Wings)
 	[2165] = true, -- Profession - Public Order Capacity - Blacksmithing
-	[2166] = true, -- Inspiration Catalyst Account-Wide Currency
-	[2167] = true, -- Inspiration Catalyst Anti-Currency
+	[2166] = true, -- Renascent Lifeblood
+	[2167] = true, -- Catalyst Charges
 	[2169] = true, -- Profession - Public Order Capacity - Leatherworking
 	[2170] = true, -- Profession - Public Order Capacity - Alchemy
 	[2171] = true, -- Profession - Public Order Capacity - Tailoring
@@ -177,6 +177,7 @@ local BLACKLIST = {
 	[1553] = true, -- Azerite
 	[1585] = true, -- Account Wide Honor
 	[1586] = true, -- Honor Level
+	[2001] = true, -- Paden Test Currency
 	-- 248 (Torghast UI (Hidden))
 	[1909] = true, -- Torghast - Scoreboard - Clear Percent
 	[1910] = true, -- Torghast - Scoreboard - Souls Percent
@@ -319,7 +320,7 @@ local BLACKLIST = {
 	[2131] = true, -- Dragon Racing - Scoreboard - Personal Best Time - Fraction 10
 	[2132] = true, -- Dragon Racing - Scoreboard - Personal Best Time - Fraction 100
 	[2133] = true, -- Dragonriding - Accepting Passengers [DNT]
-	[2154] = true, -- Dragon Racing - Personal Best Record - Waking Shores 01 Test
+	[2154] = true, -- Dragon Racing - Personal Best Record - Waking Shores 01 Reverse
 	[2155] = true, -- Dragon Racing - Best Time Display - Whole
 	[2156] = true, -- Dragon Racing - Best Time Display - Fraction 1
 	[2157] = true, -- Dragon Racing - Best Time Display - Fraction 10
@@ -328,7 +329,37 @@ local BLACKLIST = {
 	[2160] = true, -- Dragon Racing - Best Time Display - Advanced - Fraction 1
 	[2161] = true, -- Dragon Racing - Best Time Display - Advanced - Fraction 10
 	[2162] = true, -- Dragon Racing - Best Time Display - Advanced - Fraction 100
-	[2235] = true, -- 10.0 Dragonrider PVP - Whirling Surge Dismounts [DNT]
+	[2176] = true, -- Dragon Racing - Personal Best Record - Waking Shores 02 Reverse
+	[2177] = true, -- Dragon Racing - Personal Best Record - Waking Shores 03 Reverse
+	[2178] = true, -- Dragon Racing - Personal Best Record - Waking Shores 04 Reverse
+	[2179] = true, -- Dragon Racing - Personal Best Record - Waking Shores 05 Reverse
+	[2180] = true, -- Dragon Racing - Personal Best Record - Waking Shores 06 Reverse
+	[2181] = true, -- Dragon Racing - Personal Best Record - Waking Shores 07 Reverse
+	[2182] = true, -- Dragon Racing - Personal Best Record - Waking Shores 08 Reverse
+	[2183] = true, -- Dragon Racing - Personal Best Record - Ohn'ahran Plains01Reverse
+	[2184] = true, -- Dragon Racing - Personal Best Record - Ohn'ahran Plains02Reverse
+	[2185] = true, -- Dragon Racing - Personal Best Record - Ohn'ahran Plains03Reverse
+	[2186] = true, -- Dragon Racing - Personal Best Record - Ohn'ahran Plains04Reverse
+	[2187] = true, -- Dragon Racing - Personal Best Record - Ohn'ahran Plains07Reverse
+	[2188] = true, -- Dragon Racing - Personal Best Record - Azure Span 01 Reverse
+	[2189] = true, -- Dragon Racing - Personal Best Record - Azure Span 02 Reverse
+	[2190] = true, -- Dragon Racing - Personal Best Record - Azure Span 03 Reverse
+	[2191] = true, -- Dragon Racing - Personal Best Record - Azure Span 04 Reverse
+	[2192] = true, -- Dragon Racing - Personal Best Record - Azure Span 05 Reverse
+	[2193] = true, -- Dragon Racing - Personal Best Record - Azure Span 06 Reverse
+	[2194] = true, -- Dragon Racing - Personal Best Record - Thaldraszus 01 Reverse
+	[2195] = true, -- Dragon Racing - Personal Best Record - Thaldraszus 02 Reverse
+	[2196] = true, -- Dragon Racing - Personal Best Record - Thaldraszus 03 Reverse
+	[2197] = true, -- Dragon Racing - Personal Best Record - Thaldraszus 04 Reverse
+	[2198] = true, -- Dragon Racing - Personal Best Record - Thaldraszus 05 Reverse
+	[2199] = true, -- Dragon Racing - Personal Best Record - Thaldraszus 06 Reverse
+	[2224] = true, -- Dragon Racing - Best Time Display - Reverse - Whole
+	[2225] = true, -- Dragon Racing - Best Time Display - Reverse - Fraction 1
+	[2226] = true, -- Dragon Racing - Best Time Display - Reverse - Fraction 10
+	[2227] = true, -- Dragon Racing - Best Time Display - Reverse - Fraction 100
+	[2235] = true, -- 10.0 Dragonrider PVP - Whirling Surge Dismounts 10.0.2 [DNT]
+	[2236] = true, -- Dragon Racing - Scoreboard - Race Complete Time MS
+	[2237] = true, -- 10.0 Dragonrider PVP - Whirling Surge Dismounts 10.0.5 [DNT]
 	-- 252 (Tuskarr - Fishing Nets (Hidden))
 	[2113] = true, -- Tuskarr - Fishing Net - Location 01 - Net 01 - Loot
 	[2114] = true, -- Tuskarr - Fishing Net - Location 01 - Net 04 (Quest) - Loot