diff --git a/ElvUI_SLE/core/toolkit.lua b/ElvUI_SLE/core/toolkit.lua index e387f84..40a2ebf 100644 --- a/ElvUI_SLE/core/toolkit.lua +++ b/ElvUI_SLE/core/toolkit.lua @@ -445,7 +445,9 @@ function SLE:InitializeModules() local _, catch = pcall(module.Initialize, module) if catch and GetCVarBool('scriptErrors') == true then - ScriptErrorsFrame_OnError(catch, false) + if E.wowbuild < 24330 then --7.2 + ScriptErrorsFrame_OnError(catch, false) + end end end end diff --git a/ElvUI_SLE/modules/sledatatexts/specswitch.lua b/ElvUI_SLE/modules/sledatatexts/specswitch.lua index c664802..e6270e0 100644 --- a/ElvUI_SLE/modules/sledatatexts/specswitch.lua +++ b/ElvUI_SLE/modules/sledatatexts/specswitch.lua @@ -76,7 +76,6 @@ function DTP:ReplaceSpecSwitch() menuList[index + 2] = nil end end - EasyMenu(menuList, menuFrame, "cursor", E.private.sle.dt.specswitch.xOffset, E.private.sle.dt.specswitch.yOffset, "MENU", 2) end end diff --git a/ElvUI_SLE/modules/unitframes/pvpIcon.lua b/ElvUI_SLE/modules/unitframes/pvpIcon.lua index 41ba11b..c3f0e96 100644 --- a/ElvUI_SLE/modules/unitframes/pvpIcon.lua +++ b/ElvUI_SLE/modules/unitframes/pvpIcon.lua @@ -3,7 +3,7 @@ local SUF = SLE:GetModule("UnitFrames") local UF = E:GetModule('UnitFrames'); function SUF:Create_PvpIconText(frame) - local PvP = frame.PvP + local PvP = frame.PvPIndicator PvP.text = CreateFrame("Frame", nil, frame) PvP.text:Size(10,10) PvP.text:SetFrameLevel(PvP:GetParent():GetFrameLevel() + 3) @@ -16,7 +16,7 @@ function SUF:Create_PvpIconText(frame) end function SUF:Configure_PVPIcon(frame) - local PvP = frame.PvP + local PvP = frame.PvPIndicator if not PvP.text then return end local iconEnabled = frame:IsElementEnabled('PvP') diff --git a/ElvUI_SLE/modules/unitframes/roleIcons.lua b/ElvUI_SLE/modules/unitframes/roleIcons.lua index f231ad2..b7e4528 100644 --- a/ElvUI_SLE/modules/unitframes/roleIcons.lua +++ b/ElvUI_SLE/modules/unitframes/roleIcons.lua @@ -15,7 +15,7 @@ local function GetBattleFieldIndexFromUnitName(name) end function SUF:UpdateRoleIcon() - local lfdrole = self.LFDRole + local lfdrole = self.GroupRoleIndicator if not self.db then return; end local db = self.db.roleIcon; if (not db) or (db and not db.enable) then @@ -61,11 +61,11 @@ function SUF:SetRoleIcons() local group = T.select(i, header:GetChildren()) for j = 1, group:GetNumChildren() do local unitbutton = T.select(j, group:GetChildren()) - if unitbutton.LFDRole and unitbutton.LFDRole.Override and not unitbutton.LFDRole.sleRoleSetup then - unitbutton.LFDRole.Override = SUF.UpdateRoleIcon + if unitbutton.GroupRoleIndicator and unitbutton.GroupRoleIndicator.Override and not unitbutton.GroupRoleIndicator.sleRoleSetup then + unitbutton.GroupRoleIndicator.Override = SUF.UpdateRoleIcon unitbutton:UnregisterEvent("UNIT_CONNECTION") unitbutton:RegisterEvent("UNIT_CONNECTION", SUF.UpdateRoleIcon) - unitbutton.LFDRole.sleRoleSetup = true + unitbutton.GroupRoleIndicator.sleRoleSetup = true end end end diff --git a/ElvUI_SLE/modules/unitframes/statusbars.lua b/ElvUI_SLE/modules/unitframes/statusbars.lua index f627411..0dcc19d 100644 --- a/ElvUI_SLE/modules/unitframes/statusbars.lua +++ b/ElvUI_SLE/modules/unitframes/statusbars.lua @@ -80,7 +80,7 @@ end function SUF:UpdateClass(frame) local bars = frame[frame.ClassBar] local texture = E.LSM:Fetch("statusbar", E.db.sle.unitframes.statusTextures.classTexture) - if (frame.ClassBar == 'ClassIcons' or frame.ClassBar == 'Runes') then + if (frame.ClassBar == 'ClassPower' or frame.ClassBar == 'Runes') then for i = 1, (UF.classMaxResourceBar[E.myclass] or 0) do if i <= frame.MAX_CLASS_BAR then bars[i]:SetStatusBarTexture(texture) diff --git a/ElvUI_SLE/modules/unitframes/unitframes.lua b/ElvUI_SLE/modules/unitframes/unitframes.lua index d2488b8..06400d9 100644 --- a/ElvUI_SLE/modules/unitframes/unitframes.lua +++ b/ElvUI_SLE/modules/unitframes/unitframes.lua @@ -154,9 +154,9 @@ function SUF:UpdateHealComm(unit, myIncomingHeal, allIncomingHeal, totalAbsorb) end function SUF:HealthPredictUpdate(frame) - if frame.HealPrediction and (not frame.HealPrediction.SLEPredicHook and frame.HealPrediction.PostUpdate) then - frame.HealPrediction.PostUpdate = SUF.UpdateHealComm - frame.HealPrediction.SLEPredicHook = true + if frame.HealthPrediction and (not frame.HealthPrediction.SLEPredicHook and frame.HealthPrediction.PostUpdate) then + frame.HealthPrediction.PostUpdate = SUF.UpdateHealComm + frame.HealthPrediction.SLEPredicHook = true end end diff --git a/ElvUI_SLE/modules/unitframes/units/groupFrames.lua b/ElvUI_SLE/modules/unitframes/units/groupFrames.lua index 71ac4ad..6de1015 100644 --- a/ElvUI_SLE/modules/unitframes/units/groupFrames.lua +++ b/ElvUI_SLE/modules/unitframes/units/groupFrames.lua @@ -28,10 +28,10 @@ function SUF:Update_GroupFrames(frame) frame:DisableElement('SLE_Offline') end end - -- if frame.db.roleIcon.enable and frame.LFDRole then - -- frame.LFDRole:ClearAllPoints() + -- if frame.db.roleIcon.enable and frame.GroupRoleIndicator then + -- frame.GroupRoleIndicator:ClearAllPoints() -- local x, y = self:GetPositionOffset(frame.db.roleIcon.position, 1) - -- frame.LFDRole:ClearAllPoints() - -- frame.LFDRole:Point(frame.db.roleIcon.position, frame.Health, frame.db.roleIcon.position, x + db.role.xoffset, y + db.role.yoffset) + -- frame.GroupRoleIndicator:ClearAllPoints() + -- frame.GroupRoleIndicator:Point(frame.db.roleIcon.position, frame.Health, frame.db.roleIcon.position, x + db.role.xoffset, y + db.role.yoffset) -- end end \ No newline at end of file diff --git a/ElvUI_SLE/modules/unitframes/units/player.lua b/ElvUI_SLE/modules/unitframes/units/player.lua index 17a64aa..810a477 100644 --- a/ElvUI_SLE/modules/unitframes/units/player.lua +++ b/ElvUI_SLE/modules/unitframes/units/player.lua @@ -33,7 +33,7 @@ end function SUF:TestCombat() if SUF.CombatTest.Timer then SUF.CombatTest.Timer:Cancel() end - SUF.CombatTest:Point("CENTER", _G["ElvUF_Player"].Combat) + SUF.CombatTest:Point("CENTER", _G["ElvUF_Player"].CombatIndicator) SUF.CombatTest:Size(E.db.sle.unitframes.unit.player.combatico.size) SUF.CombatTest.texture:SetTexture(SUF.CombatTextures[E.db.sle.unitframes.unit.player.combatico.texture]) @@ -45,7 +45,7 @@ function SUF:TestCombat() end function SUF:UpdateRested(frame) - local rIcon = frame.Resting + local rIcon = frame.RestingIndicator local db = frame.db local Sdb = E.db.sle.unitframes.unit.player.rested if db.restIcon then @@ -71,11 +71,11 @@ end function SUF:InitPlayer() SUF.CombatTest = CreateFrame("Frame", "SLE_CombatIconTest", _G["ElvUF_Player"]) - SUF.CombatTest:Point("CENTER", _G["ElvUF_Player"].Combat) + SUF.CombatTest:Point("CENTER", _G["ElvUF_Player"].CombatIndicator) SUF.CombatTest.texture = SUF.CombatTest:CreateTexture(nil, "OVERLAY") SUF.CombatTest.texture:SetAllPoints() SUF.CombatTest:Hide() - _G["ElvUF_Player"].Combat.PostUpdate = SUF.CombatIcon_PostUpdate + _G["ElvUF_Player"].CombatIndicator.PostUpdate = SUF.CombatIcon_PostUpdate hooksecurefunc(UF, "Configure_RestingIndicator", SUF.UpdateRested) end \ No newline at end of file diff --git a/ElvUI_SLE/options/unitframes_c.lua b/ElvUI_SLE/options/unitframes_c.lua index d22a5fa..cfea30f 100644 --- a/ElvUI_SLE/options/unitframes_c.lua +++ b/ElvUI_SLE/options/unitframes_c.lua @@ -163,7 +163,7 @@ local function configTable() name = L["Combat Icon"], guiInline = true, get = function(info) return E.db.sle.unitframes.unit.player.combatico[ info[#info] ] end, - set = function(info, value) E.db.sle.unitframes.unit.player.combatico[ info[#info] ] = value; ElvUF_Player.Combat:PostUpdate(); SUF:TestCombat() end, + set = function(info, value) E.db.sle.unitframes.unit.player.combatico[ info[#info] ] = value; ElvUF_Player.CombatIndicator:PostUpdate(); SUF:TestCombat() end, args = { xoffset = { order = 1, type = 'range', name = L["X-Offset"], min = -300, max = 300, step = 1 }, yoffset = { order = 2, type = 'range', name = L["Y-Offset"], min = -150, max = 150, step = 1 },