From 86456fa1f95c4b5a6bfbb644e27216540b82e71c Mon Sep 17 00:00:00 2001
From: git--amade <amade.wossname@gmail.com>
Date: Sun, 7 Sep 2025 00:41:26 +0800
Subject: [PATCH 1/5] new script store-owned.lua and its documentation

---
 changelog.txt        |   1 +
 docs/store-owned.rst |  43 +++++
 store-owned.lua      | 410 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 454 insertions(+)
 create mode 100644 docs/store-owned.rst
 create mode 100644 store-owned.lua

diff --git a/changelog.txt b/changelog.txt
index 5ecf8024e..9d10f6fe8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -27,6 +27,7 @@ Template for new versions:
 # Future
 
 ## New Tools
+- `store-owned`: task owned items to be stored in the owner's room furniture
 
 ## New Features
 
diff --git a/docs/store-owned.rst b/docs/store-owned.rst
new file mode 100644
index 000000000..3fedc7433
--- /dev/null
+++ b/docs/store-owned.rst
@@ -0,0 +1,43 @@
+store-owned
+===========
+
+.. dfhack-tool::
+    :summary: Task units to store their owned items.
+    :tags: fort items buildings
+
+Task any owned item to be stored in an appropriate storage furniture in
+a room assigned to the item's owner.
+
+Usage
+-----
+
+``store-owned [<option>]``
+
+Select an owned item and run the tool to task the owner to put the item
+into storage.
+
+If the storage furniture is full, unreachable, or unavailable, the item
+will be dropped off on the floor of the owner's room. If the owner has
+no assigned room or is unable to access their room(s), the item will be
+stored in the dormitory if available. If the dormitory is unreachable or
+unavailable, the item will be dropped off at the trade depot instead.
+
+This tool can be used to unburden a unit that has acquired too many
+trinkets, or simply as an alternative to ``cleanowned`` when cleaning
+up scattered owned items. It can also be used to force a unit to
+relinquish ownership of the selected item.
+
+Options
+-------
+
+``discard``
+    Force the owner of the selected item to relinquish ownership of
+    said item. The item will not be tasked for storage. If the item
+    is in the owner's inventory, they will drop it to the ground.
+
+``dorm``
+    Task the selected owned item for storage in an appropriate storage
+    furniture, or on the floor, in any available dormitory zone.
+
+``depot``
+    Task the selected owned item to be dropped off at the trade depot.
diff --git a/store-owned.lua b/store-owned.lua
new file mode 100644
index 000000000..b971204bc
--- /dev/null
+++ b/store-owned.lua
@@ -0,0 +1,410 @@
+-- Task units to store their owned items.
+
+local utils = require('utils')
+
+local function GetUnit(item, options)
+    local unit = dfhack.items.getOwner(item)
+    if not unit then
+        print('Selected item is not owned by any unit.')
+    elseif not dfhack.units.isJobAvailable(unit) and not options.discard then
+        unit = nil
+        print('Owner of selected item is currently busy.')
+    end
+    return unit
+end
+
+local function isValidItem(item, unit)
+    local validItem = true
+    local itemPos = item and xyz2pos(dfhack.items.getPosition(item))
+    local building = dfhack.items.getHolderBuilding(item)
+    if item.flags.in_job or
+        item.flags.hostile or
+        item.flags.removed or
+        item.flags.dead_dwarf or
+        item.flags.rotten or
+        item.flags.spider_web or
+        item.flags.construction or
+        item.flags.encased or
+        item.flags.trader or
+        item.flags.garbage_collect or
+        item.flags.forbid or
+        item.flags.dump or
+        item.flags.on_fire or
+        item.flags.melt or
+        not dfhack.maps.isTileVisible(itemPos)
+    then
+        validItem = false
+        print('Selected item cannot be stored.')
+    elseif building then
+        for _, civzone in ipairs(building.relations) do
+            if civzone.assigned_unit_id == unit.id then
+                if df.building_cabinetst:is_instance(building) or
+                    df.building_armorstandst:is_instance(building) or
+                    df.building_weaponrackst:is_instance(building) or
+                    df.building_boxst:is_instance(building)
+                then
+                    validItem = false
+                    print('Selected item is already stored in the owner\'s room furniture.')
+                    goto skipCheck
+                end
+            end
+        end
+        if item.flags.in_building then
+            validItem = false
+            print('Selected item is part of a building.')
+        end
+    else
+        local unitPos = unit and xyz2pos(dfhack.units.getPosition(unit))
+        if not dfhack.maps.canWalkBetween(itemPos, unitPos) then
+            validItem = false
+            print('Owner of selected item cannot reach the item.')
+        end
+    end
+    ::skipCheck::
+    return validItem
+end
+
+local function isClothing(item)
+    if df.item_armorst:is_instance(item) or
+        df.item_shoesst:is_instance(item) or
+        df.item_glovesst:is_instance(item) or
+        df.item_helmst:is_instance(item) or
+        df.item_pantsst:is_instance(item)
+    then
+        return true
+    end
+    return false
+end
+
+local function isArmor(item)
+    if isClothing(item) and item.subtype.armorlevel > 0 then
+        return true
+    end
+    return false
+end
+
+local function isWeapon(item)
+    if df.item_weaponst:is_instance(item) then
+        return true
+    end
+    return false
+end
+
+local function isGoods(item)
+    if df.item_amuletst:is_instance(item) or
+        df.item_braceletst:is_instance(item) or
+        df.item_crownst:is_instance(item) or
+        df.item_earringst:is_instance(item) or
+        df.item_figurinest:is_instance(item) or
+        df.item_gemst:is_instance(item) or
+        df.item_instrumentst:is_instance(item) or
+        df.item_ringst:is_instance(item) or
+        df.item_scepterst:is_instance(item) or
+        df.item_totemst:is_instance(item) or
+        df.item_toyst:is_instance(item) or
+        df.item_toolst:is_instance(item) -- Owned books and scrolls, which can be stored in boxes.
+    then
+        return true
+    end
+    return false
+end
+
+local function GetContainerType(item)
+    local containerType
+    if isArmor(item) then
+        containerType = df.building_armorstandst
+    elseif isWeapon(item) then
+        containerType = df.building_weaponrackst
+    elseif isClothing(item) then
+        containerType = df.building_cabinetst
+    elseif isGoods(item) then
+        containerType = df.building_boxst
+    end
+    return containerType
+end
+
+local function isEnoughCapacity(item, container)
+    local capacity = 0
+    local totalVol = 0
+    local itemVol = item:getVolume()
+    for _, containedItem in ipairs(container.contained_items) do
+        -- Assume only one item is the container.
+        if containedItem.item.flags.in_building and capacity == 0 then
+            if df.item_armorstandst:is_instance(containedItem.item) or
+                df.item_weaponrackst:is_instance(containedItem.item) or
+                df.item_cabinetst:is_instance(containedItem.item) or
+                df.item_boxst:is_instance(containedItem.item)
+            then
+                capacity = dfhack.items.getCapacity(containedItem.item)
+            end
+        else
+            totalVol = totalVol + containedItem.item:getVolume()
+        end
+    end
+    local remainingCapacity = capacity - (totalVol + itemVol)
+    if remainingCapacity >= 0 then
+        return true
+    end
+    return false
+end
+
+local function GetCivzoneName(civzone)
+    local strCivzoneName
+    if #civzone.name > 0 then
+        strCivzoneName = civzone.name
+    else
+        strCivzoneName = dfhack.buildings.getName(civzone)
+    end
+    return strCivzoneName
+end
+
+local function GetPosFromContainer(item, unitPos, civzone)
+    local containerType = GetContainerType(item)
+    local strStoreContainer = 'Selected item will be stored inside %s of %s.'
+    local strCivzoneName = GetCivzoneName(civzone)
+    for _, container in ipairs(civzone.contained_buildings) do
+        if containerType:is_instance(container) then
+            local containerPos = utils.getBuildingCenter(container)
+            if containerPos and
+                isEnoughCapacity(item, container) and
+                dfhack.maps.canWalkBetween(containerPos, unitPos)
+            then
+                local jobPos = containerPos
+                print(string.format(strStoreContainer, dfhack.buildings.getName(container), strCivzoneName))
+                return jobPos
+            end
+        end
+    end
+    return nil
+end
+
+-- Items can be placed on any walkable tile, but in order to mimic native behavior
+-- more closely, the item will be placed on a tile not occupied by a building.
+-- However, to reduce visual clutter, any loose items already occupying the tile will be ignored.
+local function GetPosFromTile(unitPos, civzone)
+    local jobPos = civzone and xyz2pos(civzone.centerx, civzone.centery, civzone.z)
+    if not dfhack.maps.canWalkBetween(jobPos, unitPos) or dfhack.buildings.findAtTile(jobPos) then
+        jobPos = nil
+        local x1, x2, y1, y2, z = civzone.x1, civzone.x2, civzone.y1, civzone.y2, civzone.z
+        for y = y1, y2, 1 do
+            for x = x1, x2, 1 do
+                if dfhack.buildings.containsTile(civzone, x, y) then
+                    local tilePos = xyz2pos(x, y, z)
+                    if dfhack.maps.canWalkBetween(tilePos, unitPos) and
+                        not dfhack.buildings.findAtTile(tilePos)
+                    then
+                        jobPos = tilePos
+                        goto returnPos
+                    end
+                end
+            end
+        end
+    end
+    ::returnPos::
+    if jobPos then
+        local strStoreFloor = 'Selected item will be placed on the floor of %s.'
+        local strCivzoneName = GetCivzoneName(civzone)
+        print(string.format(strStoreFloor, strCivzoneName))
+    end
+    return jobPos
+end
+
+local function GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
+    local jobPos
+    local civzones = unit.owned_buildings
+    local strZoneType = 'assigned room(s)'
+    local strDormZone = 'the dormitory'
+    local strNoRoom = 'Owner of selected item does not have any assigned rooms.'
+    local strNoDorm = 'No dormitory available.'
+    local strNoPos = '%s %s.'
+    local strNoPosReason = 'No storage furniture with sufficient space available in'
+    local strNoRoomAccess = 'Owner of selected item cannot reach'
+    if zoneType == df.civzone_type.Dormitory then
+        civzones = df.global.world.buildings.other.ZONE_DORMITORY
+        strZoneType = strDormZone
+        strNoRoom = strNoDorm
+    end
+    if #civzones > 0 then
+        for _, civzone in ipairs(civzones) do
+            if civzone.type == zoneType then
+                if not putOnFloor then
+                    jobPos = GetPosFromContainer(item, unitPos, civzone)
+                else
+                    strNoPosReason = strNoRoomAccess
+                    jobPos = GetPosFromTile(unitPos, civzone)
+                end
+            end
+            if jobPos then return jobPos end
+        end
+        if not jobPos then
+            print(string.format(strNoPos, strNoPosReason, strZoneType))
+        end
+    else
+        print(strNoRoom)
+    end
+    return nil
+end
+
+local function GetPosFromOwnedCivzone(unit, item, unitPos, putOnFloor)
+    local jobPos
+    local zoneTypes = {
+        df.civzone_type.Bedroom,
+        df.civzone_type.Office,
+        df.civzone_type.DiningHall,
+        df.civzone_type.Tomb
+    }
+    for _, zoneType in ipairs(zoneTypes) do
+        jobPos = GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
+        if jobPos then return jobPos end
+    end
+    return nil
+end
+
+local function GetPosFromDepot(unitPos)
+    local depots = df.global.world.buildings.other.TRADE_DEPOT
+    if #depots > 0 then
+        for _, depot in ipairs(depots) do
+            -- Item will be dropped on the center tile of the trade depot rather than stored inside it.
+            local depotPos = depot and utils.getBuildingCenter(depot)
+            if depotPos and dfhack.maps.canWalkBetween(depotPos, unitPos) then
+                local jobPos = depotPos
+                print('Selected item will be dropped off at the '..dfhack.buildings.getName(depot))
+                return jobPos
+            end
+        end
+    else
+        print('No trade depot available.')
+    end
+    return nil
+end
+
+-- Prioritize storing in bedroom > office > dining room > tomb > dormitory > trade depot.
+local function GetJobPos(unit, item, options)
+    local jobPos
+    local unitPos = unit and xyz2pos(dfhack.units.getPosition(unit))
+    local putOnFloor = false
+    if options.dorm then
+        goto skipOwnedCivzones
+    elseif options.depot then
+        goto skipDorm
+    end
+    jobPos = GetPosFromOwnedCivzone(unit, item, unitPos, putOnFloor)
+    if not jobPos then
+        putOnFloor = true
+        jobPos = GetPosFromOwnedCivzone(unit, item, unitPos, putOnFloor)
+        if not jobPos then
+            print('')
+        end
+    end
+    ::skipOwnedCivzones::
+    if not jobPos then
+        local zoneType = df.civzone_type.Dormitory
+        putOnFloor = false
+        jobPos = GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
+        if not jobPos then
+            putOnFloor = true
+            jobPos = GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
+        end
+        if not jobPos then
+            print('')
+        end
+    end
+    ::skipDorm::
+    if not jobPos then
+        GetPosFromDepot(unitPos)
+    end
+    return jobPos
+end
+
+local function AssignJob(item, unit, jobPos)
+    local job = df.job:new()
+    job.job_type = df.job_type.StoreOwnedItem
+    job.pos = jobPos
+    dfhack.job.attachJobItem(job, item, df.job_role_type.Hauled, -1, -1)
+    dfhack.job.addWorker(job, unit)
+    dfhack.job.linkIntoWorld(job, true)
+    local strTasked = '%s has been tasked to store away %s.'
+    local strUnitName = unit and dfhack.units.getReadableName(unit)
+    local strItemName = item and dfhack.items.getReadableDescription(item)
+    print(string.format(strTasked, strUnitName, strItemName))
+end
+
+local function GetIdx(unitUniform, id)
+    for i, v in pairs(unitUniform) do
+        if v == id then
+            return i
+        end
+    end
+    return nil
+end
+
+local function RemoveFromUniform(item, unit, options)
+    if options.discard then
+        local strItemName = item and dfhack.items.getReadableDescription(item)
+        local strUnitName = unit and dfhack.units.getReadableName(unit)
+        dfhack.items.setOwner(item, nil)
+        local strDiscard = 'Ownership of %s was removed from %s.'
+        print(string.format(strDiscard, strItemName, strUnitName))
+    end
+    local unitUniform = unit.uniform.uniforms.CLOTHING
+    local idx = GetIdx(unitUniform, item.id)
+    if idx then unitUniform:erase(idx) end
+end
+
+local function processArgs(args)
+    local options = {
+        help = false,
+        discard = false,
+        dorm = false,
+        depot = false
+    }
+    if #args > 0 then
+        if args[1] == 'help' then options.help = true
+        elseif args[1] == 'discard' then options.discard = true
+        elseif args[1] == 'dorm' then options.dorm = true
+        elseif args[1] == 'depot' then options.depot = true
+        end
+    end
+    return options
+end
+
+local function Main(args)
+    local options = processArgs(args)
+    if args[1] == 'help' or options.help then
+        print(dfhack.script_help())
+        return
+    end
+    local item = dfhack.gui.getSelectedItem(true)
+    if not item then
+        qerror('No item selected.')
+    end
+    local unit = GetUnit(item, options)
+    local strCannotStore = 'Unable to task selected item for storage.'
+    if not unit and not options.discard then
+        qerror(strCannotStore)
+    elseif options.discard then
+        if not unit then
+            qerror('Removal of ownership from selected item is not necessary.')
+        else
+            goto removeItem
+        end
+    else
+        local validItem = isValidItem(item, unit)
+        if not validItem then
+            qerror(strCannotStore)
+        end
+        local jobPos = GetJobPos(unit, item, options)
+        if not jobPos then
+            qerror('Unable to store selected item in any owned room, dormitory, or trade depot.')
+        end
+        AssignJob(item, unit, jobPos)
+    end
+    ::removeItem::
+    RemoveFromUniform(item, unit, options)
+end
+
+if not dfhack.isSiteLoaded() and not dfhack.world.isFortressMode() then
+    qerror('This script requires the game to be in fortress mode.')
+end
+
+Main({...})

