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

dwarfmonitor: Add "view unit" option to prefs screen

develop
lethosor 2018-01-18 10:17:54 -05:00
parent 74aefddd75
commit 1ed6c70663
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/dwarfmonitor.cpp
Unescape Escape View File

@ -45,6 +45,7 @@
#include "df/trapcomp_flags.h" #include "df/trapcomp_flags.h"
#include "df/unit_preference.h" #include "df/unit_preference.h"
#include "df/unit_soul.h" #include "df/unit_soul.h"
#include "df/viewscreen_unitst.h"
#include "df/world_raws.h" #include "df/world_raws.h"
using std::deque; using std::deque;
@ -1345,14 +1346,14 @@ public:
preferences_column.auto_select = true; preferences_column.auto_select = true;
preferences_column.setTitle("Preference"); preferences_column.setTitle("Preference");
preferences_column.bottom_margin = 3; preferences_column.bottom_margin = 3;
preferences_column.search_margin = 35; preferences_column.search_margin = 50;
dwarf_column.multiselect = false; dwarf_column.multiselect = false;
dwarf_column.auto_select = true; dwarf_column.auto_select = true;
dwarf_column.allow_null = true; dwarf_column.allow_null = true;
dwarf_column.setTitle("Units with Preference"); dwarf_column.setTitle("Units with Preference");
dwarf_column.bottom_margin = 3; dwarf_column.bottom_margin = 3;
dwarf_column.search_margin = 35; dwarf_column.search_margin = 50;
populatePreferencesColumn(); populatePreferencesColumn();
} }
@ -1635,6 +1636,16 @@ public:
Screen::dismiss(this); Screen::dismiss(this);
return; return;
} }
else if (input->count(interface_key::CUSTOM_SHIFT_V))
{
df::unit *unit = getSelectedUnit();
if (unit)
{
auto unitscr = df::allocate<df::viewscreen_unitst>();
unitscr->unit = unit;
Screen::show(unitscr);
}
}
else if (input->count(interface_key::CUSTOM_SHIFT_Z)) else if (input->count(interface_key::CUSTOM_SHIFT_Z))
{ {
df::unit *selected_unit = getSelectedUnit(); df::unit *selected_unit = getSelectedUnit();
@ -1690,6 +1701,10 @@ public:
int32_t x = 2; int32_t x = 2;
OutputHotkeyString(x, y, "Leave", LEAVESCREEN); OutputHotkeyString(x, y, "Leave", LEAVESCREEN);
x += 2;
OutputHotkeyString(x, y, "View Unit", CUSTOM_SHIFT_V, false, 0,
getSelectedUnit() ? COLOR_WHITE : COLOR_DARKGREY);
x += 2; x += 2;
OutputHotkeyString(x, y, "Zoom Unit", CUSTOM_SHIFT_Z, false, 0, OutputHotkeyString(x, y, "Zoom Unit", CUSTOM_SHIFT_Z, false, 0,
getSelectedUnit() ? COLOR_WHITE : COLOR_DARKGREY); getSelectedUnit() ? COLOR_WHITE : COLOR_DARKGREY);