fiddlerwoaroof/crawl - Change FJQ2RENS2ATHQZUNEE5ZTSTHZ5VI6B36TQPAG3IUVBTULGVCCQ7AC

Remove trap-door-like logic from shaft traps, since shafts are just

supposed to be holes hidden by debris.

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

Created by zelgadis on October 5, 2007

FJQ2RENS2ATHQZUNEE5ZTSTHZ5VI6B36TQPAG3IUVBTULGVCCQ7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 405 [3.5308]

B:BD[2.827] → [2.827:882]

                mpr("You fail to trigger the shaft.");

[2.827]

[2.882]

                mpr("You don't fall through the shaft..");

Replacement in crawl-ref/source/player.cc at line 5022 [4.962854]

B:BD[2.2147] → [2.2147:2236]

    return (!airborne() && total_weight() >= 300
            && is_valid_shaft_level());

[2.2147]

[2.2236]

    return (!airborne() && total_weight() > 0 && is_valid_shaft_level());

Replacement in crawl-ref/source/mstuff2.cc at line 319 [4.1340842]

B:BD[2.10184] → [2.10184:10257]

                                        " fails to trigger the shaft.");

[2.10184]

[2.10257]

                                        " doesn't fall through the shaft.");

Replacement in crawl-ref/source/misc.cc at line 845 [4.1933596]

B:BD[2.17876] → [2.17876:17935]

        if (you.airborne() && !known_trap && !force_stair)

[2.17876]

[2.17935]

        if (!known_trap && !force_stair)

Replacement in crawl-ref/source/misc.cc at line 851 [4.1933596]

B:BD[2.18020] → [2.18020:18089]

        if (you.airborne() && you.flies() != FL_FLY && !force_stair)

[2.18020]

[2.18089]

        if (you.flies() == FL_LEVITATE && !force_stair)

Replacement in crawl-ref/source/misc.cc at line 854 [4.1933596]

B:BD[2.18127] → [2.18127:18231]

                mpr("You must have controlled flight to dive through "
                    "a shaft.");

[2.18127]

[2.18231]

                mpr("You can't fall through a shaft while levitating.");

Deletion in crawl-ref/source/acr.cc at line 1450 [4.4397395]

B:BD[2.24324] → [2.24324:24575]


static bool can_go_down_shaft()
{
    // Not a shaft
    if (trap_type_at_xy(you.x_pos, you.y_pos) != TRAP_SHAFT)
        return (false);
    // Undiscovered shaft
    if (grd[you.x_pos][you.y_pos] == DNGN_UNDISCOVERED_TRAP)
        return (false);

Deletion in crawl-ref/source/acr.cc at line 1451 [4.4397395]
B:BD[2.24576] → [2.24576:24690]
∅:D[2.24690] → [5.1260205:1260207]
B:BD[5.1260205] → [5.1260205:1260207]
∅:D[5.1260207] → [4.4421557:4421558]
B:BD[4.4421557] → [4.4421557:4421558]
```
    // Have to fly to dive through it.
    if (you.flies() != FL_FLY)
        return (false);
    return (true);
}
```

Replacement in crawl-ref/source/acr.cc at line 1494 [4.4397395]

B:BD[6.90382] → [2.24691:24842]

    if (trap_at_xy(you.x_pos, you.y_pos) == TRAP_SHAFT
        && grd[you.x_pos][you.y_pos] != DNGN_UNDISCOVERED_TRAP
        && !can_go_down_shaft())

[6.90382]

[2.24842]

    bool shaft = (trap_type_at_xy(you.x_pos, you.y_pos) == TRAP_SHAFT
                  && grd[you.x_pos][you.y_pos] != DNGN_UNDISCOVERED_TRAP);
    if (shaft && you.flies() == FL_LEVITATE)

Replacement in crawl-ref/source/acr.cc at line 1499 [4.4397395]

B:BD[2.24848] → [2.24848:24921]

        mpr("You must have controlled flight to dive through a shaft.");

[2.24848]

[2.24921]

        mpr("You can't fall through a shaft while levitating.");

Replacement in crawl-ref/source/acr.cc at line 1503 [4.4397395]

∅:D[2.24944] → [7.50355:50422]

B:BD[6.90382] → [7.50355:50422]

    if (grid_stair_direction(grd(you.pos())) != CMD_GO_DOWNSTAIRS)

[2.24944]

[6.90459]

    if (grid_stair_direction(grd(you.pos())) != CMD_GO_DOWNSTAIRS
        && !shaft)

Replacement in crawl-ref/source/acr.cc at line 1518 [4.4397395]

∅:D[8.4894] → [5.1261440:1261643]

∅:D[9.10574] → [5.1261440:1261643]

B:BD[4.4422951] → [5.1261440:1261643]

    tag_followers();  // only those beside us right now can follow
    start_delay( DELAY_DESCENDING_STAIRS,
                 1 + (you.burden_state > BS_UNENCUMBERED),
                 you.your_level );

[8.4894]

[5.1261643]


    if (shaft)
    {
        start_delay( DELAY_DESCENDING_STAIRS, 0, you.your_level );
    }
    else
    {
        tag_followers();  // only those beside us right now can follow
        start_delay( DELAY_DESCENDING_STAIRS,
                     1 + (you.burden_state > BS_UNENCUMBERED),
                     you.your_level );
    }