fiddlerwoaroof/crawl - Change 4C4D3H4E5MDQ3KT5CWXN5K6H4FVT567PN66GAAHHIWVROHZWG5CQC

FR 2046572: Don't anger allies by teleporting them. (Maybe enslaved monsters

should be exempted from that, but for now they're not.)

Make all allies (including zombies) avoid Zot traps known to the player, but don't let them avoid unknown ones (unless native, or highly intelligent, as usual.)

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

Created by j-p-e-g on November 13, 2008

4C4D3H4E5MDQ3KT5CWXN5K6H4FVT567PN66GAAHHIWVROHZWG5CQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/traps.cc at line 155 [6.5308]
∅:D[3.332] → [5.2998:3074]
B:BD[5.2998] → [5.2998:3074]
```
        const bool mechanical = (this->category() == DNGN_TRAP_MECHANICAL);
```
Replacement in crawl-ref/source/traps.cc at line 165 [6.5308]
∅:D[7.247] → [5.3602:3648]
B:BD[5.3602] → [5.3602:3648]
```
        rc = (intel >= I_NORMAL && mechanical
```
[7.247]
[5.3648]
```
        rc = (intel >= I_NORMAL
```
Deletion in crawl-ref/source/monstuff.cc at line 6537 [10.1396662]
∅:D[8.3706] → [9.2723:2724]
B:BD[11.2483] → [9.2723:2724]
∅:D[12.783] → [13.1878:1918]
∅:D[9.2724] → [13.1878:1918]
B:BD[13.1878] → [13.1878:1918]
B:BD[13.1918] → [11.2484:2510]
∅:D[11.2510] → [13.1964:1987]
B:BD[13.1964] → [13.1964:1987]
```
    // Dumb monsters don't care at all.
    if (intel == I_PLANT)
        return (true);
```

Insertion in crawl-ref/source/monstuff.cc at line 6542 [10.1396662]

[5.25491]

[13.1987]


    const bool player_knows_trap = (trap.is_known(&you));
    // No friendly monsters will ever enter a Zot trap you know.
    if (player_knows_trap && mons_friendly(monster) && trap.type == TRAP_ZOT)
        return (false);
    // Dumb monsters don't care at all.
    if (intel == I_PLANT)
        return (true);

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

B:BD[14.9811] → [15.2721:2892]

    // Monsters are not afraid of non-mechanical traps.  XXX: If we add
    // any non-mechanical traps that can damage monsters, we must add
    // checks for them here.

[14.9811]

[5.25492]

    // Hostile monsters are not afraid of non-mechanical traps.
    // Allies will try to avoid teleportation and zot traps.

Deletion in crawl-ref/source/monstuff.cc at line 6566 [10.1396662]
B:BD[5.25563] → [5.25563:25621]
```
    const bool player_knows_trap = (trap.is_known(&you));
```

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

B:BD[12.1755] → [12.1755:1830]

B:BD[12.1830] → [16.7661:7687]

            // (relative to the _current_ monster position rather than the
            // trap one).

[12.1755]

[16.7687]

            // (relative to the _trap_ position rather than the monster one).

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

B:BD[16.7764] → [16.7764:7835]

            // there's good alternative move for the monster to take),

[16.7764]

[16.7835]

            // there's a good alternative move for the monster to take),

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

∅:D[15.2998] → [17.3772:3847]

∅:D[18.3008] → [17.3772:3847]

B:BD[17.3772] → [17.3772:3847]

        return (mechanical ? mons_flies(monster) : trap.type != TRAP_ZOT);

[18.3008]

[13.2641]

    {
        return (mechanical ? mons_flies(monster)
                           : !trap.is_known(monster) || trap.type != TRAP_ZOT);
    }

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

B:BD[12.3613] → [19.2630:2681]

B:BD[19.2681] → [20.6273:6345]

        targ_cloud_num == EMPTY_CLOUD ? CLOUD_NONE
                                      : env.cloud[targ_cloud_num].type;

[12.3613]

[12.3734]

        (targ_cloud_num == EMPTY_CLOUD) ? CLOUD_NONE
                                        : env.cloud[targ_cloud_num].type;

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

B:BD[12.3837] → [19.2682:2733]

∅:D[19.2733] → [12.3887:3958]

B:BD[12.3887] → [12.3887:3958]

        curr_cloud_num == EMPTY_CLOUD ? CLOUD_NONE
                                     : env.cloud[curr_cloud_num].type;

[12.3837]

[12.3958]

        (curr_cloud_num == EMPTY_CLOUD) ? CLOUD_NONE
                                        : env.cloud[curr_cloud_num].type;

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

B:BD[21.52337] → [21.52337:52413]

            if (targ_x < 0 || targ_x >= GXM || targ_y < 0 || targ_y >= GYM)

[21.52337]

[21.52413]

            if (!in_bounds(targ_x, targ_y))

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

B:BD[22.889] → [20.6346:6389]

B:BD[20.6389] → [8.3815:3862]

        || grd(newpos) == DNGN_SECRET_DOOR
           && mons_intel(monster) >= I_NORMAL)

[22.889]

[10.1537737]

        || grd(newpos) == DNGN_SECRET_DOOR && mons_intel(monster) >= I_NORMAL)

Insertion in crawl-ref/source/beam.cc at line 5260 [10.4128068]
[23.11121]
[10.4259553]
```
    if (beam.flavour == BEAM_DIGGING)
        return (false);
```

Insertion in crawl-ref/source/beam.cc at line 5263 [10.4128068]

[10.4259554]

[24.2815]

    // haste/healing/invisibility
    if (_nice_beam(mon, beam))
        return (false);

Insertion in crawl-ref/source/beam.cc at line 5271 [10.4128068]

[24.2920]

[4.15562]

    // Friendly and good neutral monsters don't mind being teleported.
    if (beam.flavour == BEAM_TELEPORT)
        return (!mons_wont_attack(mon));

Deletion in crawl-ref/source/beam.cc at line 5296 [10.4128068]
∅:D[25.1253713] → [10.4260116:4260117]
B:BD[10.4260116] → [10.4260116:4260117]
B:BD[10.4260117] → [2.2750:2903]
∅:D[2.2903] → [10.4260166:4260190]
B:BD[10.4260166] → [10.4260166:4260190]
B:BD[10.4260190] → [2.2904:2911]
```
    // haste/healing/invisibility
    if (beam.flavour == BEAM_HASTE || beam.flavour == BEAM_HEALING
        || beam.flavour == BEAM_INVISIBILITY)
    {
        return (false);
     }
```