diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-12 20:12:49 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-12 20:12:49 +0000 |
| commit | eaa52e83a89d49475ee00812ebcf0fe7caa89980 (patch) | |
| tree | 5e5a72fe1927d96c111fddee0a0cf42109ac076a /crawl-ref/source/acr.cc | |
| parent | b7559dcd3bb981a5eba189eb732fb7eca60d5f70 (diff) | |
| download | crawl-ref-eaa52e83a89d49475ee00812ebcf0fe7caa89980.tar.gz crawl-ref-eaa52e83a89d49475ee00812ebcf0fe7caa89980.zip | |
FR 2093461: add player + allies FRIENDLY_PICKUP mode
Make Roxanne immune to disintegration (like ice statues).
Move rock worms a bit lower in the dungeon and increase their damage (a
tiny bit).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9428 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index b8dfd911bc..06cde2fdfe 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1306,14 +1306,18 @@ static void _print_friendly_pickup_setting(bool was_changed) mprf("Your intelligent allies may %sonly pick up items dropped by allies.", now.c_str()); } + else if (you.friendly_pickup == FRIENDLY_PICKUP_PLAYER) + { + mprf("Your intelligent allies may %sonly pick up items dropped by you " + "and your allies.", now.c_str()); + } else if (you.friendly_pickup == FRIENDLY_PICKUP_ALL) { - mprf("Your intelligent allies may %spick up anything they need.", now.c_str()); + mprf("Your intelligent allies may %spick up anything they need.", + now.c_str()); } else - { mprf(MSGCH_ERROR, "Your allies%s are collecting bugs!", now.c_str()); - } } // Note that in some actions, you don't want to clear afterwards. @@ -1444,8 +1448,8 @@ void process_command( command_type cmd ) // Toggle pickup mode for friendlies. _print_friendly_pickup_setting(false); - mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ", - MSGCH_PROMPT); + mpr("Change to (d)efault, (n)othing, (f)riend-dropped, (p)layer, " + "or (a)ll? ", MSGCH_PROMPT); char type = (char) getchm(KC_DEFAULT); type = tolower(type); @@ -1456,6 +1460,8 @@ void process_command( command_type cmd ) you.friendly_pickup = FRIENDLY_PICKUP_NONE; else if (type == 'f') you.friendly_pickup = FRIENDLY_PICKUP_FRIEND; + else if (type == 'p') + you.friendly_pickup = FRIENDLY_PICKUP_PLAYER; else if (type == 'a') you.friendly_pickup = FRIENDLY_PICKUP_ALL; else |