diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 5c703893..baa266c8 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -122,9 +122,10 @@ local roleBySpecTextureName = { ---@return string function DF.UnitGroupRolesAssigned(unitId, bUseSupport, specId) local _, class = UnitClass(unitId) - if class == "HERO" then - return UnitGroupRolesAssignedKey(unitId) - else + local role = UnitGroupRolesAssignedKey(unitId) + if role and role ~= "NONE" then + return role + elseif class ~= "HERO" then local specInfo = C_ClassInfo.GetSpecInfoByID(specId) if specInfo then @@ -1128,7 +1129,7 @@ end ---@return number, number, number, number, string function DF:GetClassTCoordsAndTexture(class) local l, r, t, b = unpack(CLASS_ICON_TCOORDS[class]) - return l, r, t, b, [[Interface\WORLDSTATEFRAME\Icons-Classes]] + return l, r, t, b, [[Interface\GLUES\CHARACTERCREATE\UI-CharacterCreate-Classes]] end ---create a string with the spell icon and the spell name using |T|t scape codes to add the icon inside the string diff --git a/Libs/LibOpenRaid/LibOpenRaid.lua b/Libs/LibOpenRaid/LibOpenRaid.lua index e5a8b318..fa013f82 100644 --- a/Libs/LibOpenRaid/LibOpenRaid.lua +++ b/Libs/LibOpenRaid/LibOpenRaid.lua @@ -358,9 +358,6 @@ end if (not dataTypePrefix) then openRaidLib.DiagnosticError("Invalid dataTypePrefix from player:", sender, "data:", data, "dataTypePrefix:", dataTypePrefix) return - elseif (openRaidLib.commPrefixDeprecated[dataTypePrefix]) then - openRaidLib.DiagnosticError("Invalid dataTypePrefix from player:", sender, "data:", data, "dataTypePrefix:", dataTypePrefix) - return end --if this is isn't a keystone data comm, check if the lib can receive comms diff --git a/classes/class_damage.lua b/classes/class_damage.lua index 7d59f8eb..68ddd51d 100644 --- a/classes/class_damage.lua +++ b/classes/class_damage.lua @@ -65,7 +65,6 @@ local FormatTooltipNumber = ToKFunctions[8] local TooltipMaximizedMethod = 1 - --local CLASS_ICON_TCOORDS = _G.CLASS_ICON_TCOORDS local is_player_class = Details.player_class Details.tooltip_key_overlay1 = {1, 1, 1, .2} diff --git a/classes/class_heal.lua b/classes/class_heal.lua index 22c2c10b..5e77716d 100644 --- a/classes/class_heal.lua +++ b/classes/class_heal.lua @@ -1819,7 +1819,7 @@ function healingClass:MontaInfoHealTaken() --hes:UpdadeInfoBar(row, index, spellid, name, value, max, percent, icon, detalhes) - local texCoords = CLASS_ICON_TCOORDS [tabela[4]] + local texCoords = Details.class_coords[tabela[4]] if (not texCoords) then texCoords = _detalhes.class_coords ["UNKNOW"] end diff --git a/classes/class_utility.lua b/classes/class_utility.lua index 4bc47719..180d904b 100644 --- a/classes/class_utility.lua +++ b/classes/class_utility.lua @@ -650,9 +650,9 @@ function atributo_misc:UpdateDeathRow(deathTable, whichRowLine, rankPosition, in thisRow.icone_classe:SetTexture(instanceObject.row_info.spec_file) thisRow.icone_classe:SetTexCoord(unpack(_detalhes.class_specs_coords[spec])) else - if (CLASS_ICON_TCOORDS [deathTable[4]]) then + if (Details.class_coords[deathTable[4]]) then thisRow.icone_classe:SetTexture(instanceObject.row_info.icon_file) - thisRow.icone_classe:SetTexCoord(unpack(CLASS_ICON_TCOORDS [deathTable[4]])) + thisRow.icone_classe:SetTexCoord(unpack(Details.class_coords[deathTable[4]])) else local texture, l, r, t, b = Details:GetUnknownClassIcon() thisRow.icone_classe:SetTexture(texture) @@ -660,9 +660,9 @@ function atributo_misc:UpdateDeathRow(deathTable, whichRowLine, rankPosition, in end end else - if (CLASS_ICON_TCOORDS [deathTable[4]]) then + if (Details.class_coords[deathTable[4]]) then thisRow.icone_classe:SetTexture(instanceObject.row_info.icon_file) - thisRow.icone_classe:SetTexCoord(unpack(CLASS_ICON_TCOORDS [deathTable[4]])) + thisRow.icone_classe:SetTexCoord(unpack(Details.class_coords[deathTable[4]])) else local texture, l, r, t, b = Details:GetUnknownClassIcon() thisRow.icone_classe:SetTexture(texture) diff --git a/core/gears.lua b/core/gears.lua index f332d783..da831b94 100644 --- a/core/gears.lua +++ b/core/gears.lua @@ -1704,7 +1704,7 @@ function Details.Database.StoreEncounter(combat) --check for heroic and mythic - if (storageDebug or (diff == 15 or diff == 16 or diff == 14)) then --test on raid finder: ' or diff == 17' -- normal mode: diff == 14 or + if (storageDebug or (diff == 1 or diff == 2 or diff == 3 or diff == 4)) then --test on raid finder: ' or diff == 17' -- normal mode: diff == 14 or --check the guild name local match = 0 @@ -1757,7 +1757,7 @@ function Details.Database.StoreEncounter(combat) local role = UnitGroupRolesAssigned("raid" .. i) if (UnitIsInMyGuild ("raid" .. i)) then - if (role == "DAMAGER" or role == "TANK") then + if (role == "NONE" or role == "DAMAGER" or role == "TANK") then local player_name = Details:GetFullName("raid" .. i) local _, _, class = Details:GetUnitClassFull(player_name) @@ -1767,7 +1767,7 @@ function Details.Database.StoreEncounter(combat) this_combat_data.damage [player_name] = {floor(damage_actor.total), _detalhes.item_level_pool [guid] and _detalhes.item_level_pool [guid].ilvl or 0, class or 0} end - elseif (role == "HEALER") then + elseif (role == "HEALER" or role == "SUPPORT") then local player_name = Details:GetFullName("raid" .. i) local _, _, class = Details:GetUnitClassFull(player_name) diff --git a/core/plugins_raid.lua b/core/plugins_raid.lua index 7f1d269c..68021e7c 100644 --- a/core/plugins_raid.lua +++ b/core/plugins_raid.lua @@ -16,8 +16,6 @@ local _GetSpellInfo = _detalhes.getspellinfo --details api - local CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS - ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --constants @@ -359,7 +357,7 @@ local class_color = "|cFFFF3333" if (class) then - local coords = CLASS_ICON_TCOORDS [class] + local coords = Details.class_coords[class] class_color = "|TInterface\\AddOns\\Details\\images\\classes_small_alpha:12:12:0:0:128:128:" .. coords[1]/2*128 .. ":" .. coords[2]/2*128 .. ":" .. coords[3]/2*128 .. ":" .. coords[4]/2*128 .. "|t |c" .. RAID_CLASS_COLORS [class].colorStr end @@ -464,12 +462,12 @@ local class_color2 = "|cFFFFFFFF" if (class) then - local coords = CLASS_ICON_TCOORDS [class] + local coords = Details.class_coords[class] class_color = "|TInterface\\AddOns\\Details\\images\\classes_small_alpha:12:12:0:0:128:128:" .. coords[1]/2*128 .. ":" .. coords[2]/2*128 .. ":" .. coords[3]/2*128 .. ":" .. coords[4]/2*128 .. "|t |c" .. RAID_CLASS_COLORS [class].colorStr end if (class2) then - local coords = CLASS_ICON_TCOORDS [class2] + local coords = Details.class_coords[class2] class_color2 = " -> |TInterface\\AddOns\\Details\\images\\classes_small_alpha:12:12:0:0:128:128:" .. coords[1]/2*128 .. ":" .. coords[2]/2*128 .. ":" .. coords[3]/2*128 .. ":" .. coords[4]/2*128 .. "|t |c" .. RAID_CLASS_COLORS [class2].colorStr alvo_name = _detalhes:GetOnlyName(alvo_name) else @@ -560,7 +558,7 @@ local class_color = "|cFFFFFFFF" if (class) then - local coords = CLASS_ICON_TCOORDS [class] + local coords = Details.class_coords [class] class_color = "|TInterface\\AddOns\\Details\\images\\classes_small_alpha:12:12:0:0:256:256:" .. coords[1]/2*256 .. ":" .. coords[2]/2*256 .. ":" .. coords[3]/2*256 .. ":" .. coords[4]/2*256 .. "|t |c" .. RAID_CLASS_COLORS [class].colorStr end msg = "Death: " .. class_color .. alvo_name .. "|r ->" diff --git a/frames/window_main.lua b/frames/window_main.lua index f752005f..8c189bc5 100644 --- a/frames/window_main.lua +++ b/frames/window_main.lua @@ -2110,22 +2110,14 @@ local iconFrame_OnEnter = function(self) GameCooltip:AddLine(format(localizedItemLevelString, 0)) GameCooltip:AddIcon([[]], 1, 1, 1, 20) Details:AddTooltipBackgroundStatusbar() - gotInfo = true + gotInfo = false end - local localizedTalentsString = _G.TALENTS - - if (gotInfo) then - GameCooltip:AddLine(format(localizedItemLevelString, Loc["STRING_QUERY_INSPECT_REFRESH"])) - GameCooltip:AddIcon([[]], 1, 1, 1, 24) - Details:AddTooltipBackgroundStatusbar() - end - - local height = 66 + local height = 54 if (not gotInfo) then GameCooltip:AddLine(Loc["STRING_QUERY_INSPECT"], nil, 1, "orange") GameCooltip:AddIcon([[Interface\TUTORIALFRAME\UI-TUTORIAL-FRAME]], 1, 1, 12, iconSize, 8/512, 70/512, 224/512, 306/512) - height = 54 + height = 66 end local combat = instance:GetShowingCombat() diff --git a/plugins/Details_RaidCheck/Details_RaidCheck.lua b/plugins/Details_RaidCheck/Details_RaidCheck.lua index e45a8e5b..0a11fe86 100644 --- a/plugins/Details_RaidCheck/Details_RaidCheck.lua +++ b/plugins/Details_RaidCheck/Details_RaidCheck.lua @@ -1,9 +1,6 @@ -local UnitAura = UnitAura -local UnitBuff = UnitBuff local GetSpellInfo = GetSpellInfo local UnitClass = UnitClass local UnitName = UnitName -local CLASS_ICON_TCOORDS = CLASS_ICON_TCOORDS local Loc = LibStub("AceLocale-3.0"):GetLocale("Details") local openRaidLib = LibStub:GetLibrary("LibOpenRaid-1.0")