fiddlerwoaroof/crawl - Change UQZESUMXKG6SRYSP52RYO6EUX7TRLHRALAOX2S3HUGZMR2C5NDCQC

All special room code has been moved to dat/rooms.des

DEBUG_SPECIAL_ROOMS can be defined to cause special rooms to be placed as often as possible.

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

Created by zelgadis on November 26, 2008

UQZESUMXKG6SRYSP52RYO6EUX7TRLHRALAOX2S3HUGZMR2C5NDCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/dungeon.cc at line 2544 [3.3429798]
[3.3561639]
[2.2691]
```
#ifdef DEBUG_SPECIAL_ROOMS
    if (!sr.created)
#else
```
Insertion in crawl-ref/source/dungeon.cc at line 2548 [3.3429798]
[2.2732]
[2.2732]
```
#endif
```
Deletion in crawl-ref/source/dungeon.cc at line 3539 [3.3429798]
∅:D[2.3134] → [4.4305:4319]
B:BD[3.3586282] → [4.4305:4319]
∅:D[4.4319] → [3.3586282:3586372]
B:BD[3.3586282] → [3.3586282:3586372]
B:BD[3.3586386] → [3.3586386:3586387]
B:BD[3.3586387] → [5.4345:4424]
∅:D[5.4424] → [3.3586462:3586529]
B:BD[3.3586462] → [3.3586462:3586529]
∅:D[6.7196] → [3.3586596:3586597]
B:BD[3.3586596] → [3.3586596:3586597]
B:BD[3.3586597] → [7.48936:49003]
∅:D[7.49003] → [3.3586655:3586656]
B:BD[3.3586655] → [3.3586655:3586656]
B:BD[3.3586656] → [8.77915:77938]
B:BD[8.77938] → [4.4320:4327]
```
#if 0 // MATT
    char spec_room_type = SROOM_LAIR_KOBOLD;
    int lev_mons;
    int thing_created = 0;
    object_class_type obj_type = OBJ_RANDOM;  // used in calling items() {dlb}
    unsigned char i;        // general purpose loop variable {dlb}
    FixedVector < monster_type, 10 > mons_alloc; // was [20] {dlb}
    coord_def lordpos;
#endif
```

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

B:BD[4.4797] → [4.4797:4812]

B:BD[3.3587893] → [3.3587893:3587952]

B:BD[3.3587952] → [6.7732:7792]

∅:D[6.7792] → [3.3588012:3588195]

B:BD[3.3588012] → [3.3588012:3588195]

B:BD[3.3588195] → [6.7793:7843]

∅:D[6.7843] → [3.3588245:3588278]

B:BD[3.3588245] → [3.3588245:3588278]

B:BD[3.3588288] → [3.3588288:3588326]

B:BD[3.3588336] → [3.3588336:3588337]

B:BD[3.3588337] → [6.7844:7897]

∅:D[6.7897] → [3.3588390:3589237]

B:BD[3.3588390] → [3.3588390:3589237]

B:BD[3.3589237] → [6.7898:7951]

B:BD[6.7951] → [8.78022:78198]

∅:D[8.78198] → [9.14194:14195]

B:BD[3.3589599] → [9.14194:14195]

∅:D[10.11699] → [3.3589609:3589653]

∅:D[9.14195] → [3.3589609:3589653]

B:BD[3.3589609] → [3.3589609:3589653]

B:BD[3.3589653] → [8.78199:78235]

∅:D[8.78235] → [3.3589749:3589750]

B:BD[3.3589749] → [3.3589749:3589750]

B:BD[3.3589750] → [6.7952:8012]

∅:D[6.8012] → [3.3589810:3589930]

B:BD[3.3589810] → [3.3589810:3589930]

B:BD[3.3589930] → [6.8013:8063]

∅:D[6.8063] → [3.3589980:3590013]

B:BD[3.3589980] → [3.3589980:3590013]

B:BD[3.3590023] → [3.3590023:3590064]

