Merge branch 'release/3.18.1'

Author: evil-morfar

.gitignore

@@ -2,4 +2,6 @@ sv_to_process.lua
 luacov.report.out
 .env
 .VSCodeCounter
-.debug
+.debug
+GEMINI.md
+copilot-instructions.md

.scripts/deploy.sh

@@ -11,7 +11,7 @@ echo "Executing $0" >&2
 
 # Process command-line options
 usage() {
-	echo "Usage: test.sh [-bcp]" >&2
+	echo "Usage: test.sh [-bcpx]" >&2
 	echo "  -b               Pack to _beta_ WoW edition." >&2
 	echo "  -c               Pack to _classic_ WoW edition." >&2
 	echo "  -p               Pack to _ptr_ WoW edition." >&2

.vscode/tasks.json

@@ -37,7 +37,7 @@
         {
             "label": "Busted All",
             "type": "shell",
-            "command": "busted",
+            "command": "busted.bat",
             "group": {
                 "kind": "test",
                 "isDefault": true
@@ -46,7 +46,7 @@
         {
             "label": "Busted All w/coverage",
             "type": "shell",
-            "command": "busted",
+            "command": "busted.bat",
             "group": {
                 "kind": "test",
                 "isDefault": true
@@ -58,18 +58,21 @@
         {
             "label": "Busted this file",
             "type": "shell",
-            "command": "busted",
+            "command": "busted.bat",
             "args": [
                 "--lpath=__tests/?.lua;__tests/wow_api/?.lua",
                 "-v",
                 "${file}",
             ],
             "windows": {
-                "args": [
-                    "--lpath=${workspaceFolder}\\__tests\\?.lua;__tests\\wow_api\\?.lua",
-                    "-v",
-                    "${file}",
-                ],
+                "options": {
+                    "shell": {
+                        "executable": "cmd.exe",
+                        "args": [
+                            "/c"
+                        ]
+                    }
+                },
             },
             "group": "test"
         },

Core/Constants.lua

@@ -57,6 +57,8 @@ addon.OPT_MORE_BUTTONS_VALUES = {
 	CATALYST = L.Catalyst_Items, -- items that can be converted to tier through catalyst
 	SPECIAL = L.Special_Effects_Items,
 	RARE = L.Rare_Items,
+
+	DECOR = _G.HOUSING_ITEM_TOAST_TYPE_DECOR,
 }
 
 --- Inventory types that can be converted to tier
@@ -198,6 +200,11 @@ addon.RESPONSE_CODE_GENERATORS = {
 	function(_, db, _, itemEquipLoc)
 		return db.enabledButtons.CATALYST and addon.CATALYST_ITEMS[itemEquipLoc] and "CATALYST" or nil
 	end,
+
+	-- Housing Decor 
+	function(_, db, _, _, classID)
+		return db.enabledButtons.DECOR and classID == Enum.ItemClass.Housing and "DECOR" or nil
+	end
 }
 
 --- @alias VersionCodes

Core/Defaults.lua

@@ -74,6 +74,7 @@ addon.defaults = {
 		showSpecIcon = false,
 		closeWithEscape = true,
 		timeoutFlash = true,
+		blockTradesInVoting = false,
 		chatFrameName = "DEFAULT_CHAT_FRAME", -- The chat frame to use for :Print()s
 		-- General - History
 		enableHistory = true,

Core/GlobalUpdates.lua

@@ -18,7 +18,7 @@ end
 
 addon.SendChatMessage = C_ChatInfo and C_ChatInfo.SendChatMessage or SendChatMessage
 
-Enum.LootMethod = Enum.LootMethod or {
+local EnumLootMethod = Enum.LootMethod or {
 	Freeforall = 0,
 	Roundrobin = 1,
 	Masterlooter = 2,
@@ -33,19 +33,19 @@ addon.GetLootMethod = C_PartyInfo and C_PartyInfo.GetLootMethod or
 function()
 	local method, partyID, raidId = GetLootMethod()
 	if not method then
-		method = Enum.LootMethod.Personal
+		method = EnumLootMethod.Personal
 	elseif method == "freeforall" then
-		method = Enum.LootMethod.Freeforall
+		method = EnumLootMethod.Freeforall
 	elseif method == "roundrobin" then
-		method = Enum.LootMethod.Roundrobin
+		method = EnumLootMethod.Roundrobin
 	elseif method == "master" then
-		method = Enum.LootMethod.Masterlooter
+		method = EnumLootMethod.Masterlooter
 	elseif method == "group" then
-		method = Enum.LootMethod.Group
+		method = EnumLootMethod.Group
 	elseif method == "needbeforegreed" then
-		method = Enum.LootMethod.Needbeforegreed
+		method = EnumLootMethod.Needbeforegreed
 	elseif method == "personalloot" then
-		method = Enum.LootMethod.Personal
+		method = EnumLootMethod.Personal
 	end
 	return method, partyID, raidId
 end

Locale/enUS.lua

@@ -589,6 +589,9 @@ L["opt_skipSessionFrame_name"] = "Skip Session Frame"
 L["opt_skipSessionFrame_desc"] = "Skips the Session Frame. NOTE: This causes the addon to start a session with all eligble items without you having a chance to edit the list!"
 L.opt_timeoutFlash_name = "Timeout Flash"
 L.opt_timeoutFlash_desc = "When enabled, the loot frame will flash when there's 5 seconds left to the item timeouts."
+L.opt_blockTradesInVoting_name = "Block Trades"
+L.opt_blockTradesInVoting_desc = "When enabled, any trade attempts will be cancelled while the voting frame is active."
+L.opt_blockTradesInVoting_message = "Trade from %s blocked"
 L["non_tradeable_reason_not_tradeable"] = "Not Tradeable"
 L["non_tradeable_reason_rejected_trade"] = "Wanted to keep item"
 L["non_tradeable_reason_nil"] = "Unknown"

Modules/TradeUI.lua

@@ -253,21 +253,27 @@ end
 --------------------------------------------------------------
 
 function TradeUI:OnEvent_TRADE_SHOW (event, ...)
-   self.isTrading = true
    wipe(self.tradeItems)
-
+   
    -- Try to grab the trader from Blizzard UI
    local target = _G.TradeFrameRecipientNameText:GetText()
    if not target or target == "" then
-      target = "NPC" -- Otherwise fallback to `UnitName("NPC")`
-   end
+	target = "NPC" -- Otherwise fallback to `UnitName("NPC")`
+	end
 
-   -- If target is from another realm, the name in the trade frame will be "Name(*)"
-   if target:find("(*)") then
+	-- If target is from another realm, the name in the trade frame will be "Name(*)"
+	if target:find("(*)") then
 		-- Remove the "(*)" so `UnitName` can attach realm.
 		target = string.sub(target, 1, -4)
-   end
-   self.tradeTarget = addon:UnitName(target)
+	end
+	if db.blockTradesInVoting and addon:GetActiveModule("votingframe"):IsActive() then
+		CloseTrade()
+		addon:Print(string.format(L["opt_blockTradesInVoting_message"], addon:GetClassIconAndColoredName(target)))
+		return
+	end
+
+	self.tradeTarget = addon:UnitName(target)
+	self.isTrading = true
 
    local count = self:GetNumAwardedInBagsToTradeWindow()
 

Modules/options.lua

@@ -478,6 +478,12 @@ function addon:OptionsTable()
 										desc = L.opt_timeoutFlash_desc,
 										type = "toggle"
 									},
+									blockTradesInVoting = {
+										order = 7.5,
+										name = L.opt_blockTradesInVoting_name,
+										desc = L.opt_blockTradesInVoting_desc,
+										type = "toggle",
+									},
 									chatFrameName = {
 										order = 8,
 										name = L["opt_chatFrameName_name"],

Modules/votingFrame.lua

@@ -251,6 +251,10 @@ function RCVotingFrame:Show()
 	end
 end
 
+function RCVotingFrame:IsActive()
+	return active
+end
+
 function RCVotingFrame:HasUnawardedItems ()
 	for _,v in pairs(lootTable) do
 		if not v.awarded then return true end