fiddlerwoaroof/crawl - Change FKRLQJYHK3GB6HHSNNFQ7L57ZAR52LSTBG5B6SNJBYZ2LQ36P67AC

Start of moving special room definitions (monster lairs and monster pits)

to lua. As of now all special rooms are filled with rats.

Introduces two new members to map_def, weight_depth_mult and weight_depth_div, which change a map's weight based on the absolute dungeon depth (not yet accesible via lua or vault definitions). This needs to be done in C++ rather than in lua since a map's lua isn't re-invoked every time a random map is chosen, but only when the map is placed.

NOTE: When I first made this change crawl started crashing until I manually forced the recompilation of util/levcomp.lex.o and util/levcomp.tab.o; if crawl starts crashing after this change, try doing that.

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

Created by zelgadis on November 25, 2008

FKRLQJYHK3GB6HHSNNFQ7L57ZAR52LSTBG5B6SNJBYZ2LQ36P67AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/maps.cc at line 559 [5.2007666]

[3.589980]

[4.9856]

        int absdepth = 0;
        if (sel.place.level_type == LEVEL_DUNGEON && sel.place.is_valid())
            absdepth = sel.place.absdepth();

Replacement in crawl-ref/source/maps.cc at line 567 [5.2007666]

B:BD[4.10004] → [4.10004:10040]

            rollsize += map.weight;

[4.10004]

[5.2198469]

            const int weight = map.weight
                + absdepth * map.weight_depth_mult / map.weight_depth_div;
            if (weight <= 0)
                continue;

Replacement in crawl-ref/source/maps.cc at line 573 [5.2007666]

B:BD[5.2198470] → [4.10041:10106]

            if (rollsize && x_chance_in_y(map.weight, rollsize))

[5.2198470]

[4.10106]

            rollsize += weight;
            if (rollsize && x_chance_in_y(weight, rollsize))

Insertion in crawl-ref/source/mapdef.h at line 632 [3.591249]

[4.11670]

[6.4733]

    int              weight_depth_mult;
    int              weight_depth_div;

Replacement in crawl-ref/source/mapdef.cc at line 1187 [3.594797]

∅:D[4.11824] → [6.4783:4913]

B:BD[7.12660] → [6.4783:4913]

B:BD[6.4913] → [8.1237:1342]

      welcome_messages(), map(), mons(), items(), keyspecs(),
      prelude("dlprelude"), main("dlmain"), validate("dlvalidate"),
      veto("dlveto"), rock_colour(BLACK), floor_colour(BLACK),
      index_only(false), cache_offset(0L)

[4.11824]

[7.12763]

      weight_depth_mult(), weight_depth_div(), welcome_messages(), map(),
      mons(), items(), keyspecs(), prelude("dlprelude"), main("dlmain"),
      validate("dlvalidate"), veto("dlveto"), rock_colour(BLACK),
      floor_colour(BLACK), index_only(false), cache_offset(0L)

Insertion in crawl-ref/source/mapdef.cc at line 1242 [3.594797]

[3.598754]

[7.12906]

    // How to modify weight based on absolte dungeon depth.  This
    // needs to be done in the C++ code since the map's lua code doesnt'
    // get called again each time the depth changes.
    weight_depth_mult = 0;
    weight_depth_div  = 1;

Insertion in crawl-ref/source/luadgn.cc at line 2465 [9.1232]

