Merge branch 'sci-gym-script' into SquidHack

Author: realSquidCoder

autotraining.lua

@@ -11,7 +11,7 @@ validArgs = utils.invert({
 
 local args = utils.processArgs({...}, validArgs)
 local GLOBAL_KEY  = "autotraining"
-local need_id = df.need_type['MartialTraining']
+local MartialTraining = df.need_type['MartialTraining']
 local ignore_count = 0
 
 local function get_default_state()
@@ -89,10 +89,8 @@ dfhack.onStateChange[GLOBAL_KEY] = function(sc)
     -- retrieve state saved in game. merge with default state so config
     -- saved from previous versions can pick up newer defaults.
     load_state()
-    if ( state.enabled ) then
+    if state.enabled then
         start()
-    else
-        stop()
     end
     persist_state()
 end
@@ -103,32 +101,35 @@ end
 --######
 function getTrainingCandidates()
     local ret = {}
-    local citizen = dfhack.units.getCitizens(true)
     ignore_count = 0
-    for _, unit in ipairs(citizen) do
-        if dfhack.units.isAdult(unit) then
-            local noblePos = dfhack.units.getNoblePositions(unit)
-            local isIgnNoble = false
-            if ( not state.ignored[unit.id] ) then
-                if noblePos ~=nil then
-                    for _, position in ipairs(noblePos) do
-                        if state.ignored_nobles[position.position.code] then
-                            isIgnNoble = true
-                            break
-                        end
-                    end
-                end
-                if not isIgnNoble then
-                    table.insert(ret, unit)
-                else
-                    removeTraining(unit)
-                    ignore_count = ignore_count +1
+    for _, unit in ipairs(dfhack.units.getCitizens(true)) do
+        if state.ignored[unit.id] then
+            ignore_count = ignore_count +1
+            goto next_unit
+        end
+        if not dfhack.units.isAdult(unit) then
+            goto next_unit
+        end
+        local need = getTrainingNeed(unit)
+        if not need or need.focus_level >= state.threshold  then
+            goto next_unit
+        end
+        local noblePos = dfhack.units.getNoblePositions(unit)
+        local isIgnNoble = false
+        if noblePos ~=nil then
+            for _, position in ipairs(noblePos) do
+                if state.ignored_nobles[position.position.code] then
+                    isIgnNoble = true
+                    break
                 end
-            else
-                removeTraining(unit)
-                ignore_count = ignore_count +1
             end
         end
+        if isIgnNoble then
+            ignore_count = ignore_count +1
+            goto next_unit
+        end
+        table.insert(ret, unit)
+        ::next_unit::
     end
     return ret
 end
@@ -147,10 +148,11 @@ function getTrainingSquads()
     return squads
 end
 
-function findNeed(unit)
+function getTrainingNeed(unit)
+    if unit == nil then return nil end
     local needs =  unit.status.current_soul.personality.needs
     for _, need in ipairs(needs) do
-        if need.id == need_id then
+        if need.id == MartialTraining then
             return need
         end
     end
@@ -161,48 +163,38 @@ end
 --Main
 --######
 
-function getByID(id)
-    for _, unit in ipairs(getTrainingCandidates()) do
-        if (unit.hist_figure_id == id) then
-            return unit
-        end
-    end
-
-    return nil
-end
-
 -- Find all training squads
 -- Abort if no squads found
 function checkSquads()
     local squads = {}
     for _, squad in ipairs(getTrainingSquads()) do
         if squad.entity_id == df.global.plotinfo.group_id then
             local leader = squad.positions[0].occupant
-            if ( leader ~= -1) then
+            if leader ~= -1 then
                 table.insert(squads,squad)
             end
         end
     end
 
-    if (#squads == 0) then
+    if #squads == 0 then
         return nil
     end
 
     return squads
 end
 
-function addTraining(unit)
-    if (unit.military.squad_id ~= -1) then
-        for _, squad in ipairs(getTrainingSquads()) do
+function addTraining(unit,good_squads)
+    if unit.military.squad_id ~= -1 then
+        for _, squad in ipairs(good_squads) do
             if unit.military.squad_id == squad.id then
                 return true
             end
         end
         return false
     end
-    for _, squad in ipairs(getTrainingSquads()) do
+    for _, squad in ipairs(good_squads) do
         for i=1,9,1   do
-            if ( squad.positions[i].occupant  == -1 ) then
+            if squad.positions[i].occupant  == -1 then
                 return dfhack.military.addToSquad(unit.id,squad.id,i)
             end
         end
@@ -211,24 +203,13 @@ function addTraining(unit)
     return false
 end
 
-function removeTraining(unit)
-    for _, squad in ipairs(getTrainingSquads()) do
-        for i=1,9,1   do
-            if ( unit.hist_figure_id  == squad.positions[i].occupant ) then
-                return dfhack.military.removeFromSquad(unit.id)
-            end
-        end
-    end
-    return false
-end
-
 function removeAll()
-    if ( state.training_squads == nil) then return end
+    if state.training_squads == nil then return end
     for _, squad in ipairs(getTrainingSquads()) do
         for i=1,9,1 do
-            local dwarf = getByID(squad.positions[i].occupant)
-            if (dwarf ~= nil) then
-                removeTraining(dwarf)
+            local hf = df.historical_figure.find(squad.positions[i].occupant)
+            if hf ~= nil then
+                dfhack.military.removeFromSquad(hf.unit_id)
             end
         end
     end
@@ -239,39 +220,42 @@ function check()
     local squads = checkSquads()
     local intraining_count = 0
     local inque_count = 0
-    if ( squads == nil) then return end
-    for _, unit in ipairs(getTrainingCandidates()) do
-        local need = findNeed(unit)
-        if ( need  ~= nil ) then
-            if ( need.focus_level  < state.threshold ) then
-                local bol = addTraining(unit)
-                if ( bol ) then
-                    intraining_count = intraining_count +1
-                else
-                    inque_count = inque_count +1
+    if squads == nil then return end
+    for _,squad in ipairs(squads) do
+        for i=1,9,1   do
+            if squad.positions[i].occupant  ~= -1 then
+                local hf = df.historical_figure.find(squad.positions[i].occupant)
+                if hf ~= nil then
+                    local unit = df.unit.find(hf.unit_id)
+                    local training_need = getTrainingNeed(unit)
+                    if not training_need or training_need.focus_level >= state.threshold then
+                        dfhack.military.removeFromSquad(unit)
+                    end
                 end
-            else
-                removeTraining(unit)
             end
         end
     end
+    for _, unit in ipairs(getTrainingCandidates()) do
+        local added = addTraining(unit, squads)
+        if added then
+            intraining_count = intraining_count +1
+        else
+            inque_count = inque_count +1
+        end
+    end
 
-    dfhack.println(GLOBAL_KEY  .. " | IGN: " .. ignore_count .. " TRAIN: " .. intraining_count .. " QUE: " ..inque_count )
+    dfhack.println(GLOBAL_KEY  .. " | IGNORED: " .. ignore_count .. " TRAINING: " .. intraining_count .. " QUEUE: " ..inque_count )
 end
 
 function start()
-    dfhack.println(GLOBAL_KEY  .. " | START")
-
-    if (args.t) then
+    if args.t then
         state.threshold = 0-tonumber(args.t)
     end
     repeatUtil.scheduleEvery(GLOBAL_KEY, 1, 'days', check)
 end
 
 function stop()
-    removeAll()
     repeatUtil.cancel(GLOBAL_KEY)
-    dfhack.println(GLOBAL_KEY  .. " | STOP")
 end
 
 if dfhack_flags.enable then
@@ -287,11 +271,10 @@ if dfhack_flags.module then
     return
 end
 
-if ( state.enabled ) then
+if state.enabled then
     start()
-    dfhack.println(GLOBAL_KEY  .." | Enabled")
 else
     stop()
-    dfhack.println(GLOBAL_KEY  .." | Disabled")
+    removeAll()
 end
 persist_state()

changelog.txt

@@ -17,6 +17,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- `gui/gm-unit`: remove reference to ``think_counter``, removed in v51.12
 
 ## Misc Improvements
 
@@ -31,6 +32,9 @@ Template for new versions:
 ## New Features
 
 ## Fixes
+- `gui/journal`: fix typo which caused the table of contents to always be regenerated even when not needed
+- `gui/mod-manager`: gracefully handle mods with missing or broken ``info.txt`` files
+- `uniform-unstick`: resolve overlap with new buttons in 51.13
 
 ## Misc Improvements
 

gui/journal.lua

@@ -72,7 +72,7 @@ function JournalWindow:init()
                 self.subviews.table_of_contents_panel.visible = not collapsed
                 self.subviews.table_of_contents_divider.visible = not collapsed
 
-                if not colllapsed then
+                if not collapsed then
                     self:reloadTableOfContents()
                 end
 

gui/mod-manager.lua

@@ -524,7 +524,8 @@ function ModlistWindow:refresh_list()
     local choices = {}
     for idx,mod in ipairs(scriptmanager.get_active_mods()) do
         if not include_vanilla and mod.vanilla then goto continue end
-        local steam_id = scriptmanager.get_mod_info_metadata(mod.path, 'STEAM_FILE_ID').STEAM_FILE_ID
+        local metadata = scriptmanager.get_mod_info_metadata(mod.path, 'STEAM_FILE_ID')
+        local steam_id = metadata and metadata.STEAM_FILE_ID or nil
         local url = steam_id and (': https://steamcommunity.com/sharedfiles/filedetails/?id=%s'):format(steam_id) or ''
         table.insert(choices, {
             text={

internal/gm-unit/editor_counters.lua

@@ -9,7 +9,6 @@ Editor_Counters=defclass(Editor_Counters, base_editor.Editor)
 Editor_Counters.ATTRS{
     frame_title = "Counters editor",
     counters1={
-    "think_counter",
     "job_counter",
     "swap_counter",
     "winded",

uniform-unstick.lua

@@ -343,10 +343,11 @@ local MIN_WIDTH = 26
 EquipOverlay = defclass(EquipOverlay, overlay.OverlayWidget)
 EquipOverlay.ATTRS{
     desc='Adds a link to the equip screen to fix equipment conflicts.',
-    default_pos={x=7,y=21},
+    default_pos={x=7,y=23},
     default_enabled=true,
     viewscreens='dwarfmode/Squads/Equipment/Default',
     frame={w=MIN_WIDTH, h=1},
+    version=1
 }
 
 function EquipOverlay:init()