fiddlerwoaroof/crawl - Change RDBU5O5CPJYTACBZOQZGCOXTUBKC3G6ATCZHMEOZJCHO7UBISM6AC

During arena mode, don't describe a monster as "It's doesn't appear to have

noticed you."

If a monster has an invisible foe that isn't the player, describe it as watching the foe rather than watching the player.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8540 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on January 18, 2009

RDBU5O5CPJYTACBZOQZGCOXTUBKC3G6ATCZHMEOZJCHO7UBISM6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/directn.cc at line 2894 [4.3697945]

B:BD[3.3719] → [3.3719:3755]

            && mon->foe != MHITYOU)

[3.3719]

[5.8344]

                 && mon->foe != MHITYOU && !crawl_state.arena_suspended)

Replacement in crawl-ref/source/directn.cc at line 2929 [4.3697945]

B:BD[2.3249] → [2.3249:3326]

        if (you.invisible() && mon->foe == MHITYOU && !mons_is_fleeing(mon))

[2.3249]

[2.3326]

        const actor* foe = mon->get_foe();
        if (foe && foe->invisible() && !mons_is_fleeing(mon))

Replacement in crawl-ref/source/directn.cc at line 2932 [4.3697945]
B:BD[2.3336] → [2.3336:3373]
```
            if (mons_see_invis(mon))
```
[2.3336]
[2.3373]
```
            if (!you.can_see(foe))
```

Replacement in crawl-ref/source/directn.cc at line 2934 [4.3697945]

B:BD[2.3387] → [2.3387:3456]

                mprf(MSGCH_EXAMINE, "%s is watching you carefully.",

[2.3387]

[2.3456]

                mprf(MSGCH_EXAMINE, "%s is looking at something unseen.",

Insertion in crawl-ref/source/directn.cc at line 2936 [4.3697945]

[2.3513]

            }
            else if (mons_see_invis(mon))
            {
                mprf(MSGCH_EXAMINE, "%s is watching %s carefully.",
                     mon->pronoun(PRONOUN_CAP).c_str(),
                     foe->name(DESC_NOCAP_THE).c_str());

Replacement in crawl-ref/source/directn.cc at line 2945 [4.3697945]

B:BD[2.3558] → [2.3558:3695]

                mprf(MSGCH_EXAMINE, "%s is looking in your general direction.",
                     mon->pronoun(PRONOUN_CAP).c_str());

[2.3558]

[2.3695]

                std::string name = foe->atype() == ACT_PLAYER
                                 ? "your" : (foe->name(DESC_NOCAP_THE) + "'s");
                mprf(MSGCH_EXAMINE, "%s is looking in %s general direction.",
                     mon->pronoun(PRONOUN_CAP).c_str(),
                     name.c_str());

Replacement in crawl-ref/source/directn.cc at line 2952 [4.3697945]

B:BD[2.3719] → [2.3719:3781]

        else if (mon->foe == MHITNOT || mons_is_fleeing(mon))

[2.3719]

[2.3781]

        else if (!foe || mons_is_fleeing(mon))