Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tiny change in auction finding function

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-02-10 02:58:34 +01:00
parent 18c8afb550
commit 5ce55bdd1d
2 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
history.lua
+11 -10
View File
@@ -23,7 +23,7 @@ function private.read_record(item_key)
next_push = tonumber(fields[1]), next_push = tonumber(fields[1]),
daily_max_bid = tonumber(fields[2]), daily_max_bid = tonumber(fields[2]),
daily_min_buyout = tonumber(fields[3]), daily_min_buyout = tonumber(fields[3]),
daily_max_buyout = tonumber(fields[4]), daily_max_price = tonumber(fields[4]),
market_values = Aux.util.map(Aux.persistence.deserialize(fields[5], ';'), function(value) market_values = Aux.util.map(Aux.persistence.deserialize(fields[5], ';'), function(value)
return tonumber(value) return tonumber(value)
end), end),
@@ -49,7 +49,7 @@ function private.write_record(item_key, record)
record.next_push or '', record.next_push or '',
record.daily_max_bid or '', record.daily_max_bid or '',
record.daily_min_buyout or '', record.daily_min_buyout or '',
record.daily_max_buyout or '', record.daily_max_price or '',
Aux.persistence.serialize(record.market_values, ';'), Aux.persistence.serialize(record.market_values, ';'),
Aux.persistence.serialize(record.max_bids, ';', 'x'), Aux.persistence.serialize(record.max_bids, ';', 'x'),
},'#') },'#')
@@ -59,25 +59,26 @@ function public.process_auction(auction_info)
local item_record = private.read_record(auction_info.item_key) local item_record = private.read_record(auction_info.item_key)
-- item_record.auction_count = item_record.auction_count + 1 local unit_high_bid = ceil(auction_info.high_bid / auction_info.aux_quantity)
local unit_bid_price = ceil(auction_info.bid_price / auction_info.aux_quantity)
local unit_buyout_price = ceil(auction_info.buyout_price / auction_info.aux_quantity)
if auction_info.high_bid > 0 then if auction_info.high_bid > 0 then
local unit_high_bid = ceil(auction_info.high_bid / auction_info.aux_quantity)
item_record.daily_max_bid = item_record.daily_max_bid and max(item_record.daily_max_bid, unit_high_bid) or unit_high_bid item_record.daily_max_bid = item_record.daily_max_bid and max(item_record.daily_max_bid, unit_high_bid) or unit_high_bid
end end
if auction_info.buyout_price > 0 then if auction_info.buyout_price > 0 then
local unit_buyout_price = ceil(auction_info.buyout_price / auction_info.aux_quantity)
item_record.daily_max_buyout = item_record.daily_max_buyout and max(item_record.daily_max_buyout, unit_buyout_price) or unit_buyout_price
item_record.daily_min_buyout = item_record.daily_min_buyout and min(item_record.daily_min_buyout, unit_buyout_price) or unit_buyout_price item_record.daily_min_buyout = item_record.daily_min_buyout and min(item_record.daily_min_buyout, unit_buyout_price) or unit_buyout_price
end end
item_record.daily_max_price = max(item_record.daily_price or 0, unit_buyout_price, unit_bid_price)
private.write_record(auction_info.item_key, item_record) private.write_record(auction_info.item_key, item_record)
end end
function public.price_data(item_key) function public.price_data(item_key)
local item_record = private.read_record(item_key) local item_record = private.read_record(item_key)
return item_record.daily_max_bid, item_record.daily_min_buyout, item_record.daily_max_buyout, item_record.market_values, item_record.max_bids return item_record.daily_max_bid, item_record.daily_min_buyout, item_record.daily_max_price, item_record.market_values, item_record.max_bids
end end
function public.value(item_key) function public.value(item_key)
@@ -119,8 +120,8 @@ function private.market_value(item_record)
estimate = item_record.daily_max_bid estimate = item_record.daily_max_bid
end end
if item_record.daily_max_buyout and item_record.daily_max_buyout > estimate then if item_record.daily_max_price and item_record.daily_max_price > estimate then
estimate = min(ceil(estimate * 1.15), item_record.daily_max_buyout) estimate = min(ceil(estimate * 1.15), item_record.daily_max_price)
end end
return estimate return estimate
@@ -159,6 +160,6 @@ function private.push_record(item_record)
item_record.daily_max_bid = nil item_record.daily_max_bid = nil
item_record.daily_min_buyout = nil item_record.daily_min_buyout = nil
item_record.daily_max_buyout = nil item_record.daily_max_price = nil
item_record.next_push = time() + private.PUSH_INTERVAL item_record.next_push = time() + private.PUSH_INTERVAL
end end
scan_util.lua
+11 -7
View File
@@ -24,18 +24,22 @@ function m.find(test, query, page, status_bar, on_failure, on_success)
end, end,
} }
local found
Aux.scan.start{ Aux.scan.start{
queries = { new_query }, queries = { new_query },
on_read_auction = function(auction_info, ctrl) on_read_auction = function(auction_info, ctrl)
if test(auction_info.index) then if test(auction_info.index) then
found = true
ctrl.suspend() ctrl.suspend()
if not test(auction_info.index) then status_bar:update_status(100, 100)
return on_failure() status_bar:set_text('Auction found')
else return on_success(auction_info.index)
status_bar:update_status(100, 100) end
status_bar:set_text('Auction found') end,
return on_success(auction_info.index) on_abort = function()
end if not found then
status_bar:update_status(100, 100)
status_bar:set_text('Auction not found')
end end
end, end,
on_complete = function() on_complete = function()