Merge remote-tracking branch 'origin' into rename

resolved conflict in changelog.txt

Author: SilasD

changelog.txt

@@ -27,13 +27,17 @@ 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/rename`: fix script error that sometimes caused the script to malfunction when started from the Launcher.
+- `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
 

docs/machine-toggle.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/trackstop.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.

internal/control-panel/registry.lua

@@ -126,9 +126,9 @@ COMMANDS_BY_IDX = {
     {command='deteriorate enable all', group='gameplay', mode='run',
         desc='Enable if you want deteriorate to run on all supported categories instead of just corpses.'},
     {command='deteriorate frequency 0.15 all', group='gameplay', mode='run',
-        desc='Enable if you want to slow item deterioration down so they take about a year to rot away.'},
-    {command='deteriorate frequency 3 all', group='gameplay', mode='run',
         desc='Enable if you want to speed item deterioration up so they take less than a month to rot away.'},
+    {command='deteriorate frequency 3 all', group='gameplay', mode='run',
+        desc='Enable if you want to slow item deterioration down so they take about a year to rot away.'},
     {command='dwarfvet', group='gameplay', mode='enable'},
     {command='eggs-fertile', help_command='tweak', group='gameplay', mode='tweak', default=true,
         desc='Displays an indicator on fertile eggs.'},

list-agreements.lua

@@ -71,11 +71,19 @@ function get_agr_party_name(agr)
     return party_name
 end
 
+---@param agr df.agreement
 function get_deity_name(agr)
-    local religion_id = agr.details[0].data.Location.deity_data.Religion
-    local deities = df.global.world.entities.all[religion_id].relations.deities
-    if #deities == 0 then return 'An Unknown Deity' end
-    return dfhack.translation.translateName(df.global.world.history.figures[deities[0]].name,true)
+    local practice_type = agr.details[0].data.Location.deity_type
+    local practice_id = agr.details[0].data.Location.deity_data.practice_id -- could be either entity_id or hf_id
+    if practice_type == df.religious_practice_type.WORSHIP_HFID then
+        local hf = df.historical_figure.find(practice_id)
+        if not hf then return 'An Unknown Deity' end
+        return dfhack.translation.translateName(hf.name, true)
+    else
+        local deities = df.global.world.entities.all[practice_id].relations.deities
+        if #deities == 0 then return 'An Unknown Deity' end
+        return dfhack.translation.translateName(df.global.world.history.figures[deities[0]].name, true)
+    end
 end
 
 --get resolution status, and string