Merge remote-tracking branch 'origin/master' into cj/mr-button/pr

Author: ChrisJohnsen

.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.31.2
+  rev: 0.32.1
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks

changelog.txt

@@ -31,16 +31,24 @@ Template for new versions:
 
 ## New Features
 
+## Fixes
+
+## Misc Improvements
+
+## Removed
+
+# 51.11-r1
+
 ## Fixes
 - `list-agreements`: fix date math when determining petition age
 - `gui/petitions`: fix date math when determining petition age
+- `gui/rename`: fix commandline processing when manually specifying target ids
+- `gui/sandbox`: restore metal equipment options when spawning units
 
 ## Misc Improvements
 - `fix/loyaltycascade`: now also breaks up brawls and other intra-fort conflicts that *look* like loyalty cascades
 - `makeown`: remove selected unit from any current conflicts so they don't just start attacking other citizens when you make them a citizen of your fort
 
-## Removed
-
 # 51.09-r1
 
 ## New Features

fix/ownership.lua

@@ -33,7 +33,7 @@ local zone_vecs = {
 local function relink_zones()
     for _,zones in ipairs(zone_vecs) do
         for _,zone in ipairs(zones) do
-            local unit = zone.assigned_unit
+            local unit = dfhack.buildings.getOwner(zone)
             if not unit then goto continue end
             if not utils.linear_index(unit.owned_buildings, zone.id, 'id') then
                 print(('fix/ownership: Restoring %s ownership link for %s'):format(

gui/notes.lua

@@ -361,8 +361,7 @@ function main()
         qerror('notes requires a fortress map to be loaded')
     end
 
-    view = view and view:raise() or NotesScreen{
-    }:show()
+    view = view and view:raise() or NotesScreen{}:show()
 end
 
 if not dfhack_flags.module then

gui/rename.lua

@@ -1022,14 +1022,14 @@ local function main(args)
         show_selector=true,
     }
     local positionals = argparse.processArgsGetopt(args, {
-        { 'a', 'artifact', handler=function(optarg) opts.item_id = argparse.nonnegativeInt(optarg, 'artifact') end },
-        { 'e', 'entity', handler=function(optarg) opts.entity_id = argparse.nonnegativeInt(optarg, 'entity') end },
-        { 'f', 'histfig', handler=function(optarg) opts.histfig_id = argparse.nonnegativeInt(optarg, 'histfig') end },
+        { 'a', 'artifact', hasArg=true, handler=function(optarg) opts.item_id = argparse.nonnegativeInt(optarg, 'artifact') end },
+        { 'e', 'entity', hasArg=true, handler=function(optarg) opts.entity_id = argparse.nonnegativeInt(optarg, 'entity') end },
+        { 'f', 'histfig', hasArg=true, handler=function(optarg) opts.histfig_id = argparse.nonnegativeInt(optarg, 'histfig') end },
         { 'h', 'help', handler = function() opts.help = true end },
-        { 'l', 'location', handler=function(optarg) opts.location_id = argparse.nonnegativeInt(optarg, 'location') end },
-        { 'q', 'squad', handler=function(optarg) opts.squad_id = argparse.nonnegativeInt(optarg, 'squad') end },
-        { 's', 'site', handler=function(optarg) opts.site_id = argparse.nonnegativeInt(optarg, 'site') end },
-        { 'u', 'unit', handler=function(optarg) opts.unit_id = argparse.nonnegativeInt(optarg, 'unit') end },
+        { 'l', 'location', hasArg=true, handler=function(optarg) opts.location_id = argparse.nonnegativeInt(optarg, 'location') end },
+        { 'q', 'squad', hasArg=true, handler=function(optarg) opts.squad_id = argparse.nonnegativeInt(optarg, 'squad') end },
+        { 's', 'site', hasArg=true, handler=function(optarg) opts.site_id = argparse.nonnegativeInt(optarg, 'site') end },
+        { 'u', 'unit', hasArg=true, handler=function(optarg) opts.unit_id = argparse.nonnegativeInt(optarg, 'unit') end },
         { 'w', 'world', handler=function() opts.world = true end },
         { '', 'no-target-selector', handler=function() opts.show_selector = false end },
     })

gui/sandbox.lua

@@ -458,7 +458,7 @@ local function init_arena()
             -- for i in ipairs(df.builtin_mats) do
             --     do_insert(MAT_TABLE.builtin[i], i, -1)
             -- end
-            for i, mat in ipairs(RAWS.inorganics) do
+            for i, mat in ipairs(RAWS.inorganics.all) do
                 do_insert(mat.material, 0, i)
                 -- stop at the first "special" metal. we don't need more than that
                 if mat.flags.DEEP_SPECIAL then break end

test/gui/notes.lua

@@ -39,21 +39,21 @@ end
 local function arrange_gui_notes(options)
     options = options or {}
 
+    -- running tests removes all overlays because of IN_TEST reloading.
+    -- rescan so we can load the gui/notes widget for these tests
+    overlay.rescan()
+
     arrange_notes(options.notes)
 
     gui_notes.main()
 
-    local gui_notes = gui_notes.view
-    gui_notes.enable_selector_blink = false
+    local view = gui_notes.view
+    view.enable_selector_blink = false
 
-    gui_notes:updateLayout()
-    gui_notes:onRender()
-
-    -- for some reasons running tests remove all overlays,
-    -- but there are need for gui/notes tests
-    overlay.rescan()
+    view:updateLayout()
+    view:onRender()
 
-    return gui_notes, gui_notes.subviews.notes_window
+    return view, view.subviews.notes_window
 end
 
 local function cleanup(gui_notes)