fiddlerwoaroof/crawl - Change 2PZXX7DNNOL5X3TF2ID22AGDHLHUHBPSAXQJR6EWG5YAXRJCAYWAC

Only place a newly created monster (summons) on a sanctuary square if it

is friendly.

Only allow friendly and neutral-good monsters to blink or teleport onto a sanctuary square.

Don't allow corpses on sanctuary squares to be rotted or animated.

Restrict monster cantrip messages to self-buff types if the player is in sanctuary.

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

Created by zelgadis on June 29, 2008

2PZXX7DNNOL5X3TF2ID22AGDHLHUHBPSAXQJR6EWG5YAXRJCAYWAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.cc at line 874 [4.531613]
[2.8262]
[2.8262]
```
    if (is_sanctuary(a.x, a.y))
        return (false);
```

Replacement in crawl-ref/source/spells2.cc at line 270 [4.569242]

B:BD[4.573989] → [5.5704:5749]

            if (see_grid_no_trans(adx, ady))

[4.573989]

[4.574025]

            if (see_grid_no_trans(adx, ady) && !is_sanctuary(adx, ady))

Insertion in crawl-ref/source/mstuff2.cc at line 789 [4.1340842]

[6.2989]

        const bool buff_only     = !friendly && is_sanctuary(you.x_pos,
                                                             you.y_pos);

Replacement in crawl-ref/source/mstuff2.cc at line 800 [4.1340842]
B:BD[4.1358647] → [4.1358647:1358675]
```
        switch (random2(7))
```
[4.1358647]
[4.1358675]
```
        switch (random2(buff_only ? 4 : 7))
```

Replacement in crawl-ref/source/mstuff2.cc at line 807 [4.1340842]

B:BD[4.1358875] → [7.175:261]

B:BD[7.261] → [3.5399:5442]

            if (friendly)
                need_friendly_stub = true;
            else
                mpr("You feel troubled.");

[4.1358875]

[4.1358916]

            simple_monster_message(monster, " looks stronger.",
                                   channel);

Replacement in crawl-ref/source/mstuff2.cc at line 811 [4.1340842]

B:BD[4.1358951] → [7.307:393]

B:BD[7.393] → [3.5443:5515]

            if (friendly)
                need_friendly_stub = true;
            else
                mpr("You feel a wave of unholy energy pass over you.");

[4.1358951]

[4.1359021]

            simple_monster_message(monster, " becomes somewhat translucent.",
                                   channel);

Replacement in crawl-ref/source/mstuff2.cc at line 815 [4.1340842]

B:BD[4.1359056] → [3.5516:5580]

            simple_monster_message(monster, " looks stronger.",

[4.1359056]

[3.5580]

            simple_monster_message(monster, "'s eyes start to glow.",

Replacement in crawl-ref/source/mstuff2.cc at line 819 [4.1340842]

B:BD[4.1359218] → [3.5626:5749]

            simple_monster_message(monster, " becomes somewhat translucent.",
                                   channel);

[4.1359218]

[4.1359358]

            if (friendly)
                need_friendly_stub = true;
            else
                mpr("You feel troubled.");

Replacement in crawl-ref/source/mstuff2.cc at line 825 [4.1340842]

B:BD[4.1359393] → [3.5750:5865]

            simple_monster_message(monster, "'s eyes start to glow.",
                                   channel);

[4.1359393]

[4.1359525]

            if (friendly)
                need_friendly_stub = true;
            else
                mpr("You feel a wave of unholy energy pass over you.");

Insertion in crawl-ref/source/mstuff2.cc at line 1017 [4.1340842]

[4.1363450]

[8.400410]

        if (is_sanctuary(newx, newy) && !mons_friendly(monster)
            && !mons_good_neutral(monster))
        {
            continue;
        }

Replacement in crawl-ref/source/monstuff.h at line 128 [4.1390580]

B:BD[4.1393541] → [4.1393541:1393601]

    bool allow_adjacent = false, bool restrict_LOS = true);

[4.1393541]

[4.1393601]

    bool allow_adjacent = false, bool restrict_LOS = true,
    bool forbid_sanctuary = false);

Replacement in crawl-ref/source/monstuff.cc at line 1650 [4.1396662]

B:BD[9.2743] → [9.2743:2788]

                               false, true))

[9.2743]

[10.6525]

                               false, true,
                               !mons_friendly(monster)
                               && !mons_good_neutral(monster)))

Replacement in crawl-ref/source/monstuff.cc at line 1680 [4.1396662]

B:BD[4.1429237] → [5.8268:8310]

                       bool restrict_LOS)

[4.1429237]

[4.1429260]

                       bool restrict_LOS, bool forbid_sanctuary)

Replacement in crawl-ref/source/monstuff.cc at line 1723 [4.1396662]

B:BD[10.6661] → [10.6661:6726]

            || !allow_adjacent && distance(ox, oy, tx, ty) <= 2)

[10.6661]

[10.6726]

            || !allow_adjacent && distance(ox, oy, tx, ty) <= 2
            || forbid_sanctuary && is_sanctuary(tx, ty))

Insertion in crawl-ref/source/monplace.cc at line 810 [4.1641732]

[11.4370]

        && (mg.behaviour == BEH_FRIENDLY || !is_sanctuary(mg.pos.x, mg.pos.y))

Insertion in crawl-ref/source/monplace.cc at line 835 [4.1641732]

[12.29578]

[4.1653442]

                continue;
            if (mg.behaviour != BEH_FRIENDLY && is_sanctuary(fpos.x, fpos.y))