fiddlerwoaroof/crawl - Change U56SICUKK36SJAG3QKV4WGDSAXOW5BELRPZGHTRAMZVUV56AESVAC

Reenable level-leaving monsters' using shaft traps again, properly this

time, and clean up a few related bits. Note that such monsters don't properly disappear yet after falling through shafts.

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

Created by dolorous on June 18, 2008

U56SICUKK36SJAG3QKV4WGDSAXOW5BELRPZGHTRAMZVUV56AESVAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monstuff.cc at line 82 [4.1396662]

[3.2957]

static bool _mon_can_move_to_pos(const monsters *monster, const int count_x,
                                 const int count_y, bool just_check = false);
static bool _is_trap_safe(const monsters *monster, const int trap_x,
                          const int trap_y, bool just_check = false);

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

B:BD[5.3015] → [2.2569:2695]

        // Teleportation traps: only known traps if the monster isn't
        // native to the branch, or all traps if it is.

[5.3015]

[5.3151]

        // Teleportation or shaft traps.

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

B:BD[5.3209] → [2.2696:2728]

∅:D[2.2728] → [5.3263:3378]

B:BD[5.3263] → [5.3263:3378]

        if (tt == TRAP_TELEPORT
            && (grd[(*ri).x][(*ri).y] != DNGN_UNDISCOVERED_TRAP
                || mons_is_native_in_branch(mon)))

[5.3209]

[5.3378]

        if ((tt == TRAP_TELEPORT || tt == TRAP_SHAFT)
            && _is_trap_safe(mon, (*ri).x, (*ri).y))

Insertion in crawl-ref/source/monstuff.cc at line 3262 [4.1396662]

[6.4407]

            // XXX: If it's on a new level, thanks to a shaft trap, it
            // should also do this.

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

B:BD[5.4348] → [5.4348:4500]

            // If the monster isn't travelling toward an exit, make it
            // start doing so.
            if (mon->travel_target != MTRAV_EXIT)

[5.4348]

[5.4500]

            // If the monster isn't travelling toward an exit or a trap,
            // make it start doing so.
            if (mon->travel_target == MTRAV_NONE)

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

B:BD[5.4742] → [5.4742:4795]

                    mon->travel_target = MTRAV_EXIT;

[5.4742]

[5.4795]

                    mon->travel_target =
                        (trap_at_xy(mon->target_x, mon->target_y) != -1) ?
                            MTRAV_TRAP : MTRAV_EXIT;

Deletion in crawl-ref/source/monstuff.cc at line 6558 [4.1396662]

B:BD[7.2359] → [7.2359:2360]

B:BD[7.2360] → [3.9400:9555]


static bool _mon_can_move_to_pos(const monsters *monster, const int count_x,
                                 const int count_y, bool just_check = false);

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

B:BD[3.9625] → [3.9625:9694]

                          const int trap_y, bool just_check = false)

[3.9625]

[8.1876]

                          const int trap_y, bool just_check)

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

B:BD[9.1397] → [9.1397:1456]

        if (mons_is_fleeing(monster) && intel >= I_NORMAL)

[9.1397]

[9.1456]

        if ((mons_is_fleeing(monster) || mons_is_leaving(monster))
            && intel >= I_NORMAL)
        {

Insertion in crawl-ref/source/monstuff.cc at line 6579 [4.1396662]
[9.1483]
[10.10435]
```
        }
```

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

∅:D[7.3880] → [8.2462:2641]

∅:D[11.9815] → [8.2462:2641]

B:BD[8.2462] → [8.2462:2641]

    // Friendly monsters don't enjoy Zot trap perks, handle accordingly.
    if (mons_friendly(monster))
        return (mechanical? mons_flies(monster) : trap.type != TRAP_ZOT);

[11.9815]

[8.2641]

    // Friendly and good neutral monsters don't enjoy Zot trap perks;
    // handle accordingly.
    if (mons_wont_attack(monster))
        return (mechanical ? mons_flies(monster) : trap.type != TRAP_ZOT);

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

B:BD[12.2763] → [3.10160:10230]

∅:D[3.10230] → [12.2832:2893]

B:BD[12.2832] → [12.2832:2893]

bool _mon_can_move_to_pos(const monsters *monster, const int count_x,
                         const int count_y, bool just_check)

[12.2763]

[12.2893]

static bool _mon_can_move_to_pos(const monsters *monster, const int count_x,
                                 const int count_y, bool just_check)

Replacement in crawl-ref/source/enum.h at line 2793 [4.3287960]

B:BD[5.5480] → [5.5480:5541]

    MTRAV_EXIT          // Travelling to reach a level exit.

[5.5480]

[4.3376769]

    MTRAV_EXIT,         // Travelling to reach a level exit.
    MTRAV_TRAP          // Travelling to reach a trap.