diff --git a/VikingNameplates.lua b/VikingNameplates.lua
index 6179e5c..e6b4f94 100755
--- a/VikingNameplates.lua
+++ b/VikingNameplates.lua
@@ -27,8 +27,6 @@ local VikingNameplates = {}
-- TODO Delete strings:
-- VikingNameplates_GuildDisplay
--- Disabled DrawLevel as it isn't currently being used
-
-----------------------------------------------------------------------------------------------
-- Constants
-----------------------------------------------------------------------------------------------
@@ -171,6 +169,7 @@ local karSavedProperties =
["bShowThreatIndicator"] = { default=false, nControlType=1, strControlName="IndividualShowThreatIndicator", fnCallback="OnSettingThreatIndicatorChanged" },
["bShowInterrupt"] = { default=false, nControlType=1, strControlName="IndividualShowInterrupt", fnCallback="OnSettingInterruptChanged" },
["bShowHealthTextMain"] = { default=false, nControlType=1, strControlName="IndividualShowHealthText" },
+ ["bShowLevelMain"] = { default=false, nControlType=1, strControlName="IndividualShowLevel", fnCallback="OnSettingLevelChanged" },
--Reward icons
["bShowRewardTypeQuest"] = { default=true, nControlType=1, strControlName="ShowRewardTypeQuest", fnCallback="UpdateAllNameplateRewards" },
["bShowRewardTypeMission"] = { default=true, nControlType=1, strControlName="ShowRewardTypeMission", fnCallback="UpdateAllNameplateRewards" },
@@ -193,6 +192,7 @@ local karSavedProperties =
["bShowCastBarTarget"] = { default=true, nControlType=1, strControlName="TargetedShowCastBar" },
["bShowCastBarSpellTarget"] = { default=true, nControlType=1, strControlName="TargetedShowCastBarSpell" },
["bShowHealthTextTarget"] = { default=false, nControlType=1, strControlName="TargetedShowHealthText" },
+ ["bShowLevelTarget"] = { default=false, nControlType=1, strControlName="TargetedShowLevel", fnCallback="OnSettingLevelChanged" },
--Non-targeted nameplates in combat
["bHideInCombat"] = { default=false, nControlType=0 }
}
@@ -265,7 +265,7 @@ function VikingNameplates:OnDocumentReady()
Apollo.RegisterEventHandler("UnitTitleChanged", "OnUnitTitleChanged", self)
Apollo.RegisterEventHandler("PlayerTitleChange", "OnPlayerTitleChanged", self)
Apollo.RegisterEventHandler("UnitGuildNameplateChanged", "OnUnitGuildNameplateChanged",self)
- --Apollo.RegisterEventHandler("UnitLevelChanged", "OnUnitLevelChanged", self)
+ Apollo.RegisterEventHandler("UnitLevelChanged", "OnUnitLevelChanged", self)
Apollo.RegisterEventHandler("UnitMemberOfGuildChange", "OnUnitMemberOfGuildChange", self)
Apollo.RegisterEventHandler("GuildChange", "OnGuildChange", self)
Apollo.RegisterEventHandler("UnitGibbed", "OnUnitGibbed", self)
@@ -476,7 +476,6 @@ function VikingNameplates:OnUnitCreated(unitNew) -- build main options here
background = wnd:FindChild("Container:BackgroundContainer"),
castBar = wnd:FindChild("Container:CastBar"),
vulnerable = wnd:FindChild("Container:Vulnerable"),
- level = wnd:FindChild("Container:Health:Level"),
guild = wnd:FindChild("Guild"),
name = wnd:FindChild("NameRewardContainer:Name"),
certainDeath = wnd:FindChild("TargetAndDeathContainer:CertainDeath"),
@@ -502,9 +501,9 @@ function VikingNameplates:OnUnitCreated(unitNew) -- build main options here
self.arUnit2Nameplate[idUnit] = tNameplate
self.arWnd2Nameplate[wnd:GetId()] = tNameplate
- self:DrawName(tNameplate)
+ self:DrawNameAndLevel(tNameplate)
self:DrawGuild(tNameplate)
- self:DrawLevel(tNameplate)
+ --self:DrawLevel(tNameplate)
self:UpdateNameplateRewardInfo(tNameplate)
self:DrawRewards(tNameplate)
self:DrawThreatIndicator(tNameplate)
@@ -569,6 +568,7 @@ function VikingNameplates:DrawNameplate(tNameplate)
self:DrawThreatIndicator(tNameplate)
self:DrawTargeting(tNameplate)
self:DrawInterrupt(tNameplate)
+ --self:DrawLevel(tNameplate)
end
function VikingNameplates:ColorNameplate(tNameplate)
@@ -630,13 +630,16 @@ function VikingNameplates:ColorNameplate(tNameplate)
tNameplate.wnd.guild:SetTextColor(crColorToUse)
end
-function VikingNameplates:DrawName(tNameplate)
+function VikingNameplates:DrawNameAndLevel(tNameplate)
local wndNameplate = tNameplate.wndNameplate
local unitOwner = tNameplate.unitOwner
-
+ local targetUnit = GameLib:GetTargetUnit()
local wndName = tNameplate.wnd.name
local bUseTarget = tNameplate.bIsTarget
local bShow = self.bShowNameMain
+ local sLevelText = unitOwner:GetLevel() or "--"
+ local bShowLevel = self.bShowLevelMain == true or (self.bShowLevelTarget == true and unitOwner == targetUnit)
+
if bUseTarget then
bShow = self.bShowNameTarget
end
@@ -646,10 +649,19 @@ function VikingNameplates:DrawName(tNameplate)
end
if bShow then
local strNewName
- if self.bShowTitle then
- strNewName = unitOwner:GetTitleOrName()
+ if bShowLevel then
+ local sLevelText = unitOwner:GetLevel() or "-"
+ if self.bShowTitle then
+ strNewName = unitOwner:GetTitleOrName() .. " - " .. sLevelText
+ else
+ strNewName = unitOwner:GetName() .. " - " .. sLevelText
+ end
else
- strNewName = unitOwner:GetName()
+ if self.bShowTitle then
+ strNewName = unitOwner:GetTitleOrName()
+ else
+ strNewName = unitOwner:GetName()
+ end
end
if wndName:GetText() ~= strNewName then
@@ -696,12 +708,6 @@ function VikingNameplates:DrawGuild(tNameplate)
end
end
-function VikingNameplates:DrawLevel(tNameplate)
- local unitOwner = tNameplate.unitOwner
-
- tNameplate.wnd.level:SetText(unitOwner:GetLevel() or "-")
-end
-
function VikingNameplates:DrawHealth(tNameplate)
local wndNameplate = tNameplate.wndNameplate
local unitOwner = tNameplate.unitOwner
@@ -1225,21 +1231,21 @@ end
function VikingNameplates:OnUnitNameChanged(unitUpdated, strNewName)
local tNameplate = self.arUnit2Nameplate[unitUpdated:GetId()]
if tNameplate ~= nil then
- self:DrawName(tNameplate)
+ self:DrawNameAndLevel(tNameplate)
end
end
function VikingNameplates:OnUnitTitleChanged(unitUpdated)
local tNameplate = self.arUnit2Nameplate[unitUpdated:GetId()]
if tNameplate ~= nil then
- self:DrawName(tNameplate)
+ self:DrawNameAndLevel(tNameplate)
end
end
function VikingNameplates:OnPlayerTitleChanged()
local tNameplate = self.arUnit2Nameplate[self.unitPlayer:GetId()]
if tNameplate ~= nil then
- self:DrawName(tNameplate)
+ self:DrawNameAndLevel(tNameplate)
end
end
@@ -1295,7 +1301,7 @@ function VikingNameplates:OnTargetUnitChanged(unitOwner) -- build targeted optio
tNameplateOther.bIsCluster = false
if bIsTarget or bIsCluster then
- self:DrawName(tNameplateOther)
+ self:DrawNameAndLevel(tNameplateOther)
self:DrawGuild(tNameplateOther)
--self:DrawLevel(tNameplateOther)
self:UpdateNameplateRewardInfo(tNameplateOther)
@@ -1313,7 +1319,7 @@ function VikingNameplates:OnTargetUnitChanged(unitOwner) -- build targeted optio
if GameLib.GetTargetUnit() == unitOwner then
tNameplate.bIsTarget = true
- self:DrawName(tNameplate)
+ self:DrawNameAndLevel(tNameplate)
self:DrawGuild(tNameplate)
--self:DrawLevel(tNameplate)
self:UpdateNameplateRewardInfo(tNameplate)
@@ -1434,7 +1440,13 @@ end
function VikingNameplates:OnSettingNameChanged()
for idx, tNameplate in pairs(self.arUnit2Nameplate) do
- self:DrawName(tNameplate)
+ self:DrawNameAndLevel(tNameplate)
+ end
+end
+
+function VikingNameplates:OnSettingLevelChanged()
+ for idx, tNameplate in pairs(self.arUnit2Nameplate) do
+ self:DrawNameAndLevel(tNameplate)
end
end
@@ -1446,7 +1458,7 @@ end
function VikingNameplates:OnSettingHealthChanged()
for idx, tNameplate in pairs(self.arUnit2Nameplate) do
- self:DrawLevel(tNameplate)
+ --self:DrawLevel(tNameplate)
end
end
diff --git a/VikingNameplates.xml b/VikingNameplates.xml
index 9d39c96..0b1577a 100755
--- a/VikingNameplates.xml
+++ b/VikingNameplates.xml
@@ -162,6 +162,10 @@
+
+
+
+
@@ -237,7 +241,7 @@
-
+
@@ -257,8 +261,12 @@
+
+
+
+
-
+
@@ -302,7 +310,6 @@
-