From 551e23162c1355ab083ba9d3c10de29b99a2404b Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sun, 12 Apr 2015 11:42:59 +0400 Subject: [PATCH] New options for backgrounds on char frame. Also 2h weapon ench errors (can't wait to get rid of this module <_<) --- .../modules/characterframe/characterframe.lua | 10 ++++++++-- ElvUI_SLE/options/characterframe_c.lua | 3 +++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ElvUI_SLE/modules/characterframe/characterframe.lua b/ElvUI_SLE/modules/characterframe/characterframe.lua index a231fd5..d35234e 100644 --- a/ElvUI_SLE/modules/characterframe/characterframe.lua +++ b/ElvUI_SLE/modules/characterframe/characterframe.lua @@ -22,6 +22,12 @@ local backgrounds = { ["CASTLE"] = "Castle", } +local backgroundsD = { + ["ALLIANCE2"] = [[Interface\LFGFrame\UI-PVP-BACKGROUND-Alliance]], + ["HORDE2"] = [[Interface\LFGFrame\UI-PVP-BACKGROUND-Horde]], + ["ARENA"] = [[Interface\PVPFrame\PvpBg-NagrandArena-ToastBG]], +} + do --<< Button Script >>-- function CA:OnEnter() if self.Link or self.Message then @@ -628,7 +634,7 @@ function CA:Update_Gear() if not IsEnchanted and C.EnchantableSlots[SlotName] then local id = GetInventoryItemID("player", Slot.ID) local IType = select(9, GetItemInfo(id)) - if IType == "INVTYPE_WEAPON" or IType == "INVTYPE_RANGEDRIGHT" then + if IType == "INVTYPE_WEAPON" or IType == "INVTYPE_RANGEDRIGHT" or IType == "INVTYPE_2HWEAPON"then ErrorDetected = true Slot.EnchantWarning:Show() Slot.ItemEnchant:SetText('|cffff0000'..L['Not Enchanted']) @@ -783,7 +789,7 @@ function CFO:UpdateCharacterBG() local BGdrop = E.db.sle.characterframeoptions.image.dropdown if E.db.sle.characterframeoptions.showimage ~= false then if BGdrop ~= "CUSTOM" then - CA.BG:SetTexture('Interface\\AddOns\\ElvUI_SLE\\media\\textures\\'..backgrounds[BGdrop]) + CA.BG:SetTexture(backgrounds[BGdrop] and 'Interface\\AddOns\\ElvUI_SLE\\media\\textures\\'..backgrounds[BGdrop] or backgroundsD[BGdrop]) else CA.BG:SetTexture(E.db.sle.characterframeoptions.image.custom) end diff --git a/ElvUI_SLE/options/characterframe_c.lua b/ElvUI_SLE/options/characterframe_c.lua index 82f4ab7..347e1c5 100644 --- a/ElvUI_SLE/options/characterframe_c.lua +++ b/ElvUI_SLE/options/characterframe_c.lua @@ -78,10 +78,13 @@ local function configTable() values = { ['SPACE'] = 'Space', ['ALLIANCE'] = FACTION_ALLIANCE, + ['ALLIANCE2'] = FACTION_ALLIANCE.." 2", ['HORDE'] = FACTION_HORDE, + ['HORDE2'] = FACTION_HORDE.." 2", ['CUSTOM'] = L["Custom"], ["EMPIRE"] = "The Empire", ["CASTLE"] = "Castle", + ["ARENA"] = ARENA, }, get = function() return E.db.sle.characterframeoptions.image.dropdown end, set = function(_, value) -- 1.7.9.5