fiddlerwoaroof/crawl - Change FXK7Y2F4YJE422WMQ6TYHONWVVDRWLWCU47BXHXCR53DHF6YC76AC

Improve handling of monsters leaving the level again: they all get

messages when visible now.

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

Created by dolorous on June 20, 2008

FXK7Y2F4YJE422WMQ6TYHONWVVDRWLWCU47BXHXCR53DHF6YC76AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2421 [5.1396662]

B:BD[3.4274] → [4.2569:2637]

// If _mons_find_level_exits() is ever expanded to handle more trap

[3.4274]

[4.2637]

// If _mons_find_level_exits() is ever expanded to handle more grid

Replacement in crawl-ref/source/monstuff.cc at line 2423 [5.1396662]

B:BD[4.2686] → [6.2569:2645]

static void _mons_handle_trap_level_exit(const monsters *mon, int x, int y)

[4.2686]

[4.2764]

static void _mons_handle_level_exit(const monsters *mon, int x, int y)

Replacement in crawl-ref/source/monstuff.cc at line 2425 [5.1396662]

B:BD[4.2766] → [6.2646:2735]

∅:D[6.2735] → [4.2766:2784]

B:BD[4.2766] → [4.2766:2784]

    trap_type trap = trap_type_at_xy(x, y);
    if (trap == NUM_TRAPS)
        return;
    switch (trap)

[4.2766]

[4.2784]

    switch (mon->travel_target)
    {
    case MTRAV_STAIR:
    {
        if (is_travelable_stair(grd[x][y]))
        {
            command_type dir = grid_stair_direction(grd[x][y]);
            simple_monster_message(mon,
                make_stringf(" %s the stairs.",
                    dir == CMD_GO_UPSTAIRS   ? "goes up" :
                    dir == CMD_GO_DOWNSTAIRS ? "goes down"
                                             : "takes").c_str());
        }
        else if (is_gate(grd[x][y]))
            simple_monster_message(mon, " passes through the gate.");
        break;
    }
    case MTRAV_TRAP:

Replacement in crawl-ref/source/monstuff.cc at line 2444 [5.1396662]

B:BD[4.2790] → [4.2790:3042]

        case TRAP_TELEPORT:
            simple_monster_message(mon, " disappears!");
            break;
        case TRAP_SHAFT:
            simple_monster_message(mon, " falls through a shaft!");
            break;
        default:
            break;

[4.2790]

[4.3042]

        trap_type trap = trap_type_at_xy(x, y);
        switch (trap)
        {
            case TRAP_TELEPORT:
                simple_monster_message(mon, " disappears!");
                break;
            case TRAP_SHAFT:
                simple_monster_message(mon, " falls through a shaft!");
                break;
            default:
                break;
        }
        if (trap != NUM_TRAPS)
            grd[x][y] = trap_category(trap);
        break;

Replacement in crawl-ref/source/monstuff.cc at line 2460 [5.1396662]

B:BD[4.3048] → [6.2736:2774]


    grd[x][y] = trap_category(trap);

[4.3048]

    case MTRAV_SUBMERSIBLE:
        simple_monster_message(mon,
            make_stringf(" disappears into %s!",
                mons_habitat(mon) == HT_LAVA  ? "the lava" :
                mons_habitat(mon) == HT_WATER ? "the water"
                                              : "thin air").c_str());
        break;
    default:
        break;
    }

Insertion in crawl-ref/source/monstuff.cc at line 2476 [5.1396662]
[7.3371]
[7.3371]
```
        _mons_handle_level_exit(mon, mon->target_x, mon->target_y);
```

Insertion in crawl-ref/source/monstuff.cc at line 3322 [5.1396662]

[8.2768]

                if (mon->travel_target == MTRAV_SUBMERSIBLE)
                    mon->add_ench(ENCH_SUBMERGED);

Deletion in crawl-ref/source/monstuff.cc at line 6035 [5.1396662]

B:BD[2.2972] → [2.2972:3110]

                _mons_handle_trap_level_exit(monster, monster->target_x,
                                             monster->target_y);