fiddlerwoaroof/crawl - Change WDEFQ6YABDQIGJXW5KT3OGR3EO6FZHXZELIRVIXQ4XDYTVOV5V6AC

Monsters coming up or down staircases will now

be chosen according to the destination. And yes, this does mean that occasionally an elf summoner will cross the Orc/Elf border etc, which could make things harder. On the other hand, that's just one staircase out of (at least!) seven, and monsters entering the level through the upstairs will likewise be a bit easier.

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

Created by j-p-e-g on August 23, 2007

WDEFQ6YABDQIGJXW5KT3OGR3EO6FZHXZELIRVIXQ4XDYTVOV5V6AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.h at line 113 [5.217090]

B:BD[5.224084] → [5.224084:224157]

int near_stairs(int px, int py, int max_dist, unsigned char &stair_gfx);

[5.223873]

[5.224157]

int near_stairs(int px, int py, int max_dist, unsigned char &stair_gfx, branch_type &branch);

Insertion in crawl-ref/source/stuff.cc at line 56 [5.224557]
[5.225263]
[6.103923]
```
#include "branch.h"
```

Replacement in crawl-ref/source/stuff.cc at line 1066 [5.224557]

B:BD[5.242162] → [5.242162:242234]

int near_stairs(int px, int py, int max_dist, unsigned char &stair_gfx)

[5.242162]

[5.242234]

int near_stairs(int px, int py, int max_dist, unsigned char &stair_gfx, branch_type &branch)

Insertion in crawl-ref/source/stuff.cc at line 1085 [5.224557]

[5.242701]

[6.115255]

                // shouldn't happen for escape hatches
                if (grd[x][y] == DNGN_ROCK_STAIRS_DOWN
                    || grd[x][y] == DNGN_ROCK_STAIRS_UP)
                {
                    continue;
                }

Insertion in crawl-ref/source/stuff.cc at line 1093 [5.224557]

[6.115313]

[5.242747]

                
                // is it a branch stair?
                for ( i = 0; i < NUM_BRANCHES; ++i )
                {
                     if (branches[i].entry_stairs == grd[x][y])
                     {
                         branch = branches[i].id;
                         break;
                     }
                     else if (branches[i].exit_stairs == grd[x][y])
                     {
                         branch = branches[i].parent_branch;
                         break;
                     }
                }

Insertion in crawl-ref/source/monplace.cc at line 16 [5.1641732]
[5.1642022]
[5.1642022]
```
#include "branch.h"
```

Replacement in crawl-ref/source/monplace.cc at line 305 [5.1641732]

B:BD[2.6875] → [2.6875:6939]

            while (mons_rarity(mon_type) == 0 && count < 2000);

[2.6875]

[2.6939]

            while (mons_rarity(mon_type, place) == 0 && count < 2000);

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

[5.1643072]

    
    // player shoved out of the way?
    bool shoved = false;
    unsigned char stair_gfx = 0;
    int tries = 0;
    int pval = 0;
    level_id place = level_id::current();

Replacement in crawl-ref/source/monplace.cc at line 352 [5.1641732]

B:BD[5.1643301] → [5.1643301:1643390]

    if (mon_type == RANDOM_MONSTER
        && player_in_branch( BRANCH_HALL_OF_BLADES ))

[5.1643301]

[5.1643390]

    if (mon_type == RANDOM_MONSTER)

Replacement in crawl-ref/source/monplace.cc at line 354 [5.1641732]

B:BD[5.1643396] → [5.1643396:1643442]

        mon_type = MONS_DANCING_WEAPON;
    }

[5.1643396]

[5.1643442]

        // respect destination level for staircases
        if (proximity == PROX_NEAR_STAIRS)
        {
            while(++tries <= 320)
            {
                px = 5 + random2(GXM - 10);
                py = 5 + random2(GYM - 10);
                if (mgrd[px][py] != NON_MONSTER
                    || (px == you.x_pos && py == you.y_pos))
                {
                    continue;
                }
                // Is the monster happy where we want to put it?
                unsigned char grid_wanted = monster_habitat(mon_type);
                if (!grid_compatible(grid_wanted, grd[px][py], true))
                    continue;
                // Is the grid verboten?
                if (!unforbidden( coord_def(px, py), mmask ))
                    continue;
                // don't generate monsters on top of teleport traps
                int trap = trap_at_xy(px, py);
                if (trap >= 0)
                {
                    if (env.trap[trap].type == TRAP_TELEPORT)
                       continue;
                }
                // check whether there's a stair
                // and whether it leads to another branch
                pval = near_stairs(px, py, 1, stair_gfx, place.branch);
                // no monsters spawned in the Temple
                if (branches[place.branch].id == BRANCH_ECUMENICAL_TEMPLE)
                    continue;
                // found a position near the stairs!
                if (pval > 0)
                    break;
            }
            if (tries > 320)
            {   // give up and try somewhere else
                proximity = PROX_AWAY_FROM_PLAYER;
            }
            else
            {
                if ( stair_gfx == '>' ) // deeper level
                    lev_mons++;
                else if (stair_gfx == '<') // higher level
                {
                    // monsters don't come from outside the dungeon
                    if (lev_mons <= 0)
                    {
                        proximity = PROX_AWAY_FROM_PLAYER;
                        // or maybe allow 1st level monsters, having visited the
                        // surface, to re-enter the dungeon
                        // in that case lev_mons stays as it is
                    }
                    else
                        lev_mons--;
                }
//                mprf("branch := %d, level := %d",
//                     branches[place.branch].id, lev_mons+1);
            }
        } // end proximity check

