Skip to content

Commit

Permalink
Fixes for: OpenRaidLib, Rounded Cooltip, Evoker Extra Bar and Ebon Mi…
Browse files Browse the repository at this point in the history
…ght, Welcome Window
  • Loading branch information
Tercioo committed Jan 16, 2024
1 parent 4df6df3 commit cf591e8
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Details.toc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Interface: 100200
## Interface: 100205
## Title: Details! Damage Meter
## Notes: Essential tool to impress that chick in your raid.
## SavedVariables: _detalhes_global, __details_backup, __details_debug
Expand Down
3 changes: 2 additions & 1 deletion Libs/DF/cooltip.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ local max = math.max

--api locals
local PixelUtil = PixelUtil or DFPixelUtil
local version = 19
local version = 20

local CONST_MENU_TYPE_MAINMENU = "main"
local CONST_MENU_TYPE_SUBMENU = "sub"
Expand Down Expand Up @@ -239,6 +239,7 @@ function DF:CreateCoolTip()
self:SetPoint("CENTER", UIParent, "CENTER", 0, 0)

if (not self.HaveRoundedCorners) then
self:SetBackdrop(nil)
DF:AddRoundedCornersToFrame(self, gameCooltip.RoundedFramePreset)
self:DisableRoundedCorners()
self.HaveRoundedCorners = true
Expand Down
2 changes: 1 addition & 1 deletion Libs/DF/fw.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


local dversion = 503
local dversion = 504
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary(major, minor)

Expand Down
3 changes: 1 addition & 2 deletions Libs/LibOpenRaid/GetPlayerInformation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -737,13 +737,12 @@ local getAuraDuration = function(spellId, unitId)
--spellId = customBuffDuration or spellId --can't replace the spellId by customBuffDurationSpellId has it wount be found in LIB_OPEN_RAID_PLAYERCOOLDOWNS

if (bIsNewUnitAuraAvailable) then
local bBatchCount = false
local bUsePackedAura = true
auraSpellID = customBuffDuration or spellId
auraDurationTime = 0 --reset duration
auraUnitId = unitId or "player"

AuraUtil.ForEachAura(auraUnitId, "HELPFUL", bBatchCount, handleBuffAura, bUsePackedAura) --check auras to find a buff for the spellId
AuraUtil.ForEachAura(auraUnitId, "HELPFUL", nil, handleBuffAura, bUsePackedAura) --check auras to find a buff for the spellId

if (auraDurationTime == 0) then --if the buff wasn't found, attempt to get the duration from the file
return LIB_OPEN_RAID_PLAYERCOOLDOWNS[spellId].duration or 0
Expand Down
2 changes: 1 addition & 1 deletion Libs/LibOpenRaid/LibOpenRaid.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 120
local CONST_LIB_VERSION = 121

if (LIB_OPEN_RAID_MAX_VERSION) then
if (CONST_LIB_VERSION <= LIB_OPEN_RAID_MAX_VERSION) then
Expand Down
4 changes: 2 additions & 2 deletions boot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
local addonName, Details222 = ...
local version, build, date, tocversion = GetBuildInfo()

Details.build_counter = 12220
Details.alpha_build_counter = 12220 --if this is higher than the regular counter, use it instead
Details.build_counter = 12221
Details.alpha_build_counter = 12221 --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
Expand Down
8 changes: 8 additions & 0 deletions classes/class_damage.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3033,6 +3033,14 @@ function Details:ShowExtraStatusbar(thisLine, amount, extraAmount, totalAmount,
extraStatusbar:SetPoint("topleft", thisLine, "topleft", (statusBarWidth * percent) - fillTheGapWidth, 0)
end

--check if the extra bar will be bigger than the window
local windowWidth = instanceObject:GetSize()
local lineWidth = thisLine:GetWidth()
local maxExtraBarWidth = windowWidth - lineWidth - initialOffset
if (extraStatusbarWidth > maxExtraBarWidth) then
extraStatusbarWidth = maxExtraBarWidth
end

extraStatusbar:SetWidth(extraStatusbarWidth)
extraStatusbar:SetFrameLevel(thisLine:GetFrameLevel() + 1)

Expand Down
10 changes: 6 additions & 4 deletions frames/window_welcome.lua
Original file line number Diff line number Diff line change
Expand Up @@ -467,10 +467,12 @@ local window_openned_at = time()
local new_window = function(self)
if (#_detalhes.tabela_instancias == 1) then
local newwindow = _detalhes:CreateInstance (true)
newwindow.baseframe:SetPoint("topleft", _detalhes.tabela_instancias[1].baseframe, "topright", 50, 0)
newwindow.baseframe:SetPoint("bottomleft", _detalhes.tabela_instancias[1].baseframe, "bottomright", 50, 0)
newwindow:SaveMainWindowPosition()
newwindow:RestoreMainWindowPosition()
if (newwindow) then
newwindow.baseframe:SetPoint("topleft", _detalhes.tabela_instancias[1].baseframe, "topright", 50, 0)
newwindow.baseframe:SetPoint("bottomleft", _detalhes.tabela_instancias[1].baseframe, "bottomright", 50, 0)
newwindow:SaveMainWindowPosition()
newwindow:RestoreMainWindowPosition()
end
end
self.MyObject:Disable()
end
Expand Down
2 changes: 1 addition & 1 deletion functions/spec_augmentation.lua
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ end

function augmentationFunctions.BuffOut(token, time, sourceSerial, sourceName, sourceFlags, targetSerial, targetName, targetFlags, targetFlags2, spellId, spellName, spellSchool, tipo, amount)
if (not Details.in_combat) then --when the player enter and leave combat, it tracks which players had buffs applied
return
--return
end

if (spellId == 395152) then --ebon might
Expand Down

0 comments on commit cf591e8

Please sign in to comment.