Merge pull request DFHack#716 from myk002/myk_orders

[quickfort] reinstate orders generation using code borrowed from stockflow

changelog.txt

@@ -35,6 +35,7 @@ that repo.
 ## Misc Improvements
 - `gui/quickfort`: blueprints that designate items for dumping/forbidding/etc. no longer show an error highlight for tiles that have no items on them
 - `gui/quickfort`: place (stockpile layout) mode is now supported. note that detailed stockpile configurations were part of query mode and are not yet supported
+- `gui/quickfort`: you can now generate manager orders for items required to complete bluerpints
 - `gui/create-item`: ask for number of items to spawn by default
 - `light-aquifers-only`: now available as a fort Autostart option in `gui/control-panel`. note that it will only appear if "armok" tools are configured to be shown on the Preferences tab.
 - `gui/gm-editor`: when passing the ``--freeze`` option, further ensure that the game is frozen by halting all rendering (other than for the gm-editor window itself)

gui/quickfort.lua

@@ -350,13 +350,13 @@ function Quickfort:init()
                             return #transformations == 0 and 'No transform'
                                 or table.concat(transformations, ', ') end}}}}},
         widgets.HotkeyLabel{key='CUSTOM_O', label='Generate manager orders',
-            active=function() return self.blueprint_name and false end,
-            enabled=function() return self.blueprint_name and false end,
+            active=function() return self.blueprint_name end,
+            enabled=function() return self.blueprint_name end,
             on_activate=self:callback('do_command', 'orders')},
         widgets.HotkeyLabel{key='CUSTOM_SHIFT_O',
             label='Preview manager orders',
-            active=function() return self.blueprint_name and false end,
-            enabled=function() return self.blueprint_name and false end,
+            active=function() return self.blueprint_name end,
+            enabled=function() return self.blueprint_name end,
             on_activate=self:callback('do_command', 'orders', true)},
         widgets.HotkeyLabel{key='CUSTOM_SHIFT_U', label='Undo blueprint',
             active=function() return self.blueprint_name end,

internal/quickfort/command.lua

@@ -22,7 +22,7 @@ end
 
 local command_switch = {
     run='do_run',
-    -- orders='do_orders', -- until we get stockflow working
+    orders='do_orders',
     undo='do_undo',
 }
 
@@ -185,7 +185,7 @@ local function do_one_command(command, cursor, blueprint_name, section_name,
         if command == 'orders' or mode == 'notes' or mode == 'config' then
             cursor = {x=0, y=0, z=0}
         else
-            qerror('please position the game cursor at the blueprint start ' ..
+            qerror('please position the keyboard cursor at the blueprint start ' ..
                    'location or use the --cursor option')
         end
     end
@@ -234,9 +234,6 @@ end
 function do_command(args)
     for _,command in ipairs(args.commands) do
         if not command or not command_switch[command] then
-            if command == 'orders' then
-                qerror('orders functionality not updated yet')
-            end
             qerror(string.format('invalid command: "%s"', command))
         end
     end

internal/quickfort/orders.lua

@@ -11,10 +11,13 @@ end
 
 local quickfort_common = reqscript('internal/quickfort/common')
 
-local ok, stockflow = pcall(require, 'plugins.stockflow')
-if not ok then
-    stockflow = nil
-end
+-- local ok, stockflow = pcall(require, 'plugins.stockflow')
+-- if not ok then
+--     stockflow = nil
+-- end
+
+-- use our own copy of stockflow logic until stockflow becomes available again
+local stockflow = reqscript('internal/quickfort/stockflow')
 
 local log = quickfort_common.log