fiddlerwoaroof/crawl - Change 3XZOL3FFQZITUJIGDD6B6V6ZYMBN524JKNN6ZPJAXEC7RY433I3QC

Preliminary refactoring in dungeon creation code.

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

Created by haranp on April 7, 2007

3XZOL3FFQZITUJIGDD6B6V6ZYMBN524JKNN6ZPJAXEC7RY433I3QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/enum.h at line 484 [3.3287960]

[3.3300313]

[4.905701]

enum builder_rc_type
{
    BUILD_QUIT = -1,                 // all done, don't continue
    BUILD_SKIP = 1,                 // skip further generation
    BUILD_CONTINUE = 0              // continue generation
};

Replacement in crawl-ref/source/dungeon.cc at line 89 [3.3429798]

B:BD[3.3431797] → [3.3431797:3432028]

static int builder_by_type(int level_number, char level_type);
static int builder_by_branch(int level_number);
static int builder_normal(int level_number, char level_type, spec_room &s);
static int builder_basic(int level_number);

[3.3431797]

[3.3432028]

static builder_rc_type builder_by_type(int level_number, char level_type);
static builder_rc_type builder_by_branch(int level_number);
static builder_rc_type builder_normal(int level_number, char level_type, spec_room &s);
static builder_rc_type builder_basic(int level_number);

Replacement in crawl-ref/source/dungeon.cc at line 390 [3.3429798]

B:BD[5.4156] → [5.4156:4220]

∅:D[5.4220] → [3.3437068:3437092]

B:BD[3.3437068] → [3.3437068:3437092]

    int skip_build = builder_by_type(level_number, level_type);
    if (skip_build < 0)

[5.4156]

[3.3437092]

    builder_rc_type skip_build = builder_by_type(level_number, level_type);
    if (skip_build == BUILD_QUIT)       // quit immediately

Replacement in crawl-ref/source/dungeon.cc at line 395 [3.3429798]
B:BD[3.3437109] → [3.3437109:3437134]
```
    if (skip_build == 0)
```
[3.3437109]
[3.3437134]
```
    if (skip_build == BUILD_CONTINUE)
```
Replacement in crawl-ref/source/dungeon.cc at line 399 [3.3429798]
B:BD[3.3437195] → [3.3437195:3437223]
```
        if (skip_build < 0)
```
[3.3437195]
[3.3437223]
```
        if (skip_build == BUILD_QUIT)
```
Replacement in crawl-ref/source/dungeon.cc at line 403 [3.3429798]
B:BD[3.3437300] → [3.3437300:3437325]
```
    if (skip_build == 0)
```
[3.3437300]
[3.3437325]
```
    if (skip_build == BUILD_CONTINUE)
```
Replacement in crawl-ref/source/dungeon.cc at line 409 [3.3429798]
B:BD[3.3437512] → [3.3437512:3437541]
```
        if (skip_build == 0)
```
[3.3437512]
[3.3437541]
```
        if (skip_build == BUILD_CONTINUE)
```
Replacement in crawl-ref/source/dungeon.cc at line 412 [3.3429798]
B:BD[3.3437605] → [3.3437605:3437638]
```
            if (skip_build == 0)
```
[3.3437605]
[3.3437638]
```
            if (skip_build == BUILD_CONTINUE)
```
Replacement in crawl-ref/source/dungeon.cc at line 418 [3.3429798]
B:BD[5.4224] → [5.4224:4290]
```
static void build_dungeon_level(int level_number, int level_type)
```
[5.4224]
[5.4290]
```
static int num_mons_wanted(int level_type)
```

Replacement in crawl-ref/source/dungeon.cc at line 420 [3.3429798]

B:BD[5.4292] → [5.4292:4310]

    spec_room sr;

[5.4292]