B:BD[3.3590074] → [3.3590074:3590075]

B:BD[3.3590075] → [6.8064:8177]

∅:D[6.8177] → [3.3590188:3590234]

B:BD[3.3590188] → [3.3590188:3590234]

B:BD[3.3590244] → [3.3590244:3590289]

B:BD[3.3590299] → [3.3590299:3590300]

B:BD[3.3590300] → [6.8178:8231]

B:BD[6.8231] → [8.78236:78434]

∅:D[8.78434] → [3.3590531:3590532]

B:BD[3.3590531] → [3.3590531:3590532]

B:BD[3.3590799] → [6.8283:8321]

B:BD[6.8321] → [8.78435:78504]

∅:D[7.49469] → [3.3590916:3590957]

∅:D[8.78504] → [3.3590916:3590957]

B:BD[3.3590916] → [3.3590916:3590957]

B:BD[3.3590957] → [6.8322:8385]

∅:D[6.8385] → [3.3591019:3591106]

∅:D[11.16725] → [3.3591019:3591106]

B:BD[3.3591019] → [3.3591019:3591106]

B:BD[3.3591106] → [8.78505:78624]

∅:D[8.78624] → [3.3591257:3591258]

B:BD[3.3591257] → [3.3591257:3591258]

B:BD[3.3591258] → [8.78625:79266]

∅:D[8.79266] → [3.3591951:3591952]

B:BD[3.3591951] → [3.3591951:3591952]

B:BD[3.3591952] → [8.79267:79410]

∅:D[12.53805] → [3.3592086:3592087]

∅:D[8.79410] → [3.3592086:3592087]

B:BD[3.3592086] → [3.3592086:3592087]

B:BD[3.3592087] → [8.79411:79511]

∅:D[8.79511] → [3.3592288:3592322]

B:BD[3.3592288] → [3.3592288:3592322]

B:BD[3.3592322] → [6.8386:8460]

∅:D[6.8460] → [7.49470:49490]

B:BD[3.3592322] → [7.49470:49490]

B:BD[7.49490] → [8.79512:79638]

∅:D[11.16821] → [3.3592501:3592541]

∅:D[7.49685] → [3.3592501:3592541]

∅:D[8.79638] → [3.3592501:3592541]

B:BD[3.3592501] → [3.3592501:3592541]

B:BD[3.3592541] → [13.27119:27141]

∅:D[13.27141] → [3.3592562:3592601]

B:BD[3.3592562] → [3.3592562:3592601]

B:BD[3.3592601] → [13.27142:27163]

∅:D[13.27163] → [14.967354:967396]

B:BD[3.3592621] → [14.967354:967396]

B:BD[14.967396] → [13.27164:27202]

∅:D[13.27202] → [3.3592621:3592642]

∅:D[14.967433] → [3.3592621:3592642]

B:BD[3.3592621] → [3.3592621:3592642]

B:BD[3.3592642] → [4.4813:4820]


