fiddlerwoaroof/crawl - Change JFDTUUUT6AKIGPBKGYFC7HZKGQUZOMG7EUWU4QYKSDVXXPQBBFHAC

Adjust monster habitats again. Remove the M_AMPHIBIOUS flag, and

replace it with two new habitats: HT_AMPHIBIOUS_LAND and HT_AMPHIBIOUS_WATER, to indicate which habitat a monster prefers. This effectively gives amphibious monsters primary and secondary habitats; check both when trying to place such monsters. With these changes, merfolk can be placed on land properly (via wizard mode's &M) when no water is around. The one monster that can move through rock is affected as well: rock is its primary habitat, while land is its secondary one.

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

Created by dolorous on October 5, 2008

JFDTUUUT6AKIGPBKGYFC7HZKGQUZOMG7EUWU4QYKSDVXXPQBBFHAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2207 [14.1396662]

∅:D[12.3086] → [13.5006:5087]

B:BD[13.5006] → [13.5006:5087]

                                               habitat2grid(mons_habitat(mon)));

[12.3086]

[15.13592]

                                 habitat2grid(mons_primary_habitat(mon)));

Replacement in crawl-ref/source/monstuff.cc at line 2354 [14.1396662]
B:BD[12.6389] → [12.6389:6439]
```
    const habitat_type habit = mons_habitat(mon);
```
[12.6389]
[16.3772]
```
    const habitat_type habit = mons_primary_habitat(mon);
```
Replacement in crawl-ref/source/monstuff.cc at line 2377 [14.1396662]
B:BD[12.7081] → [12.7081:7119]
```
        if (mons_habitat(m) != habit)
```
[12.7081]
[12.7119]
```
        if (mons_primary_habitat(m) != habit)
```

Replacement in crawl-ref/source/monstuff.cc at line 2827 [14.1396662]

B:BD[17.5303] → [17.5303:5373]

                        const habitat_type habit = mons_habitat(mon);

[17.5303]

[18.6064]

                        const habitat_type habit = mons_primary_habitat(mon);

Replacement in crawl-ref/source/monstuff.cc at line 5445 [14.1396662]
B:BD[19.270] → [20.7057:7098]
```
    if (mons_habitat(monster) != HT_LAND
```
[19.270]
[21.197]
```
    if (mons_primary_habitat(monster) != HT_LAND
```
Replacement in crawl-ref/source/monstuff.cc at line 6652 [14.1396662]
∅:D[22.31710] → [20.8345:8401]
B:BD[23.270] → [20.8345:8401]
```
    const habitat_type habitat = mons_habitat(monster);
```
[22.31710]
[24.3198]
```
    const habitat_type habitat = mons_primary_habitat(monster);
```
Replacement in crawl-ref/source/monstuff.cc at line 6849 [14.1396662]
B:BD[14.1529804] → [20.8492:8548]
```
    const habitat_type habitat = mons_habitat(monster);
```
[14.1529804]
[14.1529863]
```
    const habitat_type habitat = mons_primary_habitat(monster);
```

Replacement in crawl-ref/source/monplace.cc at line 119 [14.1641732]

B:BD[25.1390] → [20.9508:9569]

        habitat2grid( mons_habitat_by_type(monster_class) );

[25.1390]

[26.15194]

        habitat2grid(mons_class_primary_habitat(monster_class));
    const dungeon_feature_type nonpreferred_habitat =
        habitat2grid(mons_class_secondary_habitat(monster_class));

Replacement in crawl-ref/source/monplace.cc at line 123 [14.1641732]

B:BD[26.15195] → [27.2982:3039]

    if (grid_compatible(preferred_habitat, actual_grid))

[26.15195]