[6.480]

    if (level_type == LEVEL_ABYSS ||
        player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
        return 0;

Replacement in crawl-ref/source/dungeon.cc at line 424 [3.3429798]

B:BD[6.481] → [5.4311:4387]

    reset_level();
    build_layout_skeleton(level_number, level_type, sr);

[6.481]

[5.4387]

    int mon_wanted = roll_dice( 3, 10 );

Replacement in crawl-ref/source/dungeon.cc at line 426 [3.3429798]

B:BD[5.4388] → [2.165:224]

    if (you.level_type == LEVEL_LABYRINTH)
        return;

[5.4388]

[2.224]

    if (player_in_hell())
        mon_wanted += roll_dice( 3, 8 );
    else if (player_in_branch( BRANCH_HALL_OF_BLADES ))
        mon_wanted += roll_dice( 6, 8 );

Replacement in crawl-ref/source/dungeon.cc at line 431 [3.3429798]

∅:D[2.229] → [6.481:661]

∅:D[5.4388] → [6.481:661]

B:BD[6.481] → [6.481:661]

∅:D[6.661] → [3.3437712:3437713]

B:BD[3.3437712] → [3.3437712:3437713]

B:BD[3.3437713] → [4.951137:951201]

∅:D[4.951201] → [3.3437778:3438121]

B:BD[3.3437778] → [3.3437778:3438121]

    // Try to place minivaults that really badly want to be placed. Still
    // no guarantees, seeing this is a minivault.
    place_special_minivaults(level_number, level_type);
    // hook up the special room (if there is one, and it hasn't
    // been hooked up already in roguey_level()
    if (sr.created && !sr.hooked_up)
        specr_2(sr);
    // now place items, monster, gates, etc.
    // stairs must exist by this point. Some items and monsters
    // already exist.
    // time to make the swamp {dlb}:
    if (player_in_branch( BRANCH_SWAMP ))
        prepare_swamp();

[2.229]

[3.3438121]

    if (mon_wanted > 60)
        mon_wanted = 60;

Replacement in crawl-ref/source/dungeon.cc at line 434 [3.3429798]

B:BD[3.3438122] → [3.3438122:3438390]

    // figure out how many 'normal' monsters we should place
    int mon_wanted = 0;
    if (level_type == LEVEL_ABYSS
        || player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
    {
        mon_wanted = 0;
    }
    else
    {
        mon_wanted = roll_dice( 3, 10 );

[3.3438122]

[3.3438390]

    return mon_wanted;
}

Replacement in crawl-ref/source/dungeon.cc at line 437 [3.3429798]

B:BD[3.3438391] → [3.3438391:3439151]

B:BD[3.3439151] → [4.951202:951269]

∅:D[4.951269] → [3.3439219:3439539]

B:BD[3.3439219] → [3.3439219:3439539]

B:BD[3.3439539] → [4.951270:951305]

∅:D[4.951305] → [3.3439575:3439959]

B:BD[3.3439575] → [3.3439575:3439959]

        if (player_in_hell())
            mon_wanted += roll_dice( 3, 8 );
        else if (player_in_branch( BRANCH_HALL_OF_BLADES ))
            mon_wanted += roll_dice( 6, 8 );
        // unlikely - now only possible in HoB {dlb} 10mar2000
        if (mon_wanted > 60)
            mon_wanted = 60;
    }
    place_branch_entrances( level_number, level_type );
    check_doors();
    if (!player_in_branch( BRANCH_DIS ) && !player_in_branch( BRANCH_VAULTS ))
        hide_doors();
    if (!player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
        place_traps(level_number);
    int items_wanted = 3 + roll_dice( 3, 11 );
    if (level_number > 5 && one_chance_in(500 - 5 * level_number))
        items_wanted = 10 + random2avg( 90, 2 );  // rich level!
    // change pre-rock (105) to rock, and pre-floor (106) to floor
    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_WALL, DNGN_ROCK_WALL );
    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_FLOOR, DNGN_FLOOR );
    // place items
    builder_items(level_number, level_type, items_wanted);
    // place monsters
    builder_monsters(level_number, level_type, mon_wanted);
    // place shops, if appropriate
    if (player_in_branch( BRANCH_MAIN_DUNGEON )
         || player_in_branch( BRANCH_ORCISH_MINES )
         || player_in_branch( BRANCH_ELVEN_HALLS )
         || player_in_branch( BRANCH_LAIR )
         || player_in_branch( BRANCH_VAULTS )
         || player_in_branch( BRANCH_SNAKE_PIT )
         || player_in_branch( BRANCH_SWAMP ))
    {
        place_shops(level_number);
    }

