diff --git a/KiwiFarm.lua b/KiwiFarm.lua index 081e1ec..23d4c4d 100644 --- a/KiwiFarm.lua +++ b/KiwiFarm.lua @@ -660,6 +660,8 @@ do elseif source == 'Aux:Disenchant' and AuxDisenchant then local item = AuxInfo.item(itemID) price = item and AuxDisenchant.value(item.item_id, item.slot, item.quality, item.level) + elseif source == 'REC:Market' and RECrystallize_PriceCheck then + price = RECrystallize_PriceCheck(itemLink) elseif TSM_API and TSM_API.GetCustomPriceValue then -- TSM sources price = TSM_API.GetCustomPriceValue(source, "i:"..itemID) end @@ -1722,7 +1724,7 @@ do local function InitPriceSources(menu) for i=#menu,1,-1 do local arg = menu[i].arg1 - if (arg =='Atr' and not Atr_GetAuctionPrice and not Auctionator) or (arg =='TSM' and not TSM_API) or (arg == 'Aux' and not aux_frame) then + if (arg =='Atr' and not Atr_GetAuctionPrice and not Auctionator) or (arg =='TSM' and not TSM_API) or (arg == 'Aux' and not aux_frame) or (arg == 'REC' and not RECrystallize_PriceCheck) then tremove(menu,i) end end @@ -1830,17 +1832,18 @@ do sources[info.value] = (not sources[info.value]) or nil end menuQualitySources = { - { text = L['Vendor Price'], value = 'vendor', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Auctionator: Market Value'], value = 'Atr:DBMarket', arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Auctionator: Disenchant'], value = 'Atr:Destroy' , arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Market Value'], value = 'DBMarket', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Historical'], value = 'DBHistorical', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Recent'], value = 'DBRecent', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Min Buyout'], value = 'DBMinBuyout', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Disenchant'], value = 'Destroy', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Aux: Market Value'], value = 'Aux:Market', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Aux: Min Buyout'], value = 'Aux:MinBuyout', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Aux: Disenchant'], value = 'Aux:Disenchant', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Vendor Price'], value = 'vendor', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Auctionator: Market Value'], value = 'Atr:DBMarket', arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Auctionator: Disenchant'], value = 'Atr:Destroy' , arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Market Value'], value = 'DBMarket', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Historical'], value = 'DBHistorical', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Recent'], value = 'DBRecent', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Min Buyout'], value = 'DBMinBuyout', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Disenchant'], value = 'Destroy', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Aux: Market Value'], value = 'Aux:Market', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Aux: Min Buyout'], value = 'Aux:MinBuyout', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Aux: Disenchant'], value = 'Aux:Disenchant', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['RECrystallize: Market Value'], value = 'REC:Market', arg1 = 'REC', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, init = InitPriceSources } end @@ -1913,18 +1916,19 @@ do end -- submenu: item price sources menuItemSources = { - { text = getText, value = 'user', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Vendor Price'], value = 'vendor', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Auctionator: Market Value'], value = 'Atr:DBMarket', arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Auctionator: Disenchant'], value = 'Atr:Destroy' , arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Market Value'], value = 'DBMarket', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Historical'], value = 'DBHistorical', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Recent'], value = 'DBRecent', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Min Buyout'], value = 'DBMinBuyout', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['TSM: Disenchant'], value = 'Destroy', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Aux: Market Value'], value = 'Aux:Market', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Aux: Min Buyout'], value = 'Aux:MinBuyout', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, - { text = L['Aux: Disenchant'], value = 'Aux:Disenchant', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = getText, value = 'user', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Vendor Price'], value = 'vendor', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Auctionator: Market Value'], value = 'Atr:DBMarket', arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Auctionator: Disenchant'], value = 'Atr:Destroy' , arg1 = 'Atr', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Market Value'], value = 'DBMarket', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Historical'], value = 'DBHistorical', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Recent'], value = 'DBRecent', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Min Buyout'], value = 'DBMinBuyout', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['TSM: Disenchant'], value = 'Destroy', arg1 = 'TSM', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Aux: Market Value'], value = 'Aux:Market', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Aux: Min Buyout'], value = 'Aux:MinBuyout', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['Aux: Disenchant'], value = 'Aux:Disenchant', arg1 = 'Aux', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, + { text = L['RECrystallize: Market Value'], value = 'REC:Market', arg1 = 'REC', isNotRadio = true, keepShownOnClick = 1, checked = checked, func = set }, init = InitPriceSources, } -- submenu: individual items prices