fiddlerwoaroof/crawl - Change 43NBC6HJOFQQTASUMC5W7MWLS355ASIUS7SEFRO6PJWQDY7MRZZQC

Placeholders for the various types of special rooms now occur at

approximations of the frequency they did in 0.4 (see end of dat/rooms.des for the 0.4 frequencies). Only bee-hives and jelly pits appear in the Lair, and only morgues appear in the Crypt.

The depths at which special rooms appear is now entirely controlled by the DEPTH lines in dat/rooms.des, so they can appear at any depth except for D:1, since D:1 is constructed by differnt code than the other levels. With the current set of depths this means that special rooms on roguey levels can start appearing 3 levels earlier than in crawl 0.4

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

Created by zelgadis on November 26, 2008

43NBC6HJOFQQTASUMC5W7MWLS355ASIUS7SEFRO6PJWQDY7MRZZQC

Dependencies

In channels

main

Change contents

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

B:BD[3.3435117] → [4.10625:10685]

static void _special_room(int level_number, spec_room &sr);

[3.3435117]

[4.10685]

static void _special_room(int level_number, spec_room &sr,
                          const map_def *vault);

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

B:BD[3.3561639] → [5.3062:3123]

∅:D[5.3123] → [4.22408:22449]

B:BD[3.3561714] → [4.22408:22449]

    if (!sr.created && level_number > 5 && one_chance_in(5))
        _special_room(level_number, sr);

[3.3561639]

[3.3561754]

    if (!sr.created && one_chance_in(5))
    {
        const map_def *sroom = random_map_for_tag("special_room", true, true);
        // Might not be any special room definitions appropriate for
        // this branch and depth.
        if (sroom != NULL)
            _special_room(level_number, sr, sroom);
    }

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

B:BD[6.967126] → [4.26935:26994]

static void _special_room(int level_number, spec_room &sr)

[6.967126]

[3.3586280]

static void _special_room(int level_number, spec_room &sr,
                          const map_def *vault)

Insertion in crawl-ref/source/dungeon.cc at line 3534 [3.3429798]
[3.3586282]
[2.4305]
```
    ASSERT(vault);
```
Deletion in crawl-ref/source/dungeon.cc at line 3564 [3.3429798]
∅:D[7.78021] → [3.3587299:3587300]
B:BD[3.3587299] → [3.3587299:3587300]
B:BD[3.3587300] → [2.4328:4403]
```
    const map_def *vault = random_map_for_tag("special_room", true, true);
```

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

B:BD[2.4404] → [2.4404:4535]

    ASSERT(vault);
    if (!vault)
    {
        mpr("ERROR: failed to create special room.", MSGCH_ERROR);
        return;
    }

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

∅:D[2.4812] → [3.3587300:3587535]

B:BD[3.3587300] → [3.3587300:3587535]

B:BD[3.3587535] → [8.7395:7731]

∅:D[8.7731] → [3.3587731:3587885]

B:BD[3.3587731] → [3.3587731:3587885]

B:BD[3.3587885] → [6.967193:967227]

B:BD[6.967227] → [9.18126:18200]

∅:D[9.18200] → [6.967294:967304]

B:BD[6.967294] → [6.967294:967304]

B:BD[6.967304] → [9.18201:18247]

∅:D[9.18247] → [6.967343:967353]

B:BD[6.967343] → [6.967343:967353]

∅:D[6.967353] → [3.3587885:3587892]

B:BD[3.3587885] → [3.3587885:3587892]

    if (level_number < 7)
        spec_room_type = SROOM_LAIR_KOBOLD;
    else
    {
        spec_room_type = random2(NUM_SPECIAL_ROOMS);
        if (level_number < 23 && one_chance_in(4))
            spec_room_type = SROOM_BEEHIVE;
        // Replace overly dangerous special rooms with a room full of orcs.
        if (level_number > 13 && spec_room_type == SROOM_LAIR_KOBOLD
            || level_number < 16 && spec_room_type == SROOM_MORGUE
            || level_number < 14 && spec_room_type == SROOM_JELLY_PIT
            || level_number < 17 && one_chance_in(4))
        {
            spec_room_type = SROOM_LAIR_ORC;
        }
        if (level_number > 19 && coinflip())
            spec_room_type = SROOM_MORGUE;
        if (level_number > 13 &&
            one_chance_in(6 - (level_number > 23) - (level_number > 18)))
        {
            spec_room_type = SROOM_JELLY_PIT;
        }
    }

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

∅:D[8.13231] → [3.3683205:3683252]

B:BD[3.3683205] → [3.3683205:3683252]

    if (level_number > 8 && one_chance_in(10))

[8.13231]