[27.3039]

    if (grid_compatible(preferred_habitat, actual_grid)
        || (nonpreferred_habitat != preferred_habitat
            && grid_compatible(nonpreferred_habitat, actual_grid)))
    {

Insertion in crawl-ref/source/monplace.cc at line 128 [14.1641732]
[27.3062]
[27.3062]
```
    }
```

Deletion in crawl-ref/source/monplace.cc at line 135 [14.1641732]

B:BD[27.3342] → [27.3342:3436]

B:BD[27.3436] → [17.7460:7505]

∅:D[17.7505] → [27.3475:3697]

B:BD[27.3475] → [27.3475:3697]

    {
        return (true);
    }
    // Amphibious critters are happy in water or on land.
    if (mons_class_amphibious(monster_class)
        && (preferred_habitat == DNGN_FLOOR
                && grid_compatible(DNGN_DEEP_WATER, actual_grid)
            || preferred_habitat == DNGN_DEEP_WATER
               && grid_compatible(DNGN_FLOOR, actual_grid)))

Deletion in crawl-ref/source/monplace.cc at line 139 [14.1641732]

B:BD[28.452935] → [27.3733:3954]

∅:D[29.1665] → [28.453121:453122]

∅:D[27.3954] → [28.453121:453122]

B:BD[28.453121] → [28.453121:453122]

    // Rock wall critters are native to walls but are happy on
    // the floor as well.
    if (preferred_habitat == DNGN_ROCK_WALL
        && grid_compatible(DNGN_FLOOR, actual_grid))
    {
        return (true);
    }

Replacement in crawl-ref/source/monplace.cc at line 149 [14.1641732]
∅:D[30.5716] → [20.9646:9678]
B:BD[28.454007] → [20.9646:9678]
```
    switch (mons_habitat(mons))
```
[30.5716]
[20.9678]
```
    switch (mons_primary_habitat(mons))
```
Replacement in crawl-ref/source/monplace.cc at line 153 [14.1641732]
B:BD[20.9776] → [20.9776:9813]
```
        return grid_is_watery(grid);
```
[20.9776]
[31.2060]
```
        return (grid_is_watery(grid));
```

Replacement in crawl-ref/source/monplace.cc at line 543 [14.1641732]

∅:D[9.2810] → [32.2838:2877]

B:BD[32.2838] → [32.2838:2877]

B:BD[32.2877] → [9.2811:2864]

    dungeon_feature_type grid_wanted =
        habitat2grid(mons_habitat_by_type(montype));

[9.2810]

[32.2928]

    const dungeon_feature_type grid_preferred =
        habitat2grid(mons_class_primary_habitat(montype));
    const dungeon_feature_type grid_nonpreferred =
        habitat2grid(mons_class_secondary_habitat(montype));

Replacement in crawl-ref/source/monplace.cc at line 556 [14.1641732]

B:BD[32.3137] → [33.2953:3022]

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

[32.3137]

[32.3195]

    if (!grid_compatible(grid_preferred, grd(mg_pos), !force_location)
        && (grid_nonpreferred == grid_preferred
            || !grid_compatible(grid_nonpreferred, grd(mg_pos), !force_location)))
    {

Insertion in crawl-ref/source/monplace.cc at line 561 [14.1641732]
[32.3219]
[32.3219]
```
    }
```

Replacement in crawl-ref/source/monplace.cc at line 1951 [14.1641732]

B:BD[34.7442] → [34.7442:7499]


    return habitat2grid( mons_habitat_by_type(mtype) );

[34.7442]

[35.4112]

    return habitat2grid(mons_class_primary_habitat(mtype));

Replacement in crawl-ref/source/mon-util.h at line 102 [14.1682293]
B:BD[36.67782] → [5.2574:2645]
```
    M_AMPHIBIOUS        = (1<<13),        // monster can swim in water
```
[36.67782]
[37.2572]

Replacement in crawl-ref/source/mon-util.h at line 153 [14.1682293]

B:BD[31.2708] → [2.209:250]

∅:D[2.250] → [19.529:571]

B:BD[19.529] → [19.529:571]

∅:D[19.571] → [31.2844:2885]

B:BD[31.2844] → [31.2844:2885]

B:BD[31.2885] → [38.442:483]

    HT_LAND = 0,        // Land critters
    HT_WATER,           // Water critters
    HT_LAVA,            // Lava critters
    HT_ROCK,            // Rock critters

[31.2708]

[31.2931]

    HT_LAND = 0,         // Land critters
    HT_AMPHIBIOUS_LAND,  // Amphibious land-preferring critters
    HT_AMPHIBIOUS_WATER, // Amphibious water-preferring critters
    HT_WATER,            // Water critters
    HT_LAVA,             // Lava critters
    HT_ROCK,             // Rock critters

Insertion in crawl-ref/source/mon-util.h at line 449 [14.1682293]

[17.7672]

[14.1688829]

bool mons_class_wall_shielded(int mc);
bool mons_wall_shielded(const monsters *mon);

Replacement in crawl-ref/source/mon-util.h at line 550 [14.1682293]

B:BD[39.1047] → [20.11172:11378]

// Use mons_habitat(const monster *) wherever possible since the other
// variant does not handle zombies correctly.
habitat_type mons_habitat(const monsters *m);
habitat_type mons_habitat_by_type(int mc);

[39.1047]

[40.2613]

// Use mons_habitat() and mons_primary_habitat() wherever possible,
// since the class variants do not handle zombies correctly.
habitat_type mons_class_habitat(int mc);
habitat_type mons_habitat(const monsters *mon);
habitat_type mons_class_primary_habitat(int mc);
habitat_type mons_primary_habitat(const monsters *mon);
habitat_type mons_class_secondary_habitat(int mc);
habitat_type mons_secondary_habitat(const monsters *mon);

Deletion in crawl-ref/source/mon-util.h at line 741 [14.1682293]
∅:D[41.5453] → [42.3147:3183]
B:BD[43.465] → [42.3147:3183]
```
bool mons_is_wall_shielded(int mc);
```

Replacement in crawl-ref/source/mon-util.h at line 803 [14.1682293]

B:BD[44.1652] → [44.1652:1729]

bool mons_class_can_pass(const int mclass, const dungeon_feature_type grid);

[44.1652]

[45.18823]

bool mons_class_can_pass(int mc, const dungeon_feature_type grid);
bool mons_can_pass(const monsters *mon, dungeon_feature_type grid);

Insertion in crawl-ref/source/mon-util.cc at line 110 [14.1699344]
[28.466803]
[19.833]
```
    case HT_AMPHIBIOUS_WATER:
```
Insertion in crawl-ref/source/mon-util.cc at line 118 [14.1699344]
[19.871]
[28.466991]
```
    case HT_AMPHIBIOUS_LAND:
```
Deletion in crawl-ref/source/mon-util.cc at line 392 [14.1699344]
B:BD[46.2344] → [42.3187:3224]
B:BD[42.3224] → [20.12035:12085]
∅:D[20.12085] → [42.3266:3269]
B:BD[42.3266] → [42.3266:3269]
```
bool mons_is_wall_shielded(int mc)
{
    return (mons_habitat_by_type(mc) == HT_ROCK);
}
```

Replacement in crawl-ref/source/mon-util.cc at line 1274 [14.1699344]

B:BD[39.1477] → [30.9560:9685]

    const int type = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                            : mon->type;

[39.1477]

[30.9685]

    const int montype = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                               : mon->type;

Replacement in crawl-ref/source/mon-util.cc at line 1277 [14.1699344]
∅:D[30.9686] → [47.2623:2677]
B:BD[47.2623] → [47.2623:2677]
```
    const flight_type ret = mons_class_flies( type );
```
[30.9686]
[48.2376]
```
    const flight_type ret = mons_class_flies(montype);
```

Replacement in crawl-ref/source/mon-util.cc at line 1285 [14.1699344]

B:BD[31.3303] → [31.3303:3349]

    return mons_class_flag(mc, M_AMPHIBIOUS);

[31.3303]

[31.3349]

    habitat_type ht = mons_class_habitat(mc);
    return (ht == HT_AMPHIBIOUS_LAND || ht == HT_AMPHIBIOUS_WATER);

Replacement in crawl-ref/source/mon-util.cc at line 1291 [14.1699344]

B:BD[17.7755] → [17.7755:7880]

    const int type = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                            : mon->type;

[17.7755]

[14.1716658]

    const int montype = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                               : mon->type;
    return (mons_class_amphibious(montype));
}
bool mons_class_wall_shielded(int mc)
{
    return (mons_class_habitat(mc) == HT_ROCK);
}

Replacement in crawl-ref/source/mon-util.cc at line 1301 [14.1699344]

B:BD[14.1716659] → [17.7881:7923]

    return (mons_class_amphibious(type));

[14.1716659]

[17.7923]

bool mons_wall_shielded(const monsters *mon)
{
    const int montype = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                               : mon->type;
    return (mons_class_wall_shielded(montype));

Replacement in crawl-ref/source/mon-util.cc at line 2019 [14.1699344]
B:BD[31.3355] → [20.12986:13028]
```
habitat_type mons_habitat_by_type(int mc)
```
[31.3355]
[20.13028]
```
habitat_type mons_class_habitat(int mc)
```

Replacement in crawl-ref/source/mon-util.cc at line 2025 [14.1699344]

B:BD[20.13124] → [20.13124:13169]

habitat_type mons_habitat(const monsters *m)

[20.13124]

[31.3389]

habitat_type mons_habitat(const monsters *mon)
{
    return mons_class_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon)
                                                     : mon->type);
}
habitat_type mons_class_primary_habitat(int mc)
{
    habitat_type ht = mons_class_habitat(mc);
    if (ht == HT_AMPHIBIOUS_LAND)
        ht = HT_LAND;
    else if (ht == HT_AMPHIBIOUS_WATER)
        ht = HT_WATER;
    return (ht);
}
habitat_type mons_primary_habitat(const monsters *mon)
{
    return mons_class_primary_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon)
                                                             : mon->type);
}
habitat_type mons_class_secondary_habitat(int mc)

Replacement in crawl-ref/source/mon-util.cc at line 2049 [14.1699344]

B:BD[31.3391] → [49.5966:6109]

    return mons_habitat_by_type( mons_is_zombified(m) ? mons_zombie_base(m)
                                                      : m->type );

[31.3391]

[40.2660]

    habitat_type ht = mons_class_habitat(mc);
    if (ht == HT_AMPHIBIOUS_LAND)
        ht = HT_WATER;
    else if (ht == HT_AMPHIBIOUS_WATER || ht == HT_ROCK)
        ht = HT_LAND;
    return (ht);

Replacement in crawl-ref/source/mon-util.cc at line 2057 [14.1699344]
B:BD[40.2663] → [40.2663:2710]
```
bool intelligent_ally(const monsters *monster)
```
[40.2663]
[40.2710]
```
habitat_type mons_secondary_habitat(const monsters *mon)
```

Replacement in crawl-ref/source/mon-util.cc at line 2059 [14.1699344]

B:BD[40.2712] → [40.2712:2813]

    return (monster->attitude == ATT_FRIENDLY
            && mons_intel(monster->type) >= I_NORMAL);

[40.2712]

[50.11311]

    return mons_class_secondary_habitat(mons_is_zombified(mon) ? mons_zombie_base(mon)
                                                               : mon->type);
}
bool intelligent_ally(const monsters *mon)
{
    return (mon->attitude == ATT_FRIENDLY && mons_intel(mon->type) >= I_NORMAL);

Replacement in crawl-ref/source/mon-util.cc at line 3027 [14.1699344]
∅:D[51.55999] → [20.13627:13696]
B:BD[52.5193] → [20.13627:13696]
```
    return (grid_is_watery(grid) && mons_habitat(this) == HT_WATER);
```
[51.55999]
[8.2490]
```
    return (grid_is_watery(grid) && mons_primary_habitat(this) == HT_WATER);
```

Replacement in crawl-ref/source/mon-util.cc at line 3073 [14.1699344]

B:BD[53.8346] → [20.13697:13743]

            && mons_habitat(this) != HT_WATER

[53.8346]

[17.7983]

            && mons_primary_habitat(this) != HT_WATER

Replacement in crawl-ref/source/mon-util.cc at line 3079 [14.1699344]

B:BD[44.1734] → [44.1734:1810]

bool mons_class_can_pass(const int mclass, const dungeon_feature_type grid)

[44.1734]

[44.1810]

bool mons_class_can_pass(int mc, const dungeon_feature_type grid)

Replacement in crawl-ref/source/mon-util.cc at line 3081 [14.1699344]
B:BD[44.1812] → [42.3320:3359]
```
    if (mons_is_wall_shielded(mclass))
```
[44.1812]
[44.1977]
```
    if (mons_class_wall_shielded(mc))
```

Insertion in crawl-ref/source/mon-util.cc at line 3091 [14.1699344]

[44.2129]

[54.3420]

bool mons_can_pass(const monsters *mon, dungeon_feature_type grid)
{
    const int montype = mons_is_zombified(mon) ? mons_zombie_base(mon)
                                               : mon->type;
    return mons_class_can_pass(montype, grid);
}

Replacement in crawl-ref/source/mon-util.cc at line 3100 [14.1699344]
B:BD[44.2202] → [44.2202:2246]
```
    return mons_class_can_pass(type, grid);
```
[44.2202]
[44.2457]
```
    return mons_can_pass(this, grid);
```

Replacement in crawl-ref/source/mon-util.cc at line 6729 [14.1699344]

B:BD[55.4515] → [55.4515:4684]

            // (HT_LAND, such as hydras) and those that favour water
            // (HT_WATER, such as merfolk), but that's something we
            // can think about.

[55.4515]

[10.2475]

            // (HT_AMPHIBIOUS_LAND, such as hydras) and those that
            // favour water (HT_AMPHIBIOUS_WATER, such as merfolk), but
            // that's something we can think about.

Replacement in crawl-ref/source/mon-data.h at line 805 [14.1826214]
B:BD[56.23324] → [56.23324:23358]
```
    M_NO_SKELETON | M_AMPHIBIOUS,
```
[56.23324]
[56.23358]
```
    M_NO_SKELETON,
```

Replacement in crawl-ref/source/mon-data.h at line 811 [14.1826214]

B:BD[56.23591] → [56.23591:23650]

    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE

[56.23591]

[56.23650]

    HT_AMPHIBIOUS_LAND, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE

Replacement in crawl-ref/source/mon-data.h at line 816 [14.1826214]
B:BD[56.23710] → [56.23710:23744]
```
    M_NO_SKELETON | M_AMPHIBIOUS,
```
[56.23710]
[56.23744]
```
    M_NO_SKELETON,
```

Replacement in crawl-ref/source/mon-data.h at line 822 [14.1826214]

B:BD[56.23978] → [56.23978:24037]

    HT_LAND, 4, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE

[56.23978]

[57.11914]

    HT_AMPHIBIOUS_LAND, 4, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE

Replacement in crawl-ref/source/mon-data.h at line 851 [14.1826214]
∅:D[58.14340] → [56.24539:24572]
B:BD[56.24539] → [56.24539:24572]
```
    M_COLD_BLOOD | M_AMPHIBIOUS,
```
[58.14340]
[56.24572]
```
    M_COLD_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 857 [14.1826214]

B:BD[56.24740] → [56.24740:24799]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY

[56.24740]

[56.24799]

    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY

Replacement in crawl-ref/source/mon-data.h at line 907 [14.1826214]
B:BD[56.26385] → [56.26385:26418]
```
    M_COLD_BLOOD | M_AMPHIBIOUS,
```
[56.26385]
[28.494301]
```
    M_COLD_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 913 [14.1826214]

B:BD[56.26642] → [56.26642:26703]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM

[56.26642]

[56.26703]

    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM

Replacement in crawl-ref/source/mon-data.h at line 970 [14.1826214]
∅:D[4.2623] → [59.3413:3457]
B:BD[56.28721] → [59.3413:3457]
```
    M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
```
[4.2623]
[56.28767]
```
    M_WARM_BLOOD | M_SPEAKS,
```

Replacement in crawl-ref/source/mon-data.h at line 976 [14.1826214]

B:BD[56.29013] → [56.29013:29082]

    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM

[56.29013]

[56.29082]

    HT_AMPHIBIOUS_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM

Replacement in crawl-ref/source/mon-data.h at line 981 [14.1826214]
B:BD[56.29133] → [59.3458:3518]
```
    M_SPELLCASTER | M_WARM_BLOOD | M_AMPHIBIOUS | M_SPEAKS,
```
[56.29133]
[56.29195]
```
    M_SPELLCASTER | M_WARM_BLOOD | M_SPEAKS,
```

Replacement in crawl-ref/source/mon-data.h at line 987 [14.1826214]

B:BD[56.29441] → [56.29441:29510]

    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM

[56.29441]

[57.12283]

    HT_AMPHIBIOUS_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM

Replacement in crawl-ref/source/mon-data.h at line 1314 [14.1826214]
B:BD[14.1835536] → [14.1835536:1835569]
```
    M_WARM_BLOOD | M_AMPHIBIOUS,
```
[14.1835536]
[3.2555]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 1320 [14.1826214]
∅:D[6.2649] → [19.2386:2450]
∅:D[60.3289] → [19.2386:2450]
B:BD[57.13249] → [19.2386:2450]
```
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
```
[6.2649]
[57.13304]
```
    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
```
Replacement in crawl-ref/source/mon-data.h at line 1325 [14.1826214]
B:BD[56.38714] → [56.38714:38747]
```
    M_WARM_BLOOD | M_AMPHIBIOUS,
```
[56.38714]
[3.2581]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 1331 [14.1826214]
∅:D[6.2719] → [56.38988:39050]
B:BD[56.38988] → [56.38988:39050]
```
    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
```
[6.2719]
[56.39050]
```
    HT_AMPHIBIOUS_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
```
Replacement in crawl-ref/source/mon-data.h at line 1393 [14.1826214]
B:BD[56.41053] → [56.41053:41081]
```
    M_FLIES | M_AMPHIBIOUS,
```
[56.41053]
[56.41081]
```
    M_FLIES,
```

Replacement in crawl-ref/source/mon-data.h at line 1399 [14.1826214]

B:BD[56.41363] → [61.3040:3099]

    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG

[56.41363]

[56.41425]

    HT_AMPHIBIOUS_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG

Replacement in crawl-ref/source/mon-data.h at line 1796 [14.1826214]
B:BD[56.52969] → [56.52969:53040]
```
    M_AMPHIBIOUS | M_WARM_BLOOD,  // because it likes the swamp -- bwr
```
[56.52969]
[56.53040]
```
    M_WARM_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 1802 [14.1826214]

B:BD[62.42737] → [61.3160:3218]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG

[62.42737]

[57.15858]

    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG

Replacement in crawl-ref/source/mon-data.h at line 1949 [14.1826214]
B:BD[56.58760] → [56.58760:58793]
```
    M_COLD_BLOOD | M_AMPHIBIOUS,
```
[56.58760]
[28.498753]
```
    M_COLD_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 1955 [14.1826214]

B:BD[56.58986] → [56.58986:59046]

    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL

[56.58986]

[57.17528]

    HT_AMPHIBIOUS_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL

Replacement in crawl-ref/source/mon-data.h at line 1960 [14.1826214]
B:BD[56.59106] → [56.59106:59139]
```
    M_COLD_BLOOD | M_AMPHIBIOUS,
```
[56.59106]
[28.498885]
```
    M_COLD_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 1966 [14.1826214]

B:BD[56.59356] → [56.59356:59417]

    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM

[56.59356]

[57.17663]

    HT_AMPHIBIOUS_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM

Replacement in crawl-ref/source/mon-data.h at line 1971 [14.1826214]
B:BD[56.59466] → [56.59466:59499]
```
    M_COLD_BLOOD | M_AMPHIBIOUS,
```
[56.59466]
[28.499061]
```
    M_COLD_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 1977 [14.1826214]

B:BD[56.59726] → [56.59726:59786]

    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL

[56.59726]

[57.17922]

    HT_AMPHIBIOUS_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL

Replacement in crawl-ref/source/mon-data.h at line 1982 [14.1826214]
B:BD[56.59839] → [56.59839:59892]
```
    M_COLD_BLOOD | M_AMPHIBIOUS | M_SPECIAL_ABILITY,
```
[56.59839]
[28.499155]
```
    M_COLD_BLOOD | M_SPECIAL_ABILITY,
```

Replacement in crawl-ref/source/mon-data.h at line 1988 [14.1826214]

B:BD[56.60105] → [11.3440:3501]

    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE

[56.60105]

[57.18042]

    HT_AMPHIBIOUS_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE

Replacement in crawl-ref/source/mon-data.h at line 2146 [14.1826214]
B:BD[56.64844] → [56.64844:64903]
```
    M_SEE_INVIS | M_SPLITS | M_AMPHIBIOUS | M_ACID_SPLASH,
```
[56.64844]
[56.64903]
```
    M_SEE_INVIS | M_SPLITS | M_ACID_SPLASH,
```

Replacement in crawl-ref/source/mon-data.h at line 2152 [14.1826214]

B:BD[56.65163] → [56.65163:65226]

    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_MEDIUM

[56.65163]

[57.20336]

    HT_AMPHIBIOUS_LAND, 9, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_MEDIUM

Replacement in crawl-ref/source/mon-data.h at line 2157 [14.1826214]
B:BD[14.1851447] → [28.501217:501235]
```
    M_AMPHIBIOUS,
```
[14.1851447]
[28.501235]
```
    M_NO_FLAGS,
```
Replacement in crawl-ref/source/mon-data.h at line 2163 [14.1826214]
∅:D[56.65296] → [19.5900:5960]
B:BD[57.20410] → [19.5900:5960]
```
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
```
[56.65296]
[57.20592]
```
    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
```
Replacement in crawl-ref/source/mon-data.h at line 2179 [14.1826214]
B:BD[56.65735] → [56.65735:65785]
```
    M_NO_SKELETON | M_SENSE_INVIS | M_AMPHIBIOUS,
```
[56.65735]
[28.501640]
```
    M_NO_SKELETON | M_SENSE_INVIS,
```

Replacement in crawl-ref/source/mon-data.h at line 2185 [14.1826214]

B:BD[56.65990] → [11.3624:3685]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE

[56.65990]

[57.20859]

    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE

Replacement in crawl-ref/source/mon-data.h at line 2526 [14.1826214]
B:BD[56.77804] → [56.77804:77837]
```
    M_COLD_BLOOD | M_AMPHIBIOUS,
```
[56.77804]
[56.77837]
```
    M_COLD_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 2532 [14.1826214]

B:BD[56.78058] → [56.78058:78118]

    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL

[56.78058]

[57.26070]

    HT_AMPHIBIOUS_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL

Replacement in crawl-ref/source/mon-data.h at line 2537 [14.1826214]
B:BD[14.1864864] → [28.506957:506990]
```
    M_COLD_BLOOD | M_AMPHIBIOUS,
```
[14.1864864]
[28.506990]
```
    M_COLD_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 2543 [14.1826214]
∅:D[56.78186] → [19.8738:8799]
B:BD[57.26142] → [19.8738:8799]
```
    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
```
[56.78186]
[57.26194]
```
    HT_AMPHIBIOUS_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
```
Replacement in crawl-ref/source/mon-data.h at line 2655 [14.1826214]
B:BD[56.81290] → [56.81290:81323]
```
    M_WARM_BLOOD | M_AMPHIBIOUS,
```
[56.81290]
[56.81323]
```
    M_WARM_BLOOD,
```

Replacement in crawl-ref/source/mon-data.h at line 2662 [14.1826214]

B:BD[56.81571] → [56.81571:81629]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG

[56.81571]

[57.27590]

    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG

Replacement in crawl-ref/source/mon-data.h at line 2796 [14.1826214]
B:BD[56.86279] → [63.3088:3129]
```
    M_SEE_INVIS | M_AMPHIBIOUS | M_EVIL,
```
[56.86279]
[56.86311]
```
    M_SEE_INVIS | M_EVIL,
```

Replacement in crawl-ref/source/mon-data.h at line 2802 [14.1826214]

B:BD[56.86626] → [56.86626:86689]

    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,

[56.86626]

[57.29100]

    HT_AMPHIBIOUS_LAND, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT

Replacement in crawl-ref/source/mon-data.h at line 3890 [14.1826214]

B:BD[56.119939] → [7.2687:2764]

    M_FIGHTER | M_SPELLCASTER | M_EVIL | M_SPEAKS | M_UNIQUE | M_AMPHIBIOUS,

[56.119939]

[7.2764]

    M_FIGHTER | M_SPELLCASTER | M_EVIL | M_SPEAKS | M_UNIQUE,

Replacement in crawl-ref/source/mon-data.h at line 3896 [14.1826214]

B:BD[56.120264] → [11.4778:4845]

    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT

[56.120264]

[57.39415]

    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT

Replacement in crawl-ref/source/fight.cc at line 557 [14.3140790]
B:BD[29.2253] → [42.4360:4405]
```
        && mons_is_wall_shielded(def->type))
```
[29.2253]
[29.2309]
```
        && mons_wall_shielded(def))
```
Replacement in crawl-ref/source/effects.cc at line 2647 [14.3382105]
B:BD[64.6475] → [65.3273:3310]
```
    if (mons_habitat(mon) != HT_LAND
```
[64.6475]
[65.3310]
```
    if (mons_primary_habitat(mon) != HT_LAND
```

Replacement in crawl-ref/source/effects.cc at line 2649 [14.3382105]

∅:D[65.3344] → [64.6512:6577]

B:BD[64.6512] → [64.6512:6577]

           && mons_habitat_by_type(mon->base_monster) != HT_LAND

[65.3344]

[65.3345]

           && mons_class_primary_habitat(mon->base_monster) != HT_LAND

Replacement in crawl-ref/source/dungeon.cc at line 4657 [14.3429798]

B:BD[9.3568] → [9.3568:3640]

            const habitat_type habitat = mons_habitat_by_type(montype);

[9.3568]

[34.11425]

            const habitat_type habitat = mons_class_primary_habitat(montype);

Replacement in crawl-ref/source/dungeon.cc at line 4660 [14.3429798]

B:BD[66.2705] → [9.3641:3718]

                && (habitat != HT_WATER || !mons_class_amphibious(montype)))

[66.2705]

[66.2778]

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

Replacement in crawl-ref/source/delay.cc at line 1684 [14.3963459]

B:BD[67.3459] → [67.3459:3509]

                if (mons_habitat(mon) == HT_LAVA)

[67.3459]

[67.3509]

                if (mons_primary_habitat(mon) == HT_LAVA)

Replacement in crawl-ref/source/delay.cc at line 1686 [14.3963459]

B:BD[67.3545] → [67.3545:3601]

                else if (mons_habitat(mon) == HT_WATER)

[67.3545]

[67.3601]

                else if (mons_primary_habitat(mon) == HT_WATER)

Replacement in crawl-ref/source/debug.cc at line 1842 [14.4016436]
B:BD[68.6479] → [51.99039:99091]
```
    const habitat_type hab = mons_habitat( &mons );
```
[68.6479]
[14.4047952]
```
    const habitat_type hab = mons_habitat(&mons);
```

Replacement in crawl-ref/source/debug.cc at line 1846 [14.4016436]

B:BD[69.15647] → [70.2954:3015]

         ((hab == HT_WATER)                      ? "water" :

[69.15647]

[70.3015]

         ((hab == HT_LAND)                       ? "land" :
          (hab == HT_LAND_AMPHIBIOUS)            ? "land (amphibious)" :
          (hab == HT_WATER_AMPHIBIOUS)           ? "water (amphibious)" :
          (hab == HT_WATER)                      ? "water" :

Deletion in crawl-ref/source/debug.cc at line 1852 [14.4016436]
B:BD[70.3135] → [70.3135:3194]
```
          (hab == HT_LAND)                       ? "floor"
```

Replacement in crawl-ref/source/beam.cc at line 1510 [14.4128068]

B:BD[29.4343] → [71.479:515]

B:BD[71.515] → [42.4712:4759]

        monsters *mon = &menv[mid];
        if (!mons_is_wall_shielded(mon->type))

[29.4343]

[72.43913]

        if (!mons_wall_shielded(&menv[mid]))

Adjust monster habitats again. Remove the M_AMPHIBIOUS flag, and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2207 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2354 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2377 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2827 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5445 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6652 [14.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6849 [14.1396662]

Replacement in crawl-ref/source/monplace.cc at line 119 [14.1641732]

Replacement in crawl-ref/source/monplace.cc at line 123 [14.1641732]

Insertion in crawl-ref/source/monplace.cc at line 128 [14.1641732]

Deletion in crawl-ref/source/monplace.cc at line 135 [14.1641732]

Deletion in crawl-ref/source/monplace.cc at line 139 [14.1641732]

Replacement in crawl-ref/source/monplace.cc at line 149 [14.1641732]

Replacement in crawl-ref/source/monplace.cc at line 153 [14.1641732]

Replacement in crawl-ref/source/monplace.cc at line 543 [14.1641732]

Replacement in crawl-ref/source/monplace.cc at line 556 [14.1641732]

Insertion in crawl-ref/source/monplace.cc at line 561 [14.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1951 [14.1641732]

Replacement in crawl-ref/source/mon-util.h at line 102 [14.1682293]

Replacement in crawl-ref/source/mon-util.h at line 153 [14.1682293]

Insertion in crawl-ref/source/mon-util.h at line 449 [14.1682293]

Replacement in crawl-ref/source/mon-util.h at line 550 [14.1682293]

Deletion in crawl-ref/source/mon-util.h at line 741 [14.1682293]

Replacement in crawl-ref/source/mon-util.h at line 803 [14.1682293]

Insertion in crawl-ref/source/mon-util.cc at line 110 [14.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 118 [14.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 392 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1274 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1277 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1285 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1291 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1301 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2019 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2025 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2049 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2057 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2059 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3027 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3073 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3079 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3081 [14.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3091 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3100 [14.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6729 [14.1699344]

Replacement in crawl-ref/source/mon-data.h at line 805 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 811 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 816 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 822 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 851 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 857 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 907 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 913 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 970 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 976 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 981 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 987 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1314 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1320 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1325 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1331 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1393 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1399 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1796 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1802 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1949 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1955 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1960 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1966 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1971 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1977 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1982 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 1988 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2146 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2152 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2157 [14.1826214]

Replacement in crawl-ref/source/mon-data.h at line 2163 [14.1826214]