diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp index 183053706..02f149eb0 100644 --- a/plugins/embark-assistant/finder_ui.cpp +++ b/plugins/embark-assistant/finder_ui.cpp @@ -1375,21 +1375,21 @@ namespace embark_assist { embark_assist::screen::paintString(lr_pen, 1, 1, DFHack::Screen::getKeyDisplay(df::interface_key::STANDARDSCROLL_LEFT).c_str()); embark_assist::screen::paintString(white_pen, 2, 1, "/"); embark_assist::screen::paintString(lr_pen, 3, 1, DFHack::Screen::getKeyDisplay(df::interface_key::STANDARDSCROLL_RIGHT).c_str()); - embark_assist::screen::paintString(white_pen, 4, 1, ":\x1b/\x1a"); - embark_assist::screen::paintString(lr_pen, 9, 1, DFHack::Screen::getKeyDisplay(df::interface_key::STANDARDSCROLL_UP).c_str()); - embark_assist::screen::paintString(white_pen, 10, 1, "/"); - embark_assist::screen::paintString(lr_pen, 11, 1, DFHack::Screen::getKeyDisplay(df::interface_key::STANDARDSCROLL_DOWN).c_str()); - embark_assist::screen::paintString(white_pen, 12, 1, ":Up/Down"); - embark_assist::screen::paintString(lr_pen, 21, 1, DFHack::Screen::getKeyDisplay(df::interface_key::SELECT).c_str()); - embark_assist::screen::paintString(white_pen, 26, 1, ":Select"); - embark_assist::screen::paintString(lr_pen, 34, 1, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_F).c_str()); - embark_assist::screen::paintString(white_pen, 35, 1, ":Find"); + embark_assist::screen::paintString(white_pen, 4, 1, ": \x1b/\x1a"); + embark_assist::screen::paintString(lr_pen, 10, 1, DFHack::Screen::getKeyDisplay(df::interface_key::STANDARDSCROLL_UP).c_str()); + embark_assist::screen::paintString(white_pen, 11, 1, "/"); + embark_assist::screen::paintString(lr_pen, 12, 1, DFHack::Screen::getKeyDisplay(df::interface_key::STANDARDSCROLL_DOWN).c_str()); + embark_assist::screen::paintString(white_pen, 13, 1, ": \x18/\x19"); + embark_assist::screen::paintString(lr_pen, 19, 1, DFHack::Screen::getKeyDisplay(df::interface_key::SELECT).c_str()); + embark_assist::screen::paintString(white_pen, 24, 1, ": Select"); + embark_assist::screen::paintString(lr_pen, 33, 1, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_F).c_str()); + embark_assist::screen::paintString(white_pen, 34, 1, ": Find"); embark_assist::screen::paintString(lr_pen, 41, 1, DFHack::Screen::getKeyDisplay(df::interface_key::LEAVESCREEN).c_str()); - embark_assist::screen::paintString(white_pen, 44, 1, ":Abort"); - embark_assist::screen::paintString(lr_pen, 51, 1, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_S).c_str()); - embark_assist::screen::paintString(white_pen, 52, 1, ":Save"); - embark_assist::screen::paintString(lr_pen, 58, 1, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_L).c_str()); - embark_assist::screen::paintString(white_pen, 59, 1, ":Load"); + embark_assist::screen::paintString(white_pen, 44, 1, ": Abort"); + embark_assist::screen::paintString(lr_pen, 52, 1, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_S).c_str()); + embark_assist::screen::paintString(white_pen, 53, 1, ": Save"); + embark_assist::screen::paintString(lr_pen, 60, 1, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_L).c_str()); + embark_assist::screen::paintString(white_pen, 61, 1, ": Load"); for (uint16_t i = 0; i < state->finder_list.size(); i++) { if (i == state->finder_list_focus) { diff --git a/plugins/embark-assistant/help_ui.cpp b/plugins/embark-assistant/help_ui.cpp index ad739c57c..20064d4e8 100644 --- a/plugins/embark-assistant/help_ui.cpp +++ b/plugins/embark-assistant/help_ui.cpp @@ -270,9 +270,9 @@ namespace embark_assist{ embark_assist::screen::paintString(pen_lr, 1, 1, DFHack::Screen::getKeyDisplay(df::interface_key::CHANGETAB).c_str()); embark_assist::screen::paintString(pen, 4, 1, "/"); embark_assist::screen::paintString(pen_lr, 5, 1, DFHack::Screen::getKeyDisplay(df::interface_key::SEC_CHANGETAB).c_str()); - embark_assist::screen::paintString(pen, 14, 1, ":Next/Previous Page"); - embark_assist::screen::paintString(pen_lr, 34, 1, DFHack::Screen::getKeyDisplay(df::interface_key::LEAVESCREEN).c_str()); - embark_assist::screen::paintString(pen, 37, 1, ":Leave Info/Help"); + embark_assist::screen::paintString(pen, 14, 1, ": Next/Previous Page"); + embark_assist::screen::paintString(pen_lr, 35, 1, DFHack::Screen::getKeyDisplay(df::interface_key::LEAVESCREEN).c_str()); + embark_assist::screen::paintString(pen, 38, 1, ": Leave Info/Help"); for (uint16_t i = 0; i < help_text.size(); i++) { embark_assist::screen::paintString(pen, 1, 2 + i, help_text[i]); diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp index d04c2d756..19615cac5 100644 --- a/plugins/embark-assistant/overlay.cpp +++ b/plugins/embark-assistant/overlay.cpp @@ -157,15 +157,15 @@ namespace embark_assist { Screen::Pen pen_w(' ', COLOR_WHITE); Screen::paintString(pen_lr, width - 28, 20, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_I).c_str(), false); - Screen::paintString(pen_w, width - 27, 20, ":Embark Assistant Info", false); + Screen::paintString(pen_w, width - 27, 20, ": Embark Assistant Info", false); Screen::paintString(pen_lr, width - 28, 21, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_F).c_str(), false); - Screen::paintString(pen_w, width - 27, 21, ":Find Embark ", false); + Screen::paintString(pen_w, width - 27, 21, ": Find Embark ", false); Screen::paintString(pen_lr, width - 28, 22, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_C).c_str(), false); - Screen::paintString(pen_w, width - 27, 22, ":Cancel/Clear Find", false); + Screen::paintString(pen_w, width - 27, 22, ": Cancel/Clear Find", false); Screen::paintString(pen_lr, width - 28, 23, DFHack::Screen::getKeyDisplay(df::interface_key::CUSTOM_Q).c_str(), false); - Screen::paintString(pen_w, width - 27, 23, ":Quit Embark Assistant", false); - Screen::paintString(pen_w, width - 28, 25, "Matching World Tiles", false); - Screen::paintString(empty_pen, width - 7, 25, to_string(state->match_count), false); + Screen::paintString(pen_w, width - 27, 23, ": Quit Embark Assistant", false); + Screen::paintString(pen_w, width - 28, 25, "Matching World Tiles:", false); + Screen::paintString(empty_pen, width - 6, 25, to_string(state->match_count), false); if (height > 25) { // Mask the vanilla DF find help as it's overridden. Screen::paintString(pen_w, 50, height - 2, " ", false);