[3.3438391]

[3.3439959]

static void fixup_walls()
{

Insertion in crawl-ref/source/dungeon.cc at line 442 [3.3429798]
[3.3440102]
[3.3440102]
Insertion in crawl-ref/source/dungeon.cc at line 471 [3.3429798]
[3.3441046]
[3.3441046]
```
}
```
Insertion in crawl-ref/source/dungeon.cc at line 473 [3.3429798]
[3.3441047]
[3.3441047]
```
static void fixup_branch_stairs()
{
```

Deletion in crawl-ref/source/dungeon.cc at line 497 [3.3429798]

∅:D[7.12719] → [3.3442474:3442744]

B:BD[3.3442474] → [3.3442474:3442744]

    }
    if (player_in_branch( BRANCH_CRYPT ))
    {
        if (one_chance_in(3))
            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );
        if (one_chance_in(7))
            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );

Deletion in crawl-ref/source/dungeon.cc at line 499 [3.3429798]
B:BD[3.3442751] → [4.951306:951326]
∅:D[4.951326] → [3.3442843:3442844]
B:BD[3.3442843] → [3.3442843:3442844]
```
    place_altars();
```
Insertion in crawl-ref/source/dungeon.cc at line 500 [3.3429798]
[3.3442911]
[3.3442911]
```
    // XXX XXX why the special-casing?
```

Insertion in crawl-ref/source/dungeon.cc at line 515 [3.3429798]

[3.3443289]

}
static void build_dungeon_level(int level_number, int level_type)
{
    spec_room sr;

Insertion in crawl-ref/source/dungeon.cc at line 521 [3.3429798]

[3.3443290]

    reset_level();
    build_layout_skeleton(level_number, level_type, sr);
    if (you.level_type == LEVEL_LABYRINTH)
        return;
    
    // Try to place minivaults that really badly want to be placed. Still
    // no guarantees, seeing this is a minivault.
    place_special_minivaults(level_number, level_type);
    // hook up the special room (if there is one, and it hasn't
    // been hooked up already in roguey_level()
    if (sr.created && !sr.hooked_up)
        specr_2(sr);
    // now place items, monster, gates, etc.
    // stairs must exist by this point. Some items and monsters
    // already exist.
    // time to make the swamp {dlb}:
    if (player_in_branch( BRANCH_SWAMP ))
        prepare_swamp();
    place_branch_entrances( level_number, level_type );
    check_doors();
    if (!player_in_branch( BRANCH_DIS ) && !player_in_branch( BRANCH_VAULTS ))
        hide_doors();
    if (!player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
        place_traps(level_number);
    int items_wanted = 3 + roll_dice( 3, 11 );
    if (level_number > 5 && one_chance_in(500 - 5 * level_number))
        items_wanted = 10 + random2avg( 90, 2 );  // rich level!
    // change pre-rock (105) to rock, and pre-floor (106) to floor
    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_WALL, DNGN_ROCK_WALL );
    replace_area( 0,0,GXM-1,GYM-1, DNGN_BUILDER_SPECIAL_FLOOR, DNGN_FLOOR );
    // place items
    builder_items(level_number, level_type, items_wanted);
    // place monsters
    builder_monsters(level_number, level_type, num_mons_wanted(level_type));
    // place shops, if appropriate
    if ( branches[(int)you.where_are_you].has_shops )
        place_shops(level_number);
    fixup_walls();
    fixup_branch_stairs();
    if (player_in_branch( BRANCH_CRYPT ))
    {
        if (one_chance_in(3))
            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );
        if (one_chance_in(7))
            mons_place( MONS_CURSE_SKULL, BEH_SLEEP, MHITNOT, false, 0, 0 );
    }
    place_altars();

Replacement in crawl-ref/source/dungeon.cc at line 3678 [3.3429798]

B:BD[3.3548083] → [3.3548083:3548225]

    unsigned char ig;
    unsigned char solid_count = 0;      // clarifies innermost loop {dlb}
    int x,y;
    for (x = 1; x < GXM-1; x++)

