fiddlerwoaroof/crawl - Change GTPAKUU3R5AS3LQNCCZIP3BWV473RM4EB2AIS4FXAJRXHEOVH2PAC

Another cleanup of dungeon features. Adding general markers

for first branch/last branch and first altar/last altar that should hopefully make adding new ones easier.

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

Created by j-p-e-g on October 4, 2007

GTPAKUU3R5AS3LQNCCZIP3BWV473RM4EB2AIS4FXAJRXHEOVH2PAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 1935 [6.5936]

B:BD[4.17680] → [5.5506:5566]

    if (feat >= DNGN_ALTAR_ZIN && feat <= DNGN_ALTAR_BEOGH)

[4.17680]

[5.5566]

    if (feat >= DNGN_ALTAR_FIRST_GOD && feat <= DNGN_ALTAR_LAST_GOD)

Replacement in crawl-ref/source/tutorial.cc at line 1937 [6.5936]

B:BD[5.5587] → [5.5587:5657]

    if (feat >= DNGN_ENTER_ORCISH_MINES && feat <= DNGN_ENTER_SHOALS)

[5.5587]

[5.5657]

    if (feat >= DNGN_ENTER_FIRST_BRANCH && feat <= DNGN_ENTER_LAST_BRANCH)

Insertion in crawl-ref/source/tutorial.cc at line 1969 [6.5936]

[4.18997]

[4.19175]

            ostr << "It's just a harmless statue - or is it?\n Even if not "
                    "a danger by themselves, statues often mark special "
                    "areas, dangerous ones or ones harbouring treasure.";
            break;

Insertion in crawl-ref/source/tutorial.cc at line 1989 [6.5936]
[4.19940]
[4.19940]
```
            
```
Insertion in crawl-ref/source/tutorial.cc at line 1998 [6.5936]
[4.20363]
[4.20363]
```
            
```

Replacement in crawl-ref/source/tutorial.cc at line 2026 [6.5936]

