Update create-item.lua #1277
Update create-item.lua #1277
Conversation
Fixed issues with spawning creature based items. Vermin, pets, eggs, fish, raw fish, and remains now spawn and stack correctly.
|
pre-commit.ci autofix |
for more information, see https://pre-commit.ci
|
Could you edit the PR description to include lines like: Fixes: DFHack/dfhack#4689 for the issues that this PR should fix? That will link this PR to issues and auto-close them when this PR is merged. |
| if not typesThatUseCreaturesExceptCorpses[df.item_type[itemtype]] and df.item_type.attrs[itemtype].is_stackable then | ||
| return createItem({mattype, matindex}, {itemtype, itemsubtype}, quality, unit, description, count) | ||
| end | ||
| if typesThatUseCreaturesExceptCorpses[df.item_type[itemtype]] and df.item_type.attrs[itemtype].is_stackable then | ||
| return createItem({matindex, casteId}, {itemtype, itemsubtype}, quality, unit, description, count) | ||
| end |
There was a problem hiding this comment.
There is too much duplication here. How about this?
if df.item_type.attrs[itemtype].is_stackable then
local mat = typesThatUseCreaturesExceptCorpses[df.item_type[itemtype]] and {matindex, casteId} or {mattype, matindex}
return createItem(mat, {itemtype, itemsubtype}, quality, unit, description, count)
endThere was a problem hiding this comment.
Wait, did you test this?
There was a problem hiding this comment.
not tested, just written as a suggestion for code improvement. If you have two chunks of code that are semantically and structurally identical except for a small difference, it is usually better to factor that difference out and keep the structure simpler.
| local items = {} | ||
| for _ = 1,count do | ||
| if itemtype == df.item_type.CORPSEPIECE or itemtype == df.item_type.CORPSE then | ||
| table.insert(items, createCorpsePiece(unit, bodypart, partlayerID, matindex, casteId, corpsepieceGeneric)) | ||
| else | ||
| for _,item in ipairs(createItem({mattype, matindex}, {itemtype, itemsubtype}, quality, unit, description, 1)) do | ||
| table.insert(items, item) | ||
| if typesThatUseCreaturesExceptCorpses[df.item_type[itemtype]] then |
There was a problem hiding this comment.
you can do the same condensing here. Factor out the value of mat and avoid duplicating the for loop
Removed editing comment
Added a description of changes made to 'modtools/create-item', which in turn fixes the issues with 'gui/create-item'.
| - `gui/create-item`: fix items of type "VERMIN", "PET", "REMANS", "FISH", "RAW FISH", and "EGG" no longer spawn creature item "nothing." | ||
| Items will now spawn correctly, and will be of the creature type and creature caste that selected by the user. Items of these types will also stack correctly when needed. | ||
| - `modtools/create-item`: fix items of type "VERMIN", "PET", "REMANS", "FISH", "RAW FISH", and "EGG" no longer spawn creature item "nothing"s. | ||
| Items will now spawn correctly, and will be of the creature type and creature caste that selected by the user. Items of these types will also stack correctly when needed. |
There was a problem hiding this comment.
this is the "Template for new versions" section -- the actual changelog lines should go in the "Future" version section below
| @@ -17,6 +17,10 @@ Template for new versions: | |||
| ## New Features | |||
|
|
|||
| ## Fixes | |||
| - `gui/create-item`: fix items of type "VERMIN", "PET", "REMANS", "FISH", "RAW FISH", and "EGG" no longer spawn creature item "nothing." | |||
There was a problem hiding this comment.
REMANS -> REMAINS
"no longer spawn creature item "nothing."" -> "being created without a valid creature type"
| if not typesThatUseCreaturesExceptCorpses[df.item_type[itemtype]] and df.item_type.attrs[itemtype].is_stackable then | ||
| return createItem({mattype, matindex}, {itemtype, itemsubtype}, quality, unit, description, count) | ||
| end | ||
| if typesThatUseCreaturesExceptCorpses[df.item_type[itemtype]] and df.item_type.attrs[itemtype].is_stackable then | ||
| return createItem({matindex, casteId}, {itemtype, itemsubtype}, quality, unit, description, count) | ||
| end |
There was a problem hiding this comment.
not tested, just written as a suggestion for code improvement. If you have two chunks of code that are semantically and structurally identical except for a small difference, it is usually better to factor that difference out and keep the structure simpler.
Fixed issues with spawning creature based items. Vermin, pets, eggs, fish, raw fish, and remains now spawn and stack correctly.
Fixes: DFHack/dfhack#4689
Fixes: DFHack/dfhack#4507
Fixes: DFHack/dfhack#3674