Skip to content

Commit

Permalink
Fixed an issue with players with the time measurement 'real time'.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tercioo committed Jul 30, 2023
1 parent 0bcc58b commit 104fd73
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
5 changes: 3 additions & 2 deletions Libs/DF/button.lua
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,7 @@ detailsFramework:Mixin(ButtonMetaFunctions, detailsFramework.ScriptHookMixin)
else
self.icon:SetTexture(texture)
end

elseif (type(texture) == "table") then
local r, g, b, a = detailsFramework:ParseColors(texture)
self.icon:SetColorTexture(r, g, b, a)
Expand Down Expand Up @@ -1123,7 +1124,7 @@ end

local normalTexture = button:GetNormalTexture()
local pushedTexture = button:GetPushedTexture()
local highlightTexture = button:GetHightlightTexture()
local highlightTexture = button:GetHighlightTexture()
local disabledTexture = button:GetDisabledTexture()

if (type(texture) == "table") then
Expand Down Expand Up @@ -1184,7 +1185,7 @@ end
red, green, blue, alpha = detailsFramework:ParseColor(red, green, blue, alpha)
local normalTexture = button:GetNormalTexture()
local pushedTexture = button:GetPushedTexture()
local highlightTexture = button:GetHightlightTexture()
local highlightTexture = button:GetHighlightTexture()
local disabledTexture = button:GetDisabledTexture()

normalTexture:SetVertexColor(red, green, blue, alpha)
Expand Down
2 changes: 1 addition & 1 deletion Libs/LibLuaServer/LibLuaServer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@
---@field RegisterForClicks fun(self: button, button1: nil|buttontype, button2: nil|buttontype, button3: nil|buttontype, button4: nil|buttontype)
---@field GetNormalTexture fun(self: button) : texture
---@field GetPushedTexture fun(self: button) : texture
---@field GetHightlightTexture fun(self: button) : texture
---@field GetHighlightTexture fun(self: button) : texture
---@field GetDisabledTexture fun(self: button) : texture

---@class statusbar : frame
Expand Down
4 changes: 2 additions & 2 deletions boot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
local addonName, Details222 = ...
local version, build, date, tocversion = GetBuildInfo()

Details.build_counter = 11770
Details.alpha_build_counter = 11770 --if this is higher than the regular counter, use it instead
Details.build_counter = 11773
Details.alpha_build_counter = 11773 --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
4 changes: 4 additions & 0 deletions startup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,10 @@ function Details:StartMeUp()
Details.boss_mods_timers.encounter_timers_dbm = Details.boss_mods_timers.encounter_timers_dbm or {}
Details.boss_mods_timers.encounter_timers_bw = Details.boss_mods_timers.encounter_timers_bw or {}

if (Details.time_type == 3) then
Details.time_type = 2
end

--clear overall data on new session
--if (Details.overall_clear_logout) then --this is suppose to be in the load data file
-- Details.tabela_overall = Details.combate:NovaTabela()
Expand Down

0 comments on commit 104fd73

Please sign in to comment.