[2.5484]

}
extern spec_room lua_special_room_spec;
extern int       lua_special_room_level;
LUAFN(dgn_get_special_room_info)
{
     if (!lua_special_room_spec.created || !in_bounds(lua_special_room_spec.tl)
         || lua_special_room_level == -1)
     {
         return (0);
     }
     lua_pushnumber(ls,  lua_special_room_level);
     dlua_push_coord(ls, lua_special_room_spec.tl);
     dlua_push_coord(ls, lua_special_room_spec.br);
     return (5);

Insertion in crawl-ref/source/luadgn.cc at line 2681 [9.1232]
[2.5682]
[10.4924]
```
    { "get_special_room_info", dgn_get_special_room_info },
```

Deletion in crawl-ref/source/dungeon.h at line 35 [5.3428186]

B:BD[5.3428500] → [11.95413:95670]

enum special_room_type
{
    SROOM_LAIR_ORC,                    //    0
    SROOM_LAIR_KOBOLD,
    SROOM_TREASURY,
    SROOM_BEEHIVE,
    SROOM_JELLY_PIT,
    SROOM_MORGUE,
    NUM_SPECIAL_ROOMS                  //    5 - must remain final member {dlb}
};

Replacement in crawl-ref/source/dungeon.cc at line 61 [5.3429798]
∅:D[12.3418] → [3.948581:948611]
B:BD[3.948581] → [3.948581:948611]
```
#define MAX_PIT_MONSTERS   10
```
[12.3418]
[3.948611]
```
spec_room lua_special_room_spec;
int       lua_special_room_level;
```
Deletion in crawl-ref/source/dungeon.cc at line 64 [5.3429798]
B:BD[3.948612] → [13.84726:84748]
B:BD[13.84748] → [14.46634:46657]
∅:D[14.46657] → [3.948648:948662]
B:BD[3.948648] → [3.948648:948662]
B:BD[15.3308] → [16.385:389]
```
struct pit_mons_def
{
    monster_type type;
    int rare;
};
```
Deletion in crawl-ref/source/dungeon.cc at line 187 [5.3429798]
∅:D[17.2745] → [18.11004:11134]
B:BD[18.11004] → [18.11004:11134]
```
static void _morgue(spec_room &sr);
static void _beehive(spec_room &sr);
static void _jelly_pit(int level_number, spec_room &sr);
```

Insertion in crawl-ref/source/dungeon.cc at line 920 [5.3429798]

[8.8007]

[15.4034]


    lua_special_room_spec.created = false;
    lua_special_room_spec.tl.set(-1, -1);
    lua_special_room_level = -1;

Deletion in crawl-ref/source/dungeon.cc at line 3521 [5.3429798]

B:BD[5.3586172] → [19.77105:77107]

∅:D[19.77107] → [3.964793:964931]

B:BD[5.3586221] → [3.964793:964931]

B:BD[3.964931] → [18.26720:26865]

B:BD[18.26865] → [19.77108:77189]

∅:D[20.11685] → [3.965135:965137]

∅:D[18.26934] → [3.965135:965137]

∅:D[14.48522] → [3.965135:965137]

∅:D[19.77189] → [3.965135:965137]

B:BD[3.965135] → [3.965135:965137]

B:BD[3.965137] → [19.77190:77201]

∅:D[19.77201] → [3.965154:965155]

B:BD[3.965154] → [3.965154:965155]

B:BD[3.965155] → [21.6794:6831]

B:BD[21.6831] → [22.3311:3354]

∅:D[22.3354] → [3.965234:965522]

B:BD[3.965234] → [3.965234:965522]

B:BD[3.965522] → [21.6832:6897]

∅:D[21.6897] → [3.965586:965662]

B:BD[3.965586] → [3.965586:965662]

B:BD[3.965662] → [22.3355:3391]

∅:D[22.3391] → [3.965698:965704]

B:BD[3.965698] → [3.965698:965704]

B:BD[3.965704] → [23.13976:14053]

∅:D[23.14053] → [3.965819:965876]

B:BD[3.965819] → [3.965819:965876]

B:BD[3.965876] → [23.14054:14119]

∅:D[23.14119] → [3.965942:966063]

B:BD[3.965942] → [3.965942:966063]

B:BD[3.966063] → [24.12469:12540]

∅:D[24.12540] → [3.966131:966145]

B:BD[3.966131] → [3.966131:966145]

B:BD[3.966145] → [21.6898:6932]

∅:D[21.6932] → [3.966178:966217]

B:BD[3.966178] → [3.966178:966217]

B:BD[3.966217] → [14.48523:48551]

B:BD[14.48551] → [25.16183:16217]

∅:D[25.16217] → [14.48579:48613]

B:BD[14.48579] → [14.48579:48613]

B:BD[14.48613] → [19.77202:77234]

∅:D[25.16266] → [26.12548:12549]

∅:D[19.77234] → [26.12548:12549]

B:BD[14.48655] → [26.12548:12549]

B:BD[26.12549] → [19.77235:77298]

∅:D[19.77298] → [14.48756:48762]

B:BD[14.48756] → [14.48756:48762]

∅:D[14.48762] → [3.966290:966291]

B:BD[3.966290] → [3.966290:966291]

B:BD[3.966291] → [21.6933:6982]

B:BD[21.6982] → [19.77299:77357]

∅:D[19.77357] → [22.3429:3435]

B:BD[22.3429] → [22.3429:3435]

B:BD[22.3435] → [19.77358:77490]

∅:D[19.77490] → [3.966578:966579]

B:BD[3.966578] → [3.966578:966579]

B:BD[3.966579] → [19.77491:77537]

∅:D[19.77537] → [3.966629:966630]

B:BD[3.966629] → [3.966629:966630]

B:BD[3.966630] → [19.77538:77636]

∅:D[19.77636] → [5.3586221:3586222]

∅:D[3.966739] → [5.3586221:3586222]

B:BD[5.3586221] → [5.3586221:3586222]

B:BD[5.3586222] → [19.77637:77795]

∅:D[19.77795] → [22.3521:3535]

B:BD[22.3521] → [22.3521:3535]

B:BD[22.3535] → [19.77796:77914]

∅:D[19.77914] → [22.3666:3680]

B:BD[3.967093] → [22.3666:3680]

∅:D[22.3680] → [3.967107:967117]

B:BD[3.967107] → [3.967107:967117]

B:BD[3.967117] → [22.3681:3687]

}
// 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;
            }
        }
    }

Insertion in crawl-ref/source/dungeon.cc at line 3525 [5.3429798]
[5.3586282]
[5.3586282]
```
#if 0 // MATT
```
Insertion in crawl-ref/source/dungeon.cc at line 3536 [5.3429798]
[19.77938]
[5.3586687]
```
#endif
```

Insertion in crawl-ref/source/dungeon.cc at line 3555 [5.3429798]

