Merge branch 'master' into testing

Author: myk002

.gitattributes

@@ -0,0 +1 @@
+changelog.txt merge=union

.github/workflows/comment-pr.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Download artifact
-      uses: dawidd6/action-download-artifact@v3
+      uses: dawidd6/action-download-artifact@v6
       with:
         workflow: .github/workflows/check-type-sizes.yml
         run_id: ${{ github.event.workflow_run.id }}

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 repos:
 # shared across repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
     - id: check-added-large-files
     - id: check-case-conflict
@@ -20,7 +20,7 @@ repos:
       args: ['--fix=lf']
     - id: trailing-whitespace
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.29.2
+  rev: 0.30.0
   hooks:
     - id: check-github-workflows
 - repo: https://github.com/Lucas-C/pre-commit-hooks
@@ -34,6 +34,6 @@ repos:
         - json
 # specific to df-structures:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
     - id: forbid-new-submodules

changelog.txt

@@ -20,6 +20,13 @@ Template for new versions:
 
 ## Structures
 
+# 50.15-r1
+
+# 50.14-r2
+
+## Structures
+- added ``unitst_set_automatic_professions`` entry point export to list of known globals
+
 # 50.14-r1
 
 ## Structures

df.d_init.xml

@@ -28,6 +28,7 @@
         <enum-item name='SHOW_IMP_QUALITY'/>
         <enum-item name='SHOW_FLOW_AMOUNTS'/>
         <enum-item name='SHOW_RAMP_ARROWS'/>
+        <enum-item name='FORT_SHOW_CLOTHING_DYES'/>
     </enum-type>
 
     <enum-type type-name='d_init_flags2'> bay12: InitAdventureFlagType
@@ -53,7 +54,7 @@
         <enum-item name='LOG_MAP_REJECTS'/>
         <enum-item name='PAUSE_ON_LOAD'/>
         <enum-item name='EMBARK_WARNING_ALWAYS'/>
-        <enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE'/>
+        <enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE' comment='SHOW_ALL_HISTORY_IN_FORT_MODE'/>
 
         <enum-item name='TESTING_ARENA'/>
         <enum-item name='WALKING_SPREADS_SPATTER_DWF'/>

df.globals.xml

@@ -63,7 +63,7 @@
     -- .data
 
     <global-object name='global_table'>
-        <static-array type-name='global_table_entry' count='366'/>
+        <static-array type-name='global_table_entry' count='379'/>
     </global-object>
 
     <!-- Cursor: to find, look in the non-bss .data segment -->
@@ -85,13 +85,13 @@
     </global-object>
 
     <enum-type type-name='game_mode'>
-        <enum-item name='NONE' value='-1'/>
         <enum-item name='DWARF'/>
         <enum-item name='ADVENTURE'/>
+        <enum-item name='num'/>
+        <enum-item name='NONE'/>
     </enum-type>
 
     <enum-type type-name='game_type' base-type="int32_t" comment='bay12: GameType'>
-        <enum-item name='NONE' value='-1'/>
         <enum-item name='DWARF_MAIN'/>
         <enum-item name='ADVENTURE_MAIN'/>
         <enum-item name='VIEW_LEGENDS'/>
@@ -102,6 +102,8 @@
         <enum-item name='DWARF_TUTORIAL'/>
         <enum-item name='DWARF_UNRETIRE'/>
         <enum-item name='ADVENTURE_WORLD_DEBUG'/>
+        <enum-item name='num'/>
+        <enum-item name='NONE'/>
     </enum-type>
 
     <global-object name='gamemode'>
@@ -470,6 +472,10 @@
     <global-object name='unitst_make_own'>
         <stl-function/> <!-- void(df::unitst*) -->
     </global-object>
+
+    <global-object name='unitst_set_automatic_professions'>
+        <stl-function/> <!-- void(df::unitst*) -->
+    </global-object>
 </data-definition>
 
 <!--

df.item-raws.xml

@@ -956,7 +956,15 @@
                 <enum type-name="tool_flags" name="restriction"/>
             </pointer>
         </stl-vector>
-        <static-array name='texpos' type-name="int32_t" count="68"/>
+        <static-array name='texpos' type-name="int32_t" count="8"/>
+        <stl-vector name='texpos_container_top_plant' type-name='int32_t'/>
+        <stl-vector name='texpos_container_top_plant_subterranean' type-name='int32_t'/>
+        <stl-vector name='texpos_container_top_meal' type-name='int32_t'/>
+        <stl-vector name='texpos_container_top_cheese' type-name='int32_t'/>
+        <stl-vector name='texpos_container_top_meat' type-name='int32_t'/>
+        <stl-vector name='texpos_container_top_fish' type-name='int32_t'/>
+        <stl-vector name='texpos_container_top_bag' type-name='int32_t'/>
+        <static-array name='texpos2' type-name="int32_t" count="60"/>
         <stl-vector name='texpos_global_shape_index' type-name="int32_t"/>
         <stl-vector name='texpos_global_shape_texpos' type-name="int32_t"/>
         <stl-vector name='graphics_info' comment='item_tool_graphics_infost'/>