fiddlerwoaroof/crawl - Change WJSZFY6NYXXMYNOWVE33NTEYHQ5BVWHKG7NT5UEJX2HH5JOJ55SQC

Apply zebez' patch to differentiate gates some more from stairs.

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

Created by j-p-e-g on July 25, 2009

WJSZFY6NYXXMYNOWVE33NTEYHQ5BVWHKG7NT5UEJX2HH5JOJ55SQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.cc at line 813 [7.39949]

[6.352]

    // Make up staircases in hell appear as gates.
    if (player_in_hell())
    {
        switch (gridc)
        {
        case DNGN_STONE_STAIRS_UP_I:
        case DNGN_STONE_STAIRS_UP_II:
        case DNGN_STONE_STAIRS_UP_III:
            return (true);
        default:
            break;
        }
    }

Insertion in crawl-ref/source/travel.cc at line 840 [7.39949]
[2.516]
[2.516]
```
    case DNGN_EXIT_HELL:
```

Insertion in crawl-ref/source/tilepick.cc at line 2419 [9.96318]

[8.1948]

        if (player_in_hell())
            return TILE_DNGN_RETURN_HELL;

Deletion in crawl-ref/source/tilepick.cc at line 2471 [9.96318]
B:BD[9.151826] → [9.151826:151857]
```
    case DNGN_RETURN_FROM_ZOT:
```

Insertion in crawl-ref/source/tilepick.cc at line 2478 [9.96318]

[5.380]

[9.152202]

    case DNGN_RETURN_FROM_ZOT:
        return TILE_DNGN_RETURN_ZOT;

Insertion in crawl-ref/source/terrain.cc at line 71 [11.26938]

[10.853]

    {
        // Make up staircases in hell appear as gates.
        if (player_in_hell())
        {
            switch (grid)
            {
                case DNGN_STONE_STAIRS_UP_I:
                case DNGN_STONE_STAIRS_UP_II:
                case DNGN_STONE_STAIRS_UP_III:
                    return (false);
                default:
                    return (true);
            }
        }

Insertion in crawl-ref/source/terrain.cc at line 86 [11.26938]
[10.876]
[10.876]
```
    }
```

Replacement in crawl-ref/source/terrain.cc at line 93 [11.26938]

B:BD[10.1108] → [10.1108:1219]

            ||   grid >= DNGN_RETURN_FROM_FIRST_BRANCH
              && grid <= DNGN_RETURN_FROM_LAST_BRANCH);

[10.1108]

[11.28282]

            || grid >= DNGN_RETURN_FROM_FIRST_BRANCH
               && grid <= DNGN_RETURN_FROM_LAST_BRANCH);

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 419 [9.4169495]
[12.13778]
[13.157311]
```
dngn_return_zot DNGN_RETURN_ZOT
```
Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 424 [9.4169495]
[13.157457]
[13.157457]
```
dngn_return_hell DNGN_RETURN_HELL
```
File addition: dngn_return_zot.png (----------)
[4.2439]
File addition: dngn_return_hell.png (----------)
[4.2439]
Insertion in crawl-ref/source/ouch.h at line 59 [15.1101726]
[14.4136]
[15.1102273]
```
    KILLED_BY_FALLING_THROUGH_GATE,
```

Replacement in crawl-ref/source/ouch.cc at line 752 [15.1104358]

B:BD[16.2700] → [16.2700:2762]

        else if (death_type == KILLED_BY_FALLING_DOWN_STAIRS)

[16.2700]

[16.2762]

        else if (death_type == KILLED_BY_FALLING_DOWN_STAIRS
                 || death_type == KILLED_BY_FALLING_THROUGH_GATE)

Insertion in crawl-ref/source/misc.cc at line 1311 [15.1933596]

[17.1218]

