From b592a2ebc41874498bdd40a7acafe154ee0b57d8 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Fri, 19 Jun 2015 10:47:58 +0400 Subject: [PATCH] damn enchants --- .../Armory/CharacterArmory/CharacterArmory.lua | 14 ++++++++------ .../modules/Armory/InspectArmory/InspectArmory.lua | 16 +++++++++------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua index ca1cabd..2762269 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua @@ -631,12 +631,14 @@ function CA:Update_Gear() end if E.db.sle.Armory.Character.NoticeMissing ~= false then - if not Slot.IsEnchanted and Info.Armory_Constants.EnchantableSlots[SlotName] and not (SlotName == 'SecondaryHandSlot' and ItemType ~= 'INVTYPE_WEAPON' and ItemType ~= 'INVTYPE_WEAPONOFFHAND' and ItemType ~= 'INVTYPE_RANGEDRIGHT') then - ErrorDetected = true - Slot.EnchantWarning:Show() - - if not E.db.sle.Armory.Character.Enchant.WarningIconOnly then - Slot.ItemEnchant:SetText('|cffff0000'..L['Not Enchanted']) + if not Slot.IsEnchanted and Info.Armory_Constants.EnchantableSlots[SlotName] then + if (SlotName == 'SecondaryHandSlot' and ItemType ~= 'INVTYPE_SHIELD' and ItemType ~= 'INVTYPE_HOLDABLE' and ItemType ~= 'INVTYPE_WEAPONOFFHAND' and ItemType ~= 'INVTYPE_RANGEDRIGHT') or SlotName ~= 'SecondaryHandSlot' then + ErrorDetected = true + Slot.EnchantWarning:Show() + + if not E.db.sle.Armory.Character.Enchant.WarningIconOnly then + Slot.ItemEnchant:SetText('|cffff0000'..L['Not Enchanted']) + end end end diff --git a/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua b/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua index 703b510..0bce00d 100644 --- a/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua +++ b/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua @@ -1959,14 +1959,16 @@ function IA:InspectFrame_DataSetting(DataTable) end ]] if E.db.sle.Armory.Inspect.NoticeMissing ~= false then - if not Slot.IsEnchanted and Info.Armory_Constants.EnchantableSlots[SlotName] and not (SlotName == 'SecondaryHandSlot' and ItemType ~= 'INVTYPE_WEAPON' and ItemType ~= 'INVTYPE_WEAPONOFFHAND' and ItemType ~= 'INVTYPE_RANGEDRIGHT') then - ErrorDetected = true - Slot.EnchantWarning:Show() - - if not E.db.sle.Armory.Inspect.Enchant.WarningIconOnly then - Slot.Gradation.ItemEnchant:SetText('|cffff0000'..L['Not Enchanted']) - end + if not Slot.IsEnchanted and Info.Armory_Constants.EnchantableSlots[SlotName] then + if (SlotName == 'SecondaryHandSlot' and ItemType ~= 'INVTYPE_SHIELD' and ItemType ~= 'INVTYPE_HOLDABLE' and ItemType ~= 'INVTYPE_WEAPONOFFHAND' and ItemType ~= 'INVTYPE_RANGEDRIGHT') or SlotName ~= 'SecondaryHandSlot' then + ErrorDetected = true + Slot.EnchantWarning:Show() + + if not E.db.sle.Armory.Character.Enchant.WarningIconOnly then + Slot.ItemEnchant:SetText('|cffff0000'..L['Not Enchanted']) + end end + end if GemCount_Enable > GemCount_Now or GemCount_Enable > GemCount or GemCount_Now > GemCount then ErrorDetected = true -- 1.7.9.5