diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 18:46:56 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 18:46:56 +0000 |
| commit | 52635e528e83419737ee28b01286ecd3df9be11a (patch) | |
| tree | c9b47fa14d928199de8e5dc44d6e1cf6803f1b58 /crawl-ref/source/items.cc | |
| parent | 89b84f43d74acefe2f6e405d39c5e6121111aeb3 (diff) | |
| download | crawl-ref-52635e528e83419737ee28b01286ecd3df9be11a.tar.gz crawl-ref-52635e528e83419737ee28b01286ecd3df9be11a.zip | |
* Fix Xom's piety wrapping around from 0 -> 255.
* Fix Xom piety 100 (initial state) favouring bad effects.
* Limit tension bonus for good effects to 199.
* Add penalty for tension 0, so bad effects become more likely without
tension.
* Revert order of Xom's amusement to actually match the amusement gain.
(Was getting "roars with laughter" for gain of 2, etc.)
* Add damage shaving to Deep Dwarf ghosts.
* Add 'o' to pickup list commands -> stop prompting, start autoexplore.
* Default menu_colour_item_class to true in initfile.cc.
* Allow autopickup of chunks in Lich form.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9634 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/items.cc')
| -rw-r--r-- | crawl-ref/source/items.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index d13e974967..fc6ba2facb 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1237,7 +1237,7 @@ void pickup() int next; mpr("There are several objects here."); std::string pickup_warning; - while ( o != NON_ITEM ) + while (o != NON_ITEM) { // Must save this because pickup can destroy the item. next = mitm[o].link; @@ -1254,7 +1254,7 @@ void pickup() #ifdef USE_TILE "Left-click to enter menu, or press " #endif - "y/n/a/*?g,/q)"; + "y/n/a/*?g,/q/o)"; mprf(MSGCH_PROMPT, prompt.c_str(), get_menu_colour_prefix_tags(mitm[o], @@ -1271,7 +1271,7 @@ void pickup() break; } - if (keyin == 'q' || keyin == ESCAPE) + if (keyin == 'q' || keyin == ESCAPE || keyin == 'o') break; if (keyin == 'y' || keyin == 'a') @@ -1297,6 +1297,9 @@ void pickup() if (!pickup_warning.empty()) mpr(pickup_warning.c_str()); + + if (keyin == 'o') + start_explore(Options.explore_greedy); } } |