#if 0 // MATT
    switch (spec_room_type)
    {
    case SROOM_LAIR_ORC:
        // Determine which monster array to generate {dlb}:
        lev_mons = ((level_number > 24) ? 3 :
                    (level_number > 15) ? 2 :
                    (level_number >  9) ? 1
                                        : 0);
        // Fill with baseline monster type {dlb}:
        for (i = 0; i < 10; i++)
            mons_alloc[i] = MONS_ORC;
        // Fill in with special monster types {dlb}:
        switch (lev_mons)
        {
        case 0:
            mons_alloc[9] = MONS_ORC_WARRIOR;
            break;
        case 1:
            mons_alloc[8] = MONS_ORC_WARRIOR;
            mons_alloc[9] = MONS_ORC_WARRIOR;
            break;
        case 2:
            mons_alloc[6] = MONS_ORC_KNIGHT;
            mons_alloc[7] = MONS_ORC_WARRIOR;
            mons_alloc[8] = MONS_ORC_WARRIOR;
            mons_alloc[9] = MONS_OGRE;
            break;
        case 3:
            mons_alloc[2] = MONS_ORC_WARRIOR;
            mons_alloc[3] = MONS_ORC_WARRIOR;
            mons_alloc[4] = MONS_ORC_WARRIOR;
            mons_alloc[5] = MONS_ORC_KNIGHT;
            mons_alloc[6] = MONS_ORC_KNIGHT;
            mons_alloc[7] = MONS_OGRE;
            mons_alloc[8] = MONS_OGRE;
            mons_alloc[9] = MONS_TROLL;
            break;
        }
        // Place monsters and give them items {dlb}:
        for (rectangle_iterator ri(sr.tl, sr.br); ri; ++ri)
            if (!one_chance_in(4))
                mons_place(mgen_data::sleeper_at(mons_alloc[random2(10)], *ri));
        break;
    case SROOM_LAIR_KOBOLD:
        lordpos = sr.random_spot();
        // Determine which monster array to generate {dlb}:
        lev_mons = ((level_number < 4) ? 0 :
                    (level_number < 6) ? 1 : (level_number < 9) ? 2 : 3);
        // Fill with baseline monster type {dlb}:
        for (i = 0; i < 10; i++)
            mons_alloc[i] = MONS_KOBOLD;
        // Fill in with special monster types {dlb}:
        // In this case, they are uniformly the same {dlb}:
        for (i = (7 - lev_mons); i < 10; i++)
            mons_alloc[i] = MONS_BIG_KOBOLD;
        // Place monsters and give them items {dlb}:
        for ( rectangle_iterator ri(sr.tl, sr.br); ri; ++ri )
            if ( *ri != lordpos && !one_chance_in(4) )
                mons_place(mgen_data::sleeper_at(mons_alloc[random2(10)], *ri));
        // Put the boss monster down.
        mons_place(mgen_data::sleeper_at(MONS_BIG_KOBOLD, lordpos));
        break;
    case SROOM_TREASURY:
        // Should only appear in deep levels, with a guardian.
        // Maybe have several types of treasure room?
        // place treasure {dlb}:
        for ( rectangle_iterator ri(sr.tl, sr.br); ri; ++ri )
        {
            const int temp_rand = random2(11);
            obj_type = ((temp_rand > 8) ? OBJ_WEAPONS :       // 2 in 11
                        (temp_rand > 6) ? OBJ_ARMOUR :        // 2 in 11
                        (temp_rand > 5) ? OBJ_MISSILES :      // 1 in 11
                        (temp_rand > 4) ? OBJ_WANDS :         // 1 in 11
                        (temp_rand > 3) ? OBJ_SCROLLS :       // 1 in 11
                        (temp_rand > 2) ? OBJ_JEWELLERY :     // 1 in 11
                        (temp_rand > 1) ? OBJ_BOOKS :         // 1 in 11
                        (temp_rand > 0) ? OBJ_STAVES          // 1 in 11
                        : OBJ_POTIONS);       // 1 in 11
            thing_created = items( 1, obj_type, OBJ_RANDOM, true,
                                   level_number * 3, MAKE_ITEM_RANDOM_RACE);
            if (thing_created != NON_ITEM)
                mitm[thing_created].pos = *ri;
        }
        // place guardian {dlb}:
        // If wandering, the guardian should return to the treasure room.
        mons_place(
            mgen_data::sleeper_at( MONS_GUARDIAN_NAGA, sr.random_spot(),
                                   MG_PATROLLING ));
        break;
    case SROOM_BEEHIVE:
        _beehive(sr);
        break;
    case SROOM_MORGUE:
        _morgue(sr);
        break;
    case SROOM_JELLY_PIT:
        _jelly_pit(level_number, sr);
        break;
    }
#endif

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

[2.3162]

#ifdef DEBUG_SPECIAL_ROOMS
    if ((sroom = random_map_for_tag("special_room", true, true)) != NULL)
#else

