fiddlerwoaroof/crawl - Change 6DNNPEMZGBQDMA7YG4LCTQUVZ7LYPC3R4A2XBYT5SDQ65GYOLJVAC

Added "The Stairs" card (not yet in any deck), eventually to be the card which

re-arranges all stairs on the level, but now is just used to test the code used to move stairs in LOS away or towards the player.

Added beam flavour BEAM_VISUAL for animating someting moving in a line which doesn't have any effects on its own, and removed BEAM_LINE_OF_SIGHT, which was no longer being used. Added bolt structure field "delay", which can be used to change the delay between animating each square in a beam from the default of 15 msec.

For eventual use as a Xom effect added the stairs-are-avoiding-you durations DUR_REPEL_STAIRS_MOVE and DUR_REPEL_STAIRS_CLIMB. If DUR_REPEL_STAIRS_MOVE alone is set then stepping onto a stairs/portal/etc has a 50% chance of making it move away in a random direction. If DUR_REPEL_STAIRS_CLIMB alone is set then attempting to climb a stairs/etc has a 50% chance of making it move away before you can get through it (and ending your turn in the process). If both are set then moving onto it and attempting to climb each have a 29% chance of making it move, for a combined chance of 49.59% of a move-and-climb making the stairs move away. Once a stair is successfully taken there's a 50% chance of the stair on the other end moving away from the player, and then both durations are reset to 0.

These can be tested by drawing The Stairs card ("&c stair"), which will set DUR_REPEL_STAIRS_CLIMB if you're on top of a stair or DUR_REPEL_STAIRS_MOVE if your'e not.

Added a few wizard targetting command placeholders.

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

Created by zelgadis on December 18, 2008

6DNNPEMZGBQDMA7YG4LCTQUVZ7LYPC3R4A2XBYT5SDQ65GYOLJVAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/terrain.h at line 14 [5.24828]
[5.25228]
[6.194]
```
class  actor;
```
Insertion in crawl-ref/source/terrain.h at line 33 [5.24828]
[5.25763]
[7.1524]
```
bool grid_is_staircase(dungeon_feature_type grid);
```

Insertion in crawl-ref/source/terrain.h at line 39 [5.24828]

[5.26099]


std::string grid_preposition(dungeon_feature_type grid, bool active = false,
                             const actor* who = NULL);
std::string stair_climb_verb(dungeon_feature_type grid);

Replacement in crawl-ref/source/terrain.h at line 71 [5.24828]

B:BD[3.313] → [3.313:363]

                   bool swap_everything = false);

[3.313]

[3.363]

                   bool swap_everything = false, bool announce = true);
bool slide_feature_over(const coord_def &src,
                        coord_def prefered_dest = coord_def(-1, -1),
                        bool announce = true);

Insertion in crawl-ref/source/terrain.cc at line 14 [5.26938]
[8.2395]
[8.2395]
```
#include <sstream>
```

Insertion in crawl-ref/source/terrain.cc at line 55 [5.26938]

