fiddlerwoaroof/crawl - Change TFZ4TER7O2Z4FOGF2RCPEPYIHBTUA4LG3ECXLR7XGLCC6GO6OOTAC

The number of traps randomly generated on a level, and which types of

traps are randomly selected, can now easily be controlled on a branch by branch basis (and for Pan and the Abyss), similar to how monster level and rarity is controlled (via function pointers in the Branch data structure). The same can be done for fog machines (though this feature isn't being used as of yet).

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

Created by zelgadis on November 13, 2007

TFZ4TER7O2Z4FOGF2RCPEPYIHBTUA4LG3ECXLR7XGLCC6GO6OOTAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/traps.h at line 17 [6.3043]
[6.3434]
[6.3434]
```
#include "travel.h"
```

Insertion in crawl-ref/source/traps.h at line 66 [6.3043]

[6.5266]


bool is_valid_shaft_level(const level_id &place = level_id::current());
int       num_traps_for_place(int level_number = -1,
                              const level_id &place = level_id::current());
trap_type random_trap_for_place(int level_number = -1,
                                const level_id &place = level_id::current());

Insertion in crawl-ref/source/traps.h at line 74 [6.3043]

[6.5267]

int traps_zero_number(int level_number = -1);
int       traps_pan_number(int level_number = -1);
trap_type traps_pan_type(int level_number = -1);
int       traps_abyss_number(int level_number = -1);
trap_type traps_abyss_type(int level_number = -1);
int       traps_lab_number(int level_number = -1);
trap_type traps_lab_type(int level_number = -1);

Insertion in crawl-ref/source/traps.cc at line 19 [6.5308]
[6.5709]
[6.5709]
```
#include "branch.h"
```
Insertion in crawl-ref/source/traps.cc at line 29 [6.5308]
[6.5875]
[6.5875]
```
#include "place.h"
```

Insertion in crawl-ref/source/traps.cc at line 928 [6.5308]

[6.24424]

}
bool is_valid_shaft_level(const level_id &place)
{
    if (place.level_type != LEVEL_DUNGEON)
        return (false);
    // Don't generate shafts in branches where teleport control
    // is prevented.  Prevents player from going down levels without
    // reaching stairs, and also keeps player from getting stuck
    // on lower levels with the innability to use teleport control to
    // get back up.
    if (testbits(get_branch_flags(place.branch), LFLAG_NO_TELE_CONTROL))
    {
        return (false);
    }
    const Branch &branch = branches[place.branch];
    // When generating levels, don't place a shaft on the level
    // immediately above the bottom of a branch if that branch is
    // significantly more dangerous than normal.
    int min_delta = 1;
    if (env.turns_on_level == -1 && branch.dangerous_bottom_level)
        min_delta = 2;
    return ((branch.depth - place.depth) >= min_delta);
}
static int num_traps_default(int level_number, const level_id &place)
{
    return random2avg(9, 2);
}
int num_traps_for_place(int level_number, const level_id &place)
{
    if (level_number == -1)
    {
        switch(place.level_type)
        {
        case LEVEL_DUNGEON:
            level_number = absdungeon_depth(place.branch, place.depth);
            break;
        case LEVEL_ABYSS:
            level_number = 51;
            break;
        case LEVEL_PANDEMONIUM:
            level_number = 52;
            break;
        default:
            level_number = you.your_level;
        }
    }
    switch(place.level_type)
    {
    case LEVEL_DUNGEON:
        if (branches[place.branch].num_traps_function != NULL)
            return branches[place.branch].num_traps_function(level_number);
        else
            return num_traps_default(level_number, place);
    case LEVEL_ABYSS:
        return traps_abyss_number(level_number);
    case LEVEL_PANDEMONIUM:
        return traps_pan_number(level_number);
    case LEVEL_LABYRINTH:
    case LEVEL_PORTAL_VAULT:
        ASSERT(false);
        break;
    default:
        return 0;
    }
    return 0;
}
static trap_type random_trap_default(int level_number, const level_id &place)
{
    trap_type type = TRAP_DART;
    if ((random2(1 + level_number) > 1) && one_chance_in(4))
        type = TRAP_NEEDLE;
    if (random2(1 + level_number) > 3)
        type = TRAP_SPEAR;
    if (random2(1 + level_number) > 5)
        type = TRAP_AXE;
    // Note we're boosting arrow trap numbers by moving it
    // down the list, and making spear and axe traps rarer.
    if (type == TRAP_DART?
        random2(1 + level_number) > 2
        : one_chance_in(7))
        type = TRAP_ARROW;
        
    if ((type == TRAP_DART || type == TRAP_ARROW) && one_chance_in(15))
        type = TRAP_NET;
    if (random2(1 + level_number) > 7)
        type = TRAP_BOLT;
    if (random2(1 + level_number) > 11)
        type = TRAP_BLADE;
    if ((random2(1 + level_number) > 14 && one_chance_in(3))
        || (place.branch == BRANCH_HALL_OF_ZOT &&
            place.level_type == LEVEL_DUNGEON && coinflip()))
    {
        type = TRAP_ZOT;
    }
    if (one_chance_in(50) && is_valid_shaft_level(place))
        type = TRAP_SHAFT;
    if (one_chance_in(20))
        type = TRAP_TELEPORT;
    if (one_chance_in(40))
        type = TRAP_ALARM;
    return (type);

Insertion in crawl-ref/source/traps.cc at line 1047 [6.5308]

[6.24427]

trap_type random_trap_for_place(int level_number, const level_id &place)
{
    if (level_number == -1)
    {
        switch(place.level_type)
        {
        case LEVEL_DUNGEON:
            level_number = absdungeon_depth(place.branch, place.depth);
            break;
        case LEVEL_ABYSS:
            level_number = 51;
            break;
        case LEVEL_PANDEMONIUM:
            level_number = 52;
            break;
        default:
            level_number = you.your_level;
        }
    }
    switch(place.level_type)
    {
    case LEVEL_DUNGEON:
        if (branches[place.branch].rand_trap_function != NULL)
            return branches[place.branch].rand_trap_function(level_number);
        else
            return random_trap_default(level_number, place);
    case LEVEL_ABYSS:
        return traps_abyss_type(level_number);
    case LEVEL_PANDEMONIUM:
        return traps_pan_type(level_number);
    case LEVEL_LABYRINTH:
    case LEVEL_PORTAL_VAULT:
        ASSERT(false);
        break;
    default:
        return random_trap_default(level_number, place);
    }
    return NUM_TRAPS;
}
int traps_zero_number(int level_number)
{
    return 0;
}
int traps_pan_number(int level_number)
{
    return num_traps_default(level_number, level_id(LEVEL_PANDEMONIUM));
}
trap_type traps_pan_type(int level_number)
{
    return random_trap_default(level_number, level_id(LEVEL_PANDEMONIUM));
}
int traps_abyss_number(int level_number)
{
    return num_traps_default(level_number, level_id(LEVEL_ABYSS));
}
trap_type traps_abyss_type(int level_number)
{
    return random_trap_default(level_number, level_id(LEVEL_ABYSS));
}
int traps_lab_number(int level_number)
{
    return num_traps_default(level_number, level_id(LEVEL_LABYRINTH));
}
trap_type traps_lab_type(int level_number)
{
    return random_trap_default(level_number, level_id(LEVEL_LABYRINTH));
}

Deletion in crawl-ref/source/misc.h at line 126 [8.1928926]

B:BD[7.10010] → [2.16281:16382]

//////////////////////////////////////////////////////////////////////
bool is_valid_shaft_level();

Deletion in crawl-ref/source/misc.cc at line 1497 [8.1933596]

B:BD[2.20387] → [2.20387:21238]

∅:D[2.21238] → [8.1982357:1982358]

B:BD[8.1982357] → [8.1982357:1982358]

B:BD[8.1982358] → [2.21239:21299]

bool is_valid_shaft_level()
{
    if (you.level_type != LEVEL_DUNGEON)
        return (false);
    // Don't generate shafts in branches where teleport control
    // is prevented.  Prevents player from going down levels without
    // reaching stairs, and also keeps player from getting stuck
    // on lower levels with the innability to use teleport control to
    // get back up.
    if (testbits(get_branch_flags(), LFLAG_NO_TELE_CONTROL))
    {
        return (false);
    }
    int depth = subdungeon_depth(you.where_are_you, you.your_level);
    // When generating levels, don't place a shaft on the level
    // immediately above the bottom of a branch if that branch is
    // significantly more dangerous than normal.
    int min_delta = 1;
    if (env.turns_on_level == -1 && your_branch().dangerous_bottom_level)
        min_delta = 2;
    return ((your_branch().depth - depth) >= min_delta);
}

Insertion in crawl-ref/source/dungeon.cc at line 37 [8.3429798]
[9.11494]
[8.3430991]
```
#include "cloud.h"
```
Insertion in crawl-ref/source/dungeon.cc at line 141 [8.3429798]
[8.3432522]
[10.4463]
```
static void place_fog_machines( int level_number );
```

Replacement in crawl-ref/source/dungeon.cc at line 987 [8.3429798]

B:BD[11.5028] → [11.5028:5118]

    if (!player_in_branch( BRANCH_ECUMENICAL_TEMPLE ))
        place_traps(level_number);

[11.5028]

[11.5118]

    place_traps(level_number);
    place_fog_machines(level_number);

Deletion in crawl-ref/source/dungeon.cc at line 2060 [8.3429798]
B:BD[8.3566008] → [12.117380:117417]
B:BD[12.117417] → [13.10076:10133]
∅:D[13.10133] → [12.117468:117470]
B:BD[12.117468] → [12.117468:117470]
B:BD[12.117470] → [13.10134:10166]
∅:D[13.10166] → [12.117501:117563]
B:BD[12.117501] → [12.117501:117563]
B:BD[12.117563] → [13.10167:10195]
∅:D[13.10195] → [12.117596:117635]
B:BD[12.117596] → [12.117596:117635]
B:BD[12.117635] → [13.10196:10223]
∅:D[13.10223] → [12.117667:117706]
B:BD[12.117667] → [12.117667:117706]
B:BD[12.117706] → [13.10224:10249]
∅:D[13.10249] → [12.117736:117856]
B:BD[12.117736] → [12.117736:117856]
B:BD[12.117856] → [13.10250:10277]
∅:D[13.10277] → [12.117888:117954]
B:BD[12.117888] → [12.117888:117954]
B:BD[12.117954] → [13.10278:10305]
B:BD[13.10305] → [14.25413:25519]
∅:D[13.10305] → [12.117986:118026]
∅:D[14.25519] → [12.117986:118026]
B:BD[12.117986] → [12.117986:118026]
B:BD[12.118026] → [13.10306:10332]
∅:D[13.10332] → [12.118057:118097]
B:BD[12.118057] → [12.118057:118097]
B:BD[12.118097] → [13.10333:10360]
∅:D[13.10360] → [12.118129:118264]
B:BD[12.118129] → [12.118129:118264]
B:BD[12.118264] → [13.10361:10386]
∅:D[13.10386] → [12.118294:118301]
B:BD[12.118294] → [12.118294:118301]
B:BD[12.118301] → [3.297:377]
∅:D[3.377] → [12.118301:118328]
B:BD[12.118301] → [12.118301:118328]
B:BD[12.118328] → [13.10387:10417]
∅:D[13.10417] → [12.118363:118390]
B:BD[12.118363] → [12.118363:118390]
B:BD[12.118390] → [4.4142:4169]
∅:D[4.4169] → [12.118424:118425]
∅:D[13.10447] → [12.118424:118425]
B:BD[12.118424] → [12.118424:118425]
B:BD[12.118425] → [13.10448:10467]
```
}
// Also checks you.where_are_you!
static trap_type random_trap_for_level(int level_number)
{
    trap_type type = TRAP_DART;
    if ((random2(1 + level_number) > 1) && one_chance_in(4))
        type = TRAP_NEEDLE;
    if (random2(1 + level_number) > 3)
        type = TRAP_SPEAR;
    if (random2(1 + level_number) > 5)
        type = TRAP_AXE;
    // Note we're boosting arrow trap numbers by moving it
    // down the list, and making spear and axe traps rarer.
    if (type == TRAP_DART?
        random2(1 + level_number) > 2
        : one_chance_in(7))
        type = TRAP_ARROW;
        
    if ((type == TRAP_DART || type == TRAP_ARROW) && one_chance_in(15))
        type = TRAP_NET;
    if (random2(1 + level_number) > 7)
        type = TRAP_BOLT;
    if (random2(1 + level_number) > 11)
        type = TRAP_BLADE;
    if ((random2(1 + level_number) > 14 && one_chance_in(3))
        || (player_in_branch( BRANCH_HALL_OF_ZOT ) && coinflip()))
    {
        type = TRAP_ZOT;
    }
    if (one_chance_in(50) && is_valid_shaft_level())
        type = TRAP_SHAFT;
    if (one_chance_in(20))
        type = TRAP_TELEPORT;
    if (one_chance_in(40))
        type = TRAP_ALARM;
    return (type);
```

Replacement in crawl-ref/source/dungeon.cc at line 2065 [8.3429798]

B:BD[8.3566087] → [8.3566087:3566125]

    int num_traps = random2avg(9, 2);

[8.3566087]

[8.3566125]

    int num_traps = num_traps_for_place(level_number);
    ASSERT(num_traps >= 0);
    ASSERT(num_traps <= MAX_TRAPS);

Insertion in crawl-ref/source/dungeon.cc at line 2085 [8.3429798]
[8.3566482]
[13.10468]
```
        if (tries <= 0)
            break;
```
Replacement in crawl-ref/source/dungeon.cc at line 2089 [8.3429798]
∅:D[13.10517] → [12.118450:118507]
B:BD[15.963461] → [12.118450:118507]
```
        trap_type = random_trap_for_level(level_number);
```
[13.10517]
[15.963882]
```
        trap_type = random_trap_for_place(level_number);
```

Insertion in crawl-ref/source/dungeon.cc at line 2095 [8.3429798]

[8.3567580]

[13.10518]

static void place_fog_machines(int level_number)
{
    int i;
    int num_fogs = num_fogs_for_place(level_number);
    ASSERT(num_fogs >= 0);
    for (i = 0; i < num_fogs; i++)
    {
        fog_machine_data data = random_fog_for_place(level_number);
        if (!valid_fog_machine_data(data))
        {
            mpr("Invalid fog machine data, bailing.", MSGCH_DIAGNOSTICS);
            return;
        }
        int tries = 200;
        int x, y;
        dungeon_feature_type feat;
        do
        {
            x = random2(GXM);
            y = random2(GYM);
            feat = grd[x][y];
        }
        while (feat <= DNGN_MAXWALL && --tries > 0);
        if (tries <= 0)
            break;
        place_fog_machine(data, x, y);
    }                           // end "for i"
}                               // end place_traps()

Replacement in crawl-ref/source/dungeon.cc at line 4268 [8.3429798]

∅:D[13.11484] → [16.12319:12395]

B:BD[16.12319] → [16.12319:12395]

                f.trap == TRAP_INDEPTH? random_trap_for_level(level_number)

[13.11484]

[13.11485]

                f.trap == TRAP_INDEPTH? random_trap_for_place(level_number)

Replacement in crawl-ref/source/dungeon.cc at line 4344 [8.3429798]

B:BD[12.118898] → [12.118898:118972]

        place_specific_trap(vx, vy, random_trap_for_level(level_number));

[12.118898]

[12.118972]

        place_specific_trap(vx, vy, random_trap_for_place(level_number));

Insertion in crawl-ref/source/cloud.h at line 16 [8.4095213]
[8.4095474]
[17.6979]
```
#include "travel.h"
```

Insertion in crawl-ref/source/cloud.h at line 24 [8.4095213]

[5.2167]

};
struct fog_machine_data
{
    fog_machine_type fm_type;
    cloud_type       cl_type;
    int              size;
    int              power;

Insertion in crawl-ref/source/cloud.h at line 51 [8.4095213]
[5.2300]
[5.2300]
```
void place_fog_machine(fog_machine_data data, int x, int y);
```

Insertion in crawl-ref/source/cloud.h at line 54 [8.4095213]

[5.2301]

[8.4095676]

bool valid_fog_machine_data(fog_machine_data data);
int              num_fogs_for_place(int level_number = -1,
                                const level_id &place = level_id::current());
fog_machine_data random_fog_for_place(int level_number = -1,
                                 const level_id &place = level_id::current());
int              fogs_pan_number(int level_number = -1);
fog_machine_data fogs_pan_type(int level_number = -1);
int              fogs_abyss_number(int level_number = -1);
fog_machine_data fogs_abyss_type(int level_number = -1);
int              fogs_lab_number(int level_number = -1);
fog_machine_data fogs_lab_type(int level_number = -1);

Insertion in crawl-ref/source/cloud.cc at line 18 [8.4095717]
[8.4096022]
[8.4096022]
```
#include "branch.h"
```
Insertion in crawl-ref/source/cloud.cc at line 22 [8.4095717]
[5.2342]
[8.4096041]
```
#include "place.h"
```

Insertion in crawl-ref/source/cloud.cc at line 315 [8.4095717]

[5.2475]

