Merge pull request #2824 from myk002/myk_keybindings

set up some keybindings that are ready to go
develop
Myk 2023-02-06 09:17:08 -08:00 committed by GitHub
commit 6880225bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 17 deletions

@ -25,9 +25,6 @@ keybinding add Ctrl-Shift-K gui/cp437-table
# customizable quick command list
keybinding add Ctrl-Shift-A gui/quickcmd
# an in-game init file editor
#keybinding add Alt-S@title|dwarfmode/Default|dungeonmode gui/settings-manager
######################
# dwarfmode bindings #
@ -36,25 +33,21 @@ keybinding add Ctrl-Shift-A gui/quickcmd
# quicksave
keybinding add Ctrl-Alt-S@dwarfmode quicksave
# toggle the display of water level as 1-7 tiles
#keybinding add Ctrl-W@dwarfmode|dungeonmode twaterlvl
# designate the whole vein for digging
#keybinding add Ctrl-V@dwarfmode digv
#keybinding add Ctrl-Shift-V@dwarfmode "digv x"
keybinding add Ctrl-V@dwarfmode digv
keybinding add Ctrl-Shift-V@dwarfmode "digv x"
# clean the selected tile of blood etc
#keybinding add Ctrl-C spotclean
keybinding add Ctrl-C spotclean
# destroy the selected item
#keybinding add Ctrl-K@dwarfmode autodump-destroy-item
keybinding add Ctrl-K@dwarfmode autodump-destroy-item
# destroy items designated for dump in the selected tile
#keybinding add Ctrl-Shift-K@dwarfmode autodump-destroy-here
keybinding add Ctrl-H@dwarfmode autodump-destroy-here
# apply blueprints to the map (Alt-F for compatibility with LNP Quickfort)
# apply blueprints to the map
keybinding add Ctrl-Shift-Q@dwarfmode gui/quickfort
#keybinding add Alt-F@dwarfmode gui/quickfort
# show information collected by dwarfmonitor
#keybinding add Alt-M@dwarfmode/Default "dwarfmonitor prefs"

@ -40,6 +40,10 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Misc Improvements
- `automelt`: is now more resistent to savegame corruption
- `autodump`: reinstate ``autodump-destroy-item``, hotkey: Ctrl-K
- `autodump`: new hotkey for ``autodump-destroy-here``: Ctrl-H
- `dig`: new hotkeys for vein designation on z-level (Ctrl-V) and vein designation across z-levels (Ctrl-Shift-V)
- `clean`: new hotkey for `spotclean`: Ctrl-C
- `autobutcher`: changed defaults from 5 females / 1 male to 4 females / 2 males so a single unfortunate accident doesn't leave players without a mating pair
- `autobutcher`: now immediately loads races available at game start into the watchlist

@ -287,13 +287,11 @@ DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCom
"Destroy items marked for dumping under the keyboard cursor.",
df_autodump_destroy_here,
Gui::cursor_hotkey));
/* you can no longer select items
commands.push_back(PluginCommand(
"autodump-destroy-item",
"Destroy the selected item.",
df_autodump_destroy_item,
Gui::any_item_hotkey));
*/
return CR_OK;
}
@ -335,7 +333,6 @@ static command_result autodump_main(color_ostream &out, vector <string> & parame
return CR_WRONG_USAGE;
}
//DFHack::VersionInfo *mem = Core::getInstance().vinfo;
if (!Maps::IsValid())
{
out.printerr("Map is not available!\n");
@ -461,10 +458,11 @@ static int last_frame = 0;
command_result df_autodump_destroy_item(color_ostream &out, vector <string> & parameters)
{
// HOTKEY COMMAND; CORE ALREADY SUSPENDED
if (!parameters.empty())
return CR_WRONG_USAGE;
CoreSuspender suspend;
df::item *item = Gui::getSelectedItem(out);
if (!item)
return CR_FAILURE;