[18.620]

    }
    else if (is_gate(stair))
    {
        mprf("You %s %s through the gate.",
             you.flight_mode() == FL_FLY ? "fly" :
                   (player_is_airborne() ? "float" : "go"),
             going_up ? "up" : "down");

Replacement in crawl-ref/source/misc.cc at line 1321 [15.1933596]

B:BD[17.1225] → [19.3344:3561]

        mprf("You %s %swards.", you.flight_mode() == FL_FLY ? "fly" :
                                    (player_is_airborne() ? "float" : "climb"),
                                        going_up ? "up" : "down");

[17.1225]

[17.1412]

        mprf("You %s %swards.",
             you.flight_mode() == FL_FLY ? "fly" :
                   (player_is_airborne() ? "float" : "climb"),
             going_up ? "up" : "down");

Replacement in crawl-ref/source/misc.cc at line 1766 [15.1933596]

B:BD[3.2940] → [3.2940:3001]

        ouch(1, NON_MONSTER, KILLED_BY_FALLING_DOWN_STAIRS);

[3.2940]

[20.545092]

        if (!grid_is_staircase(stair_find))
            ouch(1, NON_MONSTER, KILLED_BY_FALLING_THROUGH_GATE);
        else
            ouch(1, NON_MONSTER, KILLED_BY_FALLING_DOWN_STAIRS);

Replacement in crawl-ref/source/misc.cc at line 1774 [15.1933596]

B:BD[15.1944863] → [3.3002:3082]

    if (you.burden_state == BS_OVERLOADED && !grid_is_escape_hatch(stair_find))

[15.1944863]

[15.1944906]

    if (you.burden_state == BS_OVERLOADED && !grid_is_escape_hatch(stair_find)
        && !is_gate(stair_find))

Replacement in crawl-ref/source/misc.cc at line 1857 [15.1933596]
B:BD[15.1947541] → [19.3562:3604]
```
    if (you.flight_mode() == FL_LEVITATE)
```
[15.1947541]
[21.1351]
```
    if (you.flight_mode() == FL_LEVITATE && !is_gate(stair_find))
```

Replacement in crawl-ref/source/misc.cc at line 1859 [15.1933596]

B:BD[21.1424] → [19.3605:3647]

    else if (you.flight_mode() == FL_FLY)

[21.1424]

[19.3647]

    else if (you.flight_mode() == FL_FLY && !is_gate(stair_find))

Replacement in crawl-ref/source/misc.cc at line 2294 [15.1933596]

B:BD[3.3330] → [3.3330:3391]

        ouch(1, NON_MONSTER, KILLED_BY_FALLING_DOWN_STAIRS);

[3.3330]

[15.1956587]

        if (!grid_is_staircase(stair_find))
            ouch(1, NON_MONSTER, KILLED_BY_FALLING_THROUGH_GATE);
        else
            ouch(1, NON_MONSTER, KILLED_BY_FALLING_DOWN_STAIRS);

Replacement in crawl-ref/source/hiscores.cc at line 430 [15.2987663]

B:BD[22.528] → [14.5547:5618]

    "beogh_smiting", "divine_wrath", "bounce", "reflect", "self_aimed"

[22.528]

[23.5211]

    "beogh_smiting", "divine_wrath", "bounce", "reflect", "self_aimed",
    "falling_through_gate"

Insertion in crawl-ref/source/hiscores.cc at line 1737 [15.2987663]

[20.844954]

        needs_damage = true;
        break;
    case KILLED_BY_FALLING_THROUGH_GATE:
        desc += terse? "fell through a gate" : "Fell down through a gate";

Replacement in crawl-ref/source/files.cc at line 1465 [15.3084589]

B:BD[24.15161] → [24.15161:15306]

                    mprf("%s slides away from you right after you %s through "
                         "it!", stair_str.c_str(), verb.c_str());

[24.15161]

[24.15306]

                    mprf("%s slides away from you right after you %s it!",
                         stair_str.c_str(), verb.c_str());

Insertion in crawl-ref/source/directn.cc at line 2645 [15.3697945]

[7.468192]

[25.37672]

        if (player_in_hell())
            return ("gateway back to the Vestibule of Hell");

Apply zebez' patch to differentiate gates some more from stairs.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/travel.cc at line 813 [7.39949]

Insertion in crawl-ref/source/travel.cc at line 840 [7.39949]

Insertion in crawl-ref/source/tilepick.cc at line 2419 [9.96318]

Deletion in crawl-ref/source/tilepick.cc at line 2471 [9.96318]

Insertion in crawl-ref/source/tilepick.cc at line 2478 [9.96318]

Insertion in crawl-ref/source/terrain.cc at line 71 [11.26938]

Insertion in crawl-ref/source/terrain.cc at line 86 [11.26938]

Replacement in crawl-ref/source/terrain.cc at line 93 [11.26938]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 419 [9.4169495]

Insertion in crawl-ref/source/rltiles/dc-dngn.txt at line 424 [9.4169495]

File addition: dngn_return_zot.png (----------)

File addition: dngn_return_hell.png (----------)

Insertion in crawl-ref/source/ouch.h at line 59 [15.1101726]