diff --git a/ElvUI_SLE/ElvUI_SLE.toc b/ElvUI_SLE/ElvUI_SLE.toc index 4442714..04f2fe2 100644 --- a/ElvUI_SLE/ElvUI_SLE.toc +++ b/ElvUI_SLE/ElvUI_SLE.toc @@ -10,7 +10,7 @@ ## OptionalDeps: AddonSkins, iFilger_ConfigUI, BigWigs, Clique, Hermes, xCT+ ## DefaultState: Enabled ## X-ElvVersion: 8.08 -## SavedVariables: KnightFrame_ArmoryDB +## SavedVariables: SLE_ArmoryDB libs\load_libs.xml locales\load_locales.xml diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua index 68db381..77a4884 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua @@ -592,14 +592,14 @@ function CA:Update_Gear() end end - for Old, New in pairs(KnightFrame_ArmoryDB.EnchantString) do + for Old, New in pairs(SLE_ArmoryDB.EnchantString) do CurrentLineText = gsub(CurrentLineText, Old, New) end Slot.ItemEnchant:SetText('|cffceff00'..CurrentLineText) end - IsEnchanted = true + Slot.IsEnchanted = true elseif CurrentLineText:find(ITEM_SPELL_TRIGGER_ONUSE) then UsableEffect = true end diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/Profile.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/Profile.lua index 26f6228..ce4d5bb 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/Profile.lua +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/Profile.lua @@ -23,25 +23,25 @@ P.sle.Armory.Character = { Level = { Display = 'Always', -- Always, MouseoverOnly, Hide ShowUpgradeLevel = false, - Font = nil, + Font = "ElvUI Font", FontSize = 10, - FontStyle = nil + FontStyle = "OUTLINE", }, Enchant = { Display = 'Always', -- Always, MouseoverOnly, Hide WarningSize = 12, WarningIconOnly = false, - Font = nil, + Font = "ElvUI Font", FontSize = 8, - FontStyle = nil + FontStyle = "OUTLINE", }, Durability = { Display = 'Always', -- Always, MouseoverOnly, DamagedOnly, Hide - Font = nil, + Font = "ElvUI Font", FontSize = 9, - FontStyle = nil + FontStyle = "OUTLINE", }, Gem = { diff --git a/ElvUI_SLE/modules/Armory/Config.lua b/ElvUI_SLE/modules/Armory/Config.lua index 832e789..5bc4c2f 100644 --- a/ElvUI_SLE/modules/Armory/Config.lua +++ b/ElvUI_SLE/modules/Armory/Config.lua @@ -74,7 +74,7 @@ local function LoadArmoryConfigTable() values = function() local List = {} - for Old, New in pairs(KnightFrame_ArmoryDB.EnchantString) do + for Old, New in pairs(SLE_ArmoryDB.EnchantString) do if not SelectedEnchantString then SelectedEnchantString = Old end @@ -105,7 +105,7 @@ local function LoadArmoryConfigTable() desc = '', func = function() if EnchantString_Old ~= '' and EnchantString_New ~= '' then - KnightFrame_ArmoryDB.EnchantString[EnchantString_Old] = EnchantString_New + SLE_ArmoryDB.EnchantString[EnchantString_Old] = EnchantString_New EnchantString_Old = '' EnchantString_New = '' @@ -117,8 +117,8 @@ local function LoadArmoryConfigTable() if InspectArmory and InspectArmory.LastDataSetting then InspectArmory:InspectFrame_DataSetting(InspectArmory.CurrentInspectData) end - elseif KnightFrame_ArmoryDB.EnchantString[EnchantString_Old] and EnchantString_New == '' then - KnightFrame_ArmoryDB.EnchantString[EnchantString_Old] = nil + elseif SLE_ArmoryDB.EnchantString[EnchantString_Old] and EnchantString_New == '' then + SLE_ArmoryDB.EnchantString[EnchantString_Old] = nil end end, disabled = function() @@ -137,8 +137,8 @@ local function LoadArmoryConfigTable() order = 8, desc = '', func = function() - if KnightFrame_ArmoryDB.EnchantString[SelectedEnchantString] then - KnightFrame_ArmoryDB.EnchantString[SelectedEnchantString] = nil + if SLE_ArmoryDB.EnchantString[SelectedEnchantString] then + SLE_ArmoryDB.EnchantString[SelectedEnchantString] = nil SelectedEnchantString = '' if CharacterArmory then @@ -174,8 +174,8 @@ local function LoadArmoryConfigTable() local List = '' local Order = 1 - if KnightFrame_ArmoryDB.EnchantString and next(KnightFrame_ArmoryDB.EnchantString) then - for Old, New in pairs(KnightFrame_ArmoryDB.EnchantString) do + if SLE_ArmoryDB.EnchantString and next(SLE_ArmoryDB.EnchantString) then + for Old, New in pairs(SLE_ArmoryDB.EnchantString) do List = List..' '..Color('ffffffff', 'ff787878')..Order..'. '..Color('ffFF7E7E', 'ff787878')..Old..'|r '..Color('ffceff00', 'ff787878')..'->|r '..Color(nil, 'ff787878')..New..'|r|n' Order = Order + 1 end diff --git a/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua b/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua index 2e5cf94..23e058f 100644 --- a/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua +++ b/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua @@ -1902,7 +1902,7 @@ function IA:InspectFrame_DataSetting(DataTable) end end - for Old, New in pairs(KnightFrame_ArmoryDB.EnchantString) do + for Old, New in pairs(SLE_ArmoryDB.EnchantString) do CurrentLineText = gsub(CurrentLineText, Old, New) end diff --git a/ElvUI_SLE/modules/Armory/InspectArmory/Profile.lua b/ElvUI_SLE/modules/Armory/InspectArmory/Profile.lua index bda6b2d..585c554 100644 --- a/ElvUI_SLE/modules/Armory/InspectArmory/Profile.lua +++ b/ElvUI_SLE/modules/Armory/InspectArmory/Profile.lua @@ -23,18 +23,18 @@ P.sle.Armory.Inspect = { Level = { Display = 'Always', -- Always, MouseoverOnly, Hide ShowUpgradeLevel = false, - Font = nil, + Font = "ElvUI Font", FontSize = 10, - FontStyle = nil + FontStyle = "OUTLINE" }, Enchant = { Display = 'Always', -- Always, MouseoverOnly, Hide WarningSize = 12, WarningIconOnly = false, - Font = nil, + Font = "ElvUI Font", FontSize = 8, - FontStyle = nil + FontStyle = "OUTLINE" }, Gem = { diff --git a/ElvUI_SLE/modules/Armory/KnightFrame.lua b/ElvUI_SLE/modules/Armory/KnightFrame.lua index 1756eb2..e42dc4c 100644 --- a/ElvUI_SLE/modules/Armory/KnightFrame.lua +++ b/ElvUI_SLE/modules/Armory/KnightFrame.lua @@ -279,8 +279,8 @@ if not (select(2, GetAddOnInfo('ElvUI_KnightFrame')) and IsAddOnLoaded('ElvUI_Kn _G[AddOnName] = Engine - if type(KnightFrame_ArmoryDB) ~= 'table' then - KnightFrame_ArmoryDB = { + if type(SLE_ArmoryDB) ~= 'table' then + SLE_ArmoryDB = { EnchantString = {} } end