Replacement in crawl-ref/source/monplace.cc at line 424 [5.1641732]

B:BD[5.1643443] → [5.1643443:1643485]

B:BD[5.1643485] → [2.7445:7515]

    if (mon_type == RANDOM_MONSTER)
    {
        mon_type = pick_random_monster(level_id::current(), lev_mons,

[5.1643443]

[2.7515]

        if (branches[place.branch].id == BRANCH_HALL_OF_BLADES)
            mon_type = MONS_DANCING_WEAPON;
        else
        {
            // now pick a monster of the given branch and level
            mon_type = pick_random_monster(place, lev_mons,

Replacement in crawl-ref/source/monplace.cc at line 431 [5.1641732]

B:BD[2.7565] → [2.7565:7635]

        if (mon_type == MONS_PROGRAM_BUG)
            return (false);

[2.7565]

[5.1645777]


            if (mon_type == MONS_PROGRAM_BUG)
                return (false);
        }

Replacement in crawl-ref/source/monplace.cc at line 450 [5.1641732]

B:BD[5.1646095] → [5.1646095:1646165]

B:BD[5.1646165] → [6.454465:454544]

∅:D[6.454544] → [5.1646235:1646278]

B:BD[5.1646235] → [5.1646235:1646278]

    // Monsters that can't move shouldn't be taking the stairs -- bwr
    if (proximity == PROX_NEAR_STAIRS && mons_class_is_stationary( mon_type ))
        proximity = PROX_AWAY_FROM_PLAYER;

[5.1646095]

[5.1646278]

    if (proximity == PROX_NEAR_STAIRS)
    {
        // for some cases disallow monsters on stairs
        if (mons_class_is_stationary( mon_type )
            || pval == 2 && (mons_speed(mon_type) == 0
               || grd[px][py] == DNGN_LAVA || grd[px][py] == DNGN_DEEP_WATER))
        {
            proximity = PROX_AWAY_FROM_PLAYER;
        }
    }

Deletion in crawl-ref/source/monplace.cc at line 464 [5.1641732]

B:BD[5.1646396] → [5.1646396:1646510]


    // player shoved out of the way?
    bool shoved = false;
    unsigned char stair_gfx = 0;
    int pval = 0;

Replacement in crawl-ref/source/monplace.cc at line 467 [5.1641732]
B:BD[5.1646536] → [5.1646536:1646559]
```
        int tries = 0;
```
[5.1646536]
[5.1646559]
```
        tries = 0;
```

Replacement in crawl-ref/source/monplace.cc at line 475 [5.1641732]

B:BD[5.1646797] → [5.1646797:1646909]

            tries ++;
            // give up on stair placement?
            if (proximity == PROX_NEAR_STAIRS)

[5.1646797]

[5.1646909]

            // handled above, won't change anymore
            if (proximity == PROX_NEAR_STAIRS && tries)

Replacement in crawl-ref/source/monplace.cc at line 478 [5.1641732]

B:BD[5.1646923] → [5.1646923:1647078]

                if (tries > 320)
                {
                    proximity = PROX_AWAY_FROM_PLAYER;
                    tries = 0;
                }

[5.1646923]

[5.1647078]

                proximity = PROX_AWAY_FROM_PLAYER;
                tries = 0;

Replacement in crawl-ref/source/monplace.cc at line 482 [5.1641732]
B:BD[7.503] → [7.503:536]
```
            else if (tries > 45)
```
[7.503]
[5.1647126]
```
            else if (tries >= 45)
```

Deletion in crawl-ref/source/monplace.cc at line 484 [5.1641732]

B:BD[5.1647158] → [5.1647158:1647239]


            px = 5 + random2(GXM - 10);
            py = 5 + random2(GYM - 10);

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

[5.1647240]

            tries ++;
            
            // placement already decided for PROX_NEAR_STAIRS
            if (proximity != PROX_NEAR_STAIRS)
            {
                px = 5 + random2(GXM - 10);
                py = 5 + random2(GYM - 10);
            }
            
            // Let's recheck these even for PROX_NEAR_STAIRS, just in case

Replacement in crawl-ref/source/monplace.cc at line 544 [5.1641732]

B:BD[5.1649025] → [5.1649025:1649122]

                    pval = near_stairs(px, py, 1, stair_gfx);
                    if (pval == 2)

[5.1649025]

[5.1649122]

                    if (pval == 2) // player on stairs

Deletion in crawl-ref/source/monplace.cc at line 632 [5.1641732]

B:BD[5.1652116] → [4.195:290]


    // if summoned onto traps, directly affect monster
    menv[id].apply_location_effects();

Replacement in crawl-ref/source/mon-util.cc at line 3936 [5.1699344]

B:BD[3.13375] → [3.13375:13444]

        if (mons_is_paralysed(this) || this->behaviour == BEH_SLEEP)

[3.13375]

[3.13444]

        if (mons_is_stationary(this) || mons_is_paralysed(this)
            || this->behaviour == BEH_SLEEP)
        {

Insertion in crawl-ref/source/mon-util.cc at line 3940 [5.1699344]
[3.13463]
[3.13463]
```
        }
```