MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into sdl2

develop
Myk Taylor 2023-06-26 16:04:50 -07:00
parent 164a889479 d9d0482386
commit e308d3204a
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/guides/quickfort-library-guide.rst
Unescape Escape View File

@ -217,7 +217,7 @@ create a drainage system so your dwarves don't drown when digging the tap, by
running the ``library/aquifer_tap.csv`` ``/help`` blueprint. running the ``library/aquifer_tap.csv`` ``/help`` blueprint.
You can see how to nullify the water pressure (so you don't flood your fort) in You can see how to nullify the water pressure (so you don't flood your fort) in
the `Dreamfort screenshot above <Services levels (4 deep)>`_. the Dreamfort cistern screenshot above: `Services levels (4 deep)`_.
The blueprint spreadsheet is also available The blueprint spreadsheet is also available
`online <https://docs.google.com/spreadsheets/d/1kwuCipF9FYAHNP9C_XlMpqVseaPu4SmL9YLUSQkbW4s/edit#gid=611877584>`__. `online <https://docs.google.com/spreadsheets/d/1kwuCipF9FYAHNP9C_XlMpqVseaPu4SmL9YLUSQkbW4s/edit#gid=611877584>`__.

4
library/modules/Gui.cpp
Unescape Escape View File

@ -343,6 +343,10 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode)
if (game->main_interface.diplomacy.open) { if (game->main_interface.diplomacy.open) {
newFocusString = baseFocus; newFocusString = baseFocus;
newFocusString += "/Diplomacy"; newFocusString += "/Diplomacy";
if (game->main_interface.diplomacy.taking_requests)
newFocusString += "/Requests";
else
newFocusString += "/Default";
focusStrings.push_back(newFocusString); focusStrings.push_back(newFocusString);
} }
if (game->main_interface.petitions.open) { if (game->main_interface.petitions.open) {

2
scripts

@ -1 +1 @@
Subproject commit fcccedb91e48ebdbe151950c86689d52f0617ea9 Subproject commit 4c74bb9055c1c7a1bd49cbe535e2fc453cd79664