    ASSERT(fm_type >= FM_GEYSER && fm_type < NUM_FOG_MACHINE_TYPES);
    ASSERT(cl_type > CLOUD_NONE && (cl_type < CLOUD_RANDOM
                                    || cl_type == CLOUD_DEBUGGING));
    ASSERT(size  >= 1);
    ASSERT(power >= 1);

Insertion in crawl-ref/source/cloud.cc at line 353 [8.4095717]

[18.913]

[5.3224]

void place_fog_machine(fog_machine_data data, int x, int y)
{
    place_fog_machine(data.fm_type, data.cl_type, x, y, data.size,
                      data.power);
}
bool valid_fog_machine_data(fog_machine_data data)
{
    if (data.fm_type < FM_GEYSER ||  data.fm_type >= NUM_FOG_MACHINE_TYPES)
        return false;

Insertion in crawl-ref/source/cloud.cc at line 364 [8.4095717]

[5.3225]

[18.913]

    if (data.cl_type <= CLOUD_NONE || (data.cl_type >= CLOUD_RANDOM
                                       && data.cl_type != CLOUD_DEBUGGING))
        return false;
    if (data.size < 1 || data.power < 1)
        return false;
    return true;
}
int num_fogs_for_place(int level_number, const level_id &place)
{
    if (level_number == -1)
    {
        switch(place.level_type)
        {
        case LEVEL_DUNGEON:
            level_number = absdungeon_depth(place.branch, place.depth);
            break;
        case LEVEL_ABYSS:
            level_number = 51;
            break;
        case LEVEL_PANDEMONIUM:
            level_number = 52;
            break;
        default:
            level_number = you.your_level;
        }
    }
    switch(place.level_type)
    {
    case LEVEL_DUNGEON:
    {
        Branch &branch = branches[place.branch];
        ASSERT((branch.num_fogs_function == NULL
                && branch.rand_fog_function == NULL)
               || (branch.num_fogs_function != NULL
                   && branch.rand_fog_function != NULL));
        if (branch.num_fogs_function == NULL)
            return 0;
        return branch.num_fogs_function(level_number);
    }
    case LEVEL_ABYSS:
        return fogs_abyss_number(level_number);
    case LEVEL_PANDEMONIUM:
        return fogs_pan_number(level_number);
    case LEVEL_LABYRINTH:
        return fogs_lab_number(level_number);
    default:
        return 0;
    }
    return 0;
}
fog_machine_data random_fog_for_place(int level_number, const level_id &place)
{
    fog_machine_data data = {NUM_FOG_MACHINE_TYPES, CLOUD_NONE, -1, -1};
    if (level_number == -1)
    {
        switch(place.level_type)
        {
        case LEVEL_DUNGEON:
            level_number = absdungeon_depth(place.branch, place.depth);
            break;
        case LEVEL_ABYSS:
            level_number = 51;
            break;
        case LEVEL_PANDEMONIUM:
            level_number = 52;
            break;
        default:
            level_number = you.your_level;
        }
    }
    switch(place.level_type)
    {
    case LEVEL_DUNGEON:
    {
        Branch &branch = branches[place.branch];
        ASSERT(branch.num_fogs_function != NULL
                && branch.rand_fog_function != NULL);
        fog_machine_data data;
        branch.rand_fog_function(level_number, data);
        return data;
    }
    case LEVEL_ABYSS:
        return fogs_abyss_type(level_number);
    case LEVEL_PANDEMONIUM:
        return fogs_pan_type(level_number);
    case LEVEL_LABYRINTH:
        return fogs_lab_type(level_number);
    default:
        ASSERT(false);
        return data;
    }
    ASSERT(false);
    return data;
}
int fogs_pan_number(int level_number)
{
    return 0;
}
fog_machine_data fogs_pan_type(int level_number)
{
    fog_machine_data data = {NUM_FOG_MACHINE_TYPES, CLOUD_NONE, -1, -1};
    return data;
}
int fogs_abyss_number(int level_number)
{
    return 0;
}
fog_machine_data fogs_abyss_type(int level_number)
{
    fog_machine_data data = {NUM_FOG_MACHINE_TYPES, CLOUD_NONE, -1, -1};
    return data;
}
int fogs_lab_number(int level_number)
{
    return 0;
}
fog_machine_data fogs_lab_type(int level_number)
{
    fog_machine_data data = {NUM_FOG_MACHINE_TYPES, CLOUD_NONE, -1, -1};
    return data;
}

Insertion in crawl-ref/source/branch.h at line 14 [9.13240]
[9.13512]
[9.13512]
```
struct fog_machine_data;
```

Replacement in crawl-ref/source/branch.h at line 46 [9.13240]

B:BD[9.14055] → [9.14055:14130]