Insertion in crawl-ref/source/dungeon.cc at line 7361 [3.3429798]
[2.3262]
[3.3683252]
```
#endif
```

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

B:BD[4.4822] → [4.4822:7155]

∅:D[4.7155] → [3.3685312:3685313]

B:BD[3.3685312] → [3.3685312:3685313]

B:BD[3.3685313] → [13.51330:51365]

∅:D[13.51365] → [3.3685347:3685349]

B:BD[3.3685347] → [3.3685347:3685349]

B:BD[3.3685349] → [8.90483:90680]

B:BD[8.90680] → [15.2946:2947]

∅:D[15.2947] → [8.90693:91065]

B:BD[8.90693] → [8.90693:91065]

∅:D[8.91065] → [3.3685429:3685430]

B:BD[3.3685429] → [3.3685429:3685430]

B:BD[3.3685430] → [8.91066:91144]

∅:D[8.91144] → [6.13362:13364]

B:BD[3.3686171] → [6.13362:13364]

∅:D[6.13364] → [3.3686235:3686236]

B:BD[3.3686235] → [3.3686235:3686236]

B:BD[3.3686236] → [13.51366:51422]

∅:D[13.51422] → [14.972990:973053]

B:BD[14.972990] → [14.972990:973053]

B:BD[14.973053] → [8.91145:91193]

∅:D[8.91193] → [14.973161:973296]

B:BD[14.973161] → [14.973161:973296]

B:BD[14.973296] → [9.15554:15555]

∅:D[9.15555] → [14.973301:973981]

B:BD[14.973301] → [14.973301:973981]

B:BD[14.973981] → [8.91194:91264]

∅:D[13.51498] → [14.974055:974058]

∅:D[8.91264] → [14.974055:974058]

B:BD[14.974055] → [14.974055:974058]

B:BD[14.974058] → [4.7156:8260]

