@@ -335,27 +335,18 @@ function hackWish(accessors, opts)
335
335
until count
336
336
end
337
337
if not mattype or not itemtype then return end
338
- if not typesThatUseCreaturesExceptCorpses [df .item_type [itemtype ]] and df .item_type .attrs [itemtype ].is_stackable then
339
- return createItem ({mattype , matindex }, {itemtype , itemsubtype }, quality , unit , description , count )
340
- end
341
- if typesThatUseCreaturesExceptCorpses [df .item_type [itemtype ]] and df .item_type .attrs [itemtype ].is_stackable then
342
- return createItem ({matindex , casteId }, {itemtype , itemsubtype }, quality , unit , description , count )
338
+ if df .item_type .attrs [itemtype ].is_stackable then
339
+ local mat = typesThatUseCreaturesExceptCorpses [df .item_type [itemtype ]] and {matindex , casteId } or {mattype , matindex }
340
+ return createItem (mat , {itemtype , itemsubtype }, quality , unit , description , count )
343
341
end
344
342
local items = {}
345
343
for _ = 1 ,count do
346
344
if itemtype == df .item_type .CORPSEPIECE or itemtype == df .item_type .CORPSE then
347
345
table.insert (items , createCorpsePiece (unit , bodypart , partlayerID , matindex , casteId , corpsepieceGeneric ))
348
346
else
349
- if typesThatUseCreaturesExceptCorpses [df .item_type [itemtype ]] then
350
- for
351
- _ ,item in ipairs (createItem ({matindex , casteId }, {itemtype , itemsubtype }, quality , unit , description , 1 )) do
352
- table.insert (items , item )
353
- end
354
- else
355
- for
356
- _ ,item in ipairs (createItem ({mattype , matindex }, {itemtype , itemsubtype }, quality , unit , description , 1 )) do
357
- table.insert (items , item )
358
- end
347
+ local mat = typesThatUseCreaturesExceptCorpses [df .item_type [itemtype ]] and {matindex , casteId } or {mattype , matindex }
348
+ for _ ,item in ipairs (createItem (mat , {itemtype , itemsubtype }, quality , unit , description , 1 )) do
349
+ table.insert (items , item )
359
350
end
360
351
end
361
352
end
0 commit comments