Merge master to fix sphinx logcleaner duplicate label issue

Author: sizzlins

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.37.0
+  rev: 0.37.2
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

changelog.txt

@@ -27,10 +27,44 @@ Template for new versions:
 # Future
 
 ## New Tools
+- `machine-toggle`: interface for toggling gear assemblies, as well as pressure plates (previously in `trackstop`) (available only if ``armok`` tools are shown)
 
 ## New Features
 
 ## Fixes
+- `gui/control-panel`: fixed incorrect description of deteriorate commands
+
+- `gui/petitions`: fix deity display
+
+## Misc Improvements
+- `trackstop`: ``pressureplate`` overlay moved to `machine-toggle` as an ``armok`` tool
+
+## Removed
+
+# 53.14-r2
+
+## New Tools
+
+## New Features
+
+## Fixes
+
+## Misc Improvements
+
+## Removed
+- ``gui/logcleaner``: Removed
+
+# 53.14-r1
+
+## New Tools
+
+## New Features
+
+## Fixes
+- `caravan`: fix ethics warning for wooden weapons
+- `gui/control-panel`: fixed inconsistent space in command help ("tweak" -> "tweak ", like with other commands)
+- `gui/siegemanager`: consistently set the initial filter to "All"
+- `immortal-cravings`: also take care of immortal units with alcohol dependence
 
 ## Misc Improvements
 

docs/gui/logcleaner.rst

@@ -6,10 +6,10 @@ immortal-cravings
     :tags: fort gameplay
 
 When enabled, this script watches your fort for units that have no physiological
-need to eat or drink but still have personality needs that can only be satisfied
-by eating or drinking (e.g. necromancers or goblins). This enables those units
-to help themselves to a drink or a meal when they crave one and are not
-otherwise occupied.
+need to eat or drink but are still alcohol dependent or have personality needs
+that can only be satisfied by eating or drinking (e.g. necromancers or goblins).
+This enables those units to help themselves to a drink or a meal when they crave
+one and are not otherwise occupied.
 
 Usage
 -----

docs/immortal-cravings.rst

@@ -0,0 +1,21 @@
+machine-toggle
+==============
+
+.. dfhack-tool::
+    :summary: Overlay to modify pressure plates and gear assemblies after construction.
+    :tags: fort armok buildings interface
+
+This script provides 2 overlays that are managed by the `overlay` framework.
+The script does nothing when executed.
+Track stops and rollers are handled by `trackstop`.
+
+The ``pressureplate`` overlay allows the player to change the trigger settings
+of a selected pressure plate after it has been constructed. Manual value entry
+of ranges for minecart and creature triggers is provided, allowing greater
+precision than the game interface normally permits. Incrementing or decrementing
+values always restricts them to the usual intervals.
+
+The ``gearassembly`` overlay allows the player to toggle the state of a selected
+gear assembly without linking it to a lever first. This is useful for dwarfputing
+and other applications where it may be desirable to default to the disengaged
+state until triggered.

docs/machine-toggle.rst

@@ -2,20 +2,15 @@ trackstop
 =========
 
 .. dfhack-tool::
-    :summary: Overlay to allow changing track stop and related building settings after construction.
+    :summary: Overlay to allow changing track stop and roller settings after construction.
     :tags: fort buildings interface
 
-This script provides 3 overlays that are managed by the `overlay` framework.
+This script provides 2 overlays that are managed by the `overlay` framework.
 The script does nothing when executed.
+Pressure plates and gear assemblies are handled by `machine-toggle`.
 
 The ``trackstop`` overlay allows the player to change the friction and dump
 direction of a selected track stop after it has been constructed.
 
 The ``rollers`` overlay allows the player to change the roller direction and
 speed of a selected roller after it has been constructed.
-
-The ``pressureplate`` overlay allows the player to change the trigger settings
-of a selected pressure plate after it has been constructed. Manual value entry
-of ranges for minecart and creature triggers is provided, allowing greater
-precision than the game interface normally permits. Incrementing or decrementing
-values always restricts them to the usual intervals.

docs/trackstop.rst

@@ -676,7 +676,7 @@ function AdvFindWindow:init()
         widgets.ConfigureButton{
             frame = {t=0, r=0},
             on_click = function()
-                local sel_window = view.subviews[2] --AdvSelWindow
+                local sel_window = view.subviews.sel_window --AdvSelWindow
                 sel_window.visible = true
                 sel_window:sel_list()
             end,
@@ -732,7 +732,10 @@ AdvFindScreen.ATTRS{
 }
 
 function AdvFindScreen:init()
-    self:addviews{AdvFindWindow{}, AdvSelWindow{}}
+    self:addviews{
+        AdvFindWindow{view_id='find_window'},
+        AdvSelWindow{view_id='sel_window'},
+    }
 end
 
 function AdvFindScreen:onDismiss()

gui/adv-finder.lua

@@ -403,7 +403,7 @@ function CommandTab:init_footer(panel)
 end
 
 local function launch_help(data)
-    dfhack.run_command('gui/launcher', data.help_command or data.command .. ' ')
+    dfhack.run_command('gui/launcher', (data.help_command or data.command) .. ' ')
 end
 
 function CommandTab:show_help()

gui/control-panel.lua

@@ -489,7 +489,7 @@ function SiegeManager:init()
                 {label='Bolt Thrower', value=df.siegeengine_type.BoltThrower},
                 {label='Catapult', value=df.siegeengine_type.Catapult},
             },
-            initial_option=1,
+            initial_option=-1,
         },
         widgets.ToggleHotkeyLabel {
             view_id = 'configure_all',