    int (*mons_rarity_function)(int);
    int (*mons_level_function)(int);

[9.14055]

[9.14171]

    int       (*mons_rarity_function)(int);
    int       (*mons_level_function)(int);
    int       (*num_traps_function)(int);
    trap_type (*rand_trap_function)(int);
    int       (*num_fogs_function)(int);
    void      (*rand_fog_function)(int,fog_machine_data&);

Insertion in crawl-ref/source/branch.cc at line 7 [9.14355]
[9.14515]
[19.4524]
```
#include "cloud.h"
```
Insertion in crawl-ref/source/branch.cc at line 12 [9.14355]
[20.126709]
[19.4546]
```
#include "traps.h"
```
Insertion in crawl-ref/source/branch.cc at line 120 [9.14355]
[21.1560]
[2.23622]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 129 [9.14355]
[21.1609]
[2.23653]
```
      traps_zero_number, NULL, NULL, NULL, // No traps in temple
```
Insertion in crawl-ref/source/branch.cc at line 138 [9.14355]
[21.1655]
[2.23684]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 147 [9.14355]
[21.1701]
[2.23716]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 156 [9.14355]
[21.1741]
[2.23746]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 165 [9.14355]
[21.1784]
[2.23777]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 174 [9.14355]
[22.1884]
[2.23807]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 183 [9.14355]
[21.1832]
[2.23837]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 192 [9.14355]
[21.1880]
[2.23867]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 201 [9.14355]
[21.1921]
[2.23898]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 210 [9.14355]
[21.1969]
[2.23928]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 220 [9.14355]
[21.2020]
[2.23958]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 229 [9.14355]
[21.2062]
[2.23989]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 238 [9.14355]
[21.2103]
[2.24020]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 247 [9.14355]
[21.2151]
[2.24050]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 256 [9.14355]
[21.2189]
[2.24081]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 265 [9.14355]
[21.2235]
[2.24110]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 274 [9.14355]
[21.2281]
[2.24139]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 283 [9.14355]
[21.2329]
[2.24168]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 292 [9.14355]
[21.2348]
[2.24197]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 301 [9.14355]
[21.2367]
[2.24228]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 310 [9.14355]
[21.2413]
[2.24259]
```
      NULL, NULL, NULL, NULL,
```
Insertion in crawl-ref/source/branch.cc at line 319 [9.14355]
[21.2432]
[2.24289]
```
      NULL, NULL, NULL, NULL,
```

The number of traps randomly generated on a level, and which types of

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/traps.h at line 17 [6.3043]

Insertion in crawl-ref/source/traps.h at line 66 [6.3043]

Insertion in crawl-ref/source/traps.h at line 74 [6.3043]

Insertion in crawl-ref/source/traps.cc at line 19 [6.5308]

Insertion in crawl-ref/source/traps.cc at line 29 [6.5308]

Insertion in crawl-ref/source/traps.cc at line 928 [6.5308]

Insertion in crawl-ref/source/traps.cc at line 1047 [6.5308]

Deletion in crawl-ref/source/misc.h at line 126 [8.1928926]

Deletion in crawl-ref/source/misc.cc at line 1497 [8.1933596]

Insertion in crawl-ref/source/dungeon.cc at line 37 [8.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 141 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 987 [8.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 2060 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2065 [8.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2085 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 2089 [8.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 2095 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4268 [8.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 4344 [8.3429798]

Insertion in crawl-ref/source/cloud.h at line 16 [8.4095213]

Insertion in crawl-ref/source/cloud.h at line 24 [8.4095213]

Insertion in crawl-ref/source/cloud.h at line 51 [8.4095213]

Insertion in crawl-ref/source/cloud.h at line 54 [8.4095213]

Insertion in crawl-ref/source/cloud.cc at line 18 [8.4095717]

Insertion in crawl-ref/source/cloud.cc at line 22 [8.4095717]

Insertion in crawl-ref/source/cloud.cc at line 315 [8.4095717]

Insertion in crawl-ref/source/cloud.cc at line 353 [8.4095717]

Insertion in crawl-ref/source/cloud.cc at line 364 [8.4095717]

Insertion in crawl-ref/source/branch.h at line 14 [9.13240]

Replacement in crawl-ref/source/branch.h at line 46 [9.13240]

Insertion in crawl-ref/source/branch.cc at line 7 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 12 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 120 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 129 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 138 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 147 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 156 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 165 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 174 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 183 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 192 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 201 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 210 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 220 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 229 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 238 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 247 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 256 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 265 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 274 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 283 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 292 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 301 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 310 [9.14355]

Insertion in crawl-ref/source/branch.cc at line 319 [9.14355]