Merge branch 'master' into gui/tooltips/1

Author: TimurKelman

.github/pull_request_template.md

@@ -0,0 +1 @@
+If this PR makes an externally-visible change in behavior, please add an appropriate line to `changelog.txt`.

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

add-thought.lua

@@ -14,7 +14,7 @@ function addEmotionToUnit(unit,thought,emotion,severity,strength,subthought)
     local properThought = tonumber(thought) or df.unit_thought_type[thought]
     local properSubthought = tonumber(subthought)
     if not properThought or not df.unit_thought_type[properThought] then
-        for _,syn in ipairs(df.global.world.raws.syndromes.all) do
+        for _,syn in ipairs(df.global.world.raws.mat_table.syndromes.all) do
             if syn.syn_name == thought then
                 properThought = df.unit_thought_type.Syndrome
                 properSubthought = syn.id

advtools.lua

@@ -1,10 +1,12 @@
 --@ module=true
 
 local convo = reqscript('internal/advtools/convo')
+local fastcombat = reqscript('internal/advtools/fastcombat')
 local party = reqscript('internal/advtools/party')
 
 OVERLAY_WIDGETS = {
     conversation=convo.AdvRumorsOverlay,
+    fastcombat=fastcombat.AdvCombatOverlay,
 }
 
 if dfhack_flags.module then

armoks-blessing.lua

@@ -233,7 +233,7 @@ end
 -- ---------------------------------------------------------------------------
 function adjust_all_dwarves(skillname)
     for _,v in ipairs(dfhack.units.getCitizens()) do
-        print("Adjusting "..dfhack.df2console(dfhack.TranslateName(dfhack.units.getVisibleName(v))))
+        print("Adjusting "..dfhack.df2console(dfhack.units.getReadableName(v)))
         brainwash_unit(v)
         elevate_attributes(v)
         rejuvenate.rejuvenate(v, true)