fiddlerwoaroof/crawl - Change AHDR6VAKT6NGNERU244ZBTXYK73SWZVF5Q3SH3GPRNHNTJSJY7FAC

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

Created by zelgadis on May 24, 2009

AHDR6VAKT6NGNERU244ZBTXYK73SWZVF5Q3SH3GPRNHNTJSJY7FAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tutorial.cc at line 2781 [5.5936]

[3.20616]

[4.17488]


        if (!mons_att_wont_attack(monster_at(gc)->attitude))
            text << "\n\nHowever, it is only <w>temporarily</w> friendly, "
                    "and will become dangerous again when this friendliness "
                    "wears off.";

Replacement in crawl-ref/source/tutorial.cc at line 4040 [5.5936]

B:BD[6.7389] → [6.7389:7398]

    else

[6.7389]

[7.9854]

    // Don't call friendly horrible things dangerous.
    else if (!mons_att_wont_attack(mons->attitude))

Insertion in crawl-ref/source/tutorial.cc at line 4072 [5.5936]

[3.27704]

        if (!mons_att_wont_attack(mons->attitude))
            ostr << "\n\nHowever, it is only <w>temporarily</w> friendly, "
                    "and will become dangerous again when this friendliness "
                    "wears off.";

Replacement in crawl-ref/source/monstuff.cc at line 8932 [10.1396662]
B:BD[8.2721] → [9.2707:2776]
```
    if (!mons_is_mimic(monster->type) && MONST_INTERESTING(monster))
```
[8.2721]
[11.447620]
```
    if (!mons_is_mimic(monster->type))
```

Replacement in crawl-ref/source/monstuff.cc at line 8934 [10.1396662]

B:BD[11.447626] → [12.705:778]

B:BD[12.778] → [2.9053:9115]

        take_note(
            Note(NOTE_SEEN_MONSTER, monster->type, 0,
                 monster->name(DESC_NOCAP_A, true).c_str()));

[11.447626]

[11.447794]

        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()));
        }

Replacement in crawl-ref/source/mon-util.cc at line 6630 [10.1699344]

B:BD[4.26947] → [4.26947:27004]

            learned_something_new(TUT_MONSTER_FRIENDLY);

[4.26947]

[13.743]

            learned_something_new(TUT_MONSTER_FRIENDLY, pos());