From 8408ffd1ecce73f5b408a022b3b4876126a90d61 Mon Sep 17 00:00:00 2001 From: mikx Date: Sun, 6 Dec 2020 05:03:00 -0500 Subject: [PATCH] Alert Fixes (2.1.1) --- Event/LOOT_OPENED.lua | 13 +++++++++---- Frame/Frame_Alert.lua | 4 +++- MxW.toc | 2 +- init.lua | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Event/LOOT_OPENED.lua b/Event/LOOT_OPENED.lua index 86e9189..3efa6bb 100644 --- a/Event/LOOT_OPENED.lua +++ b/Event/LOOT_OPENED.lua @@ -35,11 +35,16 @@ LOOT_OPENED_Frame:SetScript("OnEvent", if (itemId ~= nil) then value = MX.TSM:GetItemValue(itemId, "DBMinBuyout"); end - - MX:SendAlert(iLink,lootQuantity,value,by) - by = by - 85 + if (value ~= nil and value >= Farmer_Logic_MinAlert) then + if (quality ~= nil and quality >= 1) then + if (class == L["Alert_Class_Armor"] or class == L["Alert_Class_Weapon"] or class == L["Alert_Class_TradeGoods"] or class == L["Alert_Class_Consumable"] or class == L["Alert_Class_Misc"] or class == "Recipe") then + MX:SendAlert(iLink,lootQuantity,value,by) + by = by - 85 + end + end + end end - if (value ~= nil) then + if (value ~= nil and quality ~= nil and quality >= 1) then Farmer_Money_LootSession = Farmer_Money_LootSession + value; MX:MainUIUpdate() value = nil diff --git a/Frame/Frame_Alert.lua b/Frame/Frame_Alert.lua index 4b93721..0ba65c8 100644 --- a/Frame/Frame_Alert.lua +++ b/Frame/Frame_Alert.lua @@ -19,8 +19,10 @@ function MX:ShowAlert(item,stackqty,value,y) local AlertIcon = AlertUI:CreateTexture(nil,"ARTWORK") local itemName, itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, itemTexture, itemSellPrice = GetItemInfo(item) + local frameWidth = 200 + (string.len(itemLink)*2); + AlertUI:SetFrameStrata("BACKGROUND") - AlertUI:SetWidth(300) + AlertUI:SetWidth(frameWidth) AlertUI:SetHeight(80) AlertUI:SetPoint("CENTER", 0, y) diff --git a/MxW.toc b/MxW.toc index ae4a9ba..4206703 100644 --- a/MxW.toc +++ b/MxW.toc @@ -1,6 +1,6 @@ ## Interface: 90001 ## Title: |cff1784d1MxW|r -## Version: 2.1.0 +## Version: 2.1.1 ## Author: mikx ## Notes: MxW Addon ## RequiredDeps: TradeSkillMaster diff --git a/init.lua b/init.lua index 954180e..22da638 100644 --- a/init.lua +++ b/init.lua @@ -168,7 +168,7 @@ local function MyAddonCommands(msg, editbox) elseif (msg == 'atest') then local by = 300; for i = 4,1,-1 do - MX:ShowAlert("\124cff1eff00\124Hitem:171830::::::::60:::::\124h[Oxxein Ore]\124h\124r",4,50000000,by); + MX:ShowAlert("\124cff0070dd\124Hitem:145050::::::::60:::::\124h[Cruel Combatant's Dreadplate Chestpiece]\124h\124r",4,50000000,by); by = by - 90; end local by = 300;