Merge branch 'master' into idle-crafting

caravan.lua

@@ -18,6 +18,7 @@ end
 OVERLAY_WIDGETS = {
     trade=trade.TradeOverlay,
     tradebanner=trade.TradeBannerOverlay,
+    tradeethics=trade.TradeEthicsWarningOverlay,
     tradeagreement=tradeagreement.TradeAgreementOverlay,
     movegoods=movegoods.MoveGoodsOverlay,
     movegoods_hider=movegoods.MoveGoodsHiderOverlay,

changelog.txt

@@ -29,11 +29,16 @@ Template for new versions:
 ## New Tools
 - `embark-anyone`: allows you to embark as any civilisation, including dead, and non-dwarven ones
 - `idle-crafting`: Allow dwarfs to automatically satisfy their need to craft objects.
+- `gui/pregnancy`: view and generate pregnancies with specified parents
 
 ## New Features
+- `caravan`: DFHack dialogs for trade screens (both ``Bring goods to depot`` and the ``Trade`` barter screen) can now filter by item origins (foreign vs. fort-made) and can filter bins by whether they have a mix of ethically acceptable and unacceptable items in them
+- `caravan`: If you have managed to select an item that is ethically unacceptable to the merchant, an "Ethics warning" badge will now appear next to the "Trade" button. Clicking on the badge will show you which items that you have selected are problematic. The dialog has a button that you can click to deselect the problematic items in the trade list.
+- `confirm`: If you have ethically unacceptable items selected for trade, the "Are you sure you want to trade" confirmation will warn you about them
 
 ## Fixes
 - `timestream`: ensure child growth events (e.g. becoming an adult) are not skipped over
+- `empty-bin`: ``--liquids`` option correctly emptying containers filled with LIQUID_MISC
 
 ## Misc Improvements
 - `gui/sitemap`: show whether a unit is friendly, hostile, or wildlife

docs/caravan.rst

@@ -49,31 +49,14 @@ Overlays
 --------
 
 Additional functionality is provided on the various trade-related screens via
-`overlay` widgets.
-
-Trade screen
-````````````
-
-- ``Shift+Click checkbox``: Select all items inside a bin without selecting the
-    bin itself
-- ``Ctrl+Click checkbox``: Collapse or expand a single bin (as is possible in
-    the "Move goods to/from depot" screen)
-- ``Ctrl+c``: Collapses all bins. The hotkey hint can also be clicked as though
-    it were a button.
-- ``Ctrl+x``: Collapses everything (all item categories and anything
-    collapsible within each category). The hotkey hint can also be clicked as
-    though it were a button.
-
-There is also a reminder of the fast scroll functionality provided by the
-vanilla game when you hold shift while scrolling (this works everywhere).
-
-You can turn the overlay on and off in `gui/control-panel`, or you can
-reposition it to your liking with `gui/overlay`. The overlay is named
-``caravan.tradeScreenExtension``.
+`overlay` widgets. You can turn the overlays on and off in `gui/control-panel`,
+or you can reposition them to your liking with `gui/overlay`.
 
 Bring item to depot
 ```````````````````
 
+**caravan.movegoods**
+
 When the trade depot is selected, a button appears to bring up the DFHack
 enhanced move trade goods screen. You'll get a searchable, sortable list of all
 your tradeable items, with hotkeys to quickly select or deselect all visible
@@ -82,27 +65,93 @@ items.
 There are filter sliders for selecting items of various condition levels and
 quality. For example, you can quickly trade all your tattered, frayed, and worn
 clothing by setting the condition slider to include from tattered to worn, then
-hitting Ctrl-V to select all.
+hitting ``Ctrl-a`` to select all.
 
 Click on an item and shift-click on a second item to toggle all items between
 the two that you clicked on. If the one that you shift-clicked on was selected,
 the range of items will be deselected. If the one you shift-clicked on was not
 selected, then the range of items will be selected.
 
-Trade agreement
-```````````````
+If any current merchants have ethical concerns, the list of goods that you can
+bring to the depot is automatically filtered (by default) to only show
+ethically acceptible items. Be aware that, again, by default, if you have items
+in bins, and there are unethical items mixed into the bins, then the bins will
+still be brought to the depot so you can trade the ethical items within those
+bins. Please use the DFHack enhanced trade screen for the actual barter to
+ensure the unethical items are not actually selected for sale.
+
+**caravan.movegoods_hider**
+
+This overlay simply hides the vanilla "Move trade goods" button, so if you
+routinely prefer to use the enhanced DFHack "Move goods" dialog, you won't
+accidentally click the vanilla button.
+
+**caravan.assigntrade**
+
+This overlay provides a button on the vanilla "Move trade goods" screen to
+launch the DFHack enhanced dialog.
+
+Trade screen
+````````````
+
+**caravan.trade**
+
+This overlay enables some convenent gestures and keyboard shortcuts for working
+with bins:
+
+- ``Shift-Click checkbox``: Select all items inside a bin without selecting the
+    bin itself
+- ``Ctrl-Click checkbox``: Collapse or expand a single bin
+- ``Ctrl-Shift-Click checkbox``: Select all items within the bin and collapse it
+- ``Ctrl-c``: Collapse all bins
+- ``Ctrl-x``: Collapse everything (all item categories and anything
+    collapsible within each category)
+
+There is also a reminder of the fast scroll functionality provided by the
+vanilla game when you hold shift while scrolling (this works everywhere).
+
+**caravan.tradebanner**
+
+This overlay provides a button you can click to bring up the DFHack enhanced
+trade dialog, which you can use to quickly search, filter, and select caravan
+and fort goods for trade.
 
-A small panel is shown with some useful shortcuts:
+For example, to select all steel items for purchase, search for ``steel`` and
+hit ``Ctrl-a`` (or click the "Select all" button) to select them all.
 
-* ``Ctrl-A`` for selecting all/none in the currently shown category.
-* ``Ctrl-M`` for selecting items with specific base material price (only
+By default, the DFHack trade dialog will automatically filter out items that
+the merchants you are trading with find ethically offensive.
+
+You can also bring up the DFHack trade dialog with the keyboard shortcut
+``Ctrl-t``.
+
+**caravan.tradeethics**
+
+This overlay shows an "Ethics warning" badge next to the ``Trade`` button when
+you have any items selected for sale that would offend the merchants that you
+are trading with. Clicking on the badge will show a list of problematic items,
+and you can click the button on the dialog to deselect all the problematic
+items in your trade list.
+
+Trade agreements
+````````````````
+
+**caravan.tradeagreement**
+
+This adds a small panel with some useful shortcuts:
+
+* ``Ctrl-a`` for selecting all/none in the currently shown category.
+* ``Ctrl-m`` for selecting items with specific base material price (only
   enabled for item categories where this matters, like gems and leather).
 
 Display furniture
 `````````````````
 
+**caravan.displayitemselector**
+
 A button is added to the screen when you are viewing display furniture
-(pedestals and display cases) where you can launch an item assignment GUI.
+(pedestals and display cases) where you can launch a the extended DFhack item
+assignment GUI.
 
 The dialog allows you to sort by name, value, or where the item is currently
 assigned for display.

docs/gui/pregnancy.rst

@@ -0,0 +1,32 @@
+gui/pregnancy
+=============
+
+.. dfhack-tool::
+    :summary: Generate pregnancies with pairings of your choice.
+    :tags: adventure fort armok animals units
+
+This tool provides an interface for producing pregnancies with specific mothers
+and fathers.
+
+If a unit is selected when you run `gui/pregnancy`, they will be pre-selected
+as a parent. If the unit has a spouse of a different gender, they will be
+automatically selected as the other parent. You can click on other units on the
+map and choose them as alternate mothers or fathers as desired.
+
+If a unit is selected as a mother or father, or is listed as a spouse, you can
+zoom the map to their location by clicking on their name in the `gui/pregnancy`
+UI.
+
+A unit must be on the map to participate in a pregnancy. For example, you
+cannot designate a father that is not on-site, even if they are the selected
+mother's spouse.
+
+Children cannot be selected as a parent, and, due to game limitations,
+cross-species pregnancies are not supported.
+
+Usage
+-----
+
+::
+
+    gui/pregnancy

empty-bin.lua

@@ -18,7 +18,7 @@ local function emptyContainer(container)
         print('Emptying ' .. dfhack.items.getReadableDescription(container))
         local pos = xyz2pos(dfhack.items.getPosition(container))
         for _, item in ipairs(items) do
-            local skip_liquid = item:getType() == df.item_type.LIQUID_MISC or item:getType() == df.item_type.DRINK and not options.liquids
+            local skip_liquid = not options.liquids and (item:getType() == df.item_type.LIQUID_MISC or item:getType() == df.item_type.DRINK)
             if skip_liquid then
                 print('  ' .. dfhack.items.getReadableDescription(item) .. ' was skipped because the --liquids flag was not provided')
             else