fiddlerwoaroof/crawl - Change N7KLZSYDHJYZ6UYV6YSXCO53NLWOFWJF43IOKZHDLFLR67B2USPAC

Replace Zin's angelic retribution with a surveillance-based retribution:

giant eyeballs, eyes of draining, eyes of devastation, or great orbs of eyes will now be spawned outside player LOS.

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

Created by dolorous on November 1, 2008

N7KLZSYDHJYZ6UYV6YSXCO53NLWOFWJF43IOKZHDLFLR67B2USPAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/religion.cc at line 49 [5.804403]
[4.29273]
[5.805555]
```
#include "mstuff2.h"
```
Replacement in crawl-ref/source/religion.cc at line 3607 [5.804403]
B:BD[6.1697] → [7.2624:2658]
```
    // angels/creeping doom theme
```
[6.1697]
[8.2527]
```
    // surveillance/creeping doom theme
```

Replacement in crawl-ref/source/religion.cc at line 3639 [5.804403]

B:BD[9.3147] → [2.2733:2790]

    case 4: // Summon angels or bugs (pestilence). (30%)

[9.3147]

[10.2524]

    case 4: // Summon eyes or bugs (pestilence). (30%)

Insertion in crawl-ref/source/religion.cc at line 3642 [5.804403]

[10.2602]

            const monster_type eyes[] = {
                MONS_GIANT_EYEBALL, MONS_EYE_OF_DRAINING,
                MONS_EYE_OF_DEVASTATION, MONS_GREAT_ORB_OF_EYES
            };

Insertion in crawl-ref/source/religion.cc at line 3652 [5.804403]

[11.9839]

[3.4103]

                const monster_type mon = RANDOM_ELEMENT(eyes);
                coord_def mon_pos;
                {
                    monsters dummy;
                    dummy.type = mon;
                    dummy.attitude = ATT_HOSTILE;
                    if (!monster_random_space(&dummy, mon_pos, true))
                        continue;
                }

Replacement in crawl-ref/source/religion.cc at line 3665 [5.804403]

B:BD[3.4139] → [3.4139:4261]

                        mgen_data::hostile_at(MONS_ANGEL,
                            you.pos(), 0, 0, true, god)) != -1)

[3.4139]

[3.4261]

                        mgen_data::hostile_at(mon,
                            mon_pos, 0, MG_FORCE_PLACE, true, god)) != -1)

Replacement in crawl-ref/source/religion.cc at line 3672 [5.804403]

B:BD[12.7819] → [13.2643:2863]

∅:D[13.2863] → [11.10213:10250]

B:BD[11.10213] → [11.10213:10250]

            simple_god_message(success ? " sends the divine host to punish "
                                         "you for your evil ways!"
                                       : "'s divine host fails to appear.",
                               god);

[12.7819]

[10.3300]

            if (success)
                god_speaks(god, "You feel Zin's eyes turn towards you...");
            else
                simple_god_message("'s eyes are elsewhere at the moment.",
                                   god);

Insertion in crawl-ref/source/mstuff2.h at line 28 [5.1336995]

[14.4312]

[15.2565]

bool monster_random_space(const monsters *monster, coord_def& target,
                          bool restrict_not_LOS = false);

Insertion in crawl-ref/source/mstuff2.cc at line 599 [5.1340842]

[16.42486]

[17.399823]

    }
}
// restrict_not_LOS:  restrict target to be outside PLAYER line of sight.
bool monster_random_space(const monsters *monster, coord_def& target,
                          bool restrict_not_LOS)
{
    int tries = 0;
    while (tries++ < 150)
    {
        target.x = 10 + random2(GXM - 20);
        target.y = 10 + random2(GYM - 20);
        // Don't land on top of another monster.
        if (mgrd(target) != NON_MONSTER || target == you.pos())
            continue;
        if (is_sanctuary(target) && !mons_wont_attack(monster))
            continue;
        if (restrict_not_LOS && see_grid(target))
            continue;
        if (monster_habitable_grid(monster, grd(target)))
            return (true);

Insertion in crawl-ref/source/mstuff2.cc at line 625 [5.1340842]
[17.399829]
[18.3151]
```
    return (false);
```
Replacement in crawl-ref/source/mstuff2.cc at line 664 [5.1340842]
∅:D[19.20241] → [20.3456:3473]
B:BD[5.1363233] → [20.3456:3473]
∅:D[20.3473] → [5.1363249:1363255]
B:BD[5.1363249] → [5.1363249:1363255]
B:BD[5.1363255] → [19.20242:20328]
```
    while (true)
    {
        newpos.x = 10 + random2(GXM - 20);
        newpos.y = 10 + random2(GYM - 20);
```
[19.20241]
[5.1363333]
```
    if (monster_random_space(monster, newpos))
        monster->moveto(newpos);
```
Deletion in crawl-ref/source/mstuff2.cc at line 667 [5.1340842]
B:BD[5.1363334] → [21.13008:13057]
B:BD[21.13057] → [19.20329:20393]
∅:D[22.259] → [5.1363427:1363449]
∅:D[19.20393] → [5.1363427:1363449]
B:BD[5.1363427] → [5.1363427:1363449]
∅:D[22.270] → [5.1363449:1363450]
B:BD[5.1363449] → [5.1363449:1363450]
B:BD[5.1363450] → [19.20394:20458]
∅:D[23.2639] → [24.3605:3627]
∅:D[19.20458] → [24.3605:3627]
B:BD[24.3605] → [24.3605:3627]
B:BD[24.3638] → [24.3638:3639]
B:BD[24.3639] → [19.20459:20517]
∅:D[19.20517] → [5.1363534:1363553]
∅:D[17.400472] → [5.1363534:1363553]
B:BD[5.1363534] → [5.1363534:1363553]
B:BD[5.1363718] → [5.1363718:1363725]
B:BD[5.1363725] → [16.42487:42516]
∅:D[19.20572] → [5.1363771:1363772]
∅:D[16.42516] → [5.1363771:1363772]
B:BD[5.1363771] → [5.1363771:1363772]
```
        // Don't land on top of another monster.
        if (mgrd(newpos) != NON_MONSTER || newpos == you.pos())
            continue;
        if (is_sanctuary(newpos) && !mons_wont_attack(monster))
            continue;
        if (monster_habitable_grid(monster, grd(newpos)))
            break;
    }
    monster->moveto(newpos);
```

Replace Zin's angelic retribution with a surveillance-based retribution:

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/religion.cc at line 49 [5.804403]

Replacement in crawl-ref/source/religion.cc at line 3607 [5.804403]