[5.28282]

}
bool grid_is_staircase(dungeon_feature_type grid)
{
    if (grid_is_stone_stair(grid))
        return (true);
    // All branch entries/exits are staircases, except for Zot.
    if (grid == DNGN_ENTER_ZOT || grid == DNGN_RETURN_FROM_ZOT)
        return (false);
    return (grid >= DNGN_ENTER_FIRST_BRANCH && grid <= DNGN_ENTER_LAST_BRANCH
            ||   grid >= DNGN_RETURN_FROM_FIRST_BRANCH
              && grid <= DNGN_RETURN_FROM_LAST_BRANCH);

Replacement in crawl-ref/source/terrain.cc at line 506 [5.26938]

B:BD[5.37398] → [5.37398:37444]

B:BD[5.37444] → [9.164:208]

B:BD[9.208] → [10.262:316]

∅:D[10.316] → [9.294:359]

B:BD[9.294] → [9.294:359]

∅:D[9.359] → [5.37444:37543]

B:BD[5.37444] → [5.37444:37543]

B:BD[5.37543] → [11.576:639]

∅:D[11.639] → [5.37593:37599]

B:BD[5.37593] → [5.37593:37599]

B:BD[5.37599] → [9.360:361]

    {
        monsters *mons = &menv[mindex];
        if (mons->has_ench(ENCH_SUBMERGED)
            && !monster_can_submerge(mons, grd(pos)))
        {
            mons->del_ench(ENCH_SUBMERGED);
        }
        if (grid_is_solid(grd(pos)))
            monster_teleport(mons, true, false);
        else
            mons_check_pool(mons, mons->pos(), KILL_MISC, -1);
    }

[5.37398]

[9.361]

        menv[mindex].apply_location_effects(pos);

Replacement in crawl-ref/source/terrain.cc at line 542 [5.26938]

B:BD[3.693] → [3.693:756]

    if (you.can_pass_through(pos) || !grid_is_solid(grd(pos)))

[3.693]

[3.756]

    if (you.can_pass_through(pos))

Replacement in crawl-ref/source/terrain.cc at line 544 [5.26938]

B:BD[3.762] → [3.762:1255]

∅:D[12.918] → [9.1134:1144]

∅:D[3.1255] → [9.1134:1144]

B:BD[9.1134] → [9.1134:1144]

        if (!you.airborne())
        {
            // If the monster can't stay submerged in the new terrain
            // and there aren't any adjacent squares where it can
            // stay submerged then move it.
            if (mgrd(you.pos()) != NON_MONSTER
                && !mons_is_submerged( &menv[ mgrd(you.pos()) ] ))
            {
                monster_teleport( &menv[ mgrd(you.pos()) ], true, false);
            }
            move_player_to_grid(pos, false, true, false);
        }

[3.762]

[9.1144]

        // If the monster can't stay submerged in the new terrain and
        // there aren't any adjacent squares where it can stay
        // submerged then move it.
        const int midx = mgrd(you.pos());
        if ( midx != NON_MONSTER && !mons_is_submerged( &menv[midx] ) )
            monster_teleport( &menv[midx], true, false);
        move_player_to_grid(pos, false, true, true);

Replacement in crawl-ref/source/terrain.cc at line 590 [5.26938]

B:BD[3.1411] → [3.1411:1517]

bool swap_features(const coord_def &pos1, const coord_def &pos2,
                   bool swap_everything)

[3.1411]

[3.1517]

static void _announce_swap_real(coord_def orig_pos, coord_def dest_pos)

Replacement in crawl-ref/source/terrain.cc at line 592 [5.26938]

B:BD[3.1519] → [3.1519:1593]

    ASSERT(in_bounds(pos1) && in_bounds(pos2));
    ASSERT(pos1 != pos2);

[3.1519]

[3.1593]

    dungeon_feature_type orig_feat = grd(dest_pos);
    std::string orig_name =
        feature_description(dest_pos, false,
                            see_grid(orig_pos) ? DESC_CAP_THE : DESC_CAP_A,
                            false);
    std::string prep = grid_preposition(orig_feat, true);
    std::string orig_actor, dest_actor;
    if (orig_pos == you.pos())
        orig_actor = "you";
    else if (mgrd(orig_pos) != NON_MONSTER)
    {
        monsters &mon(menv[mgrd(orig_pos)]);
        if (you.can_see(&mon))
            orig_actor = mon.name(DESC_NOCAP_THE);
    }
    if (dest_pos == you.pos())
        dest_actor = "you";
    else if (mgrd(dest_pos) != NON_MONSTER)
    {
        monsters &mon(menv[mgrd(dest_pos)]);
        if (you.can_see(&mon))
            dest_actor = mon.name(DESC_NOCAP_THE);
    }
    std::ostringstream str;
    str << orig_name << " ";
    if (see_grid(orig_pos) && !see_grid(dest_pos))
    {
        str << "suddenly disappears";
        if (!orig_actor.empty())
            str << " from " << prep << " " << orig_actor;
    }
    else if (!see_grid(orig_pos) && see_grid(dest_pos))
    {
        str << "suddenly appears";
        if (!dest_actor.empty())
            str << " " << prep << " " << dest_actor;
    }
    else
    {
        str << "moves";
        if (!orig_actor.empty())
            str << " from " << prep << " " << orig_actor;
        if (!dest_actor.empty())
            str << " to " << prep << " " << dest_actor;
    }
    str << "!";
    mpr(str.str().c_str());
}
static void _announce_swap(coord_def pos1, coord_def pos2)
{
    if (!see_grid(pos1) && !see_grid(pos2))
        return;

Insertion in crawl-ref/source/terrain.cc at line 656 [5.26938]

[3.1695]

    if (feat1 == feat2)
        return;
    const bool notable_seen1 = is_notable_terrain(feat1) && see_grid(pos1);
    const bool notable_seen2 = is_notable_terrain(feat2) && see_grid(pos2);
    coord_def orig_pos, dest_pos;
    if (notable_seen1 && notable_seen2)
    {
        _announce_swap_real(pos1, pos2);
        _announce_swap_real(pos2, pos1);
    }
    else if (notable_seen1)
        _announce_swap_real(pos2, pos1);
    else if (notable_seen2)
        _announce_swap_real(pos1, pos2);
    else if (see_grid(pos2))
        _announce_swap_real(pos1, pos2);
    else
        _announce_swap_real(pos2, pos1);
}
bool swap_features(const coord_def &pos1, const coord_def &pos2,
                   bool swap_everything, bool announce)
{
    ASSERT(in_bounds(pos1) && in_bounds(pos2));
    ASSERT(pos1 != pos2);

Insertion in crawl-ref/source/terrain.cc at line 687 [5.26938]

[3.1770]

    const dungeon_feature_type feat1 = grd(pos1);
    const dungeon_feature_type feat2 = grd(pos2);

Insertion in crawl-ref/source/terrain.cc at line 711 [5.26938]

[3.2340]

    shop_struct* shop1 = get_shop(pos1);
    shop_struct* shop2 = get_shop(pos2);

Deletion in crawl-ref/source/terrain.cc at line 752 [5.26938]
B:BD[3.3388] → [3.3388:3434]
```
    grd(pos2) = feat1;
    grd(pos1) = feat2;
```
Insertion in crawl-ref/source/terrain.cc at line 759 [5.26938]
[3.3632]
[3.3632]
```
    grd(pos2) = feat1;
    grd(pos1) = feat2;
```

Insertion in crawl-ref/source/terrain.cc at line 769 [5.26938]

[3.3787]


    if (shop1)
        shop1->pos = pos2;
    if (shop2)
        shop2->pos = pos1;

Insertion in crawl-ref/source/terrain.cc at line 786 [5.26938]

[3.4173]


        if (announce)
            _announce_swap(pos1, pos2);

Insertion in crawl-ref/source/terrain.cc at line 797 [5.26938]

[3.4308]


    if (igrd(pos1) != NON_ITEM)
    {
        for (stack_iterator si(igrd(pos1)); si; ++si)
            si->pos = pos1;
    }
    if (igrd(pos2) != NON_ITEM)
    {
        for (stack_iterator si(igrd(pos2)); si; ++si)
            si->pos = pos2;
    }

Insertion in crawl-ref/source/terrain.cc at line 814 [5.26938]

[3.4414]


    if (mgrd(pos1) != NON_MONSTER)
        menv[mgrd(pos1)].position = pos1;
    if (mgrd(pos2) != NON_MONSTER)
        menv[mgrd(pos2)].position = pos2;

Insertion in crawl-ref/source/terrain.cc at line 837 [5.26938]

[3.4823]


    if (announce)
        _announce_swap(pos1, pos2);
    return (true);
}
static bool _ok_dest_grid(const actor* orig_actor,
                          const dungeon_feature_type orig_feat,
                          const coord_def dest_pos)
{
    const dungeon_feature_type dest_feat = grd(dest_pos);
    if (orig_feat == dest_feat)
        return (false);

Replacement in crawl-ref/source/terrain.cc at line 853 [5.26938]

B:BD[3.4824] → [3.4824:4844]

    return (false);

[3.4824]

[5.38572]

    if (is_notable_terrain(dest_feat))
        return (false);
    actor* dest_actor = NULL;
    if (dest_pos == you.pos())
        dest_actor = dynamic_cast<actor*>(&you);
    else if (mgrd(dest_pos) != NON_MONSTER)
        dest_actor = dynamic_cast<actor*>(&menv[mgrd(dest_pos)]);
    if (orig_actor && !orig_actor->is_habitable_feat(dest_feat))
        return (false);
    if (dest_actor && !dest_actor->is_habitable_feat(orig_feat))
        return (false);
    return (true);
}
bool slide_feature_over(const coord_def &src, coord_def prefered_dest,
                        bool announce)
{
    ASSERT(in_bounds(src));
    const dungeon_feature_type orig_feat = grd(src);
    actor* orig_actor = NULL;
    if (src == you.pos())
        orig_actor = dynamic_cast<actor*>(&you);
    else if (mgrd(src) != NON_MONSTER)
        orig_actor = dynamic_cast<actor*>(&menv[mgrd(src)]);
    if (in_bounds(prefered_dest)
        && _ok_dest_grid(orig_actor, orig_feat, prefered_dest))
    {
        ASSERT(prefered_dest != src);
    }
    else
    {
        radius_iterator ri(src, 1, true, false, true);
        int squares = 0;
        for (; ri; ++ri)
        {
            if (_ok_dest_grid(orig_actor, orig_feat, *ri))
            {
                if (one_chance_in(++squares))
                    prefered_dest = *ri;
            }
        }
    }
    if (!in_bounds(prefered_dest))
        return (false);
    ASSERT(prefered_dest != src);
    return swap_features(src, prefered_dest, false, announce);

Insertion in crawl-ref/source/terrain.cc at line 1041 [5.26938]

[13.1012]


std::string grid_preposition(dungeon_feature_type grid, bool active,
                             const actor* who)
{
    const bool         airborne = !who || who->airborne();
    const command_type dir      = grid_stair_direction(grid);
    if (dir == CMD_NO_CMD)
    {
        if (grid == DNGN_STONE_ARCH)
            return "beside";
        else if (grid_is_solid(grid))
        {
            if (active)
                return "around";
            else
                return "inside";
        }
        else if (!airborne && grid >= DNGN_LAVA && grid <= DNGN_WATER_STUCK)
        {
            if (active)
                return "around";
            else
                return "in";
        }
        else
        {
            if (active)
                return "over";
            else
                return "above";
        }
    }
    if (dir == CMD_GO_DOWNSTAIRS
        && (grid_is_staircase(grid) || grid_is_escape_hatch(grid)))
    {
        if (active)
            return "over";
        else
            return "above";
    }
    else if (grid_is_escape_hatch(grid))
    {
        if (active)
            return "under";
        else
            return "beneath";
    }
    else
        return "beside";
}
std::string stair_climb_verb(dungeon_feature_type grid)
{
    ASSERT(grid_stair_direction(grid) != CMD_NO_CMD);
    if (grid_is_staircase(grid))
        return "climb";
    else if (grid_is_escape_hatch(grid))
        return "use";
    else
        return "pass through";
}

Insertion in crawl-ref/source/player.cc at line 310 [16.962854]

[14.25008]

[15.342681]


    command_type stair_dir = grid_stair_direction(new_grid);
    if (stepped && stair_dir != CMD_NO_CMD
        && you.duration[DUR_REPEL_STAIRS_MOVE])
    {
        int pct;
        if (you.duration[DUR_REPEL_STAIRS_CLIMB])
            pct = 29;
        else
            pct = 50;
        if (x_chance_in_y(pct, 100))
        {
            if (slide_feature_over(you.pos(), coord_def(-1, -1), false))
            {
                std::string stair_str =
                    feature_description(new_grid, NUM_TRAPS, false,
                                        DESC_CAP_THE, false);
                std::string prep = grid_preposition(new_grid, true, &you);

Insertion in crawl-ref/source/player.cc at line 331 [16.962854]

[15.342682]

[15.342911]

                mprf("%s slides away as you move %s it!", stair_str.c_str(),
                     prep.c_str());
            }
        }
    }

Replacement in crawl-ref/source/mon-util.cc at line 7157 [16.1699344]

B:BD[17.4288] → [17.4288:4354]

    dungeon_events.fire_position_event(DET_MONSTER_MOVED, pos());

[17.4288]

[18.2770]

    if (oldpos != pos())
        dungeon_events.fire_position_event(DET_MONSTER_MOVED, pos());

Insertion in crawl-ref/source/misc.cc at line 1659 [16.1933596]

[19.2605]

[20.4213]

}
static bool _stair_moves_pre(dungeon_feature_type stair)
{
    if (crawl_state.prev_cmd == CMD_WIZARD)
        return (false);
    if (stair != grd(you.pos()))
        return (false);
    if (grid_stair_direction(stair) == CMD_NO_CMD)
        return (false);
    if (!you.duration[DUR_REPEL_STAIRS_CLIMB])
        return (false);
    int pct;
    if (you.duration[DUR_REPEL_STAIRS_MOVE])
        pct = 29;
    else
        pct = 50;
    if (!x_chance_in_y(pct, 100))
        return (false);
    // Get feature name before sliding stair over.
    std::string stair_str =
        feature_description(you.pos(), false, DESC_CAP_THE, false);
    if (!slide_feature_over(you.pos(), coord_def(-1, -1), false))
        return (false);
    std::string verb = stair_climb_verb(stair);
    mprf("%s moves away as you attempt to %s it!", stair_str.c_str(),
         verb.c_str());
    you.turn_is_over = true;
    return (true);

Insertion in crawl-ref/source/misc.cc at line 1726 [16.1933596]
[21.16412]
[21.16541]
```
    if (_stair_moves_pre(stair_find))
        return;
```
Insertion in crawl-ref/source/misc.cc at line 2085 [16.1933596]
[21.17730]
[22.9853]
```
    if (_stair_moves_pre(stair_find))
        return;
```

Replacement in crawl-ref/source/misc.cc at line 2242 [16.1933596]

B:BD[23.2954] → [23.2954:3167]

        if (stair_find == DNGN_ENTER_ABYSS
            || stair_find == DNGN_ENTER_PANDEMONIUM
            || stair_find == DNGN_TRANSIT_PANDEMONIUM
            || stair_find == DNGN_ENTER_PORTAL_VAULT)
        {

[23.2954]

[23.3167]

        if (!grid_is_staircase(stair_find))

Deletion in crawl-ref/source/misc.cc at line 2244 [16.1933596]
B:BD[23.3212] → [23.3212:3222]
```
        }
```

Insertion in crawl-ref/source/files.cc at line 1352 [16.3084589]

[2.3022]

        // 50% chance of repelling the stair you just came through.
        if (you.duration[DUR_REPEL_STAIRS_MOVE]
            || you.duration[DUR_REPEL_STAIRS_CLIMB])
        {
            dungeon_feature_type feat = grd(you.pos());
            if (feat != DNGN_ENTER_SHOP
                && grid_stair_direction(feat) != CMD_NO_CMD
                && grid_stair_direction(stair_taken) != CMD_NO_CMD
                && coinflip()
                && slide_feature_over(you.pos(), coord_def(-1, -1), false))
            {
                std::string stair_str =
                    feature_description(feat, NUM_TRAPS, false,
                                        DESC_CAP_THE, false);
                std::string verb = stair_climb_verb(feat);
                mprf("%s slides away from you right after you %s through it!",
                     stair_str.c_str(), verb.c_str());
            }
        }
        // Stairs running from you is done now that you actually caught one.
        you.duration[DUR_REPEL_STAIRS_MOVE]  = 0;
        you.duration[DUR_REPEL_STAIRS_CLIMB] = 0;

Deletion in crawl-ref/source/fight.cc at line 13 [16.3140790]
B:BD[16.3142218] → [24.5645:5664]
```
#include <sstream>
```

Deletion in crawl-ref/source/fight.cc at line 2419 [16.3140790]

B:BD[25.29932] → [25.29932:29934]

B:BD[25.29934] → [3.16245:16530]

∅:D[3.16530] → [25.29934:29935]

B:BD[25.29934] → [25.29934:29935]

B:BD[25.29935] → [3.16531:16550]

}
static bool _ok_dest_grid(const coord_def &dest)
{
    dungeon_feature_type feat = grd(dest);
    if (grid_destroys_items(feat) || grid_is_solid(feat)
        || grid_is_water(feat) || grid_is_trap(feat, true)
        || is_notable_terrain(feat))
    {
        return (false);
    }
    return (true);

Replacement in crawl-ref/source/fight.cc at line 2443 [16.3140790]

B:BD[24.10119] → [3.16862:16969]

∅:D[3.16969] → [24.10184:10190]

B:BD[24.10184] → [24.10184:10190]

    if (defender->alive() && defender->pos() != attacker->pos()
        && _ok_dest_grid(defender->pos()))
    {

[24.10119]

[3.16970]

    if (defender->alive() && defender->pos() != attacker->pos())

Deletion in crawl-ref/source/fight.cc at line 2445 [16.3140790]

∅:D[3.17002] → [24.10581:10748]

B:BD[24.10581] → [24.10581:10748]

B:BD[24.10748] → [3.17003:17039]

∅:D[3.17039] → [24.11087:11291]

B:BD[24.11087] → [24.11087:11291]

B:BD[24.11484] → [24.11484:11485]

B:BD[24.11485] → [3.17040:17104]

∅:D[3.17104] → [24.11587:11588]

B:BD[24.11587] → [24.11587:11588]

B:BD[24.11588] → [3.17105:17145]

∅:D[3.17145] → [24.11861:12127]

B:BD[24.11861] → [24.11861:12127]

    }
    if (!in_bounds(dest))
    {
        radius_iterator ri(attacker->pos(), 1, true, false, true);
        int squares = 0;
        for (; ri; ++ri)
        {
            if (_ok_dest_grid(*ri))
            {
                if (one_chance_in(++squares))
                    dest = *ri;
            }
        }
    }
    if (!in_bounds(dest))
        return (false);
    ASSERT(dest != orig_pos);
    if (!swap_features(orig_pos, dest))
        return (false);
    // Is player aware of it happening?
    if (!see_grid(orig_pos) && !see_grid(dest))
        return (true);
    std::string orig_actor, dest_actor;
    if (orig_pos == you.pos())
        orig_actor = "you";
    else if (mgrd(orig_pos) != NON_MONSTER)
    {
        monsters &mon(menv[mgrd(orig_pos)]);

Replacement in crawl-ref/source/fight.cc at line 2446 [16.3140790]

B:BD[24.12128] → [24.12128:13655]

        if (you.can_see(&mon))
            orig_actor = mon.name(DESC_NOCAP_THE);
    }
    if (dest == you.pos())
        dest_actor = "you";
    else if (mgrd(dest) != NON_MONSTER)
    {
        monsters &mon(menv[mgrd(dest)]);
        if (you.can_see(&mon))
            dest_actor = mon.name(DESC_NOCAP_THE);
    }
    std::string stair_name =
        feature_description(dest, false,
                            see_grid(orig_pos) ? DESC_CAP_THE : DESC_CAP_A,
                            false);
    std::string prep;
    if (grid_stair_direction(stair_feat) == CMD_GO_DOWNSTAIRS
        && (stair_name.find("stair") || grid_is_escape_hatch(stair_feat)))
    {
        prep = "beneath";
    }
    else if (grid_is_escape_hatch(stair_feat))
        prep = "above";
    else
        prep = "beside";
    std::ostringstream str;
    str << stair_name << " ";
    if (see_grid(orig_pos) && !see_grid(dest))
    {
        str << "suddenly disappears";
        if (!orig_actor.empty())
            str << " from " << prep << " " << orig_actor;
    }
    else if (!see_grid(orig_pos) && see_grid(dest))
    {
        str << "suddenly appears";
        if (!dest_actor.empty())
            str << " " << prep << " " << dest_actor;
    }
    else
    {
        str << "moves";
        if (!orig_actor.empty())
            str << " from " << prep << " " << orig_actor;
        if (!dest_actor.empty())
            str << " to " << prep << " " << dest_actor;
    }
    str << "!";
    mpr(str.str().c_str());
    return (true);

[24.12128]

[24.13655]

    return slide_feature_over(attacker->pos(), dest);

Insertion in crawl-ref/source/enum.h at line 252 [16.3287960]
[26.7273]
[27.3224]
```
    BEAM_LAST_REAL = BEAM_POTION_RANDOM,
```

Insertion in crawl-ref/source/enum.h at line 255 [16.3287960]

[27.3225]

    // For getting the visual effect of a beam.
    BEAM_VISUAL,                // 58

Replacement in crawl-ref/source/enum.h at line 259 [16.3287960]

B:BD[27.3292] → [28.6316:6390]

    BEAM_STEAL_FOOD,            // Pseudo-beam for harpyes stealing food.

[27.3292]

[15.905397]

    BEAM_FIRST_PSEUDO = BEAM_TORMENT_DAMAGE,
    BEAM_STEAL_FOOD,            // {60} Pseudo-beam for harpies stealing food.

Deletion in crawl-ref/source/enum.h at line 262 [16.3287960]
B:BD[15.905398] → [29.11082:11157]
```
    BEAM_LINE_OF_SIGHT,         // 60 - only used for checking monster LOS
```
Insertion in crawl-ref/source/enum.h at line 645 [16.3287960]
[30.86043]
[31.2874]
```
    CMD_TARGET_WIZARD_MAKE_SUMMONED,
    CMD_TARGET_WIZARD_POLYMORPH,
```
Insertion in crawl-ref/source/enum.h at line 1180 [16.3287960]
[32.7500]
[33.8385]
```
    DUR_REPEL_STAIRS_MOVE,
    DUR_REPEL_STAIRS_CLIMB,
```
Insertion in crawl-ref/source/decks.h at line 108 [16.3986924]
[34.40253]
[34.40253]
```
    CARD_STAIRS,                // moves stairs around
```
Insertion in crawl-ref/source/decks.cc at line 279 [16.3987460]
[35.53690]
[35.53690]
```
    case CARD_STAIRS:          return "the Stairs";
```

Insertion in crawl-ref/source/decks.cc at line 1553 [16.3987460]

[36.978]


static int stair_draw_count = 0;
static void _move_stair(coord_def stair_pos, bool away)
{
    ASSERT(stair_pos != you.pos());
    dungeon_feature_type feat = grd(stair_pos);
    ASSERT(grid_stair_direction(feat) != CMD_NO_CMD);
    coord_def begin, towards;
    if (away)
    {
        begin   = you.pos();
        towards = stair_pos;
    }
    else
    {
        // Can't move towards player if it's already adjacent.
        if (adjacent(you.pos(), stair_pos))
            return;
        begin   = stair_pos;
        towards = you.pos();
    }
    ray_def ray;
    if (!find_ray(begin, towards, true, ray, 0, true))
    {
        mpr("Couldn't find ray between player and stairs.", MSGCH_ERROR);
        return;
    }
    // Don't start off under the player.
    if (away)
        ray.advance();

Insertion in crawl-ref/source/decks.cc at line 1591 [16.3987460]

[36.979]

[37.14482]

    bool found_stairs = false;
    int  past_stairs  = 0;
    while ( in_bounds(ray.pos()) && see_grid(ray.pos())
            && !grid_is_solid(ray.pos()) && ray.pos() != you.pos() )
    {
        if (ray.pos() == stair_pos)
            found_stairs = true;
        if (found_stairs)
            past_stairs++;
        ray.advance();
    }
    past_stairs--;
    if (!away && grid_is_solid(ray.pos()))
        // Transparent wall between stair and player.
        return;
    if (away && !found_stairs)
    {
        if (grid_is_solid(ray.pos()))
            // Transparent wall between stair and player.
            return;
        mpr("Ray didn't cross stairs.", MSGCH_ERROR);
    }
    if (away && past_stairs <= 0)
        // Stairs already at edge, can't move further away.
        return;
    if ( !in_bounds(ray.pos()) || ray.pos() == you.pos() )
        ray.regress();
    while (!see_grid(ray.pos()) || grd(ray.pos()) != DNGN_FLOOR)
    {
        ray.regress();
        if (!in_bounds(ray.pos()) || ray.pos() == you.pos()
            || ray.pos() == stair_pos)
        {
            // No squares in path are a plain floor.
            return;
        }
    }
    ASSERT(stair_pos != ray.pos());
    std::string stair_str =
        feature_description(stair_pos, false, DESC_CAP_THE, false);
    mprf("%s slides %s you!", stair_str.c_str(),
         away ? "away from" : "towards");
    // Animate stair moving.
    const feature_def &feat_def = get_feature_def(feat);
    bolt beam;
    beam.range   = INFINITE_DISTANCE;
    beam.flavour = BEAM_VISUAL;
    beam.type    = feat_def.symbol;
    beam.colour  = feat_def.colour;
    beam.source  = stair_pos;
    beam.target  = ray.pos();
    beam.delay   = 50; // Make beam animation slower than normal.
    beam.name    = "STAIR BEAM";
    beam.aimed_at_spot = true;
    fire_beam(beam);
    // Clear out "missile trails"
    viewwindow(true, false);
    if (!swap_features(stair_pos, ray.pos(), false, false))
        mprf(MSGCH_ERROR, "_move_stair(): failed to move %s",
             stair_str.c_str());
}
static void _stairs_card(int power, deck_rarity_type rarity)
{
    UNUSED(power);
    UNUSED(rarity);
    you.duration[DUR_REPEL_STAIRS_MOVE]  = 0;
    you.duration[DUR_REPEL_STAIRS_CLIMB] = 0;
    if (grid_stair_direction(grd(you.pos())) == CMD_NO_CMD)
        you.duration[DUR_REPEL_STAIRS_MOVE] = 1000;
    else
        you.duration[DUR_REPEL_STAIRS_CLIMB] = 1000;
    std::vector<coord_def> stairs_avail;
    radius_iterator ri(you.pos(), LOS_RADIUS, false, true, true);
    for (; ri; ++ri)
    {
        dungeon_feature_type feat = grd(*ri);
        if (grid_stair_direction(feat) != CMD_NO_CMD
            && feat != DNGN_ENTER_SHOP)
        {
            stairs_avail.push_back(*ri);
        }
    }
    if (stairs_avail.size() == 0)
    {
        mpr("No stairs available to move.");
        return;
    }
    std::random_shuffle(stairs_avail.begin(), stairs_avail.end());
    for (unsigned int i = 0; i < stairs_avail.size(); i++)
        _move_stair(stairs_avail[i], stair_draw_count % 2);
    stair_draw_count++;
}

Insertion in crawl-ref/source/decks.cc at line 2953 [16.3987460]
[35.63875]
[35.63875]
```
    case CARD_STAIRS:           _stairs_card(power, rarity); break;
```
Insertion in crawl-ref/source/cmd-keys.h at line 143 [38.20639]
[30.92827]
[38.23720]
```
{'S', CMD_TARGET_WIZARD_MAKE_SUMMONED},
{'~', CMD_TARGET_WIZARD_POLYMORPH},
```
Insertion in crawl-ref/source/beam.h at line 67 [16.4124541]
[39.5738]
[5.106921]
```
    int         delay;                 // delay used when drawing beam.
```

Replacement in crawl-ref/source/beam.cc at line 1534 [16.4128068]

B:BD[40.5916] → [40.5916:5984]

    ASSERT(pbolt.flavour > BEAM_NONE && pbolt.flavour < NUM_BEAMS);

[16.4169482]

[40.5984]

    ASSERT(pbolt.flavour > BEAM_NONE && pbolt.flavour < BEAM_FIRST_PSEUDO);

Insertion in crawl-ref/source/beam.cc at line 1543 [16.4128068]

[4.2852]

[39.7554]

    ASSERT(pbolt.flavour != BEAM_VISUAL
           || (!beam_invisible && pbolt.colour != BLACK));

Replacement in crawl-ref/source/beam.cc at line 1560 [16.4128068]

B:BD[40.6410] → [40.6410:6519]

            if (!pbolt.is_tracer && !YOU_KILL(pbolt.thrower)
                && !crawl_state.is_god_acting()

[40.6410]

[40.6519]

            if (pbolt.flavour != BEAM_VISUAL && !pbolt.is_tracer
                && !YOU_KILL(pbolt.thrower) && !crawl_state.is_god_acting()

Replacement in crawl-ref/source/beam.cc at line 1617 [16.4128068]

B:BD[16.4170078] → [15.1227907:1227958]

B:BD[15.1227958] → [41.10944:11012]

∅:D[41.11012] → [42.33156:33220]

B:BD[42.33156] → [42.33156:33220]

B:BD[42.33220] → [41.11013:11239]

B:BD[41.11239] → [43.103302:103394]

∅:D[43.103394] → [41.11331:11476]

B:BD[41.11331] → [41.11331:11476]

∅:D[44.507] → [15.1228509:1228515]

∅:D[41.11476] → [15.1228509:1228515]

B:BD[15.1228509] → [15.1228509:1228515]

    if (pbolt.flavour != BEAM_LINE_OF_SIGHT)
    {
        mprf( MSGCH_DIAGNOSTICS, "%s%s%s [%s] (%d,%d) to (%d,%d): "
              "ty=%d col=%d flav=%d hit=%d dam=%dd%d range=%d",
              (pbolt.is_beam) ? "beam" : "missile",
              (pbolt.is_explosion) ? "*" :
              (pbolt.is_big_cloud) ? "+" : "",
              (pbolt.is_tracer) ? " tracer" : "",
              pbolt.name.c_str(),
              pbolt.source.x, pbolt.source.y,
              pbolt.target.x, pbolt.target.y,
              pbolt.type, pbolt.colour, pbolt.flavour,
              pbolt.hit, pbolt.damage.num, pbolt.damage.size,
              pbolt.range);
    }

[16.4170078]

[16.4170521]

    mprf( MSGCH_DIAGNOSTICS, "%s%s%s [%s] (%d,%d) to (%d,%d): "
          "ty=%d col=%d flav=%d hit=%d dam=%dd%d range=%d",
          (pbolt.is_beam) ? "beam" : "missile",
          (pbolt.is_explosion) ? "*" :
          (pbolt.is_big_cloud) ? "+" : "",
          (pbolt.is_tracer) ? " tracer" : "",
          pbolt.name.c_str(),
          pbolt.source.x, pbolt.source.y,
          pbolt.target.x, pbolt.target.y,
          pbolt.type, pbolt.colour, pbolt.flavour,
          pbolt.hit, pbolt.damage.num, pbolt.damage.size,
          pbolt.range);

Replacement in crawl-ref/source/beam.cc at line 1756 [16.4128068]

B:BD[40.6959] → [40.6959:7016]

        if (!was_seen && pbolt.seen && !pbolt.is_tracer)

[40.6959]

[40.7016]

        if (pbolt.flavour != BEAM_VISUAL && !was_seen && pbolt.seen
            && !pbolt.is_tracer)

Replacement in crawl-ref/source/beam.cc at line 1828 [16.4128068]
∅:D[45.4333] → [46.5937468:5937495]
∅:D[47.57480] → [46.5937468:5937495]
B:BD[46.5937468] → [46.5937468:5937495]
```
                delay(15);
```
[45.4333]
[46.5937495]
```
                delay(pbolt.delay);
```
Replacement in crawl-ref/source/beam.cc at line 1845 [16.4128068]
B:BD[16.4178081] → [16.4178081:4178108]
```
                delay(15);
```
[16.4178081]
[16.4178108]
```
                delay(pbolt.delay);
```
Deletion in crawl-ref/source/beam.cc at line 2943 [16.4128068]
B:BD[16.4204246] → [15.1236645:1236695]
B:BD[15.1236695] → [48.31998:32074]
∅:D[48.32074] → [15.1236721:1236750]
B:BD[15.1236721] → [15.1236721:1236750]
∅:D[15.1236750] → [16.4204246:4204247]
B:BD[16.4204246] → [16.4204246:4204247]
```
    if (beam.flavour == BEAM_LINE_OF_SIGHT)
    {
        if (beam.thrower != KILL_YOU_MISSILE)
            beam.foe_count++;
        return (true);
    }
```
Deletion in crawl-ref/source/beam.cc at line 3081 [16.4128068]
B:BD[16.4210600] → [16.4210600:4210601]
B:BD[16.4210601] → [48.32373:32418]
∅:D[48.32418] → [15.1238276:1238340]
B:BD[15.1238276] → [15.1238276:1238340]
```
    // Line of sight never affects anything.
    if (beam.flavour == BEAM_LINE_OF_SIGHT)
        return (0);
```

Insertion in crawl-ref/source/beam.cc at line 3089 [16.4128068]

[39.11493]

[47.59047]

    if (beam.flavour == BEAM_VISUAL)
    {
        if (mgrd(p) != NON_MONSTER)
            behaviour_event( &menv[mgrd(p)], ME_DISTURB );
        return (0);
    }

Insertion in crawl-ref/source/beam.cc at line 3655 [16.4128068]
[49.4835]
[49.4835]
```
    case BEAM_VISUAL:
```
Insertion in crawl-ref/source/beam.cc at line 3706 [16.4128068]
[49.6053]
[49.6053]
```
    case BEAM_VISUAL:
```
Replacement in crawl-ref/source/beam.cc at line 5759 [16.4128068]
B:BD[50.20009] → [50.20009:20047]
```
               obvious_effect(false),
```
[50.20009]
[50.20047]
```
               delay(15), obvious_effect(false),
```
Insertion in crawl-ref/source/beam.cc at line 5937 [16.4128068]
[40.10973]
[40.10973]
```
    case BEAM_VISUAL: return ("visual effects");
```
Deletion in crawl-ref/source/beam.cc at line 5940 [16.4128068]
B:BD[40.11077] → [40.11077:11131]
```
    case BEAM_LINE_OF_SIGHT: return("line of sight");
```

Added "The Stairs" card (not yet in any deck), eventually to be the card which

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/terrain.h at line 14 [5.24828]

Insertion in crawl-ref/source/terrain.h at line 33 [5.24828]

Insertion in crawl-ref/source/terrain.h at line 39 [5.24828]

Replacement in crawl-ref/source/terrain.h at line 71 [5.24828]

Insertion in crawl-ref/source/terrain.cc at line 14 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 55 [5.26938]

Replacement in crawl-ref/source/terrain.cc at line 506 [5.26938]

Replacement in crawl-ref/source/terrain.cc at line 542 [5.26938]

Replacement in crawl-ref/source/terrain.cc at line 544 [5.26938]

Replacement in crawl-ref/source/terrain.cc at line 590 [5.26938]

Replacement in crawl-ref/source/terrain.cc at line 592 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 656 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 687 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 711 [5.26938]

Deletion in crawl-ref/source/terrain.cc at line 752 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 759 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 769 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 786 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 797 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 814 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 837 [5.26938]

Replacement in crawl-ref/source/terrain.cc at line 853 [5.26938]

Insertion in crawl-ref/source/terrain.cc at line 1041 [5.26938]

Insertion in crawl-ref/source/player.cc at line 310 [16.962854]

Insertion in crawl-ref/source/player.cc at line 331 [16.962854]

Replacement in crawl-ref/source/mon-util.cc at line 7157 [16.1699344]

Insertion in crawl-ref/source/misc.cc at line 1659 [16.1933596]

Insertion in crawl-ref/source/misc.cc at line 1726 [16.1933596]

Insertion in crawl-ref/source/misc.cc at line 2085 [16.1933596]

Replacement in crawl-ref/source/misc.cc at line 2242 [16.1933596]

Deletion in crawl-ref/source/misc.cc at line 2244 [16.1933596]

Insertion in crawl-ref/source/files.cc at line 1352 [16.3084589]

Deletion in crawl-ref/source/fight.cc at line 13 [16.3140790]

Deletion in crawl-ref/source/fight.cc at line 2419 [16.3140790]

Replacement in crawl-ref/source/fight.cc at line 2443 [16.3140790]

Deletion in crawl-ref/source/fight.cc at line 2445 [16.3140790]

Replacement in crawl-ref/source/fight.cc at line 2446 [16.3140790]

Insertion in crawl-ref/source/enum.h at line 252 [16.3287960]

Insertion in crawl-ref/source/enum.h at line 255 [16.3287960]

Replacement in crawl-ref/source/enum.h at line 259 [16.3287960]

Deletion in crawl-ref/source/enum.h at line 262 [16.3287960]

Insertion in crawl-ref/source/enum.h at line 645 [16.3287960]

Insertion in crawl-ref/source/enum.h at line 1180 [16.3287960]

Insertion in crawl-ref/source/decks.h at line 108 [16.3986924]

Insertion in crawl-ref/source/decks.cc at line 279 [16.3987460]

Insertion in crawl-ref/source/decks.cc at line 1553 [16.3987460]

Insertion in crawl-ref/source/decks.cc at line 1591 [16.3987460]

Insertion in crawl-ref/source/decks.cc at line 2953 [16.3987460]

Insertion in crawl-ref/source/cmd-keys.h at line 143 [38.20639]

Insertion in crawl-ref/source/beam.h at line 67 [16.4124541]

Replacement in crawl-ref/source/beam.cc at line 1534 [16.4128068]

Insertion in crawl-ref/source/beam.cc at line 1543 [16.4128068]

Replacement in crawl-ref/source/beam.cc at line 1560 [16.4128068]

Replacement in crawl-ref/source/beam.cc at line 1617 [16.4128068]

Replacement in crawl-ref/source/beam.cc at line 1756 [16.4128068]

Replacement in crawl-ref/source/beam.cc at line 1828 [16.4128068]

Replacement in crawl-ref/source/beam.cc at line 1845 [16.4128068]

Deletion in crawl-ref/source/beam.cc at line 2943 [16.4128068]

Deletion in crawl-ref/source/beam.cc at line 3081 [16.4128068]

Insertion in crawl-ref/source/beam.cc at line 3089 [16.4128068]

Insertion in crawl-ref/source/beam.cc at line 3655 [16.4128068]

Insertion in crawl-ref/source/beam.cc at line 3706 [16.4128068]

Replacement in crawl-ref/source/beam.cc at line 5759 [16.4128068]

Insertion in crawl-ref/source/beam.cc at line 5937 [16.4128068]

Deletion in crawl-ref/source/beam.cc at line 5940 [16.4128068]