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

tweak confirm-embark fixes 

* Added a display of the total embark points remaining, for convenience
* Made 'esc' work by interposing key_conflict as well
* Rearranged to look more like DF's confirmations
develop
lethosor 2014-06-04 14:41:35 -04:00
parent 6ec0fd6589
commit f29d1886ff
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plugins/tweak.cpp
Unescape Escape View File

@ -346,6 +346,12 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest
{ {
typedef df::viewscreen_setupdwarfgamest interpose_base; typedef df::viewscreen_setupdwarfgamest interpose_base;
void OutputString(int8_t fg, int &x, int y, std::string text)
{
Screen::paintString(Screen::Pen(' ', fg, COLOR_BLACK), x, y, text);
x += text.length();
}
DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input)) DEFINE_VMETHOD_INTERPOSE(void, feed, (set<df::interface_key> *input))
{ {
bool intercept = false; bool intercept = false;
@ -378,28 +384,39 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest
INTERPOSE_NEXT(feed)(input); INTERPOSE_NEXT(feed)(input);
} }
DEFINE_VMETHOD_INTERPOSE(bool, key_conflict, (df::interface_key key))
{
if (key == df::interface_key::OPTIONS)
return true;
return false;
}
DEFINE_VMETHOD_INTERPOSE(void, render, ()) DEFINE_VMETHOD_INTERPOSE(void, render, ())
{ {
INTERPOSE_NEXT(render)(); INTERPOSE_NEXT(render)();
df::viewscreen * top = Gui::getCurViewscreen(); df::viewscreen * top = Gui::getCurViewscreen();
VIRTUAL_CAST_VAR(screen, df::viewscreen_setupdwarfgamest, top); VIRTUAL_CAST_VAR(screen, df::viewscreen_setupdwarfgamest, top);
auto dim = Screen::getWindowSize(); auto dim = Screen::getWindowSize();
Screen::Pen pen(' ', COLOR_WHITE, COLOR_BLACK); int x = 0, y = 0;
if (confirm_embark_state != ECS_INACTIVE) if (confirm_embark_state != ECS_INACTIVE)
{ {
Screen::fillRect(Screen::Pen(' ', COLOR_BLACK, COLOR_BLACK), 0, 0, dim.x - 1, dim.y - 1); Screen::fillRect(Screen::Pen(' ', COLOR_BLACK, COLOR_BLACK), 0, 0, dim.x - 1, dim.y - 1);
} }
if (confirm_embark_state == ECS_CONFIRM) if (confirm_embark_state == ECS_CONFIRM)
{ {
Screen::paintString(pen, 2, 2, "Really embark?"); x = 2, y = 2;
Screen::paintString(Screen::Pen(' ', COLOR_LIGHTGREEN), OutputString(COLOR_WHITE, x, y, "Really embark? (");
2, 4, Screen::getKeyDisplay(df::interface_key::MENU_CONFIRM)); OutputString(COLOR_LIGHTGREEN, x, y, Screen::getKeyDisplay(df::interface_key::MENU_CONFIRM));
Screen::paintString(pen, 3, 4, ": Confirm, Other: Cancel"); OutputString(COLOR_WHITE, x, y, " = yes, other = no)");
Screen::paintString(pen, dim.x - 10, dim.y - 1, "DFHack"); x = 2, y = 4;
int32_t points = screen->anon_37;
OutputString(COLOR_WHITE, x, y, "Points left: ");
OutputString((points ? COLOR_YELLOW : COLOR_LIGHTGREEN), x, y, std::to_string(points));
x = dim.x - 10, y = dim.y - 1;
OutputString(COLOR_WHITE, x, y, "DFHack");
} }
else if (confirm_embark_state == ECS_ACCEPTED) else if (confirm_embark_state == ECS_ACCEPTED)
{ {
Screen::paintString(pen, 2, 2, "Embarking...");
std::set<df::interface_key> input; std::set<df::interface_key> input;
input.insert(df::interface_key::SETUP_EMBARK); input.insert(df::interface_key::SETUP_EMBARK);
screen->feed(&input); screen->feed(&input);
@ -409,6 +426,7 @@ struct confirm_embark_hook : df::viewscreen_setupdwarfgamest
}; };
IMPLEMENT_VMETHOD_INTERPOSE(confirm_embark_hook, feed); IMPLEMENT_VMETHOD_INTERPOSE(confirm_embark_hook, feed);
IMPLEMENT_VMETHOD_INTERPOSE(confirm_embark_hook, key_conflict);
IMPLEMENT_VMETHOD_INTERPOSE(confirm_embark_hook, render); IMPLEMENT_VMETHOD_INTERPOSE(confirm_embark_hook, render);
struct stable_temp_hook : df::item_actual { struct stable_temp_hook : df::item_actual {
@ -1299,6 +1317,7 @@ static command_result tweak(color_ostream &out, vector <string> &parameters)
else if (cmd == "confirm-embark") else if (cmd == "confirm-embark")
{ {
enable_hook(out, INTERPOSE_HOOK(confirm_embark_hook, feed), parameters); enable_hook(out, INTERPOSE_HOOK(confirm_embark_hook, feed), parameters);
enable_hook(out, INTERPOSE_HOOK(confirm_embark_hook, key_conflict), parameters);
enable_hook(out, INTERPOSE_HOOK(confirm_embark_hook, render), parameters); enable_hook(out, INTERPOSE_HOOK(confirm_embark_hook, render), parameters);
} }
else if (cmd == "stable-temp") else if (cmd == "stable-temp")