diff --git a/Libs/LibOpenRaid/LibOpenRaid.lua b/Libs/LibOpenRaid/LibOpenRaid.lua index a932f610..91776caf 100644 --- a/Libs/LibOpenRaid/LibOpenRaid.lua +++ b/Libs/LibOpenRaid/LibOpenRaid.lua @@ -1470,7 +1470,7 @@ function openRaidLib.playerInfoManager.GetPlayerFullInfo() local nodes = tree.nodes table.sort(nodes, function(t1, t2) return t1.row < t2.row end) - + local C_Soulbinds_GetConduitCollectionData = C_Soulbinds.GetConduitCollectionData for nodeId, nodeInfo in ipairs(nodes) do --check if the node is a conduit placed by the player @@ -1487,9 +1487,9 @@ function openRaidLib.playerInfoManager.GetPlayerFullInfo() if (spellId == 0) then --is player conduit spellId = C_Soulbinds.GetConduitSpellID(nodeInfo.conduitID, nodeInfo.conduitRank) - local conduitItemLevel = C_Soulbinds.GetConduitItemLevel(conduitId, conduitRank) conduits[#conduits+1] = spellId - conduits[#conduits+1] = conduitItemLevel + local collectionData = C_Soulbinds_GetConduitCollectionData(conduitId) + conduits[#conduits+1] = collectionData and collectionData.conduitItemLevel or 0 else --is default conduit conduits[#conduits+1] = spellId diff --git a/plugins/Details_EncounterDetails/frames.lua b/plugins/Details_EncounterDetails/frames.lua index 2fa09305..5777fd45 100644 --- a/plugins/Details_EncounterDetails/frames.lua +++ b/plugins/Details_EncounterDetails/frames.lua @@ -593,6 +593,14 @@ _detalhes.EncounterDetailsTempWindow = function (EncounterDetails) local phase_colors = {{0.2, 1, 0.2, phase_alpha}, {1, 1, 0.2, phase_alpha}, {1, 0.2, 0.2, phase_alpha}, {0.2, 1, 1, phase_alpha}, {0.2, 0.2, 1, phase_alpha}, [1.5] = {0.25, 0.95, 0.25, phase_alpha}, [2.5] = {0.95, 0.95, 0.25, phase_alpha}, [3.5] = {0.95, 0.25, 0.25, phase_alpha} } + + --> bloodlust indicators + g.bloodlustIndicators = {} + for i = 1, 5 do + local texture = g:CreateTexture(nil, "overlay") + texture:SetColorTexture(0, 1, 0, 0,6) + g.bloodlustIndicators[#g.bloodlustIndicators+1] = texture + end --> build the phase panel local phase_panel = CreateFrame ("frame", "EncounterDetailsPhasePanel", g, "BackdropTemplate")