Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 08:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

test nameplate

Browse Source
This commit is contained in:
Bunny67
2018-07-28 13:10:20 +03:00
parent 362eae4448
commit 4384d79397
4 changed files with 281 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Modules/NamePlates/Elements/HealthBar.lua
+10 -35
View File
@@ -102,40 +102,13 @@ end
function mod:UpdateElement_Health(frame)
local health = frame.oldHealthBar:GetValue()
local _, maxHealth = frame.oldHealthBar:GetMinMaxValues()
frame.HealthBar:SetMinMaxValues(0, maxHealth)
frame.HealthBar:SetValue(health)
--frame:GetParent().UnitFrame.FlashTexture:Point("TOPRIGHT", frame.HealthBar:GetStatusBarTexture(), "TOPRIGHT") --idk why this fixes this
if self.db.units[frame.UnitType].healthbar.text.enable then
if maxHealth ~= 100 then
frame.HealthBar.text:SetText(E:GetFormattedText(self.db.units[frame.UnitType].healthbar.text.format, health, maxHealth))
else
local newMaxHealth
if frame.unit == "target" then
--health, maxHealth = LMH:GetUnitHealth("target")
else
local level = self:UnitLevel(frame)
if level == "??" then
level = UnitLevel("player") + 3
end
if frame.UnitType == "FRIENDLY_PLAYER" or frame.UnitType == "ENEMY_PLAYER" then
-- newMaxHealth = LMH:GetMaxHP(frame.UnitName, tonumber(level), "pc")
elseif frame.UnitType == "FRIENDLY_NPC" or frame.UnitType == "ENEMY_NPC" then
-- newMaxHealth = LMH:GetMaxHP(frame.UnitName, tonumber(level), "npc", GetInstanceDifficulty())
else
-- newMaxHealth = LMH:GetMaxHP(frame.UnitName, tonumber(level))
end
if newMaxHealth then
health = newMaxHealth / 100 * health
maxHealth = newMaxHealth
end
end
frame.HealthBar.text:SetText(E:GetFormattedText(self.db.units[frame.UnitType].healthbar.text.format, health, maxHealth))
end
frame.HealthBar.text:SetText(E:GetFormattedText(self.db.units[frame.UnitType].healthbar.text.format, health, maxHealth))
else
frame.HealthBar.text:SetText("")
end
@@ -145,6 +118,9 @@ function mod:ConfigureElement_HealthBar(frame, configuring)
local healthBar = frame.HealthBar
healthBar:SetPoint("TOP", frame, "CENTER", 0, self.db.units[frame.UnitType].castbar.height + 3)
frame:SetWidth(self.db.clickableWidth + ((E.PixelMode and 2) or 6))
frame:SetHeight(self.db.clickableHeight + self.db.units[frame.UnitType].castbar.height + 3)
if frame.isTarget and self.db.useTargetScale then
healthBar:SetHeight(self.db.units[frame.UnitType].healthbar.height * ((frame.CustomScale and frame.CustomScale * self.db.targetScale) or self.db.targetScale))
healthBar:SetWidth(self.db.units[frame.UnitType].healthbar.width * ((frame.CustomScale and frame.CustomScale * self.db.targetScale) or self.db.targetScale))
@@ -165,16 +141,15 @@ end
function mod:ConstructElement_HealthBar(parent)
local frame = CreateFrame("StatusBar", nil, parent)
self:StyleFrame(frame)
--[[
frame:SetScript("OnSizeChanged", function()
parent:SetWidth(this:GetWidth())
parent:SetHeight(this:GetHeight())
local health = this:GetValue()
local _, maxHealth = this:GetMinMaxValues()
if health > maxHealth or health < 0 then return end
this:GetStatusBarTexture():SetPoint("TOPRIGHT", -(this:GetWidth() * ((maxHealth - health) / maxHealth)), 0)
end)
]]
frame.text = frame:CreateFontString(nil, "OVERLAY")
frame.scale = CreateAnimationGroup(frame)
ElvUI/Modules/NamePlates/NamePlates.lua
+47 -39
View File
@@ -1,6 +1,6 @@
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local mod = E:NewModule("NamePlates", "AceHook-3.0", "AceEvent-3.0", "AceTimer-3.0");
--local CC = E:GetModule("ClassCache");
local CC = E:GetModule("ClassCache");
--Cache global variables
--Lua functions
@@ -325,21 +325,9 @@ function mod:RoundColors(r, g, b)
end
function mod:UnitClass(name, type)
--[[if E.private.general.classCache then
if type == "FRIENDLY_PLAYER" then
local _, class = UnitClass(name)
if class then
return class
else
local name, realm = split("-", name)
return CC:GetClassByName(name, realm)
end
end
else
if type == "FRIENDLY_PLAYER" then
return select(2, UnitClass(name))
end
end--]]
if E.private.general.classCache then
return CC:GetClassByName(name)
end
end
function mod:UnitDetailedThreatSituation(frame)
@@ -386,9 +374,15 @@ function mod:GetUnitInfo(frame)
end
end
function mod:OnShow(self)
self:SetWidth(0.01)
self:SetHeight(0.01)
function mod:OnShow(self, isUpdate)
if mod.db.motionType == "OVERLAP" then
self:SetWidth(0.001)
self:SetHeight(0.001)
end
if not isUpdate then
self.UnitFrame.moveUp:Play()
end
mod.VisiblePlates[self.UnitFrame] = true
@@ -498,7 +492,7 @@ end
function mod:UpdateAllFrame(frame)
mod:OnHide(frame:GetParent())
mod:OnShow(frame:GetParent())
mod:OnShow(frame:GetParent(), true)
end
function mod:ConfigureAll()
@@ -556,14 +550,23 @@ function mod:UpdateElement_All(frame, noTargetFrame, filterIgnore)
end
end
function mod:AnimatedHide()
local num = 0
for frame in pairs(mod.VisiblePlates) do
frame.moveDown:Play()
num = num + 1
end
if num < 1 then
end
end
local plateID = 0
function mod:OnCreated(frame)
plateID = plateID + 1
local HealthBar = frame:GetChildren()
local Border, Highlight, Name, Level, BossIcon, RaidIcon = frame:GetRegions()
frame.UnitFrame = CreateFrame("Button", format("ElvUI_NamePlate%d", plateID), frame)
E:Size(frame.UnitFrame, 100, 20)
frame.UnitFrame:SetPoint("CENTER", 0, 0)
frame.UnitFrame.plateID = plateID
@@ -572,6 +575,26 @@ function mod:OnCreated(frame)
frame:Click()
end)
frame.UnitFrame.moveUp = CreateAnimationGroup(frame.UnitFrame)
local moveUp = frame.UnitFrame.moveUp:CreateAnimation("Move")
moveUp:SetDuration(0)
moveUp:SetOffset(0, -35)
moveUp:SetOrder(1)
moveUp = frame.UnitFrame.moveUp:CreateAnimation("Move")
moveUp:SetDuration(0.5)
moveUp:SetOffset(0, 35)
moveUp:SetSmoothing("Out")
moveUp:SetOrder(2)
frame.UnitFrame.moveDown = CreateAnimationGroup(frame.UnitFrame)
local moveDown = frame.UnitFrame.moveDown:CreateAnimation("Move")
moveDown:SetDuration(0.1)
moveDown:SetOffset(0, -35)
moveDown:SetSmoothing("In")
moveDown:SetScript("OnFinished", function(self)
self:Reset()
end)
frame.UnitFrame.HealthBar = self:ConstructElement_HealthBar(frame.UnitFrame)
frame.UnitFrame.Level = self:ConstructElement_Level(frame.UnitFrame)
frame.UnitFrame.Name = self:ConstructElement_Name(frame.UnitFrame)
@@ -602,8 +625,8 @@ function mod:OnCreated(frame)
self:OnShow(frame)
HookScript(frame, "OnShow", function() self:OnShow(this) end)
HookScript(frame, "OnHide", function() self:OnHide(this) end)
frame:SetScript("OnShow", function() self:OnShow(this) end)
frame:SetScript("OnHide", function() self:OnHide(this) end)
HookScript(HealthBar, "OnValueChanged", self.UpdateElement_HealthOnValueChanged)
@@ -630,21 +653,6 @@ function mod:QueueObject(object)
object:Hide()
end
function mod:GetChildren(...)
local count = WorldGetNumChildren(WorldFrame)
if count ~= numChildren then
local frame, region
for i = numChildren + 1, count do
frame = arg[i]
region = frame:GetRegions()
if not mod.CreatedPlates[frame] and region and region:GetObjectType() == "Texture" and region:GetTexture() == BORDER then
mod:OnCreated(frame)
end
numChildren = count
end
end
end
function mod:OnUpdate()
local count = WorldGetNumChildren(WorldFrame)
if count ~= numChildren then