From 104fd7398a34751b8f8f622bdc7074b63b32b83a Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Sun, 30 Jul 2023 10:25:16 -0300 Subject: [PATCH] Fixed an issue with players with the time measurement 'real time'. --- Libs/DF/button.lua | 5 +++-- Libs/LibLuaServer/LibLuaServer.lua | 2 +- boot.lua | 4 ++-- startup.lua | 4 ++++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Libs/DF/button.lua b/Libs/DF/button.lua index 942c43ffb..e500fe87d 100644 --- a/Libs/DF/button.lua +++ b/Libs/DF/button.lua @@ -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) @@ -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 @@ -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) diff --git a/Libs/LibLuaServer/LibLuaServer.lua b/Libs/LibLuaServer/LibLuaServer.lua index 52d8ef8a4..29c191428 100644 --- a/Libs/LibLuaServer/LibLuaServer.lua +++ b/Libs/LibLuaServer/LibLuaServer.lua @@ -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 diff --git a/boot.lua b/boot.lua index d46004338..2788bc5b6 100644 --- a/boot.lua +++ b/boot.lua @@ -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 diff --git a/startup.lua b/startup.lua index f6c907872..5af9db0aa 100644 --- a/startup.lua +++ b/startup.lua @@ -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()