fiddlerwoaroof/crawl - Change JD3FMKAAAUQZSNPGFLVX7F5H5SWGUSYOFZU4X5W4XYNV6HUKDBKAC

Change place_monster_aux to always check nearby squares as if

first_band_member was false, if the one it was called with is already occupied by the player or another monster. This should fix the problem behind all those bug reports of monsters sharing a square with the player. Might introduce new ones, I guess, though I hope it won't.

Also fix a minor display bug in the chardump.

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

Created by j-p-e-g on April 19, 2008

JD3FMKAAAUQZSNPGFLVX7F5H5SWGUSYOFZU4X5W4XYNV6HUKDBKAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1276 [8.569242]

B:BD[7.6000] → [7.6000:6061]

         || grd[ targ_x ][ targ_y ] == DNGN_CLEAR_ROCK_WALL)

[7.6000]

[8.599665]

            || grd[ targ_x ][ targ_y ] == DNGN_CLEAR_ROCK_WALL)

Replacement in crawl-ref/source/spells2.cc at line 1286 [8.569242]

∅:D[9.4419] → [8.600137:600214]

B:BD[8.600137] → [8.600137:600214]

        && (restricted_type == 0 || restricted_type == MONS_FIRE_ELEMENTAL))

[9.4419]

[8.600214]

            && (restricted_type == 0 || restricted_type == MONS_FIRE_ELEMENTAL))

Replacement in crawl-ref/source/spells2.cc at line 1292 [8.569242]

B:BD[8.600378] → [8.600378:600455]

        && (restricted_type == 0 || restricted_type == MONS_FIRE_ELEMENTAL))

[8.600378]

[8.600455]

            && (restricted_type == 0 || restricted_type == MONS_FIRE_ELEMENTAL))

Replacement in crawl-ref/source/spells2.cc at line 1297 [8.569242]

B:BD[8.600569] → [8.600569:600630]

B:BD[8.600630] → [10.1282:1344]

∅:D[10.1344] → [8.600692:600770]

B:BD[8.600692] → [8.600692:600770]

            || grd[ targ_x ][ targ_y ] == DNGN_SHALLOW_WATER
            || grd[ targ_x ][ targ_y ] == DNGN_FOUNTAIN_BLUE)
        && (restricted_type == 0 || restricted_type == MONS_WATER_ELEMENTAL))

[8.600569]

[8.600770]

                || grd[ targ_x ][ targ_y ] == DNGN_SHALLOW_WATER
                || grd[ targ_x ][ targ_y ] == DNGN_FOUNTAIN_BLUE)
           && (restricted_type == 0 || restricted_type == MONS_WATER_ELEMENTAL))

Replacement in crawl-ref/source/spells2.cc at line 1304 [8.569242]

B:BD[8.600880] → [8.600880:601017]

            && env.cgrid[ targ_x ][ targ_y ] == EMPTY_CLOUD)
        && (restricted_type == 0 || restricted_type == MONS_AIR_ELEMENTAL))

[8.600880]

[8.601017]

             && env.cgrid[ targ_x ][ targ_y ] == EMPTY_CLOUD)
             && (restricted_type == 0 || restricted_type == MONS_AIR_ELEMENTAL))

Replacement in crawl-ref/source/spells2.cc at line 1327 [8.569242]

B:BD[8.601766] → [6.297:440]

∅:D[6.440] → [11.440:500]

B:BD[11.440] → [11.440:500]

                        && (type_summoned != MONS_WATER_ELEMENTAL
                            || random2((you.species == SP_MERFOLK) ? 5 : 15)
                                < you.skills[SK_ICE_MAGIC])

[8.601766]

[8.601933]

                     && (type_summoned != MONS_WATER_ELEMENTAL
                         || random2((you.species == SP_MERFOLK) ? 5 : 15)
                               < you.skills[SK_ICE_MAGIC])

Replacement in crawl-ref/source/spells2.cc at line 1331 [8.569242]

B:BD[8.601934] → [6.441:576]

                        && (type_summoned != MONS_AIR_ELEMENTAL
                            || random2(15) < you.skills[SK_AIR_MAGIC])

[8.601934]

[8.602038]

                     && (type_summoned != MONS_AIR_ELEMENTAL
                         || random2(15) < you.skills[SK_AIR_MAGIC])

Replacement in crawl-ref/source/spells2.cc at line 1334 [8.569242]

