diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 19e595b89..3467e86fb 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 397 +local dversion = 398 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary(major, minor) diff --git a/Libs/DF/picture.lua b/Libs/DF/picture.lua index 7dfaf7bea..8af78f41e 100644 --- a/Libs/DF/picture.lua +++ b/Libs/DF/picture.lua @@ -300,7 +300,7 @@ detailsFramework:Mixin(ImageMetaFunctions, detailsFramework.ScriptHookMixin) if (texture) then if (type(texture) == "table") then if (texture.gradient) then - if (detailsFramework.IsDragonflight()) then + if (detailsFramework.IsDragonflight() or ImageObject.image.SetGradient) then ImageObject.image:SetColorTexture(1, 1, 1, 1) local fromColor = detailsFramework:FormatColor("tablemembers", texture.fromColor) local toColor = detailsFramework:FormatColor("tablemembers", texture.toColor) diff --git a/Libs/LibOpenRaid/GetPlayerInformation.lua b/Libs/LibOpenRaid/GetPlayerInformation.lua index 98d60846e..8abac683e 100644 --- a/Libs/LibOpenRaid/GetPlayerInformation.lua +++ b/Libs/LibOpenRaid/GetPlayerInformation.lua @@ -453,7 +453,11 @@ local getSpellListAsHashTableFromSpellBook = function() spellId = C_SpellBook.GetOverrideSpell(spellId) local spellName = GetSpellInfo(spellId) local bIsPassive = IsPassiveSpell(spellId, "player") - if (spellName and not bIsPassive) then + if LIB_OPEN_RAID_MULTI_OVERRIDE_SPELLS[spellId] then + for _, overrideSpellId in pairs(LIB_OPEN_RAID_MULTI_OVERRIDE_SPELLS[spellId]) do + completeListOfSpells[overrideSpellId] = true + end + elseif (spellName and not bIsPassive) then completeListOfSpells[spellId] = true end end @@ -473,7 +477,11 @@ local getSpellListAsHashTableFromSpellBook = function() spellId = C_SpellBook.GetOverrideSpell(spellId) local spellName = GetSpellInfo(spellId) local bIsPassive = IsPassiveSpell(spellId, "player") - if (spellName and not bIsPassive) then + if LIB_OPEN_RAID_MULTI_OVERRIDE_SPELLS[spellId] then + for _, overrideSpellId in pairs(LIB_OPEN_RAID_MULTI_OVERRIDE_SPELLS[spellId]) do + completeListOfSpells[overrideSpellId] = true + end + elseif (spellName and not bIsPassive) then completeListOfSpells[spellId] = true end end diff --git a/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua b/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua index 6bd89e418..610accafb 100644 --- a/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua +++ b/Libs/LibOpenRaid/ThingsToMantain_Dragonflight.lua @@ -803,6 +803,11 @@ do --187827 vengeance need to test these spellIds --191427 havoc } + LIB_OPEN_RAID_MULTI_OVERRIDE_SPELLS = { + [106898] = {106898,77764,77761}, + [77764] = {106898,77764,77761}, + [77761] = {106898,77764,77761}, + } LIB_OPEN_RAID_SPECID_TO_CLASSID = { [577] = 12, diff --git a/boot.lua b/boot.lua index 2a11b6851..60c3d6604 100644 --- a/boot.lua +++ b/boot.lua @@ -6,8 +6,8 @@ local addonName, Details222 = ... local version, build, date, tocversion = GetBuildInfo() - _detalhes.build_counter = 10300 - _detalhes.alpha_build_counter = 10300 --if this is higher than the regular counter, use it instead + _detalhes.build_counter = 10301 + _detalhes.alpha_build_counter = 10301 --if this is higher than the regular counter, use it instead _detalhes.dont_open_news = true _detalhes.game_version = version _detalhes.userversion = version .. " " .. _detalhes.build_counter diff --git a/core/parser.lua b/core/parser.lua index 2cfb37224..ebf771f85 100755 --- a/core/parser.lua +++ b/core/parser.lua @@ -5332,13 +5332,12 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1 end --tag item level of all players - local openRaidLib = LibStub:GetLibrary("LibOpenRaid-1.0") - local allUnitsInfo = openRaidLib.GetAllUnitsInfo() - local allPlayersGear = openRaidLib.GetAllUnitsGear() + local openRaidLib = LibStub:GetLibrary("LibOpenRaid-1.0", true) + local allPlayersGear = openRaidLib and openRaidLib.GetAllUnitsGear() local status = xpcall(function() for actorIndex, actorObject in Details:GetCurrentCombat():GetContainer(DETAILS_ATTRIBUTE_DAMAGE):ListActors() do - local gearInfo = allPlayersGear[actorObject:Name()] + local gearInfo = allPlayersGear and allPlayersGear[actorObject:Name()] if (gearInfo) then actorObject.ilvl = gearInfo.ilevel end