From cc931869598c6743cea5cc3fb3f3b8012ad686bd Mon Sep 17 00:00:00 2001
From: git--amade <amade.wossname@gmail.com>
Date: Thu, 18 Sep 2025 22:26:41 +0800
Subject: [PATCH 2/5] Rework logic for getting job pos

---
 docs/store-owned.rst |  14 ++--
 store-owned.lua      | 160 +++++++++++++++++++++----------------------
 2 files changed, 87 insertions(+), 87 deletions(-)

diff --git a/docs/store-owned.rst b/docs/store-owned.rst
index 3fedc7433..3813314e0 100644
--- a/docs/store-owned.rst
+++ b/docs/store-owned.rst
@@ -30,14 +30,14 @@ relinquish ownership of the selected item.
 Options
 -------
 
-``discard``
-    Force the owner of the selected item to relinquish ownership of
-    said item. The item will not be tasked for storage. If the item
-    is in the owner's inventory, they will drop it to the ground.
-
-``dorm``
+``--dorm``
     Task the selected owned item for storage in an appropriate storage
     furniture, or on the floor, in any available dormitory zone.
 
-``depot``
+``--depot``
     Task the selected owned item to be dropped off at the trade depot.
+
+``--discard``
+    Force the owner of the selected item to relinquish ownership of
+    said item. The item will not be tasked for storage. If the item
+    is in the owner's inventory, they will drop it on the ground.
diff --git a/store-owned.lua b/store-owned.lua
index b971204bc..c085fd9e3 100644
--- a/store-owned.lua
+++ b/store-owned.lua
@@ -1,5 +1,6 @@
 -- Task units to store their owned items.
 