B:BD[5.5779] → [5.5779:6299]

       case DNGN_ALTAR_ZIN:
       case DNGN_ALTAR_SHINING_ONE:
       case DNGN_ALTAR_KIKUBAAQUDGHA:
       case DNGN_ALTAR_YREDELEMNUL:
       case DNGN_ALTAR_XOM:
       case DNGN_ALTAR_VEHUMET:
       case DNGN_ALTAR_OKAWARU:
       case DNGN_ALTAR_MAKHLEB:
       case DNGN_ALTAR_SIF_MUNA:
       case DNGN_ALTAR_TROG:
       case DNGN_ALTAR_NEMELEX_XOBEH:
       case DNGN_ALTAR_ELYVILON:
       case DNGN_ALTAR_LUGONU:
       case DNGN_ALTAR_BEOGH:
       {
            god_type altar_god = grid_altar_god(feat);

[5.5779]

[5.6299]

       default:
            if (feat >= DNGN_ALTAR_FIRST_GOD && feat <= DNGN_ALTAR_LAST_GOD)
            {
                god_type altar_god = grid_altar_god(feat);

Replacement in crawl-ref/source/tutorial.cc at line 2031 [6.5936]

B:BD[5.6300] → [5.6300:6358]

            if (you.religion == GOD_NO_GOD)
            {

[5.6300]

[5.6358]

                if (you.religion == GOD_NO_GOD)
                {

Replacement in crawl-ref/source/tutorial.cc at line 2042 [6.5936]

B:BD[5.7011] → [5.7011:7103]

            }
            else
            {
                if (you.religion == altar_god)

[5.7011]

[5.7103]

                }
                else

Insertion in crawl-ref/source/tutorial.cc at line 2045 [6.5936]

[5.7121]

                    if (you.religion == altar_god)
                    {

Replacement in crawl-ref/source/tutorial.cc at line 2055 [6.5936]

B:BD[5.7636] → [5.7636:7693]

                }
                else
                {

[5.7636]

[5.7693]

                    }
                    else
                    {

Insertion in crawl-ref/source/tutorial.cc at line 2069 [6.5936]
[5.8422]
[5.8422]
```
                   }
```

Insertion in crawl-ref/source/tutorial.cc at line 2071 [6.5936]

[5.8440]

                Options.tutorial_events[TUT_SEEN_ALTAR] = 0;
                break;

Replacement in crawl-ref/source/tutorial.cc at line 2074 [6.5936]

B:BD[5.8454] → [3.747:804]

∅:D[3.804] → [5.8507:9177]

B:BD[5.8507] → [5.8507:9177]

∅:D[5.9177] → [4.21516:21535]

B:BD[4.21516] → [4.21516:21535]

B:BD[4.21535] → [5.9178:9179]

∅:D[5.9179] → [4.21535:21571]

B:BD[4.21535] → [4.21535:21571]

            Options.tutorial_events[TUT_SEEN_ALTAR] = 0;
            break;
       }
       case DNGN_ENTER_ORCISH_MINES:
       case DNGN_ENTER_HIVE:
       case DNGN_ENTER_LAIR:
       case DNGN_ENTER_SLIME_PITS:
       case DNGN_ENTER_VAULTS:
       case DNGN_ENTER_CRYPT:
       case DNGN_ENTER_HALL_OF_BLADES:
       case DNGN_ENTER_ZOT:
       case DNGN_ENTER_TEMPLE:
       case DNGN_ENTER_SNAKE_PIT:
       case DNGN_ENTER_ELVEN_HALLS:
       case DNGN_ENTER_TOMB:
       case DNGN_ENTER_SWAMP:
       case DNGN_ENTER_SHOALS:
            ostr << "An entryway into one of the many dungeon branches in Crawl. ";
            if (feat != DNGN_ENTER_TEMPLE)
                ostr << "Beware, sometimes these can be deadly!";
            break;
       default:
            return;

[5.8454]

[4.21571]

            else if (feat >= DNGN_ENTER_FIRST_BRANCH && feat <= DNGN_ENTER_LAST_BRANCH)
            {
                ostr << "An entryway into one of the many dungeon branches in "
                        "Crawl. ";
                if (feat != DNGN_ENTER_TEMPLE)
                    ostr << "Beware, sometimes these can be deadly!";
                break;
            }
            else
                return;

Replacement in crawl-ref/source/terrain.cc at line 201 [7.26938]

B:BD[7.31959] → [7.31959:32088]

    if (grid >= DNGN_ALTAR_ZIN && grid <= DNGN_ALTAR_BEOGH)
        return (static_cast<god_type>( grid - DNGN_ALTAR_ZIN + 1 ));

[7.31959]

[7.32088]

    if (grid >= DNGN_ALTAR_FIRST_GOD && grid <= DNGN_ALTAR_LAST_GOD)
        return (static_cast<god_type>( grid - DNGN_ALTAR_FIRST_GOD + 1 ));

Replacement in crawl-ref/source/terrain.cc at line 214 [7.26938]

B:BD[7.32360] → [7.32360:32432]

    return static_cast<dungeon_feature_type>(DNGN_ALTAR_ZIN + god - 1);

[7.32360]

[7.32432]

    return static_cast<dungeon_feature_type>(DNGN_ALTAR_FIRST_GOD + god - 1);

Replacement in crawl-ref/source/terrain.cc at line 219 [7.26938]

B:BD[7.32493] → [7.32493:32572]

    return ((grid >= DNGN_ENTER_ORCISH_MINES && grid <= DNGN_ENTER_RESERVED_4)

[7.32493]

[7.32572]

    return ((grid >= DNGN_ENTER_FIRST_BRANCH && grid <= DNGN_ENTER_LAST_BRANCH)

Replacement in crawl-ref/source/files.cc at line 704 [9.3084589]

B:BD[8.6771] → [8.6771:6830]

    else if (stair_taken >= DNGN_RETURN_FROM_ORCISH_MINES

[8.6771]

[8.6830]

    else if (stair_taken >= DNGN_RETURN_FROM_FIRST_BRANCH

Replacement in crawl-ref/source/files.cc at line 708 [9.3084589]

B:BD[10.1860] → [10.1860:1966]

        stair_taken += (DNGN_ENTER_ORCISH_MINES
                        - DNGN_RETURN_FROM_ORCISH_MINES);

[10.1860]

[8.7033]

        stair_taken += (DNGN_ENTER_FIRST_BRANCH
                        - DNGN_RETURN_FROM_FIRST_BRANCH);

Replacement in crawl-ref/source/files.cc at line 711 [9.3084589]

B:BD[8.7039] → [8.7039:7152]

    else if (stair_taken >= DNGN_ENTER_ORCISH_MINES
             && stair_taken < DNGN_RETURN_FROM_ORCISH_MINES)

[8.7039]

[8.7152]

    else if (stair_taken >= DNGN_ENTER_FIRST_BRANCH
             && stair_taken < DNGN_RETURN_FROM_FIRST_BRANCH)

Replacement in crawl-ref/source/files.cc at line 715 [9.3084589]

B:BD[8.7220] → [10.1967:2073]

        stair_taken += (DNGN_RETURN_FROM_ORCISH_MINES
                        - DNGN_ENTER_ORCISH_MINES);

[8.7220]

[8.7302]

        stair_taken += (DNGN_RETURN_FROM_FIRST_BRANCH
                        - DNGN_ENTER_FIRST_BRANCH);

Insertion in crawl-ref/source/enum.h at line 76 [9.3287960]
[9.3290538]
[9.3290538]
```
    
    // Divine abilities
```

Replacement in crawl-ref/source/enum.h at line 901 [9.3287960]

B:BD[9.3308886] → [9.3308886:3308965]

    DNGN_ROCK_STAIRS_DOWN,   //   85 - was this supposed to be a ladder? {dlb}

[9.3308886]

[9.3308965]

    DNGN_ROCK_STAIRS_DOWN,   //  85 - now escape hatch (Stonesoup 0.3)

Insertion in crawl-ref/source/enum.h at line 903 [9.3287960]
[9.3308966]
[9.3308966]
```
    // corresponding up stairs (same order as above)
```

Replacement in crawl-ref/source/enum.h at line 907 [9.3287960]

B:BD[9.3309053] → [9.3309053:3309131]

    DNGN_ROCK_STAIRS_UP,    //   89 - was this supposed to be a ladder? {dlb}

[9.3309053]

[9.3309131]

    DNGN_ROCK_STAIRS_UP,    //   89 - now escape hatch (Stonesoup 0.3)

Insertion in crawl-ref/source/enum.h at line 909 [9.3287960]
[9.3309132]
[9.3309132]
```
    // Various gates
```

Replacement in crawl-ref/source/enum.h at line 924 [9.3287960]

B:BD[9.3309588] → [9.3309588:3309635]

    DNGN_ENTER_ORCISH_MINES = 110,     //  110

[9.3309588]

[9.3309635]

    // Entrances to various branches
    DNGN_ENTER_FIRST_BRANCH = 110,     //  110
    DNGN_ENTER_ORCISH_MINES = DNGN_ENTER_FIRST_BRANCH,

Insertion in crawl-ref/source/enum.h at line 943 [9.3287960]
[11.911868]
[9.3309987]
```
    DNGN_ENTER_LAST_BRANCH = DNGN_ENTER_RESERVED_4,
```

Replacement in crawl-ref/source/enum.h at line 945 [9.3287960]

B:BD[9.3309988] → [9.3309988:3310037]

    DNGN_RETURN_FROM_ORCISH_MINES = 130, //  130

[9.3309988]

[9.3310037]

    // Exits from various branches
    // Order must be the same as above
    DNGN_RETURN_FROM_FIRST_BRANCH = 130, //  130
    DNGN_RETURN_FROM_ORCISH_MINES = DNGN_RETURN_FROM_FIRST_BRANCH,

Insertion in crawl-ref/source/enum.h at line 965 [9.3287960]
[12.29932]
[12.29932]
```
    DNGN_RETURN_FROM_LAST_BRANCH = DNGN_RETURN_RESERVED_4,
```

Replacement in crawl-ref/source/enum.h at line 971 [9.3287960]

B:BD[9.3310449] → [9.3310449:3310496]

    DNGN_ALTAR_ZIN = 180,              //  180

[9.3310449]

[9.3310496]

    // Order of altars must match order of gods (god_type)
    DNGN_ALTAR_FIRST_GOD = 180,        // 180
    DNGN_ALTAR_ZIN = DNGN_ALTAR_FIRST_GOD,

Insertion in crawl-ref/source/enum.h at line 987 [9.3287960]
[13.20746]
[9.3310837]
```
    DNGN_ALTAR_LAST_GOD = DNGN_ALTAR_BEOGH,
```

Replacement in crawl-ref/source/dungeon.cc at line 4184 [9.3429798]

B:BD[14.11665] → [14.11665:11732]

                       DNGN_ALTAR_ZIN + altar_count) :// see below

[14.11665]

[9.3606694]

                       DNGN_ALTAR_FIRST_GOD + altar_count) :// see below

Replacement in crawl-ref/source/dungeon.cc at line 4680 [9.3429798]

B:BD[15.1145] → [15.1145:1216]

                    static_cast<dungeon_feature_type>(DNGN_ALTAR_ZIN +

[15.1145]

[15.1216]

                    static_cast<dungeon_feature_type>(DNGN_ALTAR_FIRST_GOD +

Replacement in crawl-ref/source/debug.cc at line 547 [9.4016436]

B:BD[16.6934] → [2.1919:2026]

            if (stairs < DNGN_RETURN_FROM_ORCISH_MINES
                || stairs > DNGN_RETURN_RESERVED_4)

[16.6934]

[16.7038]

            if (stairs < DNGN_RETURN_FROM_FIRST_BRANCH
                || stairs > DNGN_RETURN_FROM_LAST_BRANCH)

Replacement in crawl-ref/source/debug.cc at line 2072 [9.4016436]

B:BD[14.16466] → [14.16466:16541]

            static_cast<dungeon_feature_type>( DNGN_ALTAR_ZIN + god - 1 );

[14.16466]

[9.4062959]

            static_cast<dungeon_feature_type>( DNGN_ALTAR_FIRST_GOD + god - 1 );