add lua nestboxes to autobutcher plugin

Author: Birkow

plugins/autobutcher.cpp

@@ -971,6 +971,36 @@ static int autobutcher_getWatchList(lua_State *L) {
     return 1;
 }
 
+static int getMax(int first, int second) {
+    return first > second ? first : second;
+}
+// push info used by nestboxes
+static int autobutcher_getInfoForNestboxes(lua_State* L) {
+    PersistentDataItem rconfig;
+    color_ostream* out = Lua::GetOutput(L);
+
+    if (lua_isnumber(L, 1)) {
+        int raceId = lua_tointeger(L, 1);
+        lua_newtable(L);
+        int ctable = lua_gettop(L);
+        Lua::SetField(L, config.get_bool(CONFIG_IS_ENABLED), ctable, "autobutcher_enabled");
+
+        if (!out)
+            out = &Core::getInstance().getConsole();
+
+        WatchedRace* w;
+        if (watched_races.count(raceId)) {
+            w = watched_races[raceId];
+            WatchedRace* tally = checkRaceStocksTotal(*out, raceId);
+            Lua::SetField(L, w->isWatched, ctable, "watched");
+            int mac = getMax(w->fk - tally->fk_units.size(), 0) + getMax(w->mk - tally->mk_units.size(), 0) + getMax(w->fa - tally->fa_units.size(), 0) + getMax(w->ma - tally->ma_units.size(), 0);
+            Lua::SetField(L, mac, ctable, "mac");    // missing animals count for race, diff between target for child/adult female/male and current amounts, ignore amounts over target
+            delete tally;
+        }
+    }
+    return 1;
+}
+
 DFHACK_PLUGIN_LUA_FUNCTIONS {
     DFHACK_LUA_FUNCTION(autowatch_isEnabled),
     DFHACK_LUA_FUNCTION(autowatch_setEnabled),
@@ -986,5 +1016,6 @@ DFHACK_PLUGIN_LUA_FUNCTIONS {
 DFHACK_PLUGIN_LUA_COMMANDS {
     DFHACK_LUA_COMMAND(autobutcher_getSettings),
     DFHACK_LUA_COMMAND(autobutcher_getWatchList),
+    DFHACK_LUA_COMMAND(autobutcher_getInfoForNestboxes),
     DFHACK_LUA_END
 };

plugins/lua/autobutcher.lua

@@ -1,6 +1,7 @@
 local _ENV = mkmodule('plugins.autobutcher')
 
 local argparse = require('argparse')
+local nestboxes = require('plugins.autobutcher.nestboxes')
 
 local function is_int(val)
     return val and val == math.floor(val)
@@ -45,6 +46,13 @@ local function process_races(opts, races, start_idx)
     end
 end
 
+local function reload_modules()
+    reload('plugins.autobutcher.common')
+    reload('plugins.autobutcher.nestboxesEvent')
+    reload('plugins.autobutcher.nestboxes')
+    reload('plugins.autobutcher')
+end
+
 function parse_commandline(opts, args)
     local positionals = process_args(opts, args)
 
@@ -65,6 +73,10 @@ function parse_commandline(opts, args)
         opts.fa = check_nonnegative_int(positionals[4])
         opts.ma = check_nonnegative_int(positionals[5])
         process_races(opts, positionals, 6)
+    elseif command == 'reload' then
+        reload_modules()
+    elseif string.upper(command) == 'NESTBOXES' or string.upper(command) =='NB' then
+        nestboxes.handleCommand(positionals, opts)
     else
         qerror(('unrecognized command: "%s"'):format(command))
     end

plugins/lua/autobutcher/common.lua

@@ -0,0 +1,34 @@
+local _ENV = mkmodule('plugins.autobutcher.common')
+
+verbose = verbose or nil
+prefix = prefix or ''
+
+function printLocal(text)
+  print(prefix .. ': ' .. text)
+end
+
+function handleError(text)
+  qerror(prefix .. ': ' .. text)
+end
+
+function printDetails(text)
+  if verbose then
+    printLocal(text)
+  end
+end
+
+function dumpToString(o)
+  if type(o) == 'table' then
+    local s = '{ '
+    for k, v in pairs(o) do
+      if type(k) ~= 'number' then
+        k = '"' .. k .. '"'
+      end
+      s = s .. '[' .. k .. '] = ' .. dumpToString(v) .. ','
+    end
+    return s .. '} '
+  else
+    return tostring(o)
+  end
+end
+return _ENV