diff --git a/ElvUI_SLE/ElvUI_SLE.lua b/ElvUI_SLE/ElvUI_SLE.lua index b6717be..5266cc9 100644 --- a/ElvUI_SLE/ElvUI_SLE.lua +++ b/ElvUI_SLE/ElvUI_SLE.lua @@ -156,12 +156,6 @@ function SLE:Reset(all, uf, dt, bg, mark) if uf then E.db.sle.combatico.pos = 'TOP' E:CopyTable(E.db.unitframe.units.player.classbar, P.unitframe.units.player.classbar) - E.db.unitframe.units.player.fixTo = "health" - E.db.unitframe.units.target.fixTo = "health" - E.db.unitframe.units.targettarget.fixTo = "health" - E.db.unitframe.units.focus.fixTo = "health" - E.db.unitframe.units.arena.fixTo = "health" - E.db.unitframe.units.boss.fixTo = "health" E.db.sle.powtext = false end if dt then diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc index dd3f695..7a2e857 100644 --- a/ElvUI_SLE/ElvUI_SLE.toc +++ b/ElvUI_SLE/ElvUI_SLE.toc @@ -7,7 +7,7 @@ ## eMail: darthpred@gmail.com, repooc@tukui.org ## URL: http://tukui.org/ ## RequiredDeps: ElvUI -## OptionalDeps: iFilger_ConfigUI, BigWigs, Hermes, xCT+ +## OptionalDeps: iFilger_ConfigUI, BigWigs, Clique, Hermes, xCT+ ## DefaultState: Enabled libs\load_libs.xml diff --git a/ElvUI_SLE/config/profile.lua b/ElvUI_SLE/config/profile.lua index c02fdff..d970f18 100644 --- a/ElvUI_SLE/config/profile.lua +++ b/ElvUI_SLE/config/profile.lua @@ -372,10 +372,4 @@ end P.unitframe.units.player.classbar.xOffset = 0 P.unitframe.units.player.classbar.yOffset = 0 -P.unitframe.units.player.classbar.offset = false -P.unitframe.units.player.fixTo = "health" -P.unitframe.units.target.fixTo = "health" -P.unitframe.units.targettarget.fixTo = "health" -P.unitframe.units.focus.fixTo = "health" -P.unitframe.units.arena.fixTo = "health" -P.unitframe.units.boss.fixTo = "health" +P.unitframe.units.player.classbar.offset = false \ No newline at end of file diff --git a/ElvUI_SLE/modules/install/Clique.lua b/ElvUI_SLE/modules/install/Clique.lua new file mode 100644 index 0000000..652e78f --- /dev/null +++ b/ElvUI_SLE/modules/install/Clique.lua @@ -0,0 +1,27 @@ +local E, L, V, P, G, _ = unpack(ElvUI); +local AI = E:GetModule('AddonInstaller') + +local ace3 = false -- whether or not this database is a Ace3 profile +local name = 'Clique' -- the name of the addon +local dbname = 'CliqueDB3' -- name of the addon database + +local function OnDemand(profile) -- function that creates the "load on demand" database + local database + if profile == "Affinitii" then + -- No Settings + end + + if profile == "Repooc" then + --database = { + --} + end + + if profile == "Darth" then + -- No Settings + end + + return database +end + +-- register the profile with the engine +AI:RegisterAddonProfile(name, ace3, dbname, OnDemand) \ No newline at end of file diff --git a/ElvUI_SLE/modules/install/install.lua b/ElvUI_SLE/modules/install/install.lua index 344691d..ebe9507 100644 --- a/ElvUI_SLE/modules/install/install.lua +++ b/ElvUI_SLE/modules/install/install.lua @@ -947,7 +947,6 @@ function E:DarthSetup(private) --The function to switch from classic ElvUI setti E.db.unitframe.units.player.health.text_format = "[healthcolor][health:current-percent:sl]" E.db.unitframe.units.player.power.text_format = "[powercolor][power:current:sl]"; E.db.unitframe.units.player.power.height = 8 - E.db.unitframe.units.player.fixTo = "power" E.db.unitframe.units.player.name.text_format = "[name] [level]"; E.db.unitframe.units.player.name.position = 'TOPLEFT'; E.db.unitframe.units.player.pvp.text_format = "||cFFB04F4F[pvptimer]||r" @@ -980,7 +979,6 @@ function E:DarthSetup(private) --The function to switch from classic ElvUI setti E.db.unitframe.units.target.power.hideonnpc = false; E.db.unitframe.units.target.power.text_format = "[powercolor][power:current:sl]" E.db.unitframe.units.target.power.height = 8 - E.db.unitframe.units.target.fixTo = "power" E.db.unitframe.units.target.name.text_format = "[name:medium] [level] [shortclassification]"; E.db.unitframe.units.target.name.position = 'TOPLEFT'; E.db.unitframe.units.target.portrait.enable = true @@ -2126,7 +2124,6 @@ function E:AffinitiiSetup(loadAddons) --The function to switch from class ElvUI end if loadAddons then - print("attempt to load addons") AI:LoadAddons("Affinitii, All") end E:UpdateAll(true) diff --git a/ElvUI_SLE/modules/install/load_install.xml b/ElvUI_SLE/modules/install/load_install.xml index 6a69aad..c1350a1 100644 --- a/ElvUI_SLE/modules/install/load_install.xml +++ b/ElvUI_SLE/modules/install/load_install.xml @@ -4,6 +4,7 @@ <Script file='BigWigs.lua'/> <Script file='BigWigsFights.lua'/> <Script file='BigWigsIcon.lua'/> + <Script file='Clique.lua'/> <Script file='Hermes.lua'/> <Script file='xCT+.lua'/> </Ui> \ No newline at end of file diff --git a/ElvUI_SLE/modules/unitframes/options.lua b/ElvUI_SLE/modules/unitframes/options.lua index 370dfaf..01d0c08 100644 --- a/ElvUI_SLE/modules/unitframes/options.lua +++ b/ElvUI_SLE/modules/unitframes/options.lua @@ -16,19 +16,6 @@ local positionValues = { NONE = L['Hide'] }; -local fixUn = { - player = {"Player Frame", 2, "player"}, - target = {"Target Frame", 3, "target"}, - targettarget = {"TargetTarget Frame", 4, "targettarget"}, - focus = {"Focus Frame", 5, "focus"}, -} - -local fixGr = { - arena = {"Arena Frames", 6, "arena", 5}, - boss = {"Boss Frames", 7, "boss", MAX_BOSS_FRAMES}, -} - - E.Options.args.sle.args.unitframes = { type = "group", name = L["UnitFrames"], @@ -68,49 +55,8 @@ E.Options.args.sle.args.unitframes = { }, }, }, - fix = { - order = 8, - type = "group", - name = L["Power Text Position"], - guiInline = true, - args = { - intro = { - order = 1, - type = "description", - name = L["Position power text on this bar of chosen frame"], - }, - }, - }, - }, -} - -for k,v in pairs(fixUn) do -E.Options.args.sle.args.unitframes.args.fix.args[v[3]] = { - order = v[2], - type = "select", - name = L[v[1]], - get = function(info) return E.db.unitframe.units[v[3]].fixTo end, - set = function(info, value) E.db.unitframe.units[v[3]].fixTo = value; UF:CreateAndUpdateUF(v[3]) end, - values = { - ['health'] = L["Health"], - ['power'] = L["Power"], }, } -end - -for k,v in pairs(fixGr) do -E.Options.args.sle.args.unitframes.args.fix.args[v[3]] = { - order = v[2], - type = "select", - name = L[v[1]], - get = function(info) return E.db.unitframe.units[v[3]].fixTo end, - set = function(info, value) E.db.unitframe.units[v[3]].fixTo = value; UF:CreateAndUpdateUFGroup(v[3], v[4]) end, - values = { - ['health'] = L["Health"], - ['power'] = L["Power"], - }, -} -end if E.myclass == "DRUID" or E.myclass == "WARLOCK" then E.Options.args.sle.args.unitframes.args.druid = { diff --git a/ElvUI_SLE/modules/unitframes/units/load_units.xml b/ElvUI_SLE/modules/unitframes/units/load_units.xml index ec20e5f..752c7d3 100644 --- a/ElvUI_SLE/modules/unitframes/units/load_units.xml +++ b/ElvUI_SLE/modules/unitframes/units/load_units.xml @@ -1,8 +1,3 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/"> <Script file='player.lua'/> - <Script file='target.lua'/> - <Script file='focus.lua'/> - <Script file='boss.lua'/> - <Script file='arena.lua'/> - <Script file='targettarget.lua'/> </Ui> \ 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 135cdce..2d398c0 100644 --- a/ElvUI_SLE/modules/unitframes/units/player.lua +++ b/ElvUI_SLE/modules/unitframes/units/player.lua @@ -1,5 +1,6 @@ local E, L, V, P, G, _ = unpack(ElvUI); --Inport: Engine, Locales, PrivateDB, ProfileDB, GlobalDB, Localize Underscore if not E.private.unitframe.enable then return end + local UF = E:GetModule('UnitFrames'); local SLE = E:GetModule('SLE'); @@ -34,7 +35,9 @@ function UF:Update_PlayerFrame(frame, db) local UNIT_HEIGHT = db.height local USE_POWERBAR = db.power.enable - local USE_MINI_POWERBAR = db.power.width ~= 'fill' and USE_POWERBAR + --local USE_MINI_POWERBAR = db.power.width ~= 'fill' and USE_POWERBAR + local USE_INSET_POWERBAR = db.power.width == 'inset' and USE_POWERBAR + local USE_MINI_POWERBAR = db.power.width == 'spaced' and USE_POWERBAR local USE_POWERBAR_OFFSET = db.power.offset ~= 0 and USE_POWERBAR local POWERBAR_OFFSET = db.power.offset local POWERBAR_HEIGHT = db.power.height @@ -50,7 +53,7 @@ function UF:Update_PlayerFrame(frame, db) local PORTRAIT_WIDTH = db.portrait.width local unit = self.unit - + --[[ --Power Text if E.db.unitframe.units.player.fixTo == "power" then local x, y = self:GetPositionOffset(db.power.position) @@ -58,7 +61,7 @@ function UF:Update_PlayerFrame(frame, db) power.value:Point(db.power.position, frame.Power, db.power.position, x, y) frame:Tag(power.value, db.power.text_format) end - + ]] if not E.db.unitframe.units.player.classbar.offset then return end --Checking for offset option enabled --All this crap is needed to be copied from Elv's player.lua to avoid graphical bugs --Adjust some variables