B:BD[8.602039] → [6.577:716]

                        && (type_summoned != MONS_EARTH_ELEMENTAL
                            || random2(5)  < you.skills[SK_EARTH_MAGIC])

[8.602039]

[8.602147]

                     && (type_summoned != MONS_EARTH_ELEMENTAL
                         || random2(5)  < you.skills[SK_EARTH_MAGIC])

Replacement in crawl-ref/source/spells2.cc at line 1337 [8.569242]

B:BD[8.602148] → [6.717:773]

                        && random2(100) >= unfriendly);

[8.602148]

[8.602337]

                     && random2(100) >= unfriendly);

Replacement in crawl-ref/source/monplace.cc at line 48 [8.1641732]

B:BD[12.1030] → [12.1030:1103]

static band_type choose_band( int mon_type, int power, int &band_size );

[12.1030]

[13.3408]

static band_type choose_band(int mon_type, int power, int &band_size );

Replacement in crawl-ref/source/monplace.cc at line 50 [8.1641732]

∅:D[13.3483] → [14.245888:245972]

B:BD[8.1642670] → [14.245888:245972]

    int px, int py, int power, int extra, bool first_band_member,
    int dur = 0);

[13.3483]

[15.450980]

                             int px, int py, int power, int extra,
                             bool first_band_member, int dur = 0);

Replacement in crawl-ref/source/monplace.cc at line 496 [8.1641732]

B:BD[16.4519] → [16.4519:4653]

            || pval == 2 && (mons_speed(mon_type) == 0
               || grd[px][py] == DNGN_LAVA || grd[px][py] == DNGN_DEEP_WATER))

[16.4519]

[16.4653]

            || pval == 2
               && (mons_speed(mon_type) == 0 || grd[px][py] == DNGN_LAVA
                   || grd[px][py] == DNGN_DEEP_WATER))

Insertion in crawl-ref/source/monplace.cc at line 521 [8.1641732]
[17.10008]
[5.3573]

Replacement in crawl-ref/source/monplace.cc at line 547 [8.1641732]

B:BD[8.1647309] → [8.1647309:1647366]

                || (px == you.x_pos && py == you.y_pos))

[8.1647309]

[8.1647366]

                || px == you.x_pos && py == you.y_pos)

Replacement in crawl-ref/source/monplace.cc at line 585 [8.1641732]

B:BD[8.1648710] → [8.1648710:1648874]

                    if ((proximity == PROX_CLOSE_TO_PLAYER && !close_to_player)
                        || (proximity == PROX_AWAY_FROM_PLAYER && close_to_player))

[8.1648710]

[8.1648874]

                    if (proximity == PROX_CLOSE_TO_PLAYER && !close_to_player
                        || proximity == PROX_AWAY_FROM_PLAYER && close_to_player)

Insertion in crawl-ref/source/monplace.cc at line 686 [8.1641732]
[2.373]
[2.373]

Replacement in crawl-ref/source/monplace.cc at line 717 [8.1641732]

B:BD[8.1652931] → [8.1652931:1652958]

    if (first_band_member)

[8.1652931]

[8.1652958]

    // If the space is occupied, try some neighbouring square instead.
    if (first_band_member && mgrd[px][py] == NON_MONSTER
        && (px != you.x_pos || py != you.y_pos))

Replacement in crawl-ref/source/monplace.cc at line 735 [8.1641732]

B:BD[8.1653264] → [8.1653264:1653309]

            if (mgrd[fx][fy] != NON_MONSTER)

[8.1653264]

