diff --git a/Libs/LibOpenRaid/LibOpenRaid.lua b/Libs/LibOpenRaid/LibOpenRaid.lua index 9dcd06a1..3b1cf944 100644 --- a/Libs/LibOpenRaid/LibOpenRaid.lua +++ b/Libs/LibOpenRaid/LibOpenRaid.lua @@ -43,7 +43,7 @@ if (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE and not isExpansion_Dragonflight()) t end local major = "LibOpenRaid-1.0" -local CONST_LIB_VERSION = 121 +local CONST_LIB_VERSION = 122 if (LIB_OPEN_RAID_MAX_VERSION) then if (CONST_LIB_VERSION <= LIB_OPEN_RAID_MAX_VERSION) then @@ -2699,7 +2699,7 @@ openRaidLib.commHandler.RegisterComm(CONST_COMM_COOLDOWNREQUEST_PREFIX, openRaid end if (IsInGuild()) then - openRaidLib.Schedules.NewUniqueTimer(math.random(0, 10) + math.random(), openRaidLib.KeystoneInfoManager.SendPlayerKeystoneInfoToGuild, "KeystoneInfoManager", "sendKeystoneInfoToGuild_Schedule") + openRaidLib.Schedules.NewUniqueTimer(math.random(0, 6) + math.random(), openRaidLib.KeystoneInfoManager.SendPlayerKeystoneInfoToGuild, "KeystoneInfoManager", "sendKeystoneInfoToGuild_Schedule") end end openRaidLib.commHandler.RegisterComm(CONST_COMM_KEYSTONE_DATAREQUEST_PREFIX, openRaidLib.KeystoneInfoManager.OnReceiveRequestData) diff --git a/boot.lua b/boot.lua index c4bde811..1a20ce12 100644 --- a/boot.lua +++ b/boot.lua @@ -18,8 +18,8 @@ local addonName, Details222 = ... local version, build, date, tocversion = GetBuildInfo() - Details.build_counter = 12221 - Details.alpha_build_counter = 12221 --if this is higher than the regular counter, use it instead + Details.build_counter = 12222 + Details.alpha_build_counter = 12222 --if this is higher than the regular counter, use it instead Details.dont_open_news = true Details.game_version = version Details.userversion = version .. " " .. Details.build_counter diff --git a/classes/class_damage.lua b/classes/class_damage.lua index 24655e2f..bb81e88d 100644 --- a/classes/class_damage.lua +++ b/classes/class_damage.lua @@ -3035,8 +3035,9 @@ function Details:ShowExtraStatusbar(thisLine, amount, extraAmount, totalAmount, --check if the extra bar will be bigger than the window local windowWidth = instanceObject:GetSize() - local lineWidth = thisLine:GetWidth() + local lineWidth = thisLine:GetWidth() * (amount/topAmount) local maxExtraBarWidth = windowWidth - lineWidth - initialOffset + if (extraStatusbarWidth > maxExtraBarWidth) then extraStatusbarWidth = maxExtraBarWidth end @@ -3455,6 +3456,9 @@ function damageClass.PredictedAugSpellsOnEnter(self) end end end + + GameCooltip:AddLine(" ") + GameCooltip:AddIcon("", 1, 1, 5, 5) end end else diff --git a/core/aura_scan.lua b/core/aura_scan.lua index 9d10e155..2cd353e3 100644 --- a/core/aura_scan.lua +++ b/core/aura_scan.lua @@ -288,7 +288,7 @@ function AuraScan.OnEvent(frame, eventName, unitId, updateInfo) for auraIndex = 1, #updateInfo.addedAuras do ---@type aurainfo local auraInfo = updateInfo.addedAuras[auraIndex] - print(unitId, targetName, auraInfo.name) + --print(unitId, targetName, auraInfo.name) fAddAura(auraInfo) end end diff --git a/frames/window_mythicplus/window_mythic_breakdown.lua b/frames/window_mythicplus/window_mythic_breakdown.lua index 08704dc7..27e3b977 100644 --- a/frames/window_mythicplus/window_mythic_breakdown.lua +++ b/frames/window_mythicplus/window_mythic_breakdown.lua @@ -23,7 +23,7 @@ function mPlus.CreateMainFrame() PixelUtil.SetPoint(mPlusFrame, "center", UIParent, "center", 0, 0) PixelUtil.SetSize(mPlusFrame, Details222.BreakdownWindow.width, Details222.BreakdownWindow.height) - + end diff --git a/functions/slash.lua b/functions/slash.lua index df6d5ec6..6870f13f 100644 --- a/functions/slash.lua +++ b/functions/slash.lua @@ -1964,10 +1964,7 @@ if (WOW_PROJECT_ID == WOW_PROJECT_MAINLINE) then f:SetScript("OnEvent", function(self, event, ...) if (f:IsShown()) then if (event == "GUILD_ROSTER_UPDATE") then - local bUpdateOkay = ... - if (bUpdateOkay) then - self:RefreshData() - end + self:RefreshData() end end end) @@ -1986,13 +1983,19 @@ if (WOW_PROJECT_ID == WOW_PROJECT_MAINLINE) then local guildName = GetGuildInfo("player") if (guildName) then f:RegisterEvent("GUILD_ROSTER_UPDATE") + + C_Timer.NewTicker(1, function() + f:RefreshData() + end, 30) + C_Timer.After(30, function() f:UnregisterEvent("GUILD_ROSTER_UPDATE") end) C_GuildInfo.GuildRoster() + openRaidLib.RequestKeystoneDataFromGuild() end - end, 100, 20, "Request from Guild") + end, 100, 22, "Request from Guild") requestFromGuildButton:SetPoint("bottomleft", statusBar, "topleft", 2, 2) requestFromGuildButton:SetTemplate(detailsFramework:GetTemplate("button", "OPTIONS_BUTTON_TEMPLATE")) requestFromGuildButton:SetIcon("UI-RefreshButton", 20, 20, "overlay", {0, 1, 0, 1}, "lawngreen")