From fd60489e5d767b1ed78d04018856658ee1053f27 Mon Sep 17 00:00:00 2001 From: Myk Date: Wed, 6 Sep 2023 12:18:03 -0700 Subject: [PATCH 1/3] Update ban-cooking.rst Fix formatting --- docs/ban-cooking.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/ban-cooking.rst b/docs/ban-cooking.rst index 5ec01c5394..d096f72a19 100644 --- a/docs/ban-cooking.rst +++ b/docs/ban-cooking.rst @@ -34,6 +34,7 @@ Usage ----- :: + ban-cooking [ ...] [] Valid types are ``booze``, ``brew`` (brewable plants), ``fruit``, ``honey``, From 16b77541abf43e14a7283f04bdce8964db6bba22 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 6 Sep 2023 13:37:11 -0700 Subject: [PATCH 2/3] bump changelog to 50.09-r3 --- changelog.txt | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/changelog.txt b/changelog.txt index 844303bc48..b8de21c835 100644 --- a/changelog.txt +++ b/changelog.txt @@ -27,7 +27,19 @@ Template for new versions: # Future ## New Tools -- `devel/scan-vtables`: Scan and dump likely vtable addresses (for memory research) + +## New Features + +## Fixes + +## Misc Improvements + +## Removed + +# 50.09-r3 + +## New Tools +- `devel/scan-vtables`: scan and dump likely vtable addresses (for memory research) - `hide-interface`: hide the vanilla UI elements for clean screenshots or laid-back fortress observing - `hide-tutorials`: hide the DF tutorial popups; enable in the System tab of `gui/control-panel` - `set-orientation`: tinker with romantic inclinations (reinstated from back catalog of tools) @@ -37,12 +49,12 @@ Template for new versions: ## Fixes - `suspendmanager`: Fix the overlay enabling/disabling `suspendmanager` unexpectedly -- `caravan`: Correct price adjustment values in trade agreement details screen -- `caravan`: Apply both import and export trade agreement price adjustments to items being both bought or sold to align with how vanilla DF calculates prices +- `caravan`: correct price adjustment values in trade agreement details screen +- `caravan`: apply both import and export trade agreement price adjustments to items being both bought or sold to align with how vanilla DF calculates prices - `caravan`: cancel any active TradeAtDepot jobs if all caravans are instructed to leave - `emigration`: fix errors loading forts after dwarves assigned to work details or workshops have emigrated - `emigration`: fix citizens sometimes "emigrating" to the fortress site -- `suspendmanager`: Improve the detection on "T" and "+" shaped high walls +- `suspendmanager`: improve the detection on "T" and "+" shaped high walls - `starvingdead`: ensure sieges end properly when undead siegers starve - `fix/retrieve-units`: fix retrieved units sometimes becoming duplicated on the map - `quickfort`: cancel old dig jobs that point to a tile when a new designation is applied to the tile @@ -59,13 +71,6 @@ Template for new versions: - `gui/gm-editor`: display in the title bar whether the editor window is scanning for live updates - `gui/design`: change "auto commit" hotkey from ``c`` to ``Alt-c`` to avoid conflict with the default keybinding for z-level down - `gui/liquids`: support removing river sources by converting them into stone floors -- `necronomicon`: report on secrets of life and death contained in scrolls -- `ban-cooking`: add ``--unban`` option for removing kitchen bans - -## Documentation -- `makeown`: note that ``makeown`` fixes DF bug 10921, where you request workers from your holdings but they come as merchants and are not functional citizens - -## Removed # 50.09-r2 From 4dfb75dd1b0df0af4fb9b5a04f5a2dbba19dff11 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Wed, 6 Sep 2023 15:31:40 -0700 Subject: [PATCH 3/3] don't match items in unit inventories --- internal/caravan/movegoods.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/caravan/movegoods.lua b/internal/caravan/movegoods.lua index 62858ee221..96c8ae6417 100644 --- a/internal/caravan/movegoods.lua +++ b/internal/caravan/movegoods.lua @@ -328,11 +328,10 @@ local function is_tradeable_item(item, depot) end if item.flags.in_inventory then local gref = dfhack.items.getGeneralRef(item, df.general_ref_type.CONTAINED_IN_ITEM) - if gref then - local container = df.item.find(gref.item_id) - if container and not df.item_binst:is_instance(container) then - return false - end + if not gref then return false end + local container = df.item.find(gref.item_id) + if not container or not df.item_binst:is_instance(container) then + return false end end if item.flags.in_job then