Skip to content

Commit 8339775

Browse files
Merge branch 'develop' into tombstone-adv-fix-sleepers
2 parents 16a399e + 77e9d2d commit 8339775

File tree

180 files changed

+4199
-2430
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+4199
-2430
lines changed

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

Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,54 +20,32 @@ jobs:
2020
include:
2121
- df_steam_branch: public
2222
version: public
23-
- dfhack_ref: adv-beta
24-
structures_ref: adv-beta
23+
- df_steam_branch: beta
2524
version: 51.01-beta
2625
channel: steam
27-
df_steam_branch: beta
26+
dfhack_ref: adv-beta
27+
structures_ref: adv-beta
2828
steam_branch: adventure-beta
29-
- dfhack_ref: testing
30-
structures_ref: testing
29+
- df_steam_branch: testing
3130
version: testing
3231
channel: steam
33-
df_steam_branch: testing
32+
dfhack_ref: testing
33+
structures_ref: testing
3434
steps:
35-
- name: Setup steamcmd
36-
id: steamcmd
37-
uses: CyberAndrii/setup-steamcmd@v1
38-
continue-on-error: true
39-
- name: Setup steamcmd (retry)
40-
id: steamcmd2
41-
uses: CyberAndrii/setup-steamcmd@v1
42-
if: steps.steamcmd.outcome == 'failure'
4335
- name: Fetch state
4436
uses: actions/cache/restore@v4
4537
with:
4638
path: state
4739
key: watchstate-${{ matrix.version }}
4840
restore-keys: watchstate-${{ matrix.version }}
49-
- name: Prep Steam auth
50-
env:
51-
STEAM_CONFIG_VDF: ${{ secrets.STEAM_CONFIG_VDF }}
52-
run: |
53-
mkdir -p $HOME/Steam/config
54-
echo "$STEAM_CONFIG_VDF" | base64 -d >$HOME/Steam/config/config.vdf
5541
- name: Compare branch metadata
5642
uses: nick-fields/retry@v3
57-
env:
58-
STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
5943
with:
6044
timeout_minutes: 2
6145
command: |
62-
timestamp=$(${{ steps.steamcmd.outputs.executable || steps.steamcmd2.outputs.executable }} \
63-
+@ShutdownOnFailedCommand 1 \
64-
+login $STEAM_USERNAME \
65-
+app_info_request 975370 \
66-
+app_info_print 975370 \
67-
+quit | \
68-
awk '/^{/,0' | \
69-
awk '/^\t\t"branches"/,0' | \
70-
awk '/^\t\t\t"${{ matrix.df_steam_branch }}"/,0' | \
46+
timestamp=$(curl -X GET 'https://api.steamcmd.net/v1/info/975370?pretty=1' | \
47+
awk '/^ *"branches"/,0' | \
48+
awk '/^ *"${{ matrix.df_steam_branch }}"/,0' | \
7149
fgrep timeupdated | \
7250
head -n1 | \
7351
cut -d'"' -f4)

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ repos:
2020
args: ['--fix=lf']
2121
- id: trailing-whitespace
2222
- repo: https://github.com/python-jsonschema/check-jsonschema
23-
rev: 0.28.2
23+
rev: 0.28.4
2424
hooks:
2525
- id: check-github-workflows
2626
- repo: https://github.com/Lucas-C/pre-commit-hooks

CMakeLists.txt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ project(dfhack)
88

99
# set up versioning.
1010
set(DF_VERSION "50.13")
11-
set(DFHACK_RELEASE "r2")
12-
set(DFHACK_PRERELEASE FALSE)
11+
set(DFHACK_RELEASE "r3rc1")
12+
set(DFHACK_PRERELEASE TRUE)
1313

1414
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
1515
set(DFHACK_ABI_VERSION 2)
@@ -38,12 +38,6 @@ macro(CHECK_GCC compiler_path)
3838
string(STRIP "${GCC_VERSION_OUT}" GCC_VERSION_OUT)
3939
if(${GCC_VERSION_OUT} VERSION_LESS "10")
4040
message(SEND_ERROR "${compiler_path} version ${GCC_VERSION_OUT} cannot be used - use GCC 10 or later")
41-
# TODO: this may need to be removed when DF linux actually comes out
42-
# TODO: and we can test
43-
# GCC 5 changes ABI name mangling to enable C++11 changes.
44-
# This must be disabled to enable linking against DF.
45-
# http://developerblog.redhat.com/2015/02/05/gcc5-and-the-c11-abi/
46-
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
4741
endif()
4842
endmacro()
4943

ci/test.lua

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,9 +458,7 @@ local function load_tests(file, tests)
458458
local targets = type(env.config.target) == 'table' and env.config.target or {env.config.target}
459459
for _,target in ipairs(targets) do
460460
if target == 'core' then goto continue end
461-
if type(target) ~= 'string' or not helpdb.is_entry(target) or
462-
helpdb.get_entry_tags(target).unavailable
463-
then
461+
if type(target) ~= 'string' or helpdb.has_tag(target, 'unavailable') then
464462
dfhack.printerr('Skipping tests for unavailable target: ' .. target)
465463
return true
466464
end

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ def get_version():
181181
# directories to ignore when looking for source files.
182182
exclude_patterns = [
183183
'README.md',
184+
'.git/*',
184185
'build*',
185186
'depends/*',
186187
'docs/html/*',

data/art/tiletypes.png

3.17 KB
Loading

data/blueprints/aquifer_tap.csv

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
#notes label(help)
2-
"This blueprint will help you get a safe, everlasting source of fresh water from a light aquifer."
2+
"This blueprint will help you get a safe, everlasting source of fresh water from a light aquifer. See https://youtu.be/hF3_fjLc_EU for a video tutorial."
33
""
44
Here's the procedure:
55
""
6-
1) Dig a tunnel from where you want the water to end up (e.g. your well cistern) off to an unused portion of the map that has an aquifer above it. Be sure to dig a one-tile-wide diagonal segment in this tunnel so water that will eventually flow through the tunnel is depressurized.
6+
"1) Locate an area with a light aquifer. DFHack gives light aquifer tiles a two-drop icon that appears when you are in mining mode. If you dug through it on the way down, take note of the elevations where it's likely to be (but be aware that there is regional variation and there's no guarantee that it exists on the map where you want it to be). If you are having trouble finding the boundaries of your aquifer, you can run prospect all --show features to discover the general elevations or gui/reveal -o to see the actual tiles."
77
""
8-
"2) From the end of that tunnel, go down one z-level, enable damp dig mode in the dig toolbar, then dig a staircase straight up to the lowest aquifer level. Erase the top staircase tile (the down-only stairs) so your miners don't dig it yet. We'll be adding it back with the aquifer_tap #dig blueprint."
8+
2) Dig a one-tile-wide tunnel from where you want the water to end up (e.g. your well cistern) to an area on the same z-level directly below the target light aquifer. Dig a one-tile-wide diagonal segment in this tunnel near the cistern side so water that will eventually flow through the tunnel is depressurized.
99
""
10-
"3) From the bottom of the staircase (the z-level below where the water will flow to your cisterns), dig a straight, one-tile wide tunnel to the closest edge of the map. This is your emergency drainage tunnel. Smooth the map edge tile and carve a fortification. The water can flow through the fortification and off the map, allowing the dwarves to dig out the aquifer tap without drowning."
10+
"3) From the end of that tunnel, go down one z-level, enable damp dig mode in the dig toolbar, then dig a staircase straight up so that the top is in the lowest aquifer level (a tile with a two-drop icon). Change the top staircase tile (the down-only stairs) to a ""blueprint"" tile (default hotkey: m-L) so your miners don't dig it yet."
1111
""
12-
4) Place a lever-controlled floodgate in the drainage tunnel and open the floodgate. Place the lever somewhere else in your fort so that it will remain dry and accessible.
12+
"4) From the bottom of the staircase (the z-level below where the water will flow to your cisterns), dig a straight, one-tile wide tunnel to the closest edge of the map. This is your emergency drainage tunnel. Smooth the map edge tile and carve a fortification. The water can flow through the fortification and off the map, allowing the dwarves to dig out the aquifer tap without drowning."
1313
""
14-
"5) If you want, haul away any boulders in the tunnels and/or smooth the tiles. You won't be able to access any of this area once it fills up with water!"
14+
5) Place a lever-controlled floodgate in the drainage tunnel and open the floodgate. Place the lever somewhere else in your fort so that it will remain dry and accessible.
1515
""
16-
"6) Apply this blueprint (gui/quickfort aquifer_tap /dig) to the z-level above the top of the staircase, inside the lowest aquifer level. The tiles will be designated in ""damp dig"" mode so your miners can dig it out without the damp tiles canceling the digging designations."
16+
"6) If you want, haul away any boulders in the tunnels and/or smooth the tiles (e.g. mark them for dumping -- hotkey i-p -- and wait for them to be dumped). You won't be able to access any of this area once it fills up with water!"
1717
""
18-
"7) Dig out the tap. You can haul away any boulders and remove the ramps if you like. The water will safely flow down the staircase, through the open floodgate, down the drainage tunnel, and off the map as long as the floodgate is open."
18+
"7) Apply this blueprint (gui/quickfort aquifer_tap /dig) to the z-level above the top of the staircase, inside the lowest aquifer level. The tiles will be designated in ""damp dig"" mode so your miners can dig it out without the damp tiles canceling the digging designations. This blueprint designates ramps for digging so two layers of aquifer can contribute to the water collector."
19+
""
20+
"8) Dig out the tap. You can haul away any boulders and remove the ramps if you like. The water will safely flow down the staircase, through the open floodgate, down the drainage tunnel, and off the map as long as the floodgate is open."
1921

20-
"8) Once everything is dug out and all dwarves are out of the waterways, close the floodgate. Your cisterns will fill with water. Since the waterway to your cisterns is depressurized, the cisterns will stay forever full, but will not flood."
22+
"9) Once everything is dug out and all dwarves are out of the waterways, close the floodgate. Your cisterns will fill with water. Since the waterway to your cisterns is depressurized, the cisterns will stay forever full, but will not flood."
2123
""
2224
A diagram might be useful. Here is a vertical view through the z-levels. This blueprint goes at the top:
2325
""

0 commit comments

Comments
 (0)