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/travel.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/travel.cc')
-rw-r--r-- | crawl-ref/source/travel.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index cb00257661..8e14c27a8a 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -2979,7 +2979,7 @@ void start_explore(bool grab_items) // Forget interrupted butchering. you.attribute[ATTR_WEAPON_SWAP_INTERRUPTED] = 0; - you.running = grab_items? RMODE_EXPLORE_GREEDY : RMODE_EXPLORE; + you.running = (grab_items? RMODE_EXPLORE_GREEDY : RMODE_EXPLORE); if (you.running == RMODE_EXPLORE_GREEDY && Options.stash_tracking != STM_ALL) { @@ -4191,7 +4191,8 @@ void explore_discoveries::add_item(const item_def &i) items[j].thing.quantity = orig_quantity; } - items.push_back( named_thing<item_def>(i.name(DESC_NOCAP_A), i) ); + items.push_back( named_thing<item_def>(get_menu_colour_prefix_tags(i, + DESC_NOCAP_A), i) ); // First item of this type? // XXX: Only works when travelling. @@ -4230,8 +4231,8 @@ void explore_discoveries::found_item(const coord_def &pos, const item_def &i) } // if (you.running == RMODE_EXPLORE_GREEDY) add_item(i); - es_flags |= (you.running == RMODE_EXPLORE_GREEDY) ? ES_GREEDY_PICKUP : - ES_PICKUP; + es_flags |= (you.running == RMODE_EXPLORE_GREEDY) ? ES_GREEDY_PICKUP + : ES_PICKUP; } // Expensive O(n^2) duplicate search, but we can live with that. |