Skip to content

Fix combine-plants recursion bug #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lethosor merged 2 commits into from
Jul 7, 2016
Merged

Fix combine-plants recursion bug #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221163d
fix recursion not working
kane-t Jul 4, 2016
0253756
strip trailing whitespace
kane-t Jul 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions combine-plants.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,34 @@ if args.stockpile then stockpile = df.building.find(tonumber(args.stockpile)) en
local container = nil
if args.container then container = df.item.find(tonumber(args.container)) end

local function itemsCompatible(item0, item1)
function itemsCompatible(item0, item1)
return item0:getType() == item1:getType()
and item0.mat_type == item1.mat_type
and item0.mat_index == item1.mat_index
end

local function getPlants(items, plants, index)
for i,p in ipairs(items) do
-- Skip items currently tasked
if #p.specific_refs == 0 then
if p:getType() == 53 or p:getType() == 55 or p:getType() == 70 then
plants[index] = p
index = index + 1

else
local containedItems = dfhack.items.getContainedItems(p)
if #containedItems > 0 then
index = getPlants(containedItems, plants, index)
function getPlants(items, plants, index)
repeat
local nextBatch = {}
for _,v in pairs(items) do
-- Skip items currently tasked
if #v.specific_refs == 0 then
if v:getType() == 53 or v:getType() == 55 or v:getType() == 70 then
plants[index] = v
index = index + 1

else
local containedItems = dfhack.items.getContainedItems(v)
if #containedItems > 0 then
for _,w in pairs(containedItems) do
table.insert(nextBatch, w)
end
end
end
end
end
end
items = nextBatch
until #items == 0

return index
end
Expand All @@ -66,6 +72,7 @@ else
else
local plants = { }
local plantCount = getPlants(rootItems, plants, 0)
print("found " .. plantCount .. " plants")

local removedPlants = { }

Expand All @@ -74,7 +81,9 @@ else
local itemsNeeded = max - currentPlant.stack_size

if removedPlants[currentPlant.id] == nil and itemsNeeded > 0 then
for j=(i+1),(plantCount-1) do
local j = i+1
local last = plantCount
repeat
local sourcePlant = plants[j]

if removedPlants[sourcePlant.id] == nil and itemsCompatible(currentPlant, sourcePlant) then
Expand All @@ -88,16 +97,22 @@ else
else
sourcePlant.stack_size = sourcePlant.stack_size - amountToMove
end
-- else print("failed")
end
end

j = j + 1
until j == plantCount or itemsNeeded == 0
end
end

local removedCount = 0
for id,removed in pairs(removedPlants) do
if removed then
removedCount = removedCount + 1
local removedPlant = df.item.find(id)
dfhack.items.remove(removedPlant)
end
end
print("removed " .. removedCount .. " plants")
end
end