diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:00:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:00:12 +0000 |
| commit | ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7 (patch) | |
| tree | dbf6313bff2e2906a4f9ee61fdefff8594849522 /crawl-ref/docs/options_guide.txt | |
| parent | 0f8c8527e5a685509462e0990a7b6ec6595e445a (diff) | |
| download | crawl-ref-ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7.tar.gz crawl-ref-ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7.zip | |
Apply r6640, r6694 (both by Darshan), r6670 (Haran), r6679 and r6703
(me) to branch.
Includes TSO no longer granting permanent allies and resultant friendly
pickup change, and a number of smaller changes.
Also update change log.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6709 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/docs/options_guide.txt')
| -rw-r--r-- | crawl-ref/docs/options_guide.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crawl-ref/docs/options_guide.txt b/crawl-ref/docs/options_guide.txt index e7cb00a362..4325ba43da 100644 --- a/crawl-ref/docs/options_guide.txt +++ b/crawl-ref/docs/options_guide.txt @@ -508,11 +508,12 @@ default_friendly_pickup = (friend | none | all) when you start a new game, or when you enter a level for the first time. - Note that this only works for intelligent permanent allies (such - as you can get when worshipping Beogh or the Shining One), and - that monsters have their own reasonings for which items they may - need, and when they feel safe enough to pick them up. Except for - "none", these options won't let you override these requirements. + Note that this only works for intelligent allies (such as you + can get when worshipping Beogh or when summoning intelligent + monsters), and that monsters have their own reasonings for which + items they may need, and when they feel safe enough to pick them + up. Except for "none", these options won't let you override these + requirements. Also, friendly jellies won't ever eat any items, regardless of this option. |