+local argparse = require("argparse")
 local utils = require('utils')
 
 local function GetUnit(item, options)
@@ -160,8 +161,6 @@ end
 
 local function GetPosFromContainer(item, unitPos, civzone)
     local containerType = GetContainerType(item)
-    local strStoreContainer = 'Selected item will be stored inside %s of %s.'
-    local strCivzoneName = GetCivzoneName(civzone)
     for _, container in ipairs(civzone.contained_buildings) do
         if containerType:is_instance(container) then
             local containerPos = utils.getBuildingCenter(container)
@@ -170,7 +169,9 @@ local function GetPosFromContainer(item, unitPos, civzone)
                 dfhack.maps.canWalkBetween(containerPos, unitPos)
             then
                 local jobPos = containerPos
-                print(string.format(strStoreContainer, dfhack.buildings.getName(container), strCivzoneName))
+                local containerName = dfhack.buildings.getName(container)
+                local strCivzoneName = GetCivzoneName(civzone)
+                print(('Sufficient storage space available;\n ...selected item will be stored inside %s in %s.'):format(containerName, strCivzoneName))
                 return jobPos
             end
         end
@@ -202,50 +203,29 @@ local function GetPosFromTile(unitPos, civzone)
     end
     ::returnPos::
     if jobPos then
-        local strStoreFloor = 'Selected item will be placed on the floor of %s.'
         local strCivzoneName = GetCivzoneName(civzone)
