fiddlerwoaroof/crawl - Change O3HPZYTEN566YZRQ27OKFJOEOKZOJX3YOTDVYAKTO6T2H2IUNRFAC

Fix arena not placing water monsters correctly, remove monster habitat special-casing for "generation" time. Also fix arena "friendlies" not picking up items.

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

Created by dshaligram on January 2, 2009

O3HPZYTEN566YZRQ27OKFJOEOKZOJX3YOTDVYAKTO6T2H2IUNRFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 6749 [5.1396662]

B:BD[4.3208] → [4.3208:3276]

                    || you.friendly_pickup > FRIENDLY_PICKUP_NONE))

[4.3208]

[6.1454]

                    || you.friendly_pickup > FRIENDLY_PICKUP_NONE
                    || crawl_state.arena))

Replacement in crawl-ref/source/monplace.h at line 327 [5.1638277]

B:BD[7.655] → [7.655:757]

                     dungeon_feature_type actual_grid,
                     bool generation = false);

[7.655]

[7.868]

                     dungeon_feature_type actual_grid);

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

B:BD[7.1035] → [7.1035:1107]

                     dungeon_feature_type actual_grid, bool generation)

[7.1035]

[8.451192]

                     dungeon_feature_type actual_grid)

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

B:BD[9.3015] → [9.3015:3085]

                || !generation && actual_grid == DNGN_SHALLOW_WATER);

[9.3015]

[10.9279]

                || actual_grid == DNGN_SHALLOW_WATER);

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

B:BD[8.451640] → [11.5276:5352]

                    || !generation && actual_grid == DNGN_FOUNTAIN_BLUE)));

[8.451640]

[8.451701]

                    || actual_grid == DNGN_FOUNTAIN_BLUE)));

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

B:BD[12.7323] → [13.2834:2952]

                                    const coord_def &mg_pos,
                                    bool force_location)

[12.7323]

[14.2700]

                                    const coord_def &mg_pos)

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

B:BD[14.3137] → [15.3594:3665]

    if (!grid_compatible(grid_preferred, grd(mg_pos), !force_location)

[14.3137]

[15.3665]

    if (!grid_compatible(grid_preferred, grd(mg_pos))

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

B:BD[15.3713] → [15.3713:3796]

            || !grid_compatible(grid_nonpreferred, grd(mg_pos), !force_location)))

[15.3713]

[15.3796]

            || !grid_compatible(grid_nonpreferred, grd(mg_pos))))

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

B:BD[14.3600] → [13.3023:3095]

static bool _valid_monster_location(mgen_data &mg, bool force_location)

[14.3600]

[14.3651]

static bool _valid_monster_location(mgen_data &mg)

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

B:BD[14.3653] → [13.3096:3160]

    return _valid_monster_location(mg, mg.pos, force_location);

[14.3653]

[16.5684]

    return _valid_monster_location(mg, mg.pos);

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

B:BD[17.10488] → [13.3161:3214]

            if (!_valid_monster_location(mg, false))

[17.10488]

[5.1647380]

            if (!_valid_monster_location(mg))

Replacement in crawl-ref/source/monplace.cc at line 848 [5.1641732]
B:BD[14.3884] → [13.3215:3264]
```
    else if (!_valid_monster_location(mg, true))
```
[14.3884]
[14.3927]
```
    else if (!_valid_monster_location(mg))
```

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

B:BD[5.1653239] → [13.3265:3323]

            if (_valid_monster_location(mg, fpos, false))

[5.1653239]

[14.4068]

            if (_valid_monster_location(mg, fpos))

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

B:BD[18.5121] → [18.5121:5179]

        if (!grid_compatible(grid_wanted, grd(dc), true))

[18.5121]

[18.5179]

        if (!grid_compatible(grid_wanted, grd(dc)))

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

B:BD[16.11495] → [19.2670:2705]

B:BD[19.2705] → [15.10210:10365]

∅:D[20.3718] → [19.2778:2792]

∅:D[15.10365] → [19.2778:2792]

B:BD[19.2778] → [19.2778:2792]

            if (habitat != HT_LAND
                && (habitat != HT_WATER || !mons_class_amphibious(montype))
                && (habitat != HT_ROCK || !mons_class_wall_shielded(montype)))
            {

[16.11426]

[21.83611]

            if (!monster_habitable_grid(montype, grd(where)))

Deletion in crawl-ref/source/dungeon.cc at line 4673 [5.3429798]
∅:D[21.83663] → [19.2793:2807]
B:BD[22.27881] → [19.2793:2807]
```
            }
```

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

B:BD[23.9256] → [23.9256:9326]

            place = find_newmons_square_contiguous(mg.cls, where, 6);

[23.9256]

[23.9326]

            place = find_newmons_square_contiguous(mg.cls, where, 7);

Replacement in crawl-ref/source/dungeon.cc at line 4730 [5.3429798]
∅:D[23.9337] → [21.83664:83694]
B:BD[24.17272] → [21.83664:83694]
```
        mg.pos       = where;
```
[23.9337]
[25.5350]
```
        mg.pos       = place;
```

Replacement in crawl-ref/source/arena.cc at line 170 [23.10815]

B:BD[23.12761] → [2.2899:2937]

∅:D[2.2937] → [23.12801:12877]

B:BD[23.12801] → [23.12801:12877]

                const coord_def loc =
                    find_newmons_square_contiguous(MONS_GIANT_BAT, pos, 6);

[23.12761]

[2.2938]

                const coord_def loc = pos;

Replacement in crawl-ref/source/arena.cc at line 177 [23.10815]

B:BD[23.13128] → [23.13128:13201]

B:BD[23.13201] → [2.3054:3093]

                    end(1, false, "Failed to create monster at (%d,%d)",
                        loc.x, loc.y);

[23.13128]

[26.5262]

                    end(1, false, "Failed to create monster at (%d,%d) grd: %s",
                        loc.x, loc.y, dungeon_feature_name(grd(loc)));

Replacement in crawl-ref/source/arena.cc at line 225 [23.10815]

B:BD[3.4925] → [3.4925:5016]

            throw make_stringf("Failed to create arena named \"%s\"", arena_type.c_str());

[3.4925]

[3.5016]

            throw make_stringf("Failed to create arena named \"%s\"",
                               arena_type.c_str());

Replacement in crawl-ref/source/abyss.cc at line 678 [5.4482606]

B:BD[27.15472] → [27.15472:15531]

            || !grid_compatible(DNGN_FLOOR, grd(p), true))

[27.15472]

[28.15409]

            || !grid_compatible(DNGN_FLOOR, grd(p)))