diff options
Diffstat (limited to 'crawl-ref/source/acr.cc')
| -rw-r--r-- | crawl-ref/source/acr.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 7f640c8d34..d7384a03d0 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -1952,6 +1952,19 @@ void process_command( command_type cmd ) case CMD_TOGGLE_FRIENDLY_PICKUP: { + if (you.religion != GOD_SHINING_ONE && you.religion != GOD_BEOGH) + { + mpr("I'm sorry, your allies won't ever be able to pick up items."); + if (Options.tutorial_left) + { + mpr("Only intelligent permanent allies may equip themselves, " + "and these two restrictions are only met by allies of the " + "followers of two gods in the pantheon: the Shining One " + "and Beogh.", MSGCH_TUTORIAL); + } + break; + } + // Toggle pickup mode for friendlies. _print_friendly_pickup_setting(false); mpr("Change to (d)efault, (n)othing, (f)riend-dropped, or (a)ll? ", @@ -4047,7 +4060,9 @@ static bool _initialise(void) if (newc) // start a new game { - you.friendly_pickup = Options.default_friendly_pickup; + you.friendly_pickup = FRIENDLY_PICKUP_NONE; + if (you.religion == GOD_BEOGH || you.religion == GOD_SHINING_ONE) + you.friendly_pickup = Options.default_friendly_pickup; // Mark items in inventory as of unknown origin. origin_set_inventory(origin_set_unknown); |