MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3578 from myk002/myk_zone_depot 

[zone] properly handle animals in cages in non-cage buildings
develop
Myk 2023-07-18 03:55:19 -07:00 committed by GitHub
parent ab50b140d2 9e720b2de7
commit c5152dea98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/lua/zone.lua
Unescape Escape View File

@ -449,6 +449,17 @@ local function get_cage_ref(unit)
return dfhack.units.getGeneralRef(unit, df.general_ref_type.CONTAINED_IN_ITEM) return dfhack.units.getGeneralRef(unit, df.general_ref_type.CONTAINED_IN_ITEM)
end end
local function get_built_cage(item_cage)
if not item_cage then return end
local built_cage_ref = dfhack.items.getGeneralRef(item_cage, df.general_ref_type.BUILDING_HOLDER)
if not built_cage_ref then return end
local built_cage = df.building.find(built_cage_ref.building_id)
if not built_cage then return end
if built_cage:getType() == df.building_type.Cage then
return built_cage
end
end
local function get_status(unit) local function get_status(unit)
local assigned_pasture_ref = dfhack.units.getGeneralRef(unit, df.general_ref_type.BUILDING_CIVZONE_ASSIGNED) local assigned_pasture_ref = dfhack.units.getGeneralRef(unit, df.general_ref_type.BUILDING_CIVZONE_ASSIGNED)
if assigned_pasture_ref then if assigned_pasture_ref then
@ -463,8 +474,7 @@ local function get_status(unit)
end end
local cage_ref = get_cage_ref(unit) local cage_ref = get_cage_ref(unit)
if cage_ref then if cage_ref then
local cage = df.item.find(cage_ref.item_id) if get_built_cage(df.item.find(cage_ref.item_id)) then
if dfhack.items.getGeneralRef(cage, df.general_ref_type.BUILDING_HOLDER) then
return STATUS.BUILT_CAGE.value return STATUS.BUILT_CAGE.value
else else
return STATUS.ITEM_CAGE.value return STATUS.ITEM_CAGE.value
@ -573,13 +583,10 @@ local function detach_unit(unit)
unit.general_refs:erase(idx) unit.general_refs:erase(idx)
ref:delete() ref:delete()
elseif df.general_ref_contained_in_itemst:is_instance(ref) then elseif df.general_ref_contained_in_itemst:is_instance(ref) then
local cage = df.item.find(ref.item_id) local built_cage = get_built_cage(df.item.find(ref.item_id))
if cage then if built_cage and built_cage:getType() == df.building_type.Cage then
local built_cage_ref = dfhack.items.getGeneralRef(cage, df.general_ref_type.BUILDING_HOLDER) unassign_unit(built_cage, unit)
if built_cage_ref then -- unit's general ref will be removed when the unit is released from the cage
unassign_unit(df.building.find(built_cage_ref.building_id), unit)
-- unit's general ref will be removed when the unit is released from the cage
end
end end
elseif df.general_ref_building_chainst:is_instance(ref) then elseif df.general_ref_building_chainst:is_instance(ref) then
local chain = df.building.find(ref.building_id) local chain = df.building.find(ref.building_id)