[8.1653309]

            if (mgrd[fx][fy] != NON_MONSTER
                || fx == you.x_pos && fy == you.y_pos)
            {

Insertion in crawl-ref/source/monplace.cc at line 739 [8.1641732]
[8.1653335]
[8.1653335]
```
            }
```

Replacement in crawl-ref/source/monplace.cc at line 747 [8.1641732]

B:BD[8.1653929] → [8.1653929:1653956]

B:BD[8.1653956] → [18.11039:11110]

∅:D[18.11110] → [8.1654014:1654044]

B:BD[8.1654014] → [8.1654014:1654044]

            if (trap >= 0)
                if (!can_place_on_trap(mon_type, env.trap[trap].type))
                    continue;

[8.1653929]

[8.1654044]

            if (trap >= 0 && !can_place_on_trap(mon_type, env.trap[trap].type))
                continue;

Deletion in crawl-ref/source/monplace.cc at line 772 [8.1641732]
∅:D[3.3485] → [8.1654775:1654781]
B:BD[8.1654775] → [8.1654775:1654781]
```
    {
```
Deletion in crawl-ref/source/monplace.cc at line 773 [8.1641732]
B:BD[8.1654834] → [8.1654834:1654840]
```
    }
```
Deletion in crawl-ref/source/monplace.cc at line 774 [8.1641732]
B:BD[8.1654849] → [8.1654849:1654855]
```
    {
```
Deletion in crawl-ref/source/monplace.cc at line 775 [8.1641732]
B:BD[8.1654883] → [8.1654883:1654889]
```
    }
```
Replacement in crawl-ref/source/monplace.cc at line 801 [8.1641732]
∅:D[17.10133] → [15.455264:455298]
B:BD[15.455264] → [15.455264:455298]
```
            && !one_chance_in(5))
```
[17.10133]
[19.11191]
```
        && !one_chance_in(5))
    {
```
Insertion in crawl-ref/source/monplace.cc at line 804 [8.1641732]
[19.11234]
[20.10567]
```
    }
```

Replacement in crawl-ref/source/monplace.cc at line 1531 [8.1641732]

B:BD[8.1673353] → [4.2667:2730]

∅:D[4.2730] → [15.459188:459236]

B:BD[15.459188] → [15.459188:459236]

    if (permit_bands
            || mon_type == RANDOM_MONSTER
            || level_type == LEVEL_PANDEMONIUM)

[8.1673353]

[8.1673424]

    if (mon_type == RANDOM_MONSTER
        || level_type == LEVEL_PANDEMONIUM)
    {

Insertion in crawl-ref/source/monplace.cc at line 1535 [8.1641732]
[8.1673453]
[8.1673453]
```
    }
```

Replacement in crawl-ref/source/monplace.cc at line 1556 [8.1641732]

B:BD[8.1673839] → [8.1673839:1673913]

B:BD[8.1673913] → [14.246369:246448]

    if (place_monster( mid, mon_type, power, behaviour, target, summoned,
                       px, py, permit_bands, proximity, extra, dur ) == false)

[8.1673839]

[8.1673987]

    if (!place_monster( mid, mon_type, power, behaviour, target, summoned,
                        px, py, permit_bands, proximity, extra, dur ))

Replacement in crawl-ref/source/monplace.cc at line 1720 [8.1641732]
B:BD[15.459850] → [15.459850:459908]
```
    coord_def pos = find_newmons_square(cls, cr_x, cr_y);
```
[15.459850]
[21.1584]
```
    coord_def pos;
```

Replacement in crawl-ref/source/monplace.cc at line 1722 [8.1641732]

∅:D[21.1649] → [22.351:395]

B:BD[22.351] → [22.351:395]

        && mgrd[cr_x][cr_y] == NON_MONSTER)

[21.1649]

[22.395]

        && mgrd[cr_x][cr_y] == NON_MONSTER
        && (cr_x != you.x_pos || cr_y != you.y_pos))

Insertion in crawl-ref/source/monplace.cc at line 1728 [8.1641732]
[22.451]
[15.459908]
```
    else
        pos = find_newmons_square(cls, cr_x, cr_y);
```

Replacement in crawl-ref/source/chardump.cc at line 615 [8.4100336]

B:BD[8.4111065] → [23.3170:3222]

            text += verb + " demanding penance.\n";

[8.4111065]

[8.4111136]

            text += " " + verb + " demanding penance.\n";

Change place_monster_aux to always check nearby squares as if

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1276 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1286 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1292 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1297 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1304 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1327 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1331 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1334 [8.569242]

Replacement in crawl-ref/source/spells2.cc at line 1337 [8.569242]

Replacement in crawl-ref/source/monplace.cc at line 48 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 50 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 496 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 521 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 547 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 585 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 686 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 717 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 735 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 739 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 747 [8.1641732]

Deletion in crawl-ref/source/monplace.cc at line 772 [8.1641732]

Deletion in crawl-ref/source/monplace.cc at line 773 [8.1641732]

Deletion in crawl-ref/source/monplace.cc at line 774 [8.1641732]

Deletion in crawl-ref/source/monplace.cc at line 775 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 801 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 804 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1531 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1535 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1556 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1720 [8.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1722 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 1728 [8.1641732]

Replacement in crawl-ref/source/chardump.cc at line 615 [8.4100336]