This commit is contained in:
Bunny67
2018-06-03 13:39:40 +03:00
parent 3a0f15b393
commit 1e38c5b657
11 changed files with 39 additions and 908 deletions
@@ -9,6 +9,7 @@
<Script file="Portrait.lua"/>
<Script file="Power.lua"/>
<Script file="InfoPanel.lua"/>
<Script file="PvPIndicator.lua"/>
<Script file="RaidIcon.lua"/>
<Script file="RaidRoleIcons.lua"/>
<Script file="RestingIndicator.lua"/>
@@ -0,0 +1,23 @@
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local UF = E:GetModule("UnitFrames");
--Cache global variables
--Lua functions
--WoW API / Variables
function UF:Construct_PvPIndicator(frame)
local pvp = frame.RaisedElementParent:CreateFontString(nil, "OVERLAY")
UF:Configure_FontString(pvp)
return pvp
end
function UF:Configure_PVPIndicator(frame)
local pvp = frame.PvPText
local x, y = self:GetPositionOffset(frame.db.pvp.position)
pvp:ClearAllPoints()
E:Point(pvp, frame.db.pvp.position, frame.Health, frame.db.pvp.position, x, y)
frame:Tag(pvp, frame.db.pvp.text_format)
end
+1 -1
View File
@@ -30,7 +30,7 @@ function UF:Construct_RaidFrames()
self.Portrait2D = UF:Construct_Portrait(self, "texture")
self.Name = UF:Construct_NameText(self)
self.RaidRoleFramesAnchor = UF:Construct_RaidRoleFrames(self)
self.RaidTargetIndicator = UF:Construct_RaidIcon(self);
self.RaidTargetIndicator = UF:Construct_RaidIcon(self)
self.GPS = UF:Construct_GPS(self)
self.InfoPanel = UF:Construct_InfoPanel(self)
+3 -1
View File
@@ -485,6 +485,7 @@ end
ElvUF.Tags.OnUpdateThrottle["pvptimer"] = 1
ElvUF.Tags.Methods["pvptimer"] = function(unit)
if (UnitIsPVPFreeForAll(unit) or UnitIsPVP(unit)) then
--[[
local timer = GetPVPTimer()
if timer ~= 301000 and timer ~= -1 then
@@ -492,8 +493,9 @@ ElvUF.Tags.Methods["pvptimer"] = function(unit)
local secs = floor((timer / 1000) - (mins * 60))
return format("%s (%01.f:%02.f)", PVP, mins, secs)
else
]]
return PVP
end
--end
else
return ""
end
@@ -28,6 +28,7 @@ function UF:Construct_PlayerFrame(frame)
frame.RaidTargetIndicator = UF:Construct_RaidIcon(frame)
frame.RestingIndicator = self:Construct_RestingIndicator(frame)
frame.CombatIndicator = self:Construct_CombatIndicator(frame)
frame.PvPText = self:Construct_PvPIndicator(frame)
frame.InfoPanel = self:Construct_InfoPanel(frame)
frame:SetPoint("BOTTOMLEFT", E.UIParent, "BOTTOM", -413, 68)
@@ -94,6 +95,8 @@ function UF:Update_PlayerFrame(frame, db)
UF:UpdateNameSettings(frame)
UF:Configure_PVPIndicator(frame)
UF:Configure_Power(frame)
UF:Configure_Portrait(frame)