MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switching stockflow to the internal getStockpileContents. 

This should speed it up over checking each space individually, but no longer counts spaces with empty assigned bins and barrels as empty.
develop
Eric Wald 2014-09-07 15:07:57 -06:00
parent 1ce07c063d
commit 83b1317173
1 changed files with 11 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
plugins/lua/stockflow.lua
Unescape Escape View File

@ -973,49 +973,28 @@ function create_orders(order, amount)
df.global.world.manager_orders:insert('#', new_order)
end
function findItemsAtTile(x, y, z)
-- There should be a faster and easier way to do this...
local found = {}
local items = dfhack.maps.getTileBlock(x, y, z).items
for _, item_id in ipairs(items) do
local item = df.item.find(item_id)
if item.pos.x == x and item.pos.y == y and item.flags.on_ground then
found[#found+1] = item
end
end
return found
end
function countContents(container, settings)
local total = 0
local blocking = false
for _, item in ipairs(dfhack.items.getContainedItems(container)) do
if item.flags.container then
-- Recursively count the total of items contained.
-- Not likely to go more than two levels deep.
local subtotal, subblocked = countContents(item, settings)
local subtotal = countContents(item, settings)
if subtotal > 0 then
-- Ignore the inner container itself;
-- generally, only the contained items matter.
total = total + subtotal
elseif subblocked then
blocking = true
elseif matches_stockpile(item, settings) then
-- The container may or may not be empty,
-- but is stockpiled as a container itself.
total = total + 1
else
blocking = true
end
elseif matches_stockpile(item, settings) then
total = total + 1
else
blocking = true
end
end
return total, blocking
return total
end
function check_stockpiles(verbose)
@ -1046,19 +1025,21 @@ function check_pile(sp, verbose)
if not designation.liquid_type then
if not occupancy.item then
empty = empty + 1
else
local item_count, blocked = count_pile_items(sp, x, y)
if item_count > 0 then
filled = filled + item_count
elseif not blocked then
empty = empty + 1
end
end
end
end
end
end
for _, item in ipairs(dfhack.buildings.getStockpileContents(sp)) do
if item:isAssignedToThisStockpile(sp.id) then
-- This is a bin or barrel associated with the stockpile.
filled = filled + countContents(item, sp.settings)
elseif matches_stockpile(item, sp.settings) then
filled = filled + 1
end
end
if verbose then
print("Stockpile #"..sp.stockpile_number,
string.format("%3d spaces", numspaces),
@ -1069,29 +1050,6 @@ function check_pile(sp, verbose)
return filled, empty
end
function count_pile_items(sp, x, y)
local item_count = 0
local blocked = false
for _, item in ipairs(findItemsAtTile(x, y, sp.z)) do
if item:isAssignedToThisStockpile(sp.id) then
-- This is a bin or barrel associated with the stockpile.
-- If it's empty, it doesn't count as blocking the stockpile space.
-- Oddly, when empty, item.flags.container might be false.
local subtotal, subblocked = countContents(item, sp.settings)
item_count = item_count + subtotal
if subblocked then
blocked = true
end
elseif matches_stockpile(item, sp.settings) then
item_count = item_count + 1
else
blocked = true
end
end
return item_count, blocked
end
function matches_stockpile(item, settings)
-- Check whether the item matches the stockpile.
-- FIXME: This is starting to look like a whole lot of work.