diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 7f0180da..d5443bad 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 243 +local dversion = 244 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) diff --git a/Libs/DF/panel.lua b/Libs/DF/panel.lua index d0ee41c8..6545a275 100644 --- a/Libs/DF/panel.lua +++ b/Libs/DF/panel.lua @@ -7200,7 +7200,7 @@ DF.StatusBarFunctions = { {"PLAYER_ENTERING_WORLD"}, {"UNIT_HEALTH", true}, {"UNIT_MAXHEALTH", true}, - --{"UNIT_HEALTH_FREQUENT", true}, + {(WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE) and "UNIT_HEALTH_FREQUENT", true}, -- this one is classic-only... {(WOW_PROJECT_ID == WOW_PROJECT_MAINLINE) and "UNIT_HEAL_PREDICTION", true}, {(WOW_PROJECT_ID == WOW_PROJECT_MAINLINE) and "UNIT_ABSORB_AMOUNT_CHANGED", true}, {(WOW_PROJECT_ID == WOW_PROJECT_MAINLINE) and "UNIT_HEAL_ABSORB_AMOUNT_CHANGED", true}, diff --git a/startup.lua b/startup.lua index cf9511d6..74538e77 100644 --- a/startup.lua +++ b/startup.lua @@ -532,11 +532,9 @@ function Details:StartMeUp() --I'll never stop! end if (DetailsFramework.IsTimewalkWoW()) then - Details:Msg("TBC Beta Version: 0011") + Details:Msg("TBC Beta Version: 0012") end - - if (DetailsFramework.IsTBCWow()) then local originalPosition @@ -551,9 +549,9 @@ function Details:StartMeUp() --I'll never stop! local warningMessage = taintWarning:CreateFontString (nil, "overlay", "GameFontNormal") warningMessage:SetText ("< right click and choose 'Enter Battle' if 'Enter Battle' button does not work") - C_Timer.NewTicker(12, function() -- default = 1 - if (StaticPopup1:IsShown()) then - if (StaticPopup1.which == "CONFIRM_BATTLEFIELD_ENTRY") then + C_Timer.NewTicker(3, function() -- default = 1 + if (StaticPopup1:IsShown() or StaticPopup2:IsShown()) then + if (StaticPopup1.which == "ADDON_ACTION_FORBIDDEN" or (StaticPopup2 and StaticPopup2:IsShown() and StaticPopup2.which == "ADDON_ACTION_FORBIDDEN")) then if (StaticPopup2:IsShown()) then if (StaticPopup2.which == "ADDON_ACTION_FORBIDDEN") then @@ -566,10 +564,6 @@ function Details:StartMeUp() --I'll never stop! if (MiniMapBattlefieldFrame:IsShown())then if (not originalPosition) then - --MiniMapBattlefieldFrame:Click('RightButton') - --BattlefieldFrame_UpdateStatus(true) - --ToggleDropDownMenu(1, nil, MiniMapBattlefieldDropDown, "MiniMapBattlefieldFrame", 10, -5); - local a = {} for i = 1, MiniMapBattlefieldFrame:GetNumPoints() do a[#a + 1] = {MiniMapBattlefieldFrame:GetPoint(i)} @@ -582,8 +576,6 @@ function Details:StartMeUp() --I'll never stop! warningMessage:SetPoint ("left", MiniMapBattlefieldFrame, "right", 9, 0) MiniMapBattlefieldFrame:SetFrameStrata("HIGH") - -- - isOnOriginalPosition = false end end