fiddlerwoaroof/crawl - Change ID373JATLMWAY526Q6Q5FXHRNFWMEOFXPHGPAUUY5OAMPFDN5SJAC

Accelerate monster generation in the Vestibule after the player spends enough

time there. Needs more tuning.

[1773000] Fixed tracer crash, mea culpa.

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

Created by dshaligram on August 13, 2007

ID373JATLMWAY526Q6Q5FXHRNFWMEOFXPHGPAUUY5OAMPFDN5SJAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1392 [5.16817]
B:BD[4.1242] → [4.1242:1270]
```
    int rc = advance(true);
```
[4.1242]
[6.16774]
```
    int rc = advance(false);
```
Insertion in crawl-ref/source/monplace.h at line 105 [5.1638277]
[2.254]
[5.1641672]
```
void spawn_random_monsters();
```
Insertion in crawl-ref/source/monplace.cc at line 17 [5.1641732]
[5.1642043]
[7.448]
```
#include "lev-pand.h"
```

Insertion in crawl-ref/source/monplace.cc at line 153 [5.1641732]

[8.1206]

[3.4908]

}
static void hell_spawn_random_monsters()
{
    const int speedup_turn = 1339;
    
    // Monster generation in the Vestibule starts ratcheting up quickly
    // after speedup_turn turns spent in the Vestibule.
    int genodds = (you.char_direction == GDT_DESCENDING) ? 240 : 8;
    if (env.turns_on_level > speedup_turn)
    {
        genodds -= (env.turns_on_level - speedup_turn) / 12;
        if (genodds < 3)
            genodds = 3;
    }
    if (one_chance_in(genodds))
    {
        int distance_odds = 10;
        if (env.turns_on_level > speedup_turn)
            distance_odds -= (env.turns_on_level - speedup_turn) / 100;
        if (distance_odds < 2)
            distance_odds = 2;
        proximity_type prox =
            (one_chance_in(distance_odds) ? PROX_NEAR_STAIRS 
             : PROX_AWAY_FROM_PLAYER);
        mons_place( WANDERING_MONSTER, BEH_HOSTILE, MHITNOT, false,
                    50, 50, LEVEL_DUNGEON, prox );
        viewwindow(true, false);
    }
}
void spawn_random_monsters()
{
    if (player_in_branch(BRANCH_VESTIBULE_OF_HELL))
    {
        hell_spawn_random_monsters();
        return;
    }
    
    // place normal dungeon monsters,  but not in player LOS
    if (you.level_type == LEVEL_DUNGEON
        && !player_in_branch( BRANCH_ECUMENICAL_TEMPLE )
        && one_chance_in((you.char_direction == GDT_DESCENDING) ? 240 : 8))
    {
        proximity_type prox = (one_chance_in(10) ? PROX_NEAR_STAIRS 
                                                 : PROX_AWAY_FROM_PLAYER);
        // The rules change once the player has picked up the Orb...
        if (you.char_direction == GDT_ASCENDING)
            prox = (one_chance_in(6) ? PROX_CLOSE_TO_PLAYER : PROX_ANYWHERE);
        mons_place( WANDERING_MONSTER, BEH_HOSTILE, MHITNOT, false,
                    50, 50, LEVEL_DUNGEON, prox );
        viewwindow(true, false);
    }
    // place Abyss monsters.
    if (you.level_type == LEVEL_ABYSS && one_chance_in(5))
    {
        mons_place( WANDERING_MONSTER, BEH_HOSTILE, MHITNOT, false,
                    50, 50, LEVEL_ABYSS, PROX_ANYWHERE );
        viewwindow(true, false);
    }
    // place Pandemonium monsters
    if (you.level_type == LEVEL_PANDEMONIUM && one_chance_in(50))
    {
        pandemonium_mons();
        viewwindow(true, false);
    }
    // No monsters in the Labyrinth, or the Ecumenical Temple, or in Bazaars.

Deletion in crawl-ref/source/acr.cc at line 2250 [5.4397395]

B:BD[5.4463209] → [5.4463209:4463368]

B:BD[5.4463368] → [9.50423:50499]

∅:D[10.2579] → [5.4463445:4463451]

∅:D[9.50499] → [5.4463445:4463451]

B:BD[5.4463445] → [5.4463445:4463451]

B:BD[5.4463451] → [11.934:1078]

∅:D[11.1078] → [5.4463573:4463643]

B:BD[5.4463573] → [5.4463573:4463643]

B:BD[5.4463643] → [9.50500:50549]

∅:D[9.50549] → [10.2580:2658]

B:BD[5.4463692] → [10.2580:2658]


    // place normal dungeon monsters,  but not in player LOS
    if (you.level_type == LEVEL_DUNGEON
        && !player_in_branch( BRANCH_ECUMENICAL_TEMPLE )
        && one_chance_in((you.char_direction == GDT_DESCENDING) ? 240 : 8))
    {
        proximity_type prox = (one_chance_in(10) ? PROX_NEAR_STAIRS 
                                                 : PROX_AWAY_FROM_PLAYER);
        // The rules change once the player has picked up the Orb...
        if (you.char_direction == GDT_ASCENDING)
            prox = (one_chance_in(6) ? PROX_CLOSE_TO_PLAYER : PROX_ANYWHERE);

Replacement in crawl-ref/source/acr.cc at line 2251 [5.4397395]

B:BD[5.4463772] → [5.4463772:4463891]

B:BD[5.4463891] → [12.414:447]

∅:D[12.447] → [5.4463891:4464118]

B:BD[5.4463891] → [5.4463891:4464118]

B:BD[5.4464118] → [12.448:481]

∅:D[12.481] → [5.4464118:4464225]

B:BD[5.4464118] → [5.4464118:4464225]

B:BD[5.4464225] → [12.482:488]

∅:D[12.488] → [5.4464225:4464253]

B:BD[5.4464225] → [5.4464225:4464253]

B:BD[5.4464253] → [12.489:528]

∅:D[12.528] → [5.4464253:4464254]

B:BD[5.4464253] → [5.4464253:4464254]

B:BD[5.4464254] → [9.50550:50628]

∅:D[9.50628] → [5.4464313:4464325]

∅:D[6.1271179] → [5.4464313:4464325]

B:BD[5.4464313] → [5.4464313:4464325]

        mons_place( WANDERING_MONSTER, BEH_HOSTILE, MHITNOT, false,
                    50, 50, LEVEL_DUNGEON, prox );
        viewwindow(true, false);
    }
    // place Abyss monsters.
    if (you.level_type == LEVEL_ABYSS && one_chance_in(5))
    {
        mons_place( WANDERING_MONSTER, BEH_HOSTILE, MHITNOT, false,
                    50, 50, LEVEL_ABYSS, PROX_ANYWHERE );
        viewwindow(true, false);
    }
    // place Pandemonium monsters
    if (you.level_type == LEVEL_PANDEMONIUM && one_chance_in(50))
    {
        pandemonium_mons();
        viewwindow(true, false);
    }
    // No monsters in the Labyrinth, or the Ecumenical Temple, or in Bazaars.
    return;

[5.4463772]

[13.10806]

    spawn_random_monsters();