Skip to content

GitLab

Verified Commit dbe08443 authored by Darth Predator's avatar Darth Predator
Browse files
Options

Portraits are out as well

parent 0359faa3
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 118 deletions
CHANGELOG.txt
View file @ dbe08443
......@@ -2,7 +2,8 @@ v3.565 []
Additions:
- Apparently Darth forgot Eternal Palace exists. Now its progress is tracked in tooltips and LFR lockouts are present in time dt.
Changes:
- Removed Bags and Actionbars transparent buttons options. ElvUI deal with those now.
- Removed Bags and Actionbars transparent buttons options. ElvUI deals with those now.
- Removed portrait options for unitframes. ElvUI core function now.
Fixes:
- Fixed clean or first time install errors for locales, this compliments changes in ElvUI.
- Fixed movable frames causing a pletera of errors for "restricted" frames.
......
ElvUI_SLE/core/install.lua
View file @ dbe08443
......@@ -328,6 +328,8 @@ function PI:DarthSetup()
E.db["unitframe"]["units"]["player"]["portrait"]["enable"] = true
E.db["unitframe"]["units"]["player"]["portrait"]["camDistanceScale"] = 3
E.db["unitframe"]["units"]["player"]["portrait"]["overlay"] = true
E.db["unitframe"]["units"]["player"]["portrait"]["fullOverlay"] = true
E.db["unitframe"]["units"]["player"]["portrait"]["overlayAlpha"] = 1
E.db["unitframe"]["units"]["player"]["raidicon"]["attachTo"] = "TOPLEFT"
E.db["unitframe"]["units"]["player"]["raidicon"]["yOffset"] = 17
E.db["unitframe"]["units"]["player"]["raidicon"]["xOffset"] = -20
......@@ -389,6 +391,8 @@ function PI:DarthSetup()
E.db["unitframe"]["units"]["target"]["portrait"]["enable"] = true
E.db["unitframe"]["units"]["target"]["portrait"]["camDistanceScale"] = 3
E.db["unitframe"]["units"]["target"]["portrait"]["overlay"] = true
E.db["unitframe"]["units"]["target"]["portrait"]["fullOverlay"] = true
E.db["unitframe"]["units"]["target"]["portrait"]["overlayAlpha"] = 1
E.db["unitframe"]["units"]["target"]["orientation"] = "LEFT"
E.db["unitframe"]["units"]["target"]["power"]["attachTextTo"] = "InfoPanel"
E.db["unitframe"]["units"]["target"]["power"]["powerPrediction"] = true
......@@ -636,13 +640,6 @@ function PI:DarthSetup()
E.db["sle"]["datatexts"]["panel8"]["width"] = 470
E.db["sle"]["datatexts"]["panel8"]["transparent"] = true
E.db["sle"]["unitframes"]["unit"]["target"]["portraitAlpha"] = 1
E.db["sle"]["unitframes"]["unit"]["target"]["higherPortrait"] = true
E.db["sle"]["unitframes"]["unit"]["player"]["portraitAlpha"] = 1
E.db["sle"]["unitframes"]["unit"]["player"]["pvpIconText"]["enable"] = true
E.db["sle"]["unitframes"]["unit"]["player"]["pvpIconText"]["yoffset"] = -4
E.db["sle"]["unitframes"]["unit"]["player"]["higherPortrait"] = true
E.db["sle"]["nameplates"]["targetcount"]["enable"] = true
E.db["sle"]["nameplates"]["threat"]["enable"] = true
......@@ -1079,6 +1076,8 @@ function PI:DarthOldSetup()
E.db["unitframe"]["units"]["player"]["portrait"]["enable"] = true
E.db["unitframe"]["units"]["player"]["portrait"]["camDistanceScale"] = 3
E.db["unitframe"]["units"]["player"]["portrait"]["overlay"] = true
E.db["unitframe"]["units"]["player"]["portrait"]["fullOverlay"] = true
E.db["unitframe"]["units"]["player"]["portrait"]["overlayAlpha"] = 1
E.db["unitframe"]["units"]["player"]["castbar"]["height"] = 22
E.db["unitframe"]["units"]["player"]["castbar"]["width"] = 220
E.db["unitframe"]["units"]["player"]["customTexts"] = {}
......@@ -1115,9 +1114,12 @@ function PI:DarthOldSetup()
E.db["unitframe"]["units"]["player"]["CombatIcon"]["size"] = 32
E.db["unitframe"]["units"]["player"]["CombatIcon"]["xOffset"] = 13
E.db["unitframe"]["units"]["player"]["CombatIcon"]["yOffset"] = -7
E.db["unitframe"]["units"]["target"]["portrait"]["enable"] = true
E.db["unitframe"]["units"]["target"]["portrait"]["camDistanceScale"] = 3
E.db["unitframe"]["units"]["target"]["portrait"]["overlay"] = true
E.db["unitframe"]["units"]["target"]["portrait"]["fullOverlay"] = true
E.db["unitframe"]["units"]["target"]["portrait"]["overlayAlpha"] = 1
E.db["unitframe"]["units"]["target"]["castbar"]["width"] = 200
E.db["unitframe"]["units"]["target"]["customTexts"] = {}
E.db["unitframe"]["units"]["target"]["customTexts"]["Absorb"] = {}
......@@ -1288,11 +1290,7 @@ function PI:DarthOldSetup()
E.db["sle"]["unitframes"]["statusTextures"]["auraTexture"] = "Ohi Tribal4"
E.db["sle"]["unitframes"]["statusTextures"]["castTexture"] = "Ohi Tribal4"
E.db["sle"]["unitframes"]["statusTextures"]["classTexture"] = "ElvUI Gloss"
E.db["sle"]["unitframes"]["unit"]["player"]["portraitAlpha"] = 1
E.db["sle"]["unitframes"]["unit"]["player"]["higherPortrait"] = true
E.db["sle"]["unitframes"]["unit"]["player"]["pvpIconText"]["enable"] = true
E.db["sle"]["unitframes"]["unit"]["target"]["higherPortrait"] = true
E.db["sle"]["unitframes"]["unit"]["target"]["portraitAlpha"] = 1
E.db["sle"]["minimap"]["locPanel"]["enable"] = true
E.db["sle"]["minimap"]["locPanel"]["width"] = 310
E.db["sle"]["minimap"]["instance"]["enable"] = true
......
ElvUI_SLE/defaults/profile.lua
View file @ dbe08443
......@@ -805,12 +805,8 @@ P["sle"] = {
["threshold"] = 4,
},
},
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
},
["pet"] = {
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
["auras"] = {
["buffs"] = {
["threshold"] = 4,
......@@ -821,8 +817,6 @@ P["sle"] = {
},
},
["pettarget"] = {
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
["auras"] = {
["buffs"] = {
["threshold"] = 4,
......@@ -833,8 +827,6 @@ P["sle"] = {
},
},
["target"] = {
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
["pvpIconText"] = {
["level"] = true,
},
......@@ -848,8 +840,6 @@ P["sle"] = {
},
},
["targettarget"] = {
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
["auras"] = {
["buffs"] = {
["threshold"] = 4,
......@@ -860,8 +850,6 @@ P["sle"] = {
},
},
["targettargettarget"] = {
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
["auras"] = {
["buffs"] = {
["threshold"] = 4,
......@@ -872,8 +860,6 @@ P["sle"] = {
},
},
["focus"] = {
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
["auras"] = {
["buffs"] = {
["threshold"] = 4,
......@@ -884,8 +870,6 @@ P["sle"] = {
},
},
["focustarget"] = {
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
["auras"] = {
["buffs"] = {
["threshold"] = 4,
......@@ -924,8 +908,6 @@ P["sle"] = {
["threshold"] = 4,
},
},
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
},
["raid"] = {
["offline"] = {
......@@ -956,8 +938,6 @@ P["sle"] = {
["threshold"] = 4,
},
},
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
},
["raid40"] = {
["offline"] = {
......@@ -988,8 +968,6 @@ P["sle"] = {
["xoffset"] = 0,
["yoffset"] = 0,
},
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
},
["boss"] = {
["auras"] = {
......@@ -1000,8 +978,6 @@ P["sle"] = {
["threshold"] = 4,
},
},
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
},
["arena"] = {
["auras"] = {
......@@ -1012,8 +988,6 @@ P["sle"] = {
["threshold"] = 4,
},
},
["higherPortrait"] = false,
["portraitAlpha"] = 0.35,
},
},
["roleicons"] = "ElvUI",
......
ElvUI_SLE/locales/english.lua
View file @ dbe08443
......@@ -888,8 +888,6 @@ L["Power Texture"] = true
L["Castbar Texture"] = true
L["Red Icon"] = true
L["Aura Bars Texture"] = true
L["Higher Overlay Portrait"] = true
L["Overlay Portrait Alpha"] = true
L["Makes frame portrait visible regardless of health level when overlay portrait is set."] = true
L["Classbar Texture"] = true
L["Resize Health Prediction"] = true
......
ElvUI_SLE/locales/german.lua
View file @ dbe08443
......@@ -881,8 +881,6 @@ L["Power Texture"] = true
L["Castbar Texture"] = true
L["Red Icon"] = true
L["Aura Bars Texture"] = true
L["Higher Overlay Portrait"] = true
L["Overlay Portrait Alpha"] = true
L["Makes frame portrait visible regardless of health level when overlay portrait is set."] = true
L["Classbar Texture"] = true
L["Resize Health Prediction"] = true
......
ElvUI_SLE/locales/korean.lua
View file @ dbe08443
......@@ -873,8 +873,6 @@ L["Power Texture"] = "자원 텍스쳐"
L["Castbar Texture"] = "시전바 텍스쳐"
L["Red Icon"] = true
L["Aura Bars Texture"] = true
L["Higher Overlay Portrait"] = true
L["Overlay Portrait Alpha"] = true
L["Makes frame portrait visible regardless of health level when overlay portrait is set."] = true
L["Classbar Texture"] = true
L["Resize Health Prediction"] = true
......
ElvUI_SLE/locales/russian.lua
View file @ dbe08443
......@@ -885,8 +885,6 @@ L["Power Texture"] = "Текстура ресурса"
L["Castbar Texture"] = "Текстура полосы заклинаний"
L["Red Icon"] = "Красная иконка"
L["Aura Bars Texture"] = "Текстура полос аур"
L["Higher Overlay Portrait"] = "Наложение портрета над рамкой"
L["Overlay Portrait Alpha"] = "Прозрачность портрета при наложении"
L["Makes frame portrait visible regardless of health level when overlay portrait is set."] = "Делает портрет на этой рамке видимым не зависимо от кол-ва оставшегося здоровья при наложении."
L["Classbar Texture"] = "Текстура классовой полосы"
L["Resize Health Prediction"] = "Подогнать входящее исцеление"
......
ElvUI_SLE/modules/unitframes/unitframes.lua
View file @ dbe08443
......@@ -91,38 +91,6 @@ function SUF:NewTags()
end
end
function SUF:ConfiguePortrait(frame, dontHide)
local db = E.db.sle.unitframes.unit
local portrait = frame.Portrait
if portrait.SLEHooked or not db[frame.unitframeType] then return end
hooksecurefunc(portrait, "PostUpdate", SUF.PortraitUpdate)
portrait.SLEHooked = true
end
function SUF:PortraitUpdate(unit, ...)
local frame = self:GetParent()
local dbElv = frame.db
if not dbElv then return end
local db = E.db.sle.unitframes.unit
local portrait = dbElv.portrait
if db[frame.unitframeType] and portrait.enable and self:GetParent().USE_PORTRAIT_OVERLAY then
self:SetAlpha(0);
self:SetAlpha(db[frame.unitframeType].portraitAlpha);
end
-- if (db[frame.unitframeType] and db[frame.unitframeType].higherPortrait) and frame.USE_PORTRAIT_OVERLAY then
-- if not frame.Health.HigherPortrait then
-- frame.Health.HigherPortrait = CreateFrame("Frame", frame:GetName().."HigherPortrait", frame)
-- frame.Health.HigherPortrait:SetFrameLevel(frame.Health:GetFrameLevel() + 4)
-- frame.Health.HigherPortrait:SetPoint("TOPLEFT", frame.Health, "TOPLEFT")
-- frame.Health.HigherPortrait:SetPoint("BOTTOMRIGHT", frame.Health, "BOTTOMRIGHT", 0, 0.5)
-- end
-- self:ClearAllPoints()
-- if frame.db.portrait.style == '3D' then self:SetFrameLevel(frame.Health.HigherPortrait:GetFrameLevel()) end
-- self:SetAllPoints(frame.Health.HigherPortrait)
-- frame.Health.bg:SetParent(frame.Health)
-- end
end
local function UpdateAuraTimer(self, elapsed)
local timervalue, formatid
local unitID = self:GetParent():GetParent().unitframeType
......@@ -178,8 +146,6 @@ function SUF:Initialize()
hooksecurefunc(UF, "Update_PartyFrames", SUF.Update_GroupFrames)
hooksecurefunc(UF, "Update_RaidFrames", SUF.Update_GroupFrames)
hooksecurefunc(UF, "Update_Raid40Frames", SUF.Update_GroupFrames)
--Portrait overlay
hooksecurefunc(UF, "Configure_Portrait", SUF.ConfiguePortrait)
--Hook pvp icons
SUF:UpgradePvPIcon()
......
ElvUI_SLE/options/unitframes_c.lua
View file @ dbe08443
......@@ -94,31 +94,6 @@ local function configTable()
return config
end
local function CreatePortraitConfig(unitID)
local config = {
order = 1,
type = 'group',
name = L["Portrait"],
get = function(info) return E.db.sle.unitframes.unit[unitID][ info[#info] ] end,
set = function(info, value) E.db.sle.unitframes.unit[unitID][ info[#info] ] = value; UF:CreateAndUpdateUF(unitID); end,
args = {
-- higherPortrait = {
-- order = 1, type = "toggle",
-- name = L["Higher Overlay Portrait"],
-- desc = L["Makes frame portrait visible regardless of health level when overlay portrait is set."],
-- },
portraitAlpha = {
order = 2, type = 'range',
name = L["Overlay Portrait Alpha"],
isPercent = true,
min = 0, max = 1, step = 0.01,
},
},
}
return config
end
local function CreateAurasConfig(unitID)
local config = {
order = 6,
......@@ -204,7 +179,6 @@ local function configTable()
type = "group",
name = L["Player Frame"],
args = {
portrait = CreatePortraitConfig("player"),
pvpIconText = {
order = 5,
type = "group",
......@@ -227,7 +201,6 @@ local function configTable()
type = "group",
name = L["Pet Frame"],
args = {
portrait = CreatePortraitConfig("pet"),
auras = CreateAurasConfig("pet"),
},
},
......@@ -236,7 +209,6 @@ local function configTable()
type = "group",
name = L["PetTarget Frame"],
args = {
portrait = CreatePortraitConfig("pettarget"),
auras = CreateAurasConfig("pettarget"),
},
},
......@@ -245,7 +217,6 @@ local function configTable()
type = "group",
name = L["Target Frame"],
args = {
portrait = CreatePortraitConfig("target"),
pvpIconText = {
order = 5,
type = "group",
......@@ -265,7 +236,6 @@ local function configTable()
type = "group",
name = L["TargetTarget Frame"],
args = {
portrait = CreatePortraitConfig("targettarget"),
auras = CreateAurasConfig("targettarget"),
},
},
......@@ -274,7 +244,6 @@ local function configTable()
type = "group",
name = L["TargetTargetTarget Frame"],
args = {
portrait = CreatePortraitConfig("targettargettarget"),
auras = CreateAurasConfig("targettargettarget"),
},
},
......@@ -283,7 +252,6 @@ local function configTable()
type = "group",
name = L["Focus Frame"],
args = {
portrait = CreatePortraitConfig("focus"),
auras = CreateAurasConfig("focus"),
},
},
......@@ -292,7 +260,6 @@ local function configTable()
type = "group",
name = L["FocusTarget Frame"],
args = {
portrait = CreatePortraitConfig("focustarget"),
auras = CreateAurasConfig("focustarget"),
},
},
......@@ -309,7 +276,6 @@ local function configTable()
UF:HeaderConfig(ElvUF_Party, ElvUF_Party.forceShow ~= true or nil)
end,
},
portrait = CreatePortraitConfig("party"),
offline = CreateOfflineConfig("party"),
dead = CreateDeadConfig("party"),
auras = CreateAurasConfig("party"),
......@@ -328,7 +294,6 @@ local function configTable()
UF:HeaderConfig(_G['ElvUF_Raid'], _G['ElvUF_Raid'].forceShow ~= true or nil)
end,
},
portrait = CreatePortraitConfig("raid"),
offline = CreateOfflineConfig("raid"),
dead = CreateDeadConfig("raid"),
auras = CreateAurasConfig("raid"),
......@@ -347,7 +312,6 @@ local function configTable()
UF:HeaderConfig(_G['ElvUF_Raid40'], _G['ElvUF_Raid40'].forceShow ~= true or nil)
end,
},
portrait = CreatePortraitConfig("raid40"),
offline = CreateOfflineConfig("raid40"),
dead = CreateDeadConfig("raid40"),
auras = CreateAurasConfig("raid40"),
......@@ -358,7 +322,6 @@ local function configTable()
type = "group",
name = L["Boss Frames"],
args = {
portrait = CreatePortraitConfig("boss"),
auras = CreateAurasConfig("boss"),
},
},
......@@ -367,7 +330,6 @@ local function configTable()
type = "group",
name = L["Arena Frames"],
args = {
portrait = CreatePortraitConfig("arena"),
auras = CreateAurasConfig("arena"),
},
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment