From cd43f8935274a5b43297adfdbf1a657eed289add Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Thu, 4 Jan 2024 08:04:43 -0800 Subject: [PATCH 01/10] differentiate squad equipment customization screen --- library/modules/Gui.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index ea2470e4b..74f5c7067 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -670,6 +670,10 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode) if (game->main_interface.squad_equipment.open) { newFocusString = baseFocus; newFocusString += "/SquadEquipment"; + if (game->main_interface.squad_equipment.customizing_equipment) + newFocusString += "/Customizing"; + else + newFocusString += "/Default"; focusStrings.push_back(newFocusString); } // squads should be last because it's the only one not exclusive with the others? or something? From 8f7cb40775dae2d75138961e3ad638bc74112450 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Thu, 4 Jan 2024 08:49:39 -0800 Subject: [PATCH 02/10] add focus strings for choose_start_site screen --- library/modules/Gui.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index 74f5c7067..693e6a430 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -84,6 +84,7 @@ using namespace DFHack; #include "df/ui_unit_view_mode.h" #include "df/unit.h" #include "df/unit_inventory_item.h" +#include "df/viewscreen_choose_start_sitest.h" #include "df/viewscreen_dwarfmodest.h" #include "df/viewscreen_legendsst.h" #include "df/viewscreen_new_regionst.h" @@ -176,6 +177,15 @@ DEFINE_GET_FOCUS_STRING_HANDLER(new_region) focusStrings.push_back(baseFocus); } +DEFINE_GET_FOCUS_STRING_HANDLER(choose_start_site) +{ + if (screen->doing_site_finder) + focusStrings.push_back(baseFocus + "/SiteFinder"); + + if (focusStrings.empty()) + focusStrings.push_back(baseFocus); +} + DEFINE_GET_FOCUS_STRING_HANDLER(setupdwarfgame) { if (screen->doing_custom_settings) From 94de377c0b360d8ebe8c2fa49c028b7214db0695 Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Thu, 4 Jan 2024 16:57:52 +0000 Subject: [PATCH 03/10] Auto-update submodules library/xml: master scripts: master --- library/xml | 2 +- scripts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/xml b/library/xml index e7134f51e..dc4f837f3 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit e7134f51ea1da848a2c37c7d410e996a5b66c526 +Subproject commit dc4f837f34309ca44b94534c89db0886475c6651 diff --git a/scripts b/scripts index a51727e51..6df7a4880 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit a51727e519a26f1e903605921cb903fec78726e5 +Subproject commit 6df7a488081d98d1f8ce3af5aa898251f868ac8c From d773a2aa1836ee6a6427047f1769361d7191278d Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Thu, 4 Jan 2024 14:15:40 -0800 Subject: [PATCH 04/10] add in some more focus strings for choose_start_site --- library/modules/Gui.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index 693e6a430..da4a4ca7b 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -181,6 +181,10 @@ DEFINE_GET_FOCUS_STRING_HANDLER(choose_start_site) { if (screen->doing_site_finder) focusStrings.push_back(baseFocus + "/SiteFinder"); + else if (screen->choosing_civilization) + focusStrings.push_back(baseFocus + "/ChooseCiv"); + else if (screen->choosing_reclaim) + focusStrings.push_back(baseFocus + "/Reclaim"); if (focusStrings.empty()) focusStrings.push_back(baseFocus); From d986c3dcdb8455474dd458cecca66fb9c436c0a4 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Thu, 4 Jan 2024 18:59:10 -0800 Subject: [PATCH 05/10] more focus strings for squad equipment page --- library/modules/Gui.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/library/modules/Gui.cpp b/library/modules/Gui.cpp index da4a4ca7b..3fb51f757 100644 --- a/library/modules/Gui.cpp +++ b/library/modules/Gui.cpp @@ -684,8 +684,15 @@ DEFINE_GET_FOCUS_STRING_HANDLER(dwarfmode) if (game->main_interface.squad_equipment.open) { newFocusString = baseFocus; newFocusString += "/SquadEquipment"; - if (game->main_interface.squad_equipment.customizing_equipment) + if (game->main_interface.squad_equipment.customizing_equipment) { newFocusString += "/Customizing"; + if (game->main_interface.squad_equipment.cs_setting_material) + newFocusString += "/Material"; + else if (game->main_interface.squad_equipment.cs_setting_color_pattern) + newFocusString += "/Color"; + else + newFocusString += "/Default"; + } else newFocusString += "/Default"; focusStrings.push_back(newFocusString); From c0d7668bcb66a3b2a751095a4c4f99174a968ae9 Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Fri, 5 Jan 2024 07:13:23 +0000 Subject: [PATCH 06/10] Auto-update submodules scripts: master --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index 6df7a4880..f615ee0ad 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 6df7a488081d98d1f8ce3af5aa898251f868ac8c +Subproject commit f615ee0ad65297013411aac0d3352cd9a5ae4990 From 597a5bb12840feddd15a13abc5c158ad69f43353 Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Fri, 5 Jan 2024 07:17:44 +0000 Subject: [PATCH 07/10] Auto-update submodules scripts: master --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index f615ee0ad..0c4d55d0e 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit f615ee0ad65297013411aac0d3352cd9a5ae4990 +Subproject commit 0c4d55d0e54a7cd0ac5f44a47c9f7922f156eac6 From 528d7b1be146f04d6f2c414e6b932967e3a73e76 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 5 Jan 2024 01:22:37 -0800 Subject: [PATCH 08/10] add keybinding for gui/mass-remove --- data/init/dfhack.keybindings.init | 2 +- docs/changelog.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/init/dfhack.keybindings.init b/data/init/dfhack.keybindings.init index ce4a8a490..41a031a28 100644 --- a/data/init/dfhack.keybindings.init +++ b/data/init/dfhack.keybindings.init @@ -158,7 +158,7 @@ keybinding add Alt-K@dwarfmode toggle-kbd-cursor # gui/design keybinding add Ctrl-D@dwarfmode/Default gui/design - +keybinding add Ctrl-M@dwarfmode/Default gui/mass-remove ##################### diff --git a/docs/changelog.txt b/docs/changelog.txt index 688bcaf8f..4bcd39ea2 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -55,6 +55,7 @@ Template for new versions: ## New Features - `sort`: search and sort for the "choose unit to elevate to the barony" screen. units are sorted by the number of item preferences they have and the units are annotated with the items that they have preferences for +- `gui/mass-remove`: new global keybinding: Ctrl-M while on the fort map ## Fixes - `reveal`: now avoids revealing blocks that contain divine treasures, encased horrors, and deep vein hollows (so the surprise triggers are not triggered prematurely) From 3619230a50fc3176ac2d6cfda61729dd634ced25 Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Fri, 5 Jan 2024 10:25:11 +0000 Subject: [PATCH 09/10] Auto-update submodules scripts: master --- scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts b/scripts index 0c4d55d0e..7e08fb131 160000 --- a/scripts +++ b/scripts @@ -1 +1 @@ -Subproject commit 0c4d55d0e54a7cd0ac5f44a47c9f7922f156eac6 +Subproject commit 7e08fb13144e802315c89d826890df3a46155907 From bb9bc27ea4a3fd43f9233eb34fde3b1a1c09c187 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Fri, 5 Jan 2024 02:27:16 -0800 Subject: [PATCH 10/10] bump version to 50.11-r5rc1 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b4fe01d9..811c58891 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,8 @@ project(dfhack) # set up versioning. set(DF_VERSION "50.11") -set(DFHACK_RELEASE "r4") -set(DFHACK_PRERELEASE FALSE) +set(DFHACK_RELEASE "r5rc1") +set(DFHACK_PRERELEASE TRUE) set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_ABI_VERSION 1)