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

Merge pull request #299 from eswald/stockflow-40 

Stockflow Repairs
develop
Quietust 2014-08-28 14:56:04 -05:00
parent f0c52a9a73 632b0b85bd
commit 5c0588dd34
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -978,10 +978,10 @@ end
function findItemsAtTile(x, y, z) function findItemsAtTile(x, y, z)
-- There should be a faster and easier way to do this... -- There should be a faster and easier way to do this...
local found = {} local found = {}
for _, item in ipairs(df.global.world.items.all) do local items = dfhack.maps.getTileBlock(x, y, z).items
-- local ix, iy, iz = dfhack.items.getPosition(item) for _, item_id in ipairs(items) do
if item.pos.x == x and item.pos.y == y and local item = df.item.find(item_id)
item.pos.z == z and item.flags.on_ground then if item.pos.x == x and item.pos.y == y and item.flags.on_ground then
found[#found+1] = item found[#found+1] = item
end end
end end
@ -1042,9 +1042,7 @@ function check_pile(sp, verbose)
local empty = 0 local empty = 0
for y = sp.y1, sp.y2 do for y = sp.y1, sp.y2 do
for x = sp.x1, sp.x2 do for x = sp.x1, sp.x2 do
-- Sadly, the obvious check currently fails when y == sp.y2 if dfhack.buildings.containsTile(sp, x, y) then
if dfhack.buildings.containsTile(sp, x, y) or
(y == sp.y2 and dfhack.buildings.findAtTile(x, y, sp.z) == sp) then
numspaces = numspaces + 1 numspaces = numspaces + 1
local designation, occupancy = dfhack.maps.getTileFlags(x, y, sp.z) local designation, occupancy = dfhack.maps.getTileFlags(x, y, sp.z)
if not designation.liquid_type then if not designation.liquid_type then
@ -1115,8 +1113,6 @@ function matches_stockpile(item, settings)
return settings.flags.food return settings.flags.food
elseif df.item_plantst:is_instance(item) then elseif df.item_plantst:is_instance(item) then
return settings.flags.food return settings.flags.food
elseif df.item_leavesst:is_instance(item) then
return settings.flags.food
elseif df.item_cheesest:is_instance(item) then elseif df.item_cheesest:is_instance(item) then
return settings.flags.food return settings.flags.food
elseif df.item_globst:is_instance(item) then elseif df.item_globst:is_instance(item) then