fiddlerwoaroof/crawl - Change HYXNSIBI3LPNH7VATDEUXYEONKKT3VPDTVDW43ZSTXISQY5DYH7AC

Multiple sanctuary fixes:

Set sanctuary floor property before checking if monster will flee.
Make mimics teleport away, since they can't move.
Don't count as fleeing monsters which can't flee, like plants.
Don't tell the player about unseen fleeing monsters.

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

Created by zelgadis on June 29, 2008

HYXNSIBI3LPNH7VATDEUXYEONKKT3VPDTVDW43ZSTXISQY5DYH7AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells3.cc at line 1690 [6.531613]
∅:D[4.444] → [5.366:367]
∅:D[7.449] → [5.366:367]
B:BD[5.366] → [5.366:367]
B:BD[5.367] → [2.167:228]
∅:D[2.228] → [5.426:512]
B:BD[5.426] → [5.426:512]
∅:D[8.363] → [9.3911:3912]
∅:D[5.560] → [9.3911:3912]
B:BD[9.3911] → [9.3911:3912]
B:BD[9.3912] → [7.450:494]
∅:D[7.494] → [5.674:692]
B:BD[5.674] → [5.674:692]
B:BD[5.692] → [3.194:236]
```
            // scare all attacking monsters inside sanctuary
            if (dist != -1)
            {
                monster = mgrd[posx][posy];
                if (monster != NON_MONSTER)
                {
                    mon = &menv[monster];
```

Deletion in crawl-ref/source/spells3.cc at line 1691 [6.531613]

B:BD[7.548] → [2.229:276]

∅:D[2.276] → [7.592:811]

B:BD[7.592] → [7.592:811]

∅:D[7.811] → [5.782:814]

B:BD[5.782] → [5.782:814]

∅:D[5.814] → [8.395:396]

B:BD[9.4136] → [8.395:396]

                    if (!mons_wont_attack(mon)
                        && mon->add_ench(mon_enchant(ENCH_FEAR, 0, KC_YOU)))
                    {
                        behaviour_event(mon, ME_SCARE, MHITYOU);
                        count++;
                    }
                }
            }

Replacement in crawl-ref/source/spells3.cc at line 1698 [6.531613]

B:BD[5.1188] → [5.1188:1232]

                || pattern == 2 // latticed

[5.1188]

[5.1232]

               || pattern == 2 // latticed

Replacement in crawl-ref/source/spells3.cc at line 1707 [6.531613]

B:BD[5.1581] → [5.1581:1591]

[5.1581]

[8.397]


            // scare all attacking monsters inside sanctuary
            if (dist != -1)
            {
                monster = mgrd[posx][posy];
                if (monster != NON_MONSTER)
                {
                    mon = &menv[monster];
                    if (!mons_wont_attack(mon))
                    {
                        if (mons_is_mimic(mon->type))
                        {
                            mimic_alert(mon);
                            if(you.can_see(mon))
                                count++;
                        }
                        else if (mon->add_ench(mon_enchant(ENCH_FEAR, 0,
                                 KC_YOU)))
                        {
                            behaviour_event(mon, ME_SCARE, MHITYOU);

Insertion in crawl-ref/source/spells3.cc at line 1730 [6.531613]

[8.398]

[5.1598]

                            // Check to see that monster is actually fleeing,
                            // since plants can't flee.
                            if (mons_is_fleeing(mon) && you.can_see(mon))
                                count++;
                        }
                    }
                } // if (monster != NON_MONSTER)
            } // if (dist != -1)
        } // radius loop