[3.3683252]

    const map_def *sroom;
    if (one_chance_in(10)
	    && (sroom = random_map_for_tag("special_room", true, true)) != NULL)

Replacement in crawl-ref/source/dungeon.cc at line 7493 [3.3429798]
∅:D[7.89684] → [4.49572:49615]
B:BD[3.3683509] → [4.49572:49615]
```
        _special_room( level_number, sr );
```
[7.89684]
[3.3683551]
```
        _special_room( level_number, sr, sroom );
```
Replacement in crawl-ref/source/dat/rooms.des at line 1 [2.8289]
B:BD[2.8289] → [2.8290:8343]
```
NAME: special_room_test
TAGS: special_room allow_dup
```
[2.8289]
[2.8343]
```
lua {{
```
Replacement in crawl-ref/source/dat/rooms.des at line 3 [2.8289]
B:BD[2.8344] → [2.8344:8347]
```
{{
```
[2.8344]
[2.8347]
```
function fill_special_room(mon)
```
Insertion in crawl-ref/source/dat/rooms.des at line 10 [2.8289]
[2.8528]
[2.8528]
```
    crawl.mpr("mon = " .. mon .. ", level = " .. level)
```
Replacement in crawl-ref/source/dat/rooms.des at line 15 [2.8289]
B:BD[2.8585] → [2.8585:8629]
```
            dgn.create_monster(x, y, "rat")
```
[2.8585]
[2.8629]
```
            dgn.create_monster(x, y, mon)
```
Insertion in crawl-ref/source/dat/rooms.des at line 18 [2.8289]
[2.8649]
[2.8649]
```
return
end
```

Insertion in crawl-ref/source/dat/rooms.des at line 22 [2.8289]

[2.8652]


##########################
NAME:   special_room_kobold
DEPTH:  6-14, !Lair, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 11
: fill_special_room("kobold")
MAP
ENDMAP
NAME:   special_room_orc_a
DEPTH:  8-14, !Lair, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 59
: fill_special_room("orc")
MAP
ENDMAP
NAME:   special_room_bee_a
DEPTH:  8-14, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 30
: fill_special_room("killer bee")
MAP
ENDMAP
################################
NAME:   special_room_orc_b
DEPTH:  15-16, !Lair, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 50
: fill_special_room("orc")
MAP
ENDMAP
NAME:   special_room_bee_b
DEPTH:  15-16, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 25
: fill_special_room("killer bee")
MAP
ENDMAP
NAME:   special_room_morgue_b
DEPTH:  15-16, !Lair
TAGS:   special_room allow_dup
WEIGHT: 25
: fill_special_room("rat zombie")
MAP
ENDMAP
#################################
NAME:   special_room_orc_c
DEPTH:  17, !Lair, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 40
: fill_special_room("orc")
MAP
ENDMAP
NAME:   special_room_bee_c
DEPTH:  17, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 25
: fill_special_room("killer bee")
MAP
ENDMAP
NAME:   special_room_morgue_c
DEPTH:  17, !Lair
TAGS:   special_room allow_dup
WEIGHT: 27
: fill_special_room("rat zombie")
MAP
ENDMAP
NAME:   special_room_jelly_c
DEPTH:  17, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 9
: fill_special_room("jelly")
MAP
ENDMAP
#################################
NAME:   special_room_orc_d
DEPTH:  18-20, !Lair, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 25
: fill_special_room("orc")
MAP
ENDMAP
NAME:   special_room_bee_d
DEPTH:  18-20, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 33
: fill_special_room("killer bee")
MAP
ENDMAP
NAME:   special_room_morgue_d
DEPTH:  18-20, !Lair
TAGS:   special_room allow_dup
WEIGHT: 29
: fill_special_room("rat zombie")
MAP
ENDMAP
NAME:   special_room_jelly_d
DEPTH:  18-20, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 13
: fill_special_room("jelly")
MAP
ENDMAP
#################################
NAME:   special_room_orc_e
DEPTH:  21-, !Lair, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 15
: fill_special_room("orc")
MAP
ENDMAP
NAME:   special_room_bee_e
DEPTH:  21-, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 8
: fill_special_room("killer bee")
MAP
ENDMAP
NAME:   special_room_morgue_e
DEPTH:  21-, !Lair
TAGS:   special_room allow_dup
WEIGHT: 32
: fill_special_room("rat zombie")

Insertion in crawl-ref/source/dat/rooms.des at line 160 [2.8289]

[2.8663]