[3.3548083]

[3.3548225]

    for (int x = 1; x < GXM-1; x++)

Replacement in crawl-ref/source/dungeon.cc at line 3680 [3.3429798]
B:BD[3.3548231] → [3.3548231:3548267]
```
        for (y = 1; y < GYM-1; y++)
```
[3.3548231]
[3.3548267]
```
        for (int y = 1; y < GYM-1; y++)
```

Replacement in crawl-ref/source/dungeon.cc at line 3682 [3.3429798]

B:BD[3.3548277] → [3.3548277:3548346]

            ig = grd[x][y];
            if (ig != DNGN_CLOSED_DOOR)

[3.3548277]

[3.3548346]

            if (grd[x][y] != DNGN_CLOSED_DOOR)

Replacement in crawl-ref/source/dungeon.cc at line 3685 [3.3429798]
B:BD[3.3548373] → [3.3548373:3548402]
```
            solid_count = 0;
```
[3.3548373]
[3.3548402]
```
            int solid_count = 0;
```
Deletion in crawl-ref/source/dungeon.cc at line 3687 [3.3429798]
B:BD[3.3548403] → [3.3548403:3548483]
```
            // first half of each conditional represents bounds checking {dlb}:
```
Replacement in crawl-ref/source/dungeon.cc at line 3876 [3.3429798]
∅:D[4.960584] → [3.3553988:3554050]
B:BD[3.3553988] → [3.3553988:3554050]
```
static int builder_by_type(int level_number, char level_type)
```
[4.960584]
[3.3554050]
```
static builder_rc_type builder_by_type(int level_number, char level_type)
```
Replacement in crawl-ref/source/dungeon.cc at line 3881 [3.3429798]
B:BD[3.3554136] → [3.3554136:3554155]
```
        return -1;
```
[3.3554136]
[3.3554155]
```
        return BUILD_QUIT;
```
Replacement in crawl-ref/source/dungeon.cc at line 3887 [3.3429798]
B:BD[3.3554229] → [3.3554229:3554247]
```
        return 1;
```
[3.3554229]
[3.3554247]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 3892 [3.3429798]
B:BD[3.3554301] → [3.3554301:3554332]
```
        char which_demon = -1;
```
[3.3554301]
[3.3554332]
```
        int which_demon = -1;
```

Replacement in crawl-ref/source/dungeon.cc at line 3921 [3.3429798]

B:BD[4.960748] → [8.148496:148621]

                random_map_for_tag(
                    pandemon_level_names[(int) which_demon],
                    false);

[4.960748]

[4.960825]

                random_map_for_tag(pandemon_level_names[which_demon], false);

Replacement in crawl-ref/source/dungeon.cc at line 3926 [3.3429798]

B:BD[9.963] → [9.963:1025]

                    pandemon_level_names[(int) which_demon]);

[9.963]

[4.961081]

                    pandemon_level_names[which_demon]);

Replacement in crawl-ref/source/dungeon.cc at line 3941 [3.3429798]
B:BD[3.3555237] → [3.3555237:3555255]
```
        return 1;
```
[3.3555237]
[3.3555255]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 3945 [3.3429798]
B:BD[3.3555292] → [3.3555292:3555306]
```
    return 0;
```
[3.3555292]
[3.3555306]
```
    return BUILD_CONTINUE;
```
Replacement in crawl-ref/source/dungeon.cc at line 3991 [3.3429798]
B:BD[8.149175] → [8.149175:149222]
```
static int builder_by_branch(int level_number)
```
[8.149175]
[8.149222]
```
static builder_rc_type builder_by_branch(int level_number)
```
Replacement in crawl-ref/source/dungeon.cc at line 3998 [3.3429798]
B:BD[4.962006] → [4.962006:962024]
```
        return 1;
```
[4.961916]
[4.962024]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4005 [3.3429798]
∅:D[4.962088] → [3.3555740:3555758]
B:BD[3.3555740] → [3.3555740:3555758]
```
        return 1;
```
[4.962088]
[3.3555758]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4009 [3.3429798]
∅:D[4.962145] → [3.3556056:3556074]
B:BD[3.3556056] → [3.3556056:3556074]
```
        return 1;
```
[4.962145]
[3.3556074]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4013 [3.3429798]
B:BD[3.3558466] → [3.3558466:3558484]
```
        return 1;
```
[3.3558466]
[3.3558484]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4019 [3.3429798]
B:BD[3.3558608] → [3.3558608:3558630]
```
            return 1;
```
[3.3558608]
[3.3558630]
```
            return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4026 [3.3429798]
B:BD[3.3559442] → [3.3559442:3559456]
```
    return 0;
