Merge branch 'develop' into squid-docs-fix

Author: realSquidCoder

.github/workflows/generate-symbols.yml

@@ -36,6 +36,7 @@ on:
         default: default
         options:
         - default
+        - experimental
         - testing
         - adventure_test
         - beta

.github/workflows/watch-df-release.yml

@@ -15,13 +15,17 @@ jobs:
       fail-fast: false
       matrix:
         # df_steam_branch: which DF Steam branch to watch
-        # platform: leave blank to default to all
+        # platform: for symbols generation; leave blank to default to all
         # structures_ref: leave blank to default to master
         # dfhack_ref: leave blank if no structures update is desired
         # steam_branch: leave blank if no DFHack steam push is desired
         include:
           - df_steam_branch: public
           - df_steam_branch: beta
+          - df_steam_branch: experimental
+            structures_ref: experimental
+            dfhack_ref: experimental
+            steam_branch: experimental
     steps:
     - name: Fetch state
       uses: actions/cache/restore@v4

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

CMakeLists.txt

@@ -6,9 +6,9 @@ cmake_policy(SET CMP0048 NEW)
 cmake_policy(SET CMP0074 NEW)
 
 # set up versioning.
-set(DF_VERSION "51.05")
-set(DFHACK_RELEASE "r1")
-set(DFHACK_PRERELEASE FALSE)
+set(DF_VERSION "51.06")
+set(DFHACK_RELEASE "r2rc1")
+set(DFHACK_PRERELEASE TRUE)
 
 set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
 set(DFHACK_ABI_VERSION 2)

data/CMakeLists.txt

@@ -24,6 +24,10 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/
         FILES_MATCHING PATTERN "*"
                        PATTERN blueprints/test EXCLUDE)
 
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/patches/
+    DESTINATION ${DFHACK_DATA_DESTINATION}/patches
+)
+
 if(BUILD_TESTS)
     install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/test/
             DESTINATION "${DFHACK_DATA_DESTINATION}/data/blueprints/test")

data/blueprints/dreamfort.csv

@@ -113,6 +113,7 @@ You can save some time by setting up your settings in gui/control-panel before y
 - autobutcher
 - autobutcher target 10 10 14 2 BIRD_GOOSE
 - autochop
+- autocheese
 - autofarm
 - autofarm threshold 150 grass_tail_pig
 - autofish
@@ -134,6 +135,7 @@ You can save some time by setting up your settings in gui/control-panel before y
 """Gameplay"" subtab:"
 - combine
 - dwarfvet
+- immortal-cravings
 - timestream
 - work-now
 "Note that if you've already started your fort and have missed the ""new fort"" trigger, you can enable these tools on the ""Enabled"" tabs instead. You can run the one-time commands (like ban-cooking all) manually from gui/launcher."
@@ -283,11 +285,11 @@ Surface Walkthrough:
 Sieges and Prisoner Processing:
 Here are some tips and procedures for handling seiges -- including how to clean up afterwards!
 ""
-"- Your ""Inside+"" burrow will automatically grow with your fort and should include only safe areas of your fort. In particular, it should not include the ""atrium"" area (where the ""siege bait"" pasture is) or the trapped hallways."
+"- Your ""Inside+"" burrow will automatically grow with your fort and should include only safe areas. In particular, it does not include the ""atrium"" area (where the ""siege bait"" pasture is) or the trapped hallways."
 ""
 "- When a siege begins, set your civilian alert (attach the alert to your ""Inside+"" burrow if it isn't already) to ensure all your civilians stay out of danger. Immediately pull the lever to close the outer main gate. It is also wise to close the trade depot and inner main gate as well. That way, if enemies get past the traps, they'll have to go through the soldiers in your barracks (assuming you have a military)."
 ""
-"- During a siege, you can use the levers to control how attackers path through the trapped corridors. If there are more enemies than cage traps, time your lever pulling so that the inner gates snap closed before your last cage trap is sprung. Then the remaining attackers will have to backtrack and go through the other trap-filled hallway. You can also choose *not* to use the trap hallways and meet the siege with your military. It's up to you!"
+"- During a siege, you can use the levers to control how attackers path through the trapped corridors. If there are more enemies than cage traps, time your lever pulling so that the inner gates snap closed before your last cage trap is sprung. Then the remaining attackers will have to backtrack and go through the other trap-filled hallway. You can also choose *not* to use the trap hallways and instead meet the siege head-on with your military. It's up to you!"
 ""
 "- If your cage traps fill up, ensure your hallways are free of uncaged attackers, then close the trap hallway outer gates and open the inner gates. Clear the civilian alert and allow your dwarves to reset all the traps -- make some extra cages in preparation for this! Then re-enable the civilian alert and open the trap hallway outer gates."
 ""

data/init/dfhack.keybindings.init

@@ -41,6 +41,12 @@ keybinding add Ctrl-A@choose_start_site gui/embark-anywhere
 # in the game root directory
 keybinding add Ctrl-T@dwarfmode/ViewSheets/UNIT|dwarfmode/ViewSheets/ITEM|dungeonmode/ViewSheets/UNIT|dungeonmode/ViewSheets/ITEM markdown
 
+# gui/sitemap
+keybinding add Ctrl-G@dwarfmode/Default|dungeonmode/Default gui/sitemap
+
+# toggle keyboard cursor
+keybinding add Alt-K@dwarfmode|dungeonmode/Default|dungeonmode/Look toggle-kbd-cursor
+
 
 ######################
 # dwarfmode bindings #
@@ -71,9 +77,6 @@ keybinding add Ctrl-Shift-T@dwarfmode gui/teleport
 # apply blueprints to the map
 keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
 
-# toggle keyboard cursor
-keybinding add Alt-K@dwarfmode toggle-kbd-cursor
-
 # Stocks plugin
 #keybinding add Ctrl-Shift-Z@dwarfmode/Default "stocks show"
 

data/orders/basic.json

@@ -114,27 +114,6 @@
 		"job" : "CustomReaction",
 		"reaction" : "BREW_DRINK_FROM_PLANT_GROWTH"
 	},
-	{
-		"amount_left" : 1,
-		"amount_total" : 1,
-		"frequency" : "Daily",
-		"id" : 3,
-		"is_active" : false,
-		"is_validated" : false,
-		"item_conditions" : 
-		[
-			{
-				"condition" : "AtLeast",
-				"flags" : 
-				[
-					"unrotten",
-					"milk"
-				],
-				"value" : 2
-			}
-		],
-		"job" : "MakeCheese"
-	},
 	{
 		"amount_left" : 1,
 		"amount_total" : 1,

data/patches/README.md

@@ -0,0 +1,13 @@
+Place IDA-exported `.dif` files for use by `binpatch` in subdirectories of this
+directory. Each `.dif` file must be in a subdirectory named after the full
+symbol table version string. For example, for DF version 51.05, you would use
+these subdirectories:
+
+- "v0.51.05 linux64 CLASSIC"
+- "v0.51.05 linux64 ITCH"
+- "v0.51.05 linux64 STEAM"
+- "v0.51.05 win64 CLASSIC"
+- "v0.51.05 win64 ITCH"
+- "v0.51.05 win64 STEAM"
+
+See https://docs.dfhack.org/en/stable/docs/dev/Binpatches.html for more details.