Merge branch 'release/3.11.0'

Author: evil-morfar

.luacheckrc

@@ -2700,7 +2700,6 @@ globals = {
 	"GetItemSpecInfo",
 	"GetItemSpell",
 	"GetItemStatDelta",
-	"GetItemStats",
 	"GetItemSubClassInfo",
 	"GetItemUniqueness",
 	"GetItemUpdateLevel",

.specs/Integration/Utils/AutoPass.spec.lua

@@ -60,6 +60,7 @@ addon.defaults = {
 		autoPassBoE = true,
 		autoPassTransmog = true,
 		autoPassTransmogSource = true,
+		autoPassWeapons = true, -- Auto pass on weapons that can't be used for your class.
 		printResponse = false, -- Print response in chat
 		autoGroupLootGuildGroupOnly = true,
 		-- General - Frame

Core/Defaults.lua

@@ -519,6 +519,8 @@ L["opt_autoAddItems_desc"] = "Automatically add all eligible items to a session.
 L["opt_autoAddPets_name"] = "Add Pets"
 L["opt_autoAddPets_desc"] = "Automatically add all Companion Pets to a session."
 L["opt_autoAwardPrioList_desc"] = "Items are awarded to the first candidate found in your group according to this priority list."
+L.opt_autoPassWeapons_name = "Auto Pass Weapons"
+L.opt_autoPassWeapons_desc = "Check to enable auto passing of weapons your class can't equip."
 L.opt_autoGroupLootGuildGroupOnly_name = "Guild Groups Only"
 L.opt_autoGroupLootGuildGroupOnly_desc = "When enabled, RCLootCouncil will only do group loot auto pass when you're in a guild group."
 L["opt_autoTrade_desc"] = "Check to automatically add awarded items to the trade window when trading with the winner. If disabled, you'll see a popup before items are added."

Locale/enUS.lua

@@ -427,6 +427,12 @@ local mapIDsToText = {
    [2070] = "Battle of Dazar'alor",
    [2096] = "Crucible of Storms",
    [2164] = "The Eternal Palace",
+	[2217] = "Ny'alotha",
+	[2296] = "Castle Nathria",
+	[2450] = "Sanctum of Domination",
+	[2481] = "Sepulcher of the First Ones",
+	[2522] = "Vault of the Incarnates",
+	[2569] = "Aberrus, the Shadowed Crucible",
 }
 
 local diffIDToText = {
@@ -464,34 +470,41 @@ local diffIDToText = {
    [149] = "Heroic",
 }
 
+local function instanceNameFromMapID(mapID)
+	if not (C_EncounterJournal.GetInstanceForGameMap and EJ_GetInstanceInfo) then return "" end
+	return select(1,EJ_GetInstanceInfo(C_EncounterJournal.GetInstanceForGameMap(mapID)))
+end
+
 function private:RebuildInstance(data, t, line)
-   local instance, diffID, mapID = data[11], data[13], data[14]
-   if mapID and diffID then
-      mapID = tonumber(mapID)
-      diffID = tonumber(diffID)
-      if mapIDsToText[mapID] and diffIDToText[diffID] then
-         t.instance = mapIDsToText[mapID] .."-".. diffIDToText[diffID]
-         t.mapID = mapID
-         t.difficultyID = diffID
-      end
-   elseif mapID and not diffID and not instance then
-      mapID = tonumber(mapID)
-      t.instance = mapIDsToText[mapID]
-      t.mapID = mapID
-      t.difficultyID = nil
-   elseif instance then
-      if string.find(instance, "-") then
-         mapID = mapID or tInvert(mapIDsToText)[(string.split("-",instance))]
-         diffID = diffID or tInvert(diffIDToText)[select(2,string.split("-",instance))]
-      else
-         mapID = mapID or tInvert(mapIDsToText)[instance]
-      end
-      t.instance = instance
-      t.mapID = mapID
-      t.difficultyID = diffID
-   -- else
-      -- self:AddError(line, string.format("%s|%s|%s", tostring(instance), tostring(diffID), tostring(mapID)), "Could not recreate instance info.")
-   end
+	local instance, diffID, mapID = data[11], tonumber(data[13] or 0), tonumber(data[14] or 0)
+	if mapID and mapID > 0 then
+		if diffID > 0 then
+			local instanceNameFromMapID = instanceNameFromMapID(mapID)
+			if instanceNameFromMapID == "" and mapIDsToText[mapID] and diffIDToText[diffID] then
+				t.instance = mapIDsToText[mapID] .."-".. diffIDToText[diffID]
+			else
+				t.instance = instanceNameFromMapID .. "-" .. diffIDToText[diffID]
+			end
+			t.mapID = mapID
+			t.difficultyID = diffID
+		elseif not instance then
+			t.instance = mapIDsToText[mapID] or ""
+			t.mapID = mapID
+			t.difficultyID = nil
+		end
+	elseif instance then
+		if string.find(instance, "-") then
+			mapID = mapID > 0 and mapID or tInvert(mapIDsToText)[(string.split("-",instance))]
+			diffID = diffID > 0 and diffID or tInvert(diffIDToText)[select(2,string.split("-",instance))]
+		else
+			mapID = mapID or tInvert(mapIDsToText)[instance]
+		end
+		t.instance = instance
+		t.mapID = mapID
+		t.difficultyID = diffID
+	-- else
+		-- self:AddError(line, string.format("%s|%s|%s", tostring(instance), tostring(diffID), tostring(mapID)), "Could not recreate instance info.")
+	end
 end
 
 function private:AddError (lineNum, value, desc)

Modules/History/CSVImport.lua

@@ -485,7 +485,7 @@ function LootHistory.SetCellResponse(rowFrame, frame, data, cols, row, realrow,
 	local args = data[realrow].cols[column].args
 	frame.text:SetText(args.response)
 
-	if args.color and type(args.color) == "table" then -- Never version saves the color with the entry
+	if args.color and type(args.color) == "table" and type(args.color[1]) == "number" then -- Never version saves the color with the entry
 		frame.text:SetTextColor(unpack(args.color))
 	elseif args.responseID and args.responseID > 0 then -- try to recreate color from ID
 		frame.text:SetTextColor(unpack(addon:GetResponse("default", args.responseID).color))

Modules/History/lootHistory.lua

@@ -395,14 +395,20 @@ function addon:OptionsTable()
 										type = "toggle",
 										disabled = function() return self.db.profile.autoPassTransmog end
 									},
-									printResponse = {
+									autoPassWeapons = {
 										order = 7,
+										name = L.opt_autoPassWeapons_name,
+										desc = L.opt_autoPassWeapons_desc,
+										type = "toggle",
+									},
+									printResponse = {
+										order = 8,
 										name = L["Print Responses"],
 										desc = L["print_response_desc"],
 										type = "toggle",
 									},
 									autoGroupLootGuildGroupOnly = {
-										order = 8,
+										order = 9,
 										name = L.opt_autoGroupLootGuildGroupOnly_name,
 										desc = L.opt_autoGroupLootGuildGroupOnly_desc,
 									    type = "toggle"

Modules/options.lua

@@ -38,7 +38,6 @@ end
 
 function RCSessionFrame:OnEnable()
 	addon.Log("RCSessionFrame enabled")
-	self:RegisterMessage("RCLootStatusReceived", "UpdateLootStatus")
 	addon:RegisterEvent("CINEMATIC_START", self.OnCinematicStart, self)
 	addon:RegisterEvent("CINEMATIC_STOP", self.OnCinematicStop, self)
 	self.showAfterCinematic = false
@@ -48,7 +47,6 @@ end
 function RCSessionFrame:OnDisable()
 	self.frame:Hide()
 	self.frame.rows = {}
-	self:UnregisterMessage("RCLootStatusReceived")
 	awardLater = false
 	self.showAfterCinematic = false
 	addon.Log("RCSessionFrame disabled")
@@ -140,20 +138,6 @@ function RCSessionFrame:Update()
 	end
 end
 
-function RCSessionFrame:UpdateLootStatus ()
-	if not self.frame then return end
-	local status, list = addon:GetLootStatusData()
-	self.frame.lootStatus:SetText(status)
-	self.frame.lootStatus:SetScript("OnEnter", function()
-		GameTooltip:SetOwner(self.frame.lootStatus, "ANCHOR_RIGHT")
-		GameTooltip:AddLine(L["Loot Status"])
-		for _, v in ipairs(list) do
-			GameTooltip:AddDoubleLine(addon:GetUnitClassColoredName(v.name), v.text)
-		end
-		GameTooltip:Show()
-	end)
-end
-
 function RCSessionFrame:DeleteItem(session, row)
 	addon.Log:D("Delete row:", row, "Sesison:", session)
 	ml:RemoveItem(session) -- remove the item from MLs lootTable
@@ -259,16 +243,6 @@ function RCSessionFrame:GetFrame()
 	end)
 	f.closeBtn = b2
 
-	-- Loot Status
-	f.lootStatus = addon.UI:New("Text", f.content, " ")
-	f.lootStatus:SetTextColor(1,1,1,1) -- White for now
-	f.lootStatus:SetHeight(20)
-	f.lootStatus:SetWidth(75)
-	-- f.lootStatus:SetPoint("BOTTOMRIGHT", f, "BOTTOMRIGHT", -10, 14)
-	f.lootStatus:SetPoint("LEFT", f.closeBtn, "RIGHT", 13, 1)
-	f.lootStatus:SetScript("OnLeave", addon.Utils.HideTooltip)
-	f.lootStatus.text:SetJustifyH("LEFT")
-
 	local st = ST:CreateST(self.scrollCols, 5, ROW_HEIGHT, nil, f.content)
 	st.head:SetHeight(0)
 	st.frame:SetPoint("TOPLEFT",f,"TOPLEFT",10,-20)

Modules/sessionFrame.lua

@@ -93,7 +93,6 @@ end
 function RCVotingFrame:OnEnable()
 	self:RegisterComms()
 	self:RegisterBucketEvent({"UNIT_PHASE", "ZONE_CHANGED_NEW_AREA"}, 1, "Update") -- Update "Out of instance" text when any raid members change zone
-	self:RegisterMessage("RCLootStatusReceived", "UpdateLootStatus")
 	self:RegisterMessage("RCLootTableAdditionsReceived", "OnLootTableAdditionsReceived")
 	db = addon:Getdb()
 	--active = true
@@ -113,7 +112,6 @@ function RCVotingFrame:OnDisable() -- We never really call this
 	self:Hide()
 	self.frame:SetParent(nil)
 	self.frame = nil
-	wipe(addon.lootStatus)
 	wipe(lootTable)
 	active = false
 	session = 1
@@ -998,6 +996,7 @@ function RCVotingFrame:GetFrame()
 	iState:SetPoint("LEFT", ilvl, "RIGHT", 5, 0)
 	iState:SetTextColor(0,1,0,1) -- Green
 	iState:SetText("")
+	iState:SetJustifyH("LEFT")
 	f.iState = iState
 
 	local iType = f.content:CreateFontString(nil, "OVERLAY", "GameFontNormal")
@@ -1085,15 +1084,6 @@ function RCVotingFrame:GetFrame()
 	rf:SetWidth(rft:GetStringWidth())
 	f.rollResult = rf
 
-	-- Loot Status
-	f.lootStatus = addon.UI:New("Text", f.content, " ")
-	f.lootStatus:SetTextColor(1,1,1,1) -- White for now
-	f.lootStatus:SetHeight(20)
-	f.lootStatus:SetWidth(150)
-	f.lootStatus:SetPoint("RIGHT", rf, "LEFT", -10, 0)
-	f.lootStatus:SetScript("OnLeave", addon.Utils.HideTooltip)
-	f.lootStatus.text:SetJustifyH("RIGHT")
-
 	-- Owner
 	f.ownerString = {}
 	f.ownerString.icon = addon.UI:New("Icon", f.content)
@@ -1140,36 +1130,6 @@ function RCVotingFrame:GetFrame()
 	return f;
 end
 
-function RCVotingFrame:UpdateLootStatus()
-	if not self.frame then return end -- Might not be created yet
-	if not addon.isCouncil then return end
-
-	local status, list = addon:GetLootStatusData()
-	self.frame.lootStatus:SetText(L["Loot Status"] .. ": " .. status)
-	self.frame.lootStatus:SetScript("OnEnter", function()
-		GameTooltip:SetOwner(UIParent, "ANCHOR_CURSOR")
-		GameTooltip:AddLine(L["Loot Status"])
-		if addon.debug then
-			GameTooltip:AddLine("Debug")
-			for id, v in pairs(addon.lootStatus) do
-				if id ~= addon.lastEncounterID then
-					GameTooltip:AddDoubleLine(id, v.num,1,1,1,1,1,1)
-				else
-					GameTooltip:AddLine("EncounterID: " .. addon.lastEncounterID)
-					for player, item in pairs(v) do
-						GameTooltip:AddDoubleLine(player, item)
-					end
-				end
-			end
-			GameTooltip:AddLine(" ")
-		end
-		for _, v in ipairs(list) do
-			GameTooltip:AddDoubleLine(addon:GetUnitClassColoredName(v.name), v.text)
-		end
-		GameTooltip:Show()
-	end)
-end
-
 function RCVotingFrame:UpdatePeopleToVote()
 	local hasVoted = {}
 	local shouldVote = {}

Modules/votingFrame.lua

@@ -1,8 +1,8 @@
 ## Author: Potdisc
-## Interface: 100205
-## Notes: Interface for running a Loot Council v3.10.5
+## Interface: 100206
+## Notes: Interface for running a Loot Council v3.11.0
 ## Title: RCLootCouncil
-## Version: 3.10.5
+## Version: 3.11.0
 ## SavedVariables: RCLootCouncilDB, RCLootCouncilLootDB
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, lib-st, LibWindow-1.1, LibDialog-1.0
 ## X-Curse-Project-ID: 39928