```
[3.3559442]
[3.3559456]
```
    return BUILD_CONTINUE;
```

Replacement in crawl-ref/source/dungeon.cc at line 4060 [3.3429798]

B:BD[3.3559610] → [3.3559610:3559687]


static int builder_normal(int level_number, char level_type, spec_room &sr)

[3.3559610]

[3.3559687]

static builder_rc_type builder_normal(int level_number, char level_type,
                                      spec_room &sr)

Replacement in crawl-ref/source/dungeon.cc at line 4079 [3.3429798]
∅:D[10.148612] → [3.3559851:3559869]
∅:D[4.962645] → [3.3559851:3559869]
B:BD[3.3559851] → [3.3559851:3559869]
```
        return 1;
```
[4.962645]
[3.3559869]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4085 [3.3429798]
∅:D[4.962721] → [3.3560123:3560141]
B:BD[3.3560123] → [3.3560123:3560141]
```
        return 1;
```
[4.962721]
[3.3560141]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4094 [3.3429798]
B:BD[3.3560318] → [3.3560318:3560336]
```
        return 1;
```
[3.3560318]
[3.3560336]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4102 [3.3429798]
B:BD[3.3560485] → [3.3560485:3560507]
```
            return 1;
```
[3.3560485]
[3.3560507]
```
            return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4108 [3.3429798]
B:BD[3.3560586] → [3.3560586:3560608]
```
            return 1;
```
[3.3560586]
[3.3560608]
```
            return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4123 [3.3429798]
B:BD[3.3560835] → [3.3560835:3560853]
```
        return 1;
```
[3.3560835]
[3.3560853]
```
        return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4142 [3.3429798]
B:BD[4.963063] → [4.963063:963089]
```
                return 1;
```
[4.963063]
[4.963089]
```
                return BUILD_SKIP;
```
Replacement in crawl-ref/source/dungeon.cc at line 4163 [3.3429798]
B:BD[3.3561755] → [3.3561755:3561769]
```
    return 0;
```
[3.3561755]
[3.3561769]
```
    return BUILD_CONTINUE;
```
Replacement in crawl-ref/source/dungeon.cc at line 4167 [3.3429798]
∅:D[4.963225] → [3.3561826:3561869]
B:BD[3.3561826] → [3.3561826:3561869]
```
static int builder_basic(int level_number)
```
[4.963225]
[3.3561869]
```
static builder_rc_type builder_basic(int level_number)
```
Replacement in crawl-ref/source/dungeon.cc at line 4261 [3.3429798]
B:BD[3.3564329] → [3.3564329:3564343]
```
    return 0;
```
[3.3564329]
[3.3564343]
```
    return BUILD_CONTINUE;
```
Deletion in crawl-ref/source/dungeon.cc at line 4319 [3.3429798]
B:BD[3.3565716] → [3.3565716:3565717]
Deletion in crawl-ref/source/dungeon.cc at line 4779 [3.3429798]
B:BD[3.3577602] → [3.3577602:3577625]
```
    int which_unique;
```

Replacement in crawl-ref/source/dungeon.cc at line 4781 [3.3429798]

B:BD[3.3577729] → [3.3577729:3578006]

        && !player_in_hell()
        && !player_in_branch( BRANCH_ORCISH_MINES )
        && !player_in_branch( BRANCH_HIVE )
        && !player_in_branch( BRANCH_LAIR )
        && !player_in_branch( BRANCH_SLIME_PITS )
        && !player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))

[3.3577729]