NAME:   special_room_jelly_e
DEPTH:  21-, !Crypt
TAGS:   special_room allow_dup
WEIGHT: 45
: fill_special_room("jelly")
MAP
ENDMAP
#########################################################################
#########################################################################
# 0.4 crawl C code for randomly determining which special room type to
# use
#    if (level_number < 7)
#        spec_room_type = SROOM_LAIR_KOBOLD;
#    else
#    {
#        spec_room_type = random2(NUM_SPECIAL_ROOMS);
#
#        if (level_number < 23 && one_chance_in(4))
#            spec_room_type = SROOM_BEEHIVE;
#
#        // Replace overly dangerous special rooms with a room full of orcs.
#        if (level_number > 13 && spec_room_type == SROOM_LAIR_KOBOLD
#            || level_number < 16 && spec_room_type == SROOM_MORGUE
#            || level_number < 14 && spec_room_type == SROOM_JELLY_PIT
#            || level_number < 17 && one_chance_in(4))
#        {
#            spec_room_type = SROOM_LAIR_ORC;
#        }
#
#        if (level_number > 19 && coinflip())
#            spec_room_type = SROOM_MORGUE;
#
#        if (level_number > 13 &&
#            one_chance_in(6 - (level_number > 23) - (level_number > 18)))
#        {
#            spec_room_type = SROOM_JELLY_PIT;
#        }
#    }
#
####################################
# 0.4 crawl percentages for each room type generated per level (for 10,000
# randomly generated vaults per level)
#  |   K   |    O   |    B   |    M   |    J   |
#-----------------------------------------------
# 0|  0.00 |   0.00 |   0.00 |   0.00 |   0.00 |
# 1|  0.00 |   0.00 |   0.00 |   0.00 |   0.00 |
# 2|  0.00 |   0.00 |   0.00 |   0.00 |   0.00 |
# 3|  0.00 |   0.00 |   0.00 |   0.00 |   0.00 |
# 4|  0.00 |   0.00 |   0.00 |   0.00 |   0.00 |
# 5|  0.00 |   0.00 |   0.00 |   0.00 |   0.00 |
# 6|100.00 |   0.00 |   0.00 |   0.00 |   0.00 |
# 7| 11.39 |  59.25 |  29.36 |   0.00 |   0.00 |
# 8| 11.07 |  58.43 |  30.50 |   0.00 |   0.00 |
# 9| 11.23 |  57.98 |  30.79 |   0.00 |   0.00 |
#10| 11.46 |  58.39 |  30.15 |   0.00 |   0.00 |
#11| 11.30 |  58.78 |  29.92 |   0.00 |   0.00 |
#12| 11.21 |  58.65 |  30.14 |   0.00 |   0.00 |
#13| 10.92 |  58.96 |  30.12 |   0.00 |   0.00 |
#14|  0.00 |  49.58 |  24.99 |  25.43 |   0.00 |
#15|  0.00 |  49.74 |  24.56 |  25.70 |   0.00 |
#16|  0.00 |  39.51 |  24.77 |  27.04 |   8.68 |
#17|  0.00 |  24.23 |  33.07 |  29.57 |  13.13 |
#18|  0.00 |  25.31 |  32.99 |  29.06 |  12.64 |
#19|  0.00 |  24.52 |  32.53 |  31.09 |  11.86 |
#20|  0.00 |  11.63 |  15.84 |  25.52 |  47.01 |
#21|  0.00 |  12.06 |  17.33 |  25.60 |  45.01 |
#22|  0.00 |  12.12 |  15.97 |  25.50 |  46.41 |
#23|  0.00 |  14.94 |   8.64 |  27.63 |  48.79 |
#24|  0.00 |  15.20 |   7.29 |  32.14 |  45.37 |
#25|  0.00 |  14.82 |   7.88 |  33.04 |  44.26 |
#26|  0.00 |  14.99 |   7.91 |  31.94 |  45.16 |
#27|  0.00 |  14.96 |   7.28 |  32.06 |  45.70 |
#28|  0.00 |  15.12 |   7.88 |  32.11 |  44.89 |
#29|  0.00 |  15.48 |   7.40 |  33.17 |  43.95 |
#30|  0.00 |  15.08 |   7.84 |  31.97 |  45.11 |

Placeholders for the various types of special rooms now occur at

Dependencies

In channels

Change contents

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/dat/rooms.des at line 1 [2.8289]

Replacement in crawl-ref/source/dat/rooms.des at line 3 [2.8289]

Insertion in crawl-ref/source/dat/rooms.des at line 10 [2.8289]

Replacement in crawl-ref/source/dat/rooms.des at line 15 [2.8289]

Insertion in crawl-ref/source/dat/rooms.des at line 18 [2.8289]

Insertion in crawl-ref/source/dat/rooms.des at line 22 [2.8289]

Insertion in crawl-ref/source/dat/rooms.des at line 160 [2.8289]