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

Right align happiness monitor to avoid interference with announcements

develop
Anuradha Dissanayake 2013-04-01 19:52:13 +13:00
parent c020c0271c
commit 1550df496f
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/dwarfmonitor.cpp
Unescape Escape View File

@ -1128,6 +1128,17 @@ DFhackCExport command_result plugin_onupdate (color_ostream &out)
return CR_OK; return CR_OK;
} }
static color_value monitor_colors[] =
{
COLOR_LIGHTRED,
COLOR_RED,
COLOR_YELLOW,
COLOR_WHITE,
COLOR_CYAN,
COLOR_LIGHTBLUE,
COLOR_LIGHTGREEN
};
struct dwarf_monitor_hook : public df::viewscreen_dwarfmodest struct dwarf_monitor_hook : public df::viewscreen_dwarfmodest
{ {
typedef df::viewscreen_dwarfmodest interpose_base; typedef df::viewscreen_dwarfmodest interpose_base;
@ -1143,22 +1154,23 @@ struct dwarf_monitor_hook : public df::viewscreen_dwarfmodest
if (monitor_misery && Maps::IsValid()) if (monitor_misery && Maps::IsValid())
{ {
int x = gps->dimx - 22; string entries[7];
size_t length = 9;
for (int i = 0; i < 7; i++)
{
entries[i] = int_to_string(misery[i]);
length += entries[i].length();
}
int x = gps->dimx - length;
int y = gps->dimy - 1; int y = gps->dimy - 1;
OutputString(COLOR_WHITE, x, y, "H:"); OutputString(COLOR_WHITE, x, y, "H:");
OutputString(COLOR_LIGHTRED, x, y, int_to_string(misery[0])); for (int i = 0; i < 7; i++)
OutputString(COLOR_WHITE, x, y, "/"); {
OutputString(COLOR_RED, x, y, int_to_string(misery[1])); OutputString(monitor_colors[i], x, y, entries[i]);
OutputString(COLOR_WHITE, x, y, "/"); if (i < 6)
OutputString(COLOR_YELLOW, x, y, int_to_string(misery[2])); OutputString(COLOR_WHITE, x, y, "/");
OutputString(COLOR_WHITE, x, y, "/"); }
OutputString(COLOR_WHITE, x, y, int_to_string(misery[3]));
OutputString(COLOR_WHITE, x, y, "/");
OutputString(COLOR_CYAN, x, y, int_to_string(misery[4]));
OutputString(COLOR_WHITE, x, y, "/");
OutputString(COLOR_LIGHTBLUE, x, y, int_to_string(misery[5]));
OutputString(COLOR_WHITE, x, y, "/");
OutputString(COLOR_LIGHTGREEN, x, y, int_to_string(misery[6]));
} }
} }
}; };