Skip to content

Fix "combine" breaking dye mixes #1596

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

Open
Snowstar38 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix "combine" breaking dye mixes #1596

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
18c93d8
Fix for breaking dye mixes
Snowstar38 Jun 24, 2026
9013879
Remove dye combining from script
Snowstar38 Jun 25, 2026
4123e73
Merge branch 'DFHack:master' into master
Snowstar38 Jun 25, 2026
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
13 changes: 12 additions & 1 deletion combine.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,17 @@ local function stack_type_new(type_vals)
return stack_type
end

local function isDye(item)
-- Dyes should not be combined as this will cause bugs when mixing them together
if item:getType() ~= df.item_type.POWDER_MISC then return false end
-- pcall guards items/materials that can't be decoded or lack the flag
local ok, is_dye = pcall(function()
local mat = dfhack.matinfo.decode(item.mat_type, item.mat_index)
return mat and mat.material.flags.IS_DYE or false
end)
return ok and is_dye or false
end

local function stacks_add_item(stockpile, stacks, stack_type, item, container)
-- add an item to the matching comp_items table; based on comp_key.
local comp_key = ''
Expand Down Expand Up @@ -436,7 +447,7 @@ local function stacks_add_items(stockpile, stacks, items, container, ind)
local stack_type = stacks.stack_types[type_id]

-- item type in list of included types?
if stack_type and not item:isSand() and not item:isPlaster() and isValidPart(item) then
if stack_type and not item:isSand() and not item:isPlaster() and not isDye(item) and isValidPart(item) then
if not isRestrictedItem(item) and item.stack_size <= stack_type.max_stack_qty then

stacks_add_item(stockpile, stacks, stack_type, item, container)
Expand Down