[5.3587300]

    const map_def *vault = random_map_for_tag("special_room", true, true);
    ASSERT(vault);
    if (!vault)
    {
        mpr("ERROR: failed to create special room.", MSGCH_ERROR);
        return;
    }
    lua_special_room_spec  = sr;
    lua_special_room_level = level_number;
    _build_minivaults( level_number, vault, false, false, sr.tl);
    lua_special_room_spec.created = false;
    lua_special_room_spec.tl.set(-1, -1);
    lua_special_room_level = -1;
#if 0 // MATT

Insertion in crawl-ref/source/dungeon.cc at line 3719 [5.3429798]
[5.3592642]
[5.3592642]
```
#endif
```
Deletion in crawl-ref/source/dungeon.cc at line 3721 [5.3429798]
B:BD[5.3592696] → [5.3592696:3592697]
B:BD[5.3592697] → [27.13417:13452]
∅:D[21.8495] → [18.27203:27239]
∅:D[27.13452] → [18.27203:27239]
B:BD[5.3592731] → [18.27203:27239]
∅:D[18.27239] → [5.3592766:3592768]
B:BD[5.3592766] → [5.3592766:3592768]
B:BD[5.3592768] → [19.79639:79749]
B:BD[19.79749] → [28.2772:2773]
∅:D[28.2773] → [19.79758:79846]
B:BD[19.79758] → [19.79758:79846]
∅:D[19.79846] → [5.3592792:3592793]
B:BD[5.3592792] → [5.3592792:3592793]
B:BD[5.3592793] → [19.79847:79880]
B:BD[19.79880] → [28.2774:2775]
∅:D[28.2775] → [19.79889:80091]
B:BD[19.79889] → [19.79889:80091]
∅:D[19.80091] → [5.3593311:3593312]
B:BD[5.3593311] → [5.3593311:3593312]
B:BD[5.3593312] → [19.80092:80140]
∅:D[19.80140] → [5.3593364:3593365]
B:BD[5.3593364] → [5.3593364:3593365]
B:BD[5.3593483] → [29.3862:3941]
B:BD[29.3941] → [19.80141:80256]
∅:D[19.80256] → [5.3593647:3593648]
B:BD[5.3593647] → [5.3593647:3593648]
B:BD[5.3593648] → [19.80257:80300]
B:BD[19.80300] → [30.4701:4911]
∅:D[30.4911] → [19.80511:80517]
B:BD[19.80511] → [19.80511:80517]
B:BD[19.80517] → [28.2778:2779]
∅:D[28.2779] → [19.80522:80602]
B:BD[19.80522] → [19.80522:80602]
∅:D[29.4046] → [14.50006:50008]
∅:D[21.8614] → [14.50006:50008]
∅:D[25.17009] → [14.50006:50008]
∅:D[19.80602] → [14.50006:50008]
B:BD[14.50006] → [14.50006:50008]
```
// 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));
}
```

Insertion in crawl-ref/source/dungeon.cc at line 7368 [5.3429798]

[5.3685312]


#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;
            }
        }
    }
}

Insertion in crawl-ref/source/dungeon.cc at line 7506 [5.3429798]

[3.974058]

[19.91265]

// 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

File addition: rooms.des (----------)

[3.1041429]

NAME: special_room_test
TAGS: special_room allow_dup
{{
    local level, tl_x, tl_y, br_x, br_y = dgn.get_special_room_info()
    -- Return early if we're being called during map validation.
    if not level then
        return
    end
    for x = tl_x, br_x do
        for y = tl_y, br_y do
            dgn.create_monster(x, y, "rat")
        end
    end
}}
MAP
ENDMAP

Replacement in crawl-ref/source/dat/clua/loadmaps.lua at line 16 [32.816]
B:BD[4.16258] → [31.14565:14606]
```
  "crypt.des", "ziggurat.des", "zot.des"
```
[4.16258]
[32.1249]
```
  "crypt.des", "ziggurat.des", "zot.des", "rooms.des"
```

Start of moving special room definitions (monster lairs and monster pits)

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/maps.cc at line 559 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 567 [5.2007666]

Replacement in crawl-ref/source/maps.cc at line 573 [5.2007666]

Insertion in crawl-ref/source/mapdef.h at line 632 [3.591249]

Replacement in crawl-ref/source/mapdef.cc at line 1187 [3.594797]

Insertion in crawl-ref/source/mapdef.cc at line 1242 [3.594797]

Insertion in crawl-ref/source/luadgn.cc at line 2465 [9.1232]

Insertion in crawl-ref/source/luadgn.cc at line 2681 [9.1232]

Deletion in crawl-ref/source/dungeon.h at line 35 [5.3428186]

Replacement in crawl-ref/source/dungeon.cc at line 61 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 64 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 187 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 920 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 3521 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 3525 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 3536 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 3555 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 3719 [5.3429798]

Deletion in crawl-ref/source/dungeon.cc at line 3721 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 7368 [5.3429798]

Insertion in crawl-ref/source/dungeon.cc at line 7506 [5.3429798]

File addition: rooms.des (----------)

Replacement in crawl-ref/source/dat/clua/loadmaps.lua at line 16 [32.816]