diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 21:32:07 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-07 21:32:07 +0000 |
| commit | 5a806811128416a0c67409e137c929873c28cd7a (patch) | |
| tree | fbde21511115a46723c43fcc07f7701e89cbefa4 /crawl-ref/source/items.cc | |
| parent | f5a70a7cbd7c9a7dd6c41fdfade1dc53dbb77f0f (diff) | |
| download | crawl-ref-5a806811128416a0c67409e137c929873c28cd7a.tar.gz crawl-ref-5a806811128416a0c67409e137c929873c28cd7a.zip | |
Nerf damage of the bat transformation. Reduced from
2 + skill(unarmed_combat)/3 to
2 + rnd(skill(unarmed_combat)/5 + 1)
Also replace the menu_colour_prefix colouring for prompts and the like
to use message_colour instead, so those "msg" abbreviations in
food_colouring.txt actually have an effect now, and players can disable
colouring of prompts etc. (respects channels) while leaving it on in the
inventory.
I'm leaving the menu_colour_prefix function in for now, in case it can
be used somewhere else.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5558 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
| -rw-r--r-- | crawl-ref/source/items.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 0e9dd58955..157571a963 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -769,7 +769,8 @@ void item_check(bool verbose) if (items.size() == 1 ) { item_def it(*items[0]); - std::string name = get_menu_colour_prefix_tags(it, DESC_NOCAP_A); + std::string name = get_message_colour_tags(it, DESC_NOCAP_A, + MSGCH_FLOOR_ITEMS); strm << "You see here " << name << '.' << std::endl; return; } @@ -824,7 +825,8 @@ void item_check(bool verbose) for (unsigned int i = 0; i < items.size(); ++i) { item_def it(*items[i]); - std::string name = get_menu_colour_prefix_tags(it, DESC_NOCAP_A); + std::string name = get_message_colour_tags(it, DESC_NOCAP_A, + MSGCH_FLOOR_ITEMS); strm << name << std::endl; } } @@ -1214,7 +1216,7 @@ void pickup() mpr("There are several objects here."); while ( o != NON_ITEM ) { - // must save this because pickup can destroy the item + // Must save this because pickup can destroy the item. next = mitm[o].link; if ( num_nonsquelched && _invisible_to_player(mitm[o]) ) @@ -1226,8 +1228,8 @@ void pickup() if (keyin != 'a') { mprf(MSGCH_PROMPT, "Pick up %s? (y/n/a/*?g,/q)", - get_menu_colour_prefix_tags(mitm[o], - DESC_NOCAP_A).c_str()); + get_message_colour_tags(mitm[o], DESC_NOCAP_A, + MSGCH_PROMPT).c_str()); #ifndef USE_TILE keyin = get_ch(); #else |