Merge branch 'DFHack:master' into combine

Author: SilasD

changelog.txt

@@ -37,6 +37,21 @@ Template for new versions:
 
 ## Removed
 
+# 53.06-r1
+
+## New Tools
+
+## New Features
+
+## Fixes
+- `gui/design`: designating a single-level stair construction now properly follows the selected stair type.
+- `gui/design`: adjusted conflicting keybinds, diagonal line reverse becoming ``R`` and bottom stair type becoming ``g``.
+- `modtools/set-personality`: use correct caste trait ranges; fixes `gui/gm-unit` being unable to correctly randomize traits or set traits to caste average
+
+## Misc Improvements
+
+## Removed
+
 # 53.04-r1
 
 ## New Tools

docs/gui/design.rst

@@ -45,7 +45,7 @@ Shapes
     - Spacing can be increased/decreased using 'T'/'t'.
     - They can be inverted using 'i'.
 - Diagonal
-    - Direction can be reversed using 'r'.
+    - Direction can be reversed using 'R'.
     - Spacing can be increased/decreased using 'T'/'t'.
     - They can be inverted using 'i'.
 - Line

gui/design.lua

@@ -409,7 +409,7 @@ function Design:init()
                         widgets.CycleHotkeyLabel {
                             view_id='stairs_bottom_subtype',
                             frame={t=1, l=0},
-                            key='CUSTOM_SHIFT_B',
+                            key='CUSTOM_G',
                             label='Bottom Stair Type:',
                             visible=function()
                                 local bounds = self:get_view_bounds()
@@ -1346,8 +1346,15 @@ function Design:get_designation(point)
     if mode.desig == 'i' then
         local stairs_top_type = self.subviews.stairs_top_subtype:getOptionValue()
         local stairs_bottom_type = self.subviews.stairs_bottom_subtype:getOptionValue()
+        local stairs_only_type = self.subviews.stairs_only_subtype:getOptionValue()
         if point.z == 0 then
-            return stairs_bottom_type == 'auto' and 'u' or stairs_bottom_type
+            if view_bounds.z1 == view_bounds.z2 then
+                -- Single layer staircase
+                return stairs_only_type
+            else
+                -- Bottom of multi-level staircase
+                return stairs_bottom_type == 'auto' and 'u' or stairs_bottom_type
+        end
         elseif view_bounds and point.z == math.abs(view_bounds.z1 - view_bounds.z2) then
             local pos = Point{x=view_bounds.x1, y=view_bounds.y1, z=view_bounds.z1} + point
             local tile_type = dfhack.maps.getTileType(xyz2pos(pos.x, pos.y, pos.z))

internal/design/shapes.lua

@@ -384,7 +384,7 @@ function Diag:init()
             name = "Reverse",
             type = "bool",
             value = false,
-            key = "CUSTOM_R",
+            key = "CUSTOM_SHIFT_R",
         },
     }
 end

modtools/set-personality.lua

@@ -168,9 +168,9 @@ function getUnitCasteTraitRange(unit, trait)
   local caste = dfhack.units.getCasteRaw(unit)
   local range = {}
 
-  range.min = caste.personality.a[df.personality_facet_type[trait]]
-  range.mid = caste.personality.b[df.personality_facet_type[trait]]
-  range.max = caste.personality.c[df.personality_facet_type[trait]]
+  range.min = caste.personality.min[df.personality_facet_type[trait]]
+  range.mid = caste.personality.med[df.personality_facet_type[trait]]
+  range.max = caste.personality.max[df.personality_facet_type[trait]]
 
   return range
 end