[3.3578006]

        && branches[(int)you.where_are_you].has_uniques)

Replacement in crawl-ref/source/dungeon.cc at line 4785 [3.3429798]

B:BD[3.3578054] → [3.3578054:3578106]

            which_unique = -1;   //     30 in total

[3.3578054]

[3.3578106]

            int which_unique = -1;   //     30 in total

Replacement in crawl-ref/source/dungeon.cc at line 4801 [3.3429798]
B:BD[3.3579075] → [3.3579075:3579109]
```
            if (which_unique < 0)
```
[3.3579075]
[3.3579109]
```
            if (which_unique == -1)
```
Insertion in crawl-ref/source/branch.h at line 28 [7.13240]
[7.13971]
[7.13971]
```
    bool has_shops;
    bool has_uniques;
```
Replacement in crawl-ref/source/branch.cc at line 15 [7.14355]
B:BD[7.14720] → [7.14720:14744]
```
      LIGHTGREY, BROWN,
```
[7.14720]
[7.14744]
```
      true, true, LIGHTGREY, BROWN,
```

Replacement in crawl-ref/source/branch.cc at line 24 [7.14355]

B:BD[7.14990] → [7.14990:15066]

      LIGHTGREY, LIGHTGREY, mons_standard_rare, mons_standard_level, NULL,

[7.14990]

[7.15066]

      false, false, LIGHTGREY, LIGHTGREY,
      mons_standard_rare, mons_standard_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 32 [7.14355]
B:BD[7.15260] → [7.15260:15280]
```
      BROWN, BROWN,
```
[7.15260]
[7.15280]
```
      true, false, BROWN, BROWN,
```

Replacement in crawl-ref/source/branch.cc at line 40 [7.14355]

B:BD[7.15521] → [7.15521:15593]

      DARKGREY, LIGHTGREY, mons_hallelf_rare, mons_hallelf_level, NULL,

[7.15521]

[7.15593]

      true, true, DARKGREY, LIGHTGREY,
      mons_hallelf_rare, mons_hallelf_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 48 [7.14355]

B:BD[7.15759] → [7.15759:15818]

      GREEN, BROWN, mons_lair_rare, mons_lair_level, NULL,

[7.15759]

[7.15818]

      true, false, GREEN, BROWN,
      mons_lair_rare, mons_lair_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 56 [7.14355]

B:BD[7.15971] → [7.15971:16033]

      BROWN, BROWN, mons_swamp_rare, mons_swamp_level, NULL,

[7.15971]

[7.16033]

      true, true, BROWN, BROWN,
      mons_swamp_rare, mons_swamp_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 64 [7.14355]

B:BD[7.16214] → [7.16214:16286]

      GREEN, LIGHTGREEN, mons_pitslime_rare, mons_pitslime_level, NULL,

[7.16214]

[7.16286]

      false, false, GREEN, LIGHTGREEN,
      mons_pitslime_rare, mons_pitslime_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 72 [7.14355]

B:BD[7.16459] → [7.16459:16532]

      LIGHTGREEN, YELLOW, mons_pitsnake_rare, mons_pitsnake_level, NULL,

[7.16459]

[7.16532]

      true, true, LIGHTGREEN, YELLOW,
      mons_pitsnake_rare, mons_pitsnake_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 80 [7.14355]

B:BD[7.16739] → [7.16739:16800]

      YELLOW, BROWN, mons_hive_rare, mons_hive_level, NULL,

[7.16739]

[7.16800]

      false, false, YELLOW, BROWN,
      mons_hive_rare, mons_hive_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 88 [7.14355]

B:BD[7.16967] → [7.16967:17038]

      LIGHTGREY, BROWN, mons_standard_rare, mons_standard_level, NULL,

[7.16967]

[7.17038]

      true, true, LIGHTGREY, BROWN,
      mons_standard_rare, mons_standard_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 97 [7.14355]

B:BD[7.17239] → [7.17239:17317]

      LIGHTGREY, LIGHTGREY, mons_hallblade_rare, mons_hallblade_level, NULL,

[7.17239]

