From 4fd5210858042ffa3eeb6de181868eebb38cd81f Mon Sep 17 00:00:00 2001 From: zelgadis Date: Sun, 24 May 2009 08:22:40 +0000 Subject: Tutorial changes: - If a friendly monster is enslaved/charmed, note that it is only *temporarily* friendly, and that it will become hostile when its friendliness wears out. - Make sure TUT_MONSTER_FRIENDLY is fired for summoned friendly monsters, not just for enslaved/charmed monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9816 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/monstuff.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 07e9a43170..4b6913717e 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -8929,11 +8929,17 @@ void seen_monster(monsters *monster) // First time we've seen this particular monster. monster->flags |= MF_SEEN; - if (!mons_is_mimic(monster->type) && MONST_INTERESTING(monster)) + if (!mons_is_mimic(monster->type)) { - take_note( - Note(NOTE_SEEN_MONSTER, monster->type, 0, - monster->name(DESC_NOCAP_A, true).c_str())); + if (Options.tutorial_left) + tutorial_first_monster(*monster); + + if (MONST_INTERESTING(monster)) + { + take_note( + Note(NOTE_SEEN_MONSTER, monster->type, 0, + monster->name(DESC_NOCAP_A, true).c_str())); + } } } -- cgit v1.2.3-54-g00ecf