From 07b7895909859f2577ed2ccc898674c2efdf172f Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 30 Jul 2016 20:57:59 +0300 Subject: [PATCH] Adopted scripts from DejaCharacterStats to work with Armory. Removed some unneeded stuff as well. --- ElvUI_SLE/core/core.lua | 1 + ElvUI_SLE/locales/english.lua | 9 + ElvUI_SLE/locales/russian.lua | 8 + .../Armory/CharacterArmory/CharacterArmory.lua | 24 +- .../CharacterArmory/Load_CharacterArmory.xml | 1 + .../modules/Armory/CharacterArmory/Profile.lua | 22 +- ElvUI_SLE/modules/Armory/CharacterArmory/Stats.lua | 250 ++++++++++++++++++++ ElvUI_SLE/modules/Armory/Config.lua | 70 ++++++ 8 files changed, 372 insertions(+), 13 deletions(-) create mode 100644 ElvUI_SLE/modules/Armory/CharacterArmory/Stats.lua diff --git a/ElvUI_SLE/core/core.lua b/ElvUI_SLE/core/core.lua index 5fdbe8e..f3b7124 100644 --- a/ElvUI_SLE/core/core.lua +++ b/ElvUI_SLE/core/core.lua @@ -101,6 +101,7 @@ local _CompList = { "ElvUI_MerathilisUI", "QuestKing", "ElvUI_Enhanced", + "DejaCharacterStats", } for i = 1, #_CompList do if GetAddOnEnableState(E.myname, _CompList[i]) == 0 then SLE._Compatibility[_CompList[i]] = nil else SLE._Compatibility[_CompList[i]] = true end diff --git a/ElvUI_SLE/locales/english.lua b/ElvUI_SLE/locales/english.lua index 3b55460..4242e87 100644 --- a/ElvUI_SLE/locales/english.lua +++ b/ElvUI_SLE/locales/english.lua @@ -160,6 +160,14 @@ L["Only Damaged"] = true L["Gem Sockets"] = true L["Socket Size"] = true L["Inspect Armory"] = true +L["Full Item Level"] = true +L["Show both equipped and average item levels."] = true +L["Item Level Coloring"] = true +L["Color code item levels values. Equipped will be gradient, avarage - selected color."] = true +L["Color of Average"] = true +L["Sets the color of avarage item level."] = true +L["Only Relevant Stats"] = true +L["Show only those primary stats relevant to your spec."] = true --AFK L["You Are Away From Keyboard for"] = true @@ -863,6 +871,7 @@ Benik, The Slacker Blazeflack Boradan Camealion +Dejablue Nils Ruesch Omega1970 Pvtschlag diff --git a/ElvUI_SLE/locales/russian.lua b/ElvUI_SLE/locales/russian.lua index f367839..9d1bb87 100644 --- a/ElvUI_SLE/locales/russian.lua +++ b/ElvUI_SLE/locales/russian.lua @@ -157,6 +157,14 @@ L["Only Damaged"] = "Только поврежденные" L["Gem Sockets"] = "Слоты камней" L["Socket Size"] = "Размер слотов" L["Inspect Armory"] = "Осмотр" +L["Full Item Level"] = "Полный уровень предметов" +L["Show both equipped and average item levels."] = "Отображать и уровень одетых предметов, и общий средний уровень." +L["Item Level Coloring"] = "Окраска уровней предметов" +L["Color code item levels values. Equipped will be gradient, avarage - selected color."] = "Окрашивает значения уровней предметов. Цвет уровня одетых вещей будет градиентом, цвет среднего урвоня по выбору." +L["Color of Average"] = "Цвет стреднего" +L["Sets the color of avarage item level."] = "Устанавливает цвет среднего уровня предметов." +L["Only Relevant Stats"] = "Только подходящие" +L["Show only those primary stats relevant to your spec."] = "Отображает только те основные характеристики, что подходят вашей текущей специализации." --AFK L["You Are Away From Keyboard for"] = "Вы отошли на" diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua index 903b525..9cd2329 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua @@ -241,10 +241,10 @@ function CA:Setup_CharacterArmory() _G["CharacterLevelText"]:SetText('|c'..RAID_CLASS_COLORS[E.myclass].colorStr.._G["CharacterLevelText"]:GetText()) _G["CharacterFrameTitleText"]:ClearAllPoints() - _G["CharacterFrameTitleText"]:Point('TOP', self, 0, 23) + _G["CharacterFrameTitleText"]:Point('TOP', self, 0, 35) _G["CharacterFrameTitleText"]:SetParent(self) _G["CharacterLevelText"]:ClearAllPoints() - _G["CharacterLevelText"]:SetPoint('TOP', _G["CharacterFrameTitleText"], 'BOTTOM', 0, -13) + _G["CharacterLevelText"]:SetPoint('TOP', _G["CharacterFrameTitleText"], 'BOTTOM', 0, 2) _G["CharacterLevelText"]:SetParent(self) end end) @@ -262,13 +262,6 @@ function CA:Setup_CharacterArmory() --<< Change Model Frame's frameLevel >>-- _G["CharacterModelFrame"]:SetFrameLevel(self:GetFrameLevel() + 2) - --<< Average Item Level >>-- - KF:TextSetting(self, nil, { Tag = 'AverageItemLevel', FontSize = 12 }, 'BOTTOM', _G["CharacterModelFrame"], 'TOP', 0, 14) - local function ValueColorUpdate() - self.AverageItemLevel:SetText(KF:Color_Value(L["Average"])..' : '..format('%.2f', T.select(2, T.GetAverageItemLevel()))) - end - E.valueColorUpdateFuncs[ValueColorUpdate] = true - -- Create each equipment slots gradation, text, gem socket icon. local Slot for i, SlotName in T.pairs(Info.Armory_Constants.GearList) do @@ -744,8 +737,6 @@ function CA:Update_Gear() end end - self.AverageItemLevel:SetText(KF:Color_Value(STAT_AVERAGE_ITEM_LEVEL)..' : '..format('%.2f', T.select(2, T.GetAverageItemLevel()))) - if NeedUpdateList then self.GearUpdated = NeedUpdateList return true @@ -852,7 +843,6 @@ function CA:Update_Display(Force) end end - KF.Modules[#KF.Modules + 1] = 'CharacterArmory' KF.Modules.CharacterArmory = function() if E.db.sle.Armory.Character.Enable ~= false then @@ -940,4 +930,14 @@ KF.Modules.CharacterArmory = function() KF_KnightArmory_NoticeMissing.CheckButton:SetTexture('Interface\\Buttons\\UI-CheckBox-Check-Disabled') ]] end + if SLE._Compatibility["DejaCharacterStats"] then return end + --Resize and reposition god damned ilevel text + CharacterStatsPane.ItemLevelFrame:SetPoint("TOP", CharacterStatsPane.ItemLevelCategory, "BOTTOM", 0, 6) + CharacterStatsPane.ItemLevelFrame:SetHeight(15) + CharacterStatsPane.ItemLevelFrame.Background:SetHeight(15) + CharacterStatsPane.ItemLevelFrame.leftGrad:SetHeight(15) + CharacterStatsPane.ItemLevelFrame.rightGrad:SetHeight(15) + CharacterStatsPane.ItemLevelFrame.Value:FontTemplate() + hooksecurefunc("PaperDollFrame_UpdateStats", CA.PaperDollFrame_UpdateStats) + CA:ToggleStats() end \ No newline at end of file diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/Load_CharacterArmory.xml b/ElvUI_SLE/modules/Armory/CharacterArmory/Load_CharacterArmory.xml index 0686a7b..a16c3f8 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/Load_CharacterArmory.xml +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/Load_CharacterArmory.xml @@ -1,4 +1,5 @@