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

embark-assistant: add spaces around drawBorder titles

develop
lethosor 2018-07-10 11:01:22 -04:00
parent 8dec8c332f
commit eb1f3e1d4c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/embark-assistant/finder_ui.cpp
Unescape Escape View File

@ -1370,7 +1370,7 @@ namespace embark_assist {
uint16_t offset = 0; uint16_t offset = 0;
Screen::clear(); Screen::clear();
Screen::drawBorder("Embark Assistant Site Finder"); Screen::drawBorder(" Embark Assistant Site Finder ");
embark_assist::screen::paintString(lr_pen, 1, 1, DFHack::Screen::getKeyDisplay(df::interface_key::STANDARDSCROLL_LEFT).c_str()); 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(white_pen, 2, 1, "/");

8
plugins/embark-assistant/help_ui.cpp
Unescape Escape View File

@ -99,7 +99,7 @@ namespace embark_assist{
switch (current_page) { switch (current_page) {
case pages::Intro: case pages::Intro:
Screen::drawBorder("Embark Assistant Help/Info Introduction Page"); Screen::drawBorder(" Embark Assistant Help/Info Introduction Page ");
help_text.push_back("Embark Assistant is used on the embark selection screen to provide information"); help_text.push_back("Embark Assistant is used on the embark selection screen to provide information");
help_text.push_back("to help selecting a suitable embark site. It provides three services:"); help_text.push_back("to help selecting a suitable embark site. It provides three services:");
@ -139,7 +139,7 @@ namespace embark_assist{
break; break;
case pages::General: case pages::General:
Screen::drawBorder("Embark Assistant Help/Info General Page"); Screen::drawBorder(" Embark Assistant Help/Info General Page ");
help_text.push_back("The Embark Assistant overlays the region map with characters indicating sites"); help_text.push_back("The Embark Assistant overlays the region map with characters indicating sites");
help_text.push_back("normally not displayed by DF. The following key is used:"); help_text.push_back("normally not displayed by DF. The following key is used:");
@ -178,7 +178,7 @@ namespace embark_assist{
break; break;
case pages::Finder: case pages::Finder:
Screen::drawBorder("Embark Assistant Help/Info Find Page"); Screen::drawBorder(" Embark Assistant Help/Info Find Page ");
help_text.push_back("The Embark Assist Finder page is brought up with the f command key."); help_text.push_back("The Embark Assist Finder page is brought up with the f command key.");
help_text.push_back("The top of the Finder page lists the command keys available on the page:"); help_text.push_back("The top of the Finder page lists the command keys available on the page:");
@ -222,7 +222,7 @@ namespace embark_assist{
break; break;
case pages::Caveats: case pages::Caveats:
Screen::drawBorder("Embark Assistant Help/Info Caveats Page"); Screen::drawBorder(" Embark Assistant Help/Info Caveats Page ");
help_text.push_back("Find searching first does a sanity check (e.g. max < min) and then a rough"); help_text.push_back("Find searching first does a sanity check (e.g. max < min) and then a rough");
help_text.push_back("world tile match to find tiles that may have matching embarks. This results"); help_text.push_back("world tile match to find tiles that may have matching embarks. This results");

14
plugins/embark-assistant/overlay.cpp
Unescape Escape View File

@ -72,7 +72,7 @@ namespace embark_assist {
if ((map_size - result * factor) * 2 != factor) { if ((map_size - result * factor) * 2 != factor) {
result = (map_size + factor / 2) / factor; result = (map_size + factor / 2) / factor;
} }
if (result <= available_screen) { if (result <= available_screen) {
return {result, factor}; return {result, factor};
} }
@ -151,7 +151,7 @@ namespace embark_assist {
if (state->matching) state->show = true; if (state->matching) state->show = true;
Screen::drawBorder("Embark Assistant"); Screen::drawBorder(" Embark Assistant ");
Screen::Pen pen_lr(' ', COLOR_LIGHTRED); Screen::Pen pen_lr(' ', COLOR_LIGHTRED);
Screen::Pen pen_w(' ', COLOR_WHITE); Screen::Pen pen_w(' ', COLOR_WHITE);
@ -192,10 +192,10 @@ namespace embark_assist {
if (left_x < 0) { left_x = 0; } if (left_x < 0) { left_x = 0; }
if (top_y < 0) { top_y = 0; } if (top_y < 0) { top_y = 0; }
right_x = left_x + width / 2 - 7 - 18; right_x = left_x + width / 2 - 7 - 18;
bottom_y = top_y + height - 8 - 2; bottom_y = top_y + height - 8 - 2;
if (right_x >= world->worldgen.worldgen_parms.dim_x) { if (right_x >= world->worldgen.worldgen_parms.dim_x) {
right_x = world->worldgen.worldgen_parms.dim_x - 1; right_x = world->worldgen.worldgen_parms.dim_x - 1;
left_x = right_x - (width / 2 - 7 - 18); left_x = right_x - (width / 2 - 7 - 18);
@ -226,7 +226,7 @@ namespace embark_assist {
} }
} }
} }
/* // Stuff for trying to replicate the DF right world map sizing logic. Close, but not there. /* // Stuff for trying to replicate the DF right world map sizing logic. Close, but not there.
Screen::Pen pen(' ', COLOR_YELLOW); Screen::Pen pen(' ', COLOR_YELLOW);
// Boundaries of the top level world map // Boundaries of the top level world map
@ -234,7 +234,7 @@ namespace embark_assist {
// Screen::paintString(pen, width - 30, 2, "X", false); // Marks UR corner of right world map area. // Screen::paintString(pen, width - 30, 2, "X", false); // Marks UR corner of right world map area.
// Screen::paintString(pen, width / 2 - 5, height - 8, "X", false); // BL corner of right world map area. // Screen::paintString(pen, width / 2 - 5, height - 8, "X", false); // BL corner of right world map area.
// Screen::paintString(pen, width - 30, height - 8, "X", false); // BR corner of right world map area. // Screen::paintString(pen, width - 30, height - 8, "X", false); // BR corner of right world map area.
uint16_t l_width = width - 30 - (width / 2 - 5) + 1; // Horizontal space available for right world map. uint16_t l_width = width - 30 - (width / 2 - 5) + 1; // Horizontal space available for right world map.
uint16_t l_height = height - 8 - 2 + 1; // Vertical space available for right world map. uint16_t l_height = height - 8 - 2 + 1; // Vertical space available for right world map.
df::coord2d size_factor_x = world_dimension_size(l_width, world->worldgen.worldgen_parms.dim_x); df::coord2d size_factor_x = world_dimension_size(l_width, world->worldgen.worldgen_parms.dim_x);
@ -360,7 +360,7 @@ void embark_assist::overlay::set_embark(embark_assist::defs::site_infos *site_in
if (site_info->aquifer) { if (site_info->aquifer) {
if (site_info->aquifer_full) { if (site_info->aquifer_full) {
state->embark_info.push_back({ Screen::Pen(' ', COLOR_BLUE), "Aquifer" }); state->embark_info.push_back({ Screen::Pen(' ', COLOR_BLUE), "Aquifer" });
} }
else { else {
state->embark_info.push_back({ Screen::Pen(' ', COLOR_LIGHTBLUE), "Aquifer" }); state->embark_info.push_back({ Screen::Pen(' ', COLOR_LIGHTBLUE), "Aquifer" });