[7.17317]

      false, true, LIGHTGREY, LIGHTGREY,
      mons_hallblade_rare, mons_hallblade_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 105 [7.14355]

B:BD[7.17472] → [7.17472:17541]

      LIGHTGREY, LIGHTGREY, mons_crypt_rare, mons_crypt_level, NULL,

[7.17472]

[7.17541]

      false, true, LIGHTGREY, LIGHTGREY,
      mons_crypt_rare, mons_crypt_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 113 [7.14355]

B:BD[7.17705] → [7.17705:17770]

      YELLOW, LIGHTGREY, mons_tomb_rare, mons_tomb_level, NULL,

[7.17705]

[7.17770]

      false, true, YELLOW, LIGHTGREY,
      mons_tomb_rare, mons_tomb_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 121 [7.14355]
B:BD[7.17955] → [7.17955:17983]
```
      LIGHTGREY, LIGHTGREY,
```
[7.17955]
[7.17983]
```
      false, true, LIGHTGREY, LIGHTGREY,
```
Replacement in crawl-ref/source/branch.cc at line 130 [7.14355]
B:BD[7.18212] → [7.18212:18230]
```
      CYAN, CYAN,
```
[7.18212]
[7.18230]
```
      false, false, CYAN, CYAN,
```
Replacement in crawl-ref/source/branch.cc at line 139 [7.14355]
B:BD[7.18448] → [7.18448:18469]
```
      DARKGREY, RED,
```
[7.18448]
[7.18469]
```
      false, false, DARKGREY, RED,
```
Replacement in crawl-ref/source/branch.cc at line 148 [7.14355]
B:BD[7.18695] → [7.18695:18723]
```
      LIGHTBLUE, LIGHTCYAN,
```
[7.18695]
[7.18723]
```
      false, false, LIGHTBLUE, LIGHTCYAN,
```
Replacement in crawl-ref/source/branch.cc at line 157 [7.14355]
B:BD[7.18953] → [7.18953:18979]
```
      DARKGREY, DARKGREY,
```
[7.18953]
[7.18979]
```
      false, false, DARKGREY, DARKGREY,
```
Replacement in crawl-ref/source/branch.cc at line 166 [7.14355]
B:BD[7.19174] → [7.19174:19194]
```
      BLACK, BLACK,
```
[7.19174]
[7.19194]
```
      false, false, BLACK, BLACK,
```
Replacement in crawl-ref/source/branch.cc at line 175 [7.14355]
B:BD[7.19360] → [7.19360:19380]
```
      BLACK, BLACK,
```
[7.19360]
[7.19380]
```
      false, false, BLACK, BLACK,
```

Replacement in crawl-ref/source/branch.cc at line 184 [7.14355]

B:BD[7.19575] → [7.19575:19640]

      BLACK, BLACK, mons_hallzot_rare, mons_hallzot_level, NULL,

[7.19575]

[7.19640]

      false, true, BLACK, BLACK,
      mons_hallzot_rare, mons_hallzot_level, NULL,

Replacement in crawl-ref/source/branch.cc at line 192 [7.14355]
B:BD[7.19778] → [7.19778:19798]
```
      BLACK, BLACK,
```
[7.19778]
[7.19798]
```
      false, false, BLACK, BLACK,
```

Preliminary refactoring in dungeon creation code.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/enum.h at line 484 [3.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 89 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 390 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 395 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 399 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 403 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 409 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 412 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 418 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 420 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 424 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 426 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 431 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 434 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 437 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 442 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 471 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 473 [3.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 497 [3.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 499 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 500 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 515 [3.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 521 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3678 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3680 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3682 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3685 [3.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 3687 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3876 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3881 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3887 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3892 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3921 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3926 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3941 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3945 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3991 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3998 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4005 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4009 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4013 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4019 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4026 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4060 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4079 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4085 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4094 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4102 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4108 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4123 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4142 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4163 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4167 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4261 [3.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4319 [3.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 4779 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4781 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4785 [3.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4801 [3.3429798]

Insertion in crawl-ref/source/branch.h at line 28 [7.13240]

Replacement in crawl-ref/source/branch.cc at line 15 [7.14355]