Skip to content

Commit fe1809f

Browse files
authored
Update create-item.lua
Refactored code, tested, works, etc.
1 parent 9f3d27b commit fe1809f

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

modtools/create-item.lua

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -335,27 +335,18 @@ function hackWish(accessors, opts)
335335
until count
336336
end
337337
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)
343341
end
344342
local items = {}
345343
for _ = 1,count do
346344
if itemtype == df.item_type.CORPSEPIECE or itemtype == df.item_type.CORPSE then
347345
table.insert(items, createCorpsePiece(unit, bodypart, partlayerID, matindex, casteId, corpsepieceGeneric))
348346
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)
359350
end
360351
end
361352
end

0 commit comments

Comments
 (0)