#if 0 // MATT
// Fill special room sr with monsters from the pit_list at density%...
// then place a "lord of the pit" of lord_type at (lordx, lordy).
static void _fill_monster_pit( spec_room &sr, FixedVector<pit_mons_def,
                               MAX_PIT_MONSTERS> &pit_list, int density,
                               monster_type lord_type, const coord_def& lordpos)
{
    int i;
    // Make distribution cumulative.
    for (i = 1; i < MAX_PIT_MONSTERS; ++i)
    {
        // assuming that the first zero rarity is the end of the list:
        if (!pit_list[i].rare)
            break;
        pit_list[i].rare = pit_list[i].rare + pit_list[i - 1].rare;
    }
    const int num_types = i;
    const int rare_sum = pit_list[num_types - 1].rare;
    // Calculate die_size, factoring in the density% of the pit.
    const int die_size = (rare_sum * 100) / density;
#if DEBUG_DIAGNOSTICS
    for (i = 0; i < num_types; ++i)
    {
        const int delta = ((i > 0) ? pit_list[i].rare - pit_list[i - 1].rare
                                   : pit_list[i].rare);
        const float perc = (static_cast<float>( delta ) * 100.0)
                                / static_cast<float>( rare_sum );
        mprf( MSGCH_DIAGNOSTICS, "%6.2f%%: %s", perc,
              mons_type_name( pit_list[i].type, DESC_PLAIN).c_str() );
    }
#endif
    // Put the boss monster down.
    if (lord_type != MONS_PROGRAM_BUG)
    {
        mgen_data mg;
        mg.cls       = lord_type;
        mg.behaviour = BEH_SLEEP;
        mg.pos       = lordpos;
        mons_place(mgen_data::sleeper_at(lord_type, lordpos));
    }
    // Place monsters and give them items {dlb}:
    for ( rectangle_iterator ri(sr.tl, sr.br); ri; ++ri )
    {
        // Avoid the boss (or anyone else we may have dropped already).
        if (mgrd(*ri) != NON_MONSTER)
            continue;
        const int roll = random2( die_size );
        // Density skip (no need to iterate).
        if (roll >= rare_sum)
            continue;
        // Run through the cumulative chances and place a monster.
        for (i = 0; i < num_types; ++i)
        {
            if (roll < pit_list[i].rare)
            {
                mons_place(
                    mgen_data::sleeper_at(pit_list[i].type, *ri));
                break;
            }
        }
    }
}
static void _morgue(spec_room &sr)
{
    for (rectangle_iterator ri(sr.tl, sr.br); ri; ++ri)
    {
        if (grd(*ri) == DNGN_FLOOR || grd(*ri) == DNGN_BUILDER_SPECIAL_FLOOR)
        {
            const int temp_rand = random2(24);
            const monster_type mon_type =
                ((temp_rand > 11) ? MONS_ZOMBIE_SMALL :  // 50.0%
                 (temp_rand >  7) ? MONS_WIGHT :         // 16.7%
                 (temp_rand >  3) ? MONS_NECROPHAGE :    // 16.7%
                 (temp_rand >  0) ? MONS_WRAITH          // 12.5%
                                  : MONS_VAMPIRE);       //  4.2%
            mons_place(mgen_data::sleeper_at(mon_type, *ri));
        }
    }
}
static void _jelly_pit(int level_number, spec_room &sr)
{
    FixedVector< pit_mons_def, MAX_PIT_MONSTERS >  pit_list;
    const coord_def lordpos = sr.random_spot();
    for (int i = 0; i < MAX_PIT_MONSTERS; i++)
    {
        pit_list[i].type = MONS_PROGRAM_BUG;
        pit_list[i].rare = 0;
    }
#if DEBUG_DIAGNOSTICS
    mprf( MSGCH_DIAGNOSTICS, "Build: Jelly Pit" );
#endif
    pit_list[0].type = MONS_OOZE;
    pit_list[0].rare = 27 - level_number / 5;
    pit_list[1].type = MONS_JELLY;
    pit_list[1].rare = 20;
    pit_list[2].type = MONS_BROWN_OOZE;
    pit_list[2].rare = 3 + level_number;
    pit_list[3].type = MONS_DEATH_OOZE;
    pit_list[3].rare = 2 + (2 * level_number) / 3;
    if (level_number >= 12)
    {
        pit_list[4].type = MONS_AZURE_JELLY;
        pit_list[4].rare = 1 + (level_number - 12) / 3;
    }
    if (level_number >= 15)
    {
        pit_list[5].type = MONS_ACID_BLOB;
        pit_list[5].rare = 1 + (level_number - 15) / 4;
    }
    _fill_monster_pit( sr, pit_list, 90, MONS_PROGRAM_BUG, lordpos );
}
// Fills a special room with bees.
static void _beehive(spec_room &sr)
{
    for ( rectangle_iterator ri(sr.tl, sr.br); ri; ++ri )
    {
        if (coinflip())
            continue;
        const int i = get_item_slot();
        if (i == NON_ITEM)
            continue;
        item_def& item(mitm[i]);
        item.quantity = 1;
        item.base_type = OBJ_FOOD;
        item.sub_type = (one_chance_in(25) ? FOOD_ROYAL_JELLY : FOOD_HONEYCOMB);
        item.pos = *ri;
        item_colour( item );
    }
    const coord_def queenpos(sr.random_spot());
    // Mark all kinds of bees at patrolling to make them return to their hive.
    for ( rectangle_iterator ri(sr.tl, sr.br); ri; ++ri )
    {
        if (*ri == queenpos)
            continue;
        // The hive is chock full of bees!
        mons_place(mgen_data::sleeper_at(
                       one_chance_in(7) ? MONS_KILLER_BEE_LARVA
                                        : MONS_KILLER_BEE,
                       *ri, MG_PATROLLING));
    }
    mons_place(mgen_data::sleeper_at(MONS_QUEEN_BEE, queenpos, MG_PATROLLING));
}
#endif

All special room code has been moved to dat/rooms.des

Dependencies

In channels

Change contents

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

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

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

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

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

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

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