summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-12-12 23:05:06 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-12-13 00:06:16 +0100
commit3cb73e26c3837e247053c0c23b77081d42624d8c (patch)
tree923198c5dd7a814e95d9b8fcc4c7b89534111c6d /crawl-ref
parentb3c353bf5696b67c3bfbe3d09eb709b118a8c830 (diff)
downloadcrawl-ref-3cb73e26c3837e247053c0c23b77081d42624d8c.tar.gz
crawl-ref-3cb73e26c3837e247053c0c23b77081d42624d8c.zip
Describe good_neutral monsters differenly from neutral (hostile to you) ones.
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/docs/develop/levels/syntax.txt5
-rw-r--r--crawl-ref/source/directn.cc2
2 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/docs/develop/levels/syntax.txt b/crawl-ref/docs/develop/levels/syntax.txt
index 4f3c3062a2..029591b133 100644
--- a/crawl-ref/docs/develop/levels/syntax.txt
+++ b/crawl-ref/docs/develop/levels/syntax.txt
@@ -571,9 +571,8 @@ MONS: (list of monsters)
* att:hostile -- the default
* att:friendly -- tame, will follow you
* att:neutral -- hostile to both you and att:hostile monsters
- * att:good_neutral -- won't actively follow anyone, can still hit
- people (including you) when they randomly wander into them
- * att:fellow_slime -- as att:friendly but won't follow you
+ * att:good_neutral -- hostile to att:hostile
+ * att:fellow_slime -- tame, won't follow you
Note that 8, 9, 0 also place monsters (see the table).
diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc
index dbebce5637..7a4c6fd79f 100644
--- a/crawl-ref/source/directn.cc
+++ b/crawl-ref/source/directn.cc
@@ -3133,6 +3133,8 @@ static std::string _get_monster_desc(const monsters *mon)
if (mon->attitude == ATT_FRIENDLY)
text += pronoun + " is friendly.\n";
+ else if (mon->good_neutral())
+ text += pronoun + " seems to be peaceful towards you.\n";
else if (mon->neutral()) // don't differentiate between permanent or not
text += pronoun + " is indifferent to you.\n";