-        print(string.format(strStoreFloor, strCivzoneName))
+        print(('Unobstructed tile available;\n ...selected item will be dropped off on the floor of %s.'):format(strCivzoneName))
     end
     return jobPos
 end
 
-local function GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
+local function GetPosFromCivzone(civzones, item, unitPos, zoneType, putOnFloor)
     local jobPos
-    local civzones = unit.owned_buildings
-    local strZoneType = 'assigned room(s)'
-    local strDormZone = 'the dormitory'
-    local strNoRoom = 'Owner of selected item does not have any assigned rooms.'
-    local strNoDorm = 'No dormitory available.'
-    local strNoPos = '%s %s.'
-    local strNoPosReason = 'No storage furniture with sufficient space available in'
-    local strNoRoomAccess = 'Owner of selected item cannot reach'
-    if zoneType == df.civzone_type.Dormitory then
-        civzones = df.global.world.buildings.other.ZONE_DORMITORY
-        strZoneType = strDormZone
-        strNoRoom = strNoDorm
-    end
-    if #civzones > 0 then
-        for _, civzone in ipairs(civzones) do
-            if civzone.type == zoneType then
-                if not putOnFloor then
-                    jobPos = GetPosFromContainer(item, unitPos, civzone)
-                else
-                    strNoPosReason = strNoRoomAccess
-                    jobPos = GetPosFromTile(unitPos, civzone)
-                end
+    for _, civzone in ipairs(civzones) do
+        if civzone.type == zoneType then
+            strCivzoneName = GetCivzoneName(civzone)
+            if not putOnFloor then
+                jobPos = GetPosFromContainer(item, unitPos, civzone)
+            else
+                jobPos = GetPosFromTile(unitPos, civzone)
             end
-            if jobPos then return jobPos end
-        end
-        if not jobPos then
-            print(string.format(strNoPos, strNoPosReason, strZoneType))
         end
-    else
-        print(strNoRoom)
+        if jobPos then return jobPos end
     end
     return nil
 end
 
-local function GetPosFromOwnedCivzone(unit, item, unitPos, putOnFloor)
+local function GetPosFromOwnedCivzone(civzones, item, unitPos, putOnFloor)
     local jobPos
     local zoneTypes = {
         df.civzone_type.Bedroom,
@@ -254,26 +234,23 @@ local function GetPosFromOwnedCivzone(unit, item, unitPos, putOnFloor)
         df.civzone_type.Tomb
     }
     for _, zoneType in ipairs(zoneTypes) do
-        jobPos = GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
+        jobPos = GetPosFromCivzone(civzones, item, unitPos, zoneType, putOnFloor)
         if jobPos then return jobPos end
     end
     return nil
 end
 
 local function GetPosFromDepot(unitPos)
-    local depots = df.global.world.buildings.other.TRADE_DEPOT
-    if #depots > 0 then
-        for _, depot in ipairs(depots) do
-            -- Item will be dropped on the center tile of the trade depot rather than stored inside it.
-            local depotPos = depot and utils.getBuildingCenter(depot)
-            if depotPos and dfhack.maps.canWalkBetween(depotPos, unitPos) then
-                local jobPos = depotPos
-                print('Selected item will be dropped off at the '..dfhack.buildings.getName(depot))
-                return jobPos
-            end
+    for _, depot in ipairs(df.global.world.buildings.other.TRADE_DEPOT) do
+        -- Item will be dropped on the center tile of the trade depot rather than stored inside it.
+        local depotPos = depot and utils.getBuildingCenter(depot)
+        if depotPos and dfhack.maps.canWalkBetween(depotPos, unitPos) then
+            local jobPos = depotPos
+            print('Depot accessible;\n ...selected item will be dropped off at the '..dfhack.buildings.getName(depot)..'.')
+            return jobPos
+        else
+            print('Unable to drop selected item off at the trade depot.')
         end
-    else
-        print('No trade depot available.')
     end
     return nil
 end
@@ -282,36 +259,60 @@ end
 local function GetJobPos(unit, item, options)
     local jobPos
     local unitPos = unit and xyz2pos(dfhack.units.getPosition(unit))
+    local civzones = unit and unit.owned_buildings
     local putOnFloor = false
-    if options.dorm then
-        goto skipOwnedCivzones
+    local strNoStorage = 'Unable to store selected item inside a storage furniture in'
+    local strNoTile = 'Unable to drop selected item off on the floor of'
+    local strOwnRoom = 'owner\'s assigned room(s)'
+    local strDorm = 'the dormitory'
+    if options.dorm or #civzones < 1 then
+        if #civzones < 1 then
+            print('Owner of selected item does not have any assigned rooms.')
+        end
+        goto getFromDorm
     elseif options.depot then
-        goto skipDorm
+        goto getFromDepot
     end
-    jobPos = GetPosFromOwnedCivzone(unit, item, unitPos, putOnFloor)
+    -- Get container in owned rooms to put item in.
+    jobPos = GetPosFromOwnedCivzone(civzones, item, unitPos, putOnFloor)
     if not jobPos then
+        print(('%s %s.'):format(strNoStorage, strOwnRoom))
         putOnFloor = true
-        jobPos = GetPosFromOwnedCivzone(unit, item, unitPos, putOnFloor)
-        if not jobPos then
-            print('')
-        end
+        -- Get tile in owned rooms to drop item on.
+        jobPos = GetPosFromOwnedCivzone(civzones, item, unitPos, putOnFloor)
     end
-    ::skipOwnedCivzones::
+    ::getFromDorm::
     if not jobPos then
+        if not options.dorm and #civzones > 0 then
+            print(('%s %s.'):format(strNoTile, strOwnRoom))
+        end
+        if #df.global.world.buildings.other.ZONE_DORMITORY > 0 then
+            civzones = df.global.world.buildings.other.ZONE_DORMITORY
+        else
+            print('No dormitory available.')
+            goto getFromDepot
+        end
         local zoneType = df.civzone_type.Dormitory
         putOnFloor = false
-        jobPos = GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
+        -- Get container in dorm to put item in.
+        jobPos = GetPosFromCivzone(civzones, item, unitPos, zoneType, putOnFloor)
         if not jobPos then
+            print(('%s %s.'):format(strNoStorage, strDorm))
             putOnFloor = true
-            jobPos = GetPosFromCivzone(unit, item, unitPos, zoneType, putOnFloor)
-        end
-        if not jobPos then
-            print('')
+            -- Get tile in dorm to drop item on.
+            jobPos = GetPosFromCivzone(civzones, item, unitPos, zoneType, putOnFloor)
         end
     end
-    ::skipDorm::
+    ::getFromDepot::
     if not jobPos then
-        GetPosFromDepot(unitPos)
+        if not options.depot and #civzones > 0 then
+            print(('%s %s.'):format(strNoTile, strDorm))
+        end
+        if #df.global.world.buildings.other.TRADE_DEPOT > 0 then
+            jobPos = GetPosFromDepot(unitPos)
+        else
+            print('No trade depot available.')
+        end
     end
     return jobPos
 end
@@ -323,10 +324,9 @@ local function AssignJob(item, unit, jobPos)
     dfhack.job.attachJobItem(job, item, df.job_role_type.Hauled, -1, -1)
     dfhack.job.addWorker(job, unit)
     dfhack.job.linkIntoWorld(job, true)
-    local strTasked = '%s has been tasked to store away %s.'
     local strUnitName = unit and dfhack.units.getReadableName(unit)
     local strItemName = item and dfhack.items.getReadableDescription(item)
-    print(string.format(strTasked, strUnitName, strItemName))
+    print(('%s has been tasked to store away %s.'):format(strUnitName, strItemName))
 end
 
 local function GetIdx(unitUniform, id)
@@ -343,33 +343,33 @@ local function RemoveFromUniform(item, unit, options)
         local strItemName = item and dfhack.items.getReadableDescription(item)
         local strUnitName = unit and dfhack.units.getReadableName(unit)
         dfhack.items.setOwner(item, nil)
-        local strDiscard = 'Ownership of %s was removed from %s.'
-        print(string.format(strDiscard, strItemName, strUnitName))
+        print(('Ownership of %s was removed from %s.'):format(strItemName, strUnitName))
     end
     local unitUniform = unit.uniform.uniforms.CLOTHING
     local idx = GetIdx(unitUniform, item.id)
     if idx then unitUniform:erase(idx) end
 end
 
-local function processArgs(args)
+local function ParseCommandLine(args)
     local options = {
         help = false,
-        discard = false,
         dorm = false,
-        depot = false
+        depot = false,
+        discard = false
     }
-    if #args > 0 then
-        if args[1] == 'help' then options.help = true
-        elseif args[1] == 'discard' then options.discard = true
-        elseif args[1] == 'dorm' then options.dorm = true
-        elseif args[1] == 'depot' then options.depot = true
-        end
-    end
+    local positionals = argparse.processArgsGetopt(args, {
+        {'h', 'help', handler = function() options.help = true end},
+        {'', 'dorm', handler = function() options.dorm = true end},
+        {'', 'depot', handler = function() options.depot = true
+        options.dorm = false end},
+        {'', 'discard', handler = function() options.discard = true
+        options.dorm = false options.depot = false end},
+    })
     return options
 end
 
 local function Main(args)
-    local options = processArgs(args)
+    local options = ParseCommandLine(args)
     if args[1] == 'help' or options.help then
         print(dfhack.script_help())
         return
@@ -384,7 +384,7 @@ local function Main(args)
         qerror(strCannotStore)
     elseif options.discard then
         if not unit then
-            qerror('Removal of ownership from selected item is not necessary.')
+            qerror('Cannot remove ownership of an ownerless item.')
         else
             goto removeItem
         end

From e1f8b366be4ed148e95474c6b568f2844111e8df Mon Sep 17 00:00:00 2001
From: git--amade <amade.wossname@gmail.com>
Date: Fri, 19 Sep 2025 07:40:06 +0800
Subject: [PATCH 3/5] Revise RemoveFromUniform()

---
 store-owned.lua | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/store-owned.lua b/store-owned.lua
index c085fd9e3..61437e56a 100644
--- a/store-owned.lua
+++ b/store-owned.lua
@@ -329,15 +329,6 @@ local function AssignJob(item, unit, jobPos)
     print(('%s has been tasked to store away %s.'):format(strUnitName, strItemName))
 end
 
-local function GetIdx(unitUniform, id)
-    for i, v in pairs(unitUniform) do
-        if v == id then
-            return i
-        end
-    end
-    return nil
-end
-
 local function RemoveFromUniform(item, unit, options)
     if options.discard then
         local strItemName = item and dfhack.items.getReadableDescription(item)
@@ -345,9 +336,16 @@ local function RemoveFromUniform(item, unit, options)
         dfhack.items.setOwner(item, nil)
         print(('Ownership of %s was removed from %s.'):format(strItemName, strUnitName))
     end
-    local unitUniform = unit.uniform.uniforms.CLOTHING
-    local idx = GetIdx(unitUniform, item.id)
-    if idx then unitUniform:erase(idx) end
+    local uniforms = {
+        unit.uniform.uniforms.CLOTHING,
+        unit.uniform.uniforms.REGULAR,
+        unit.uniform.uniforms.TRAINING,
+        unit.uniform.uniforms.TRAINING_RANGED
+    }
+    for _, uniform in ipairs(uniforms) do
+        local idx = utils.linear_index(uniform, item.id)
+        if idx then uniform:erase(idx) end
+    end
 end
 
 local function ParseCommandLine(args)

From 8fe176874aef0c7f79ed12cad0b24430e8739082 Mon Sep 17 00:00:00 2001
From: git--amade <amade.wossname@gmail.com>
Date: Fri, 26 Sep 2025 07:50:16 +0800
Subject: [PATCH 4/5] Assign default value for containerType, restructured
 Main()

---
 store-owned.lua | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/store-owned.lua b/store-owned.lua
index 61437e56a..2558c1f94 100644
--- a/store-owned.lua
+++ b/store-owned.lua
@@ -111,7 +111,8 @@ local function isGoods(item)
 end
 
 local function GetContainerType(item)
-    local containerType
+    -- Use chest as default, in case of any item not explicitly categorized.
+    local containerType = df.building_boxst
     if isArmor(item) then
         containerType = df.building_armorstandst
     elseif isWeapon(item) then
@@ -378,15 +379,7 @@ local function Main(args)
     end
     local unit = GetUnit(item, options)
     local strCannotStore = 'Unable to task selected item for storage.'
-    if not unit and not options.discard then
-        qerror(strCannotStore)
-    elseif options.discard then
-        if not unit then
-            qerror('Cannot remove ownership of an ownerless item.')
-        else
-            goto removeItem
-        end
-    else
+    if unit and not options.discard then
         local validItem = isValidItem(item, unit)
         if not validItem then
             qerror(strCannotStore)
@@ -396,8 +389,13 @@ local function Main(args)
             qerror('Unable to store selected item in any owned room, dormitory, or trade depot.')
         end
         AssignJob(item, unit, jobPos)
+    elseif not unit and not options.discard then
+        qerror(strCannotStore)
+    else
+        if not unit then
+            qerror('Cannot remove ownership of an ownerless item.')
+        end
     end
-    ::removeItem::
     RemoveFromUniform(item, unit, options)
 end
 

From 9def71184030ce75baac849430a4da59974d5a1d Mon Sep 17 00:00:00 2001
From: git--amade <amade.wossname@gmail.com>
Date: Fri, 26 Sep 2025 07:52:25 +0800
Subject: [PATCH 5/5] Update changelog.txt

---
 changelog.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 9d10f6fe8..02eca8e6a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -27,11 +27,18 @@ Template for new versions:
 # Future
 
 ## New Tools
+- `fix/archery-practice`: combine ammo items in units' quivers to fix 'Soldier (no item)' issue
+- `gui/adv-finder`: UI for tracking historical figures and artifacts in adventure mode
 - `store-owned`: task owned items to be stored in the owner's room furniture
 
 ## New Features
 
 ## Fixes
+- `uniform-unstick`: added quivers, backpacks, and flasks/waterskins to uniform analysis
+- `uniform-unstick`: the ``--drop`` option now only evaluates clothing as possible items to drop
+- `uniform-unstick`: the ``--free`` option no longer redundantly reports an improperly assigned item when that item is removed from a uniform
+- `uniform-unstick`: the ``--drop`` and ``--free`` options now only drop items which are actually in a unit's inventory
+- `uniform-unstick`: the ``--all`` and ``--drop`` options, when used together, now print the separator line between each unit's report in the proper place
 
 ## Misc Improvements
 
@@ -43,7 +50,6 @@ Template for new versions:
 - `autotraining`: new tool to assign citizens to a military squad when they need Martial Training
 - `gui/autotraining`: configuration tool for autotraining
 - `entomb`: allow any unit that has a corpse or body parts to be assigned a tomb zone
-
 - `husbandry`: Automatically milk and shear animals at nearby farmer's workshops
 
 ## New Features