summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/newgame.cc
diff options
context:
space:
mode:
authorChris Campbell <chriscampbell89@gmail.com>2014-02-20 06:32:57 +0000
committerChris Campbell <chriscampbell89@gmail.com>2014-02-20 06:32:57 +0000
commita253274b23a6a995e8731892ab9d14ee6a7f5470 (patch)
treebd99f0a01ea171f5e8ce981ce2d1da62d47cce19 /crawl-ref/source/newgame.cc
parent85431affb76106617f54433337489f9b49af5b3d (diff)
downloadcrawl-ref-a253274b23a6a995e8731892ab9d14ee6a7f5470.tar.gz
crawl-ref-a253274b23a6a995e8731892ab9d14ee6a7f5470.zip
More character selection menu colour adjustments
Make unrecommended combos lightgrey-on-blue instead of lightgrey-on-yellow (which was difficult to read), change the highlighting of the options at the bottom of the screen (random species/background etc) for legibility too. Also add full stops to a bunch of help text.
Diffstat (limited to 'crawl-ref/source/newgame.cc')
-rw-r--r--crawl-ref/source/newgame.cc86
1 files changed, 43 insertions, 43 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index e3fcb9d352..7f7132362d 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -595,7 +595,7 @@ static void _construct_species_menu(const newgame_def* ng,
|| species_allowed(ng->job, species) == CC_RESTRICTED)
{
tmp->set_fg_colour(LIGHTGRAY);
- tmp->set_highlight_colour(YELLOW);
+ tmp->set_highlight_colour(BLUE);
}
else
{
@@ -649,8 +649,8 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_id(M_VIABLE);
else
tmp->set_id(M_RANDOM);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Picks a random viable species based on your current job choice");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Picks a random viable species based on your current job choice.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -664,9 +664,9 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('#');
tmp->set_id(M_VIABLE_CHAR);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Shuffles through random viable character combinations "
- "until you accept one");
+ "until you accept one.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -680,8 +680,8 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('%');
tmp->set_id(M_APTITUDES);
- tmp->set_description_text("Lists the numerical skill train aptitudes for all races");
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_description_text("Lists the numerical skill train aptitudes for all races.");
+ tmp->set_highlight_colour(DARKGRAY);
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -695,8 +695,8 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('?');
tmp->set_id(M_HELP);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Opens the help screen");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Opens the help screen.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -710,8 +710,8 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('*');
tmp->set_id(M_RANDOM);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Picks a random species");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Picks a random species.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -725,9 +725,9 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('!');
tmp->set_id(M_RANDOM_CHAR);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Shuffles through random character combinations "
- "until you accept one");
+ "until you accept one.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -736,12 +736,12 @@ static void _construct_species_menu(const newgame_def* ng,
if (ng->job != JOB_UNKNOWN)
{
tmp->set_text("Space - Change background");
- tmp->set_description_text("Lets you change your background choice");
+ tmp->set_description_text("Lets you change your background choice.");
}
else
{
tmp->set_text("Space - Pick background first");
- tmp->set_description_text("Lets you pick your background first");
+ tmp->set_description_text("Lets you pick your background first.");
}
min_coord.x = X_MARGIN + COLUMN_WIDTH - 4;
min_coord.y = SPECIAL_KEYS_START_Y + 2;
@@ -751,7 +751,7 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey(' ');
tmp->set_id(M_ABORT);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -771,8 +771,8 @@ static void _construct_species_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('\t');
tmp->set_id(M_DEFAULT_CHOICE);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Play a new game with your previous choice");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Play a new game with your previous choice.");
menu->attach_item(tmp);
tmp->set_visible(true);
}
@@ -950,7 +950,7 @@ void job_group::attach(const newgame_def* ng, const newgame_def& defaults,
|| job_allowed(ng->species, job) == CC_RESTRICTED)
{
tmp->set_fg_colour(LIGHTGRAY);
- tmp->set_highlight_colour(YELLOW);
+ tmp->set_highlight_colour(BLUE);
}
else
{
@@ -1050,8 +1050,8 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_id(M_VIABLE);
else
tmp->set_id(M_RANDOM);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Picks a random viable background based on your current species choice");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Picks a random viable background based on your current species choice.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1065,9 +1065,9 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('#');
tmp->set_id(M_VIABLE_CHAR);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Shuffles through random viable character combinations "
- "until you accept one");
+ "until you accept one.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1081,8 +1081,8 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('%');
tmp->set_id(M_APTITUDES);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Lists the numerical skill train aptitudes for all races");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Lists the numerical skill train aptitudes for all races.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1096,8 +1096,8 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('?');
tmp->set_id(M_HELP);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Opens the help screen");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Opens the help screen.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1111,8 +1111,8 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('*');
tmp->set_id(M_RANDOM);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Picks a random background");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Picks a random background.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1126,9 +1126,9 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('!');
tmp->set_id(M_RANDOM_CHAR);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Shuffles through random character combinations "
- "until you accept one");
+ "until you accept one.");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1137,12 +1137,12 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
if (ng->species != SP_UNKNOWN)
{
tmp->set_text("Space - Change species");
- tmp->set_description_text("Lets you change your species choice");
+ tmp->set_description_text("Lets you change your species choice.");
}
else
{
tmp->set_text("Space - Pick species first");
- tmp->set_description_text("Lets you pick your species first");
+ tmp->set_description_text("Lets you pick your species first.");
}
min_coord.x = X_MARGIN + COLUMN_WIDTH - 4;
@@ -1153,7 +1153,7 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey(' ');
tmp->set_id(M_ABORT);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1171,8 +1171,8 @@ static void _construct_backgrounds_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('\t');
tmp->set_id(M_DEFAULT_CHOICE);
- tmp->set_highlight_colour(LIGHTGRAY);
- tmp->set_description_text("Play a new game with your previous choice");
+ tmp->set_highlight_colour(DARKGRAY);
+ tmp->set_description_text("Play a new game with your previous choice.");
menu->attach_item(tmp);
tmp->set_visible(true);
}
@@ -1369,7 +1369,7 @@ static void _construct_weapon_menu(const newgame_def* ng,
else
{
tmp->set_fg_colour(LIGHTGRAY);
- tmp->set_highlight_colour(YELLOW);
+ tmp->set_highlight_colour(BLUE);
}
const char letter = 'a' + i;
tmp->add_hotkey(letter);
@@ -1421,7 +1421,7 @@ static void _construct_weapon_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('+');
tmp->set_id(M_VIABLE);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Picks a random viable weapon");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1436,7 +1436,7 @@ static void _construct_weapon_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('%');
tmp->set_id(M_APTITUDES);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Lists the numerical skill train aptitudes for all races");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1451,7 +1451,7 @@ static void _construct_weapon_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('?');
tmp->set_id(M_HELP);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Opens the help screen");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1466,7 +1466,7 @@ static void _construct_weapon_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('*');
tmp->set_id(WPN_RANDOM);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Picks a random weapon");
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1483,7 +1483,7 @@ static void _construct_weapon_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey(CK_BKSP);
tmp->set_id(M_ABORT);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
menu->attach_item(tmp);
tmp->set_visible(true);
@@ -1509,7 +1509,7 @@ static void _construct_weapon_menu(const newgame_def* ng,
tmp->set_fg_colour(BROWN);
tmp->add_hotkey('\t');
tmp->set_id(M_DEFAULT_CHOICE);
- tmp->set_highlight_colour(LIGHTGRAY);
+ tmp->set_highlight_colour(DARKGRAY);
tmp->set_description_text("Select your old weapon");
menu->attach_item(tmp);
tmp->set_visible(true);