diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-25 20:38:08 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-25 20:38:08 +0000 |
| commit | a99482600e234c892e8d0c257c44ebbbef7053b8 (patch) | |
| tree | 26d3ff8c3a571997b7c88929f16b9039aec0ea84 /crawl-ref/source/items.cc | |
| parent | 94d9e1a1dbf297d9882754d07021ddb2793657b2 (diff) | |
| download | crawl-ref-a99482600e234c892e8d0c257c44ebbbef7053b8.tar.gz crawl-ref-a99482600e234c892e8d0c257c44ebbbef7053b8.zip | |
* Use menu colours (rather than message colours) for item announcements
and the like.
* Fix 'V' if there are more than 52 monsters/items in the list.
* Make Xom act more often, with the probability depending strongly on
tension. Also tweak a few action probabilities according to tension,
so that e.g. summons are more likely for high tension.
* Fix monsters being created with large quantities of curare needles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9546 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
| -rw-r--r-- | crawl-ref/source/items.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index c368440068..24d63b7dd9 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -731,8 +731,7 @@ void item_check(bool verbose) if (items.size() == 1 ) { item_def it(*items[0]); - std::string name = get_message_colour_tags(it, DESC_NOCAP_A, - MSGCH_FLOOR_ITEMS); + std::string name = get_menu_colour_prefix_tags(it, DESC_NOCAP_A); strm << "You see here " << name << '.' << std::endl; return; } @@ -787,8 +786,7 @@ void item_check(bool verbose) for (unsigned int i = 0; i < items.size(); ++i) { item_def it(*items[i]); - std::string name = get_message_colour_tags(it, DESC_NOCAP_A, - MSGCH_FLOOR_ITEMS); + std::string name = get_menu_colour_prefix_tags(it, DESC_NOCAP_A); strm << name << std::endl; } } @@ -1259,8 +1257,8 @@ void pickup() "y/n/a/*?g,/q)"; mprf(MSGCH_PROMPT, prompt.c_str(), - get_message_colour_tags(mitm[o], DESC_NOCAP_A, - MSGCH_PROMPT).c_str()); + get_menu_colour_prefix_tags(mitm[o], + DESC_NOCAP_A).c_str()); mouse_control mc(MOUSE_MODE_MORE); keyin = getch(); @@ -1616,8 +1614,8 @@ int move_item_to_player( int obj, int quant_got, bool quiet, if (!quiet) { - mpr(get_message_colour_tags(you.inv[m], - DESC_INVENTORY).c_str()); + mpr(get_menu_colour_prefix_tags(you.inv[m], + DESC_INVENTORY).c_str()); } you.turn_is_over = true; @@ -1684,8 +1682,8 @@ int move_item_to_player( int obj, int quant_got, bool quiet, if (!quiet) { - mpr(get_message_colour_tags(you.inv[freeslot], - DESC_INVENTORY).c_str()); + mpr(get_menu_colour_prefix_tags(you.inv[freeslot], + DESC_INVENTORY).c_str()); } if (Options.tutorial_left) { |