fiddlerwoaroof/crawl - Change 2UO6ZOW7UCP5XJ2TJ26PJNQABILK2BZ4J3BAKLOKMZPJDQHW24MAC

So many files? That's probably some debugging messages included,

again…

Anyway, I added a check to make sure that monsters that somehow end up in deep water (confusion!) can get out of it again if not aquatic. Monsters that can drown, will still do so, of course. I also removed the drowning conditional for zombies and skeletons. They'll now slog invisibly underwater and eventually reappear in shallow water or dry land. I think this is more interesting than making them drown. That, and they've seen a lot of nerfs lately.

Oh, right, and I replaced some ENCH_SUBMERGED with mons_is_submerged(), that might explain the number of modified files…

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

Created by j-p-e-g on November 9, 2008

2UO6ZOW7UCP5XJ2TJ26PJNQABILK2BZ4J3BAKLOKMZPJDQHW24MAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 1119 [9.16817]
[8.59]
[8.59]
```
            {
```
Insertion in crawl-ref/source/view.cc at line 1122 [9.16817]
[8.123]
[8.123]
```
            }
```
Deletion in crawl-ref/source/traps.cc at line 144 [10.5308]
B:BD[6.2713] → [6.2713:2734]
```
    bool rc = false;
```

Replacement in crawl-ref/source/traps.cc at line 147 [10.5308]

B:BD[6.2854] → [6.2854:2923]

        rc = player_knows;
    else if (act->atype() == ACT_MONSTER)

[6.2854]

[6.2923]

        return (player_knows);
    bool rc = false;
    if (act->atype() == ACT_MONSTER)

Replacement in crawl-ref/source/traps.cc at line 166 [10.5308]

B:BD[6.3700] → [6.3700:3827]

                  || (mons_wont_attack(monster) && player_knows)
                  || (intel >= I_HIGH && one_chance_in(3))));

[6.3700]

[6.3827]

                  || mons_wont_attack(monster) && player_knows
                  || intel >= I_HIGH && one_chance_in(3)));

Replacement in crawl-ref/source/traps.cc at line 264 [10.5308]

B:BD[10.8645] → [10.8645:8714]

            mons_check_pool(mon, pbolt.killer(), pbolt.beam_source);

[10.8645]

[10.8714]

            mons_check_pool(mon, mon->pos(), pbolt.killer(), pbolt.beam_source);

Replacement in crawl-ref/source/terrain.cc at line 502 [10.26938]

B:BD[10.37543] → [10.37543:37593]

            mons_check_pool(mons, KILL_MISC, -1);

[10.37543]

[10.37593]

            mons_check_pool(mons, mons->pos(), KILL_MISC, -1);

Insertion in crawl-ref/source/state.cc at line 145 [11.1546]
[11.4856]
[11.4856]
```
    mpr("in interrupt_cmd_repeat");
```

Replacement in crawl-ref/source/player.cc at line 115 [9.962854]

B:BD[12.3224] → [13.17848:18013]

    ASSERT(swapping && mgrd(p) != NON_MONSTER ||
           !swapping && (mgrd(p) == NON_MONSTER
                         || mons_is_submerged( &menv[ mgrd(p) ])));

[12.3224]

[14.338335]

    ASSERT(swapping && mgrd(p) != NON_MONSTER
           || !swapping && (mgrd(p) == NON_MONSTER
                            || mons_is_submerged( &menv[ mgrd(p) ])));

Replacement in crawl-ref/source/player.cc at line 2607 [9.962854]
B:BD[9.1003585] → [15.5702:5740]
```
    if (mon->has_ench(ENCH_SUBMERGED)
```
[9.1003585]
[16.4920]
```
    if (mons_is_submerged(mon)
```
Replacement in crawl-ref/source/mstuff2.cc at line 699 [9.1340842]
B:BD[17.3937] → [17.3937:3976]
```
    monster->apply_location_effects();
```
[17.3937]
[18.2325]
```
    monster->apply_location_effects(oldplace);
```

Replacement in crawl-ref/source/monstuff.h at line 90 [9.1390580]

B:BD[19.151] → [20.323:435]

void mons_check_pool(monsters *monster, killer_type killer = KILL_NONE,
                     int killnum = -1);

[19.151]

[9.1392125]

void mons_check_pool(monsters *monster, const coord_def &oldpos,
                     killer_type killer = KILL_NONE, int killnum = -1);

Replacement in crawl-ref/source/monstuff.cc at line 1755 [9.1396662]
B:BD[17.4066] → [17.4066:4105]
```
    monster->apply_location_effects();
```
[17.4066]
[21.2800]
```
    monster->apply_location_effects(oldplace);
```

Replacement in crawl-ref/source/monstuff.cc at line 2228 [9.1396662]

B:BD[22.3091] → [22.3091:3138]

            && !mon->del_ench(ENCH_SUBMERGED))

[22.3091]

[22.3138]

             && !mon->del_ench(ENCH_SUBMERGED))

Replacement in crawl-ref/source/monstuff.cc at line 3769 [9.1396662]
∅:D[23.2869] → [15.8684:8730]
B:BD[9.1467603] → [15.8684:8730]
```
        || monster->has_ench(ENCH_SUBMERGED))
```
[23.2869]
[9.1467656]
```
        || mons_is_submerged(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 3884 [9.1396662]
∅:D[23.2977] → [15.8927:8973]
B:BD[9.1471284] → [15.8927:8973]
```
        || monster->has_ench(ENCH_SUBMERGED))
```
[23.2977]
[9.1471337]
```
        || mons_is_submerged(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 4398 [9.1396662]
B:BD[9.1481457] → [7.2469:2512]
```
    if (monster->has_ench(ENCH_SUBMERGED))
```
[9.1481457]
[9.1481517]
```
    if (mons_is_submerged(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 4453 [9.1396662]

B:BD[23.6492] → [23.6492:6582]

        || monster->has_ench(ENCH_CONFUSION)
        || monster->has_ench(ENCH_SUBMERGED)

[23.6492]

[23.6582]

        || mons_is_confused(monster)
        || mons_is_submerged(monster)

Replacement in crawl-ref/source/monstuff.cc at line 4956 [9.1396662]
B:BD[23.12672] → [23.12672:12717]
```
        || monster->has_ench(ENCH_SUBMERGED)
```
[23.12672]
[24.7103]
```
        || mons_is_submerged(monster)
```

Replacement in crawl-ref/source/monstuff.cc at line 4981 [9.1396662]

B:BD[9.1491210] → [25.3319:3389]

             || (monster->type == MONS_BALL_LIGHTNING && coinflip()))

[9.1491210]

[9.1491279]

             || monster->type == MONS_BALL_LIGHTNING && coinflip())

Replacement in crawl-ref/source/monstuff.cc at line 5127 [9.1396662]

B:BD[2.2995] → [2.2995:3056]

                            && spell_harms_area(spell_cast))

[2.2995]

[2.3056]

                        && spell_harms_area(spell_cast))

Insertion in crawl-ref/source/monstuff.cc at line 5139 [9.1396662]

[26.29115]

[9.1495587]

                    continue;
                // Friendly monsters don't use polymorph, for fear of harming
                // the player.
                if (spell_cast == SPELL_POLYMORPH_OTHER
                    && mons_friendly(monster))
                {

Insertion in crawl-ref/source/monstuff.cc at line 5147 [9.1396662]
[9.1495617]
[9.1495617]
```
                }
```
Replacement in crawl-ref/source/monstuff.cc at line 5639 [9.1396662]
∅:D[27.50538] → [28.8610:8657]
B:BD[28.8610] → [28.8610:8657]
```
        && !monster->has_ench(ENCH_SUBMERGED))
```
[27.50538]
[14.429445]
```
        && !mons_is_submerged(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 5725 [9.1396662]
B:BD[14.430814] → [15.10333:10384]
```
            if (monster->has_ench(ENCH_SUBMERGED))
```
[14.430814]
[29.4569]
```
            if (mons_is_submerged(monster))
```

Replacement in crawl-ref/source/monstuff.cc at line 5807 [9.1396662]

B:BD[30.3737] → [30.3737:3792]

                if (monster->has_ench(ENCH_SUBMERGED))

[30.3737]

[30.3792]

                if (mons_is_submerged(monster))

Replacement in crawl-ref/source/monstuff.cc at line 5848 [9.1396662]

B:BD[31.7636] → [31.7636:7693]

                   && monster->has_ench(ENCH_SUBMERGED))

[31.7636]

[31.7693]

                   && mons_is_submerged(monster))

Replacement in crawl-ref/source/monstuff.cc at line 6166 [9.1396662]
B:BD[23.12901] → [23.12901:12947]
```
        || monster->has_ench(ENCH_SUBMERGED))
```
[23.12901]
[23.12947]
```
        || mons_is_submerged(monster))
```
Replacement in crawl-ref/source/monstuff.cc at line 6394 [9.1396662]
∅:D[13.30004] → [17.4106:4175]
B:BD[32.6204] → [17.4106:4175]
```
    mon->apply_location_effects();
    m2->apply_location_effects();
```
[13.30004]
[14.443559]
```
    mon->apply_location_effects(c);
    m2->apply_location_effects(n);
```

Insertion in crawl-ref/source/monstuff.cc at line 6430 [9.1396662]

[19.3426]

[13.30364]

    if (grd(monster->pos()) == DNGN_DEEP_WATER && grd(f) != DNGN_DEEP_WATER
        && !monster_habitable_grid(monster, DNGN_DEEP_WATER))
    {
        mpr("set seen_context...");
        monster->seen_context = "emerges from the water";
    }

Replacement in crawl-ref/source/monstuff.cc at line 6443 [9.1396662]
∅:D[13.30553] → [17.4176:4215]
B:BD[32.6268] → [17.4176:4215]
```
    monster->apply_location_effects();
```
[13.30553]
[29.7534]
```
    monster->apply_location_effects(monster->pos() - delta);
```

Replacement in crawl-ref/source/monstuff.cc at line 6448 [9.1396662]

B:BD[19.4124] → [20.2292:2362]

void mons_check_pool(monsters *mons, killer_type killer, int killnum)

[19.4124]

[19.4173]

void mons_check_pool(monsters *mons, const coord_def &oldpos,
                     killer_type killer, int killnum)

Replacement in crawl-ref/source/monstuff.cc at line 6463 [9.1396662]
∅:D[28.10540] → [19.4624:4645]
B:BD[19.4624] → [19.4624:4645]
```
        if (message)
```
[28.10540]
[28.10541]
```
        if (message && (oldpos == mons->pos() || grd(oldpos) != grid))
```

Deletion in crawl-ref/source/monstuff.cc at line 6487 [9.1396662]

B:BD[25.3660] → [25.3660:3756]

B:BD[25.3756] → [33.3267:3408]

                                            MSGCH_MONSTER_DAMAGE, MDAM_DEAD);
                }
                else if (mons_is_zombified(mons))
                {
                    simple_monster_message( mons, " sinks like a rock.",

Replacement in crawl-ref/source/monstuff.cc at line 6531 [9.1396662]

∅:D[34.2936] → [35.2632:2720]

B:BD[35.2632] → [35.2632:2720]

// allegiance.  (just_check is used for intelligent monsters trying to
// avoid traps.)

[34.2936]

[13.30554]

// allegiance.
// (just_check is used for intelligent monsters trying to avoid traps.)

Insertion in crawl-ref/source/monstuff.cc at line 6691 [9.1396662]

[36.2531]

static bool _no_habitable_adjacent_grids(const monsters *mon)
{
    for (adjacent_iterator ai(mon->pos()); ai; ++ai)
        if (_habitat_okay(mon, grd(*ai)))
            return (false);
    return (true);
}

Deletion in crawl-ref/source/monstuff.cc at line 6707 [9.1396662]
∅:D[13.31444] → [37.2668:2669]
B:BD[36.2985] → [37.2668:2669]

Insertion in crawl-ref/source/monstuff.cc at line 6764 [9.1396662]

[36.4695]

[38.6459]

        // If the monster somehow ended up in this habitat (and is
        // not dead by now), give it a chance to get out again.
        if (grd(monster->pos()) == target_grid
            && _no_habitable_adjacent_grids(monster))
        {
            return (true);
        }

Replacement in crawl-ref/source/monstuff.cc at line 6936 [9.1396662]
B:BD[30.4611] → [30.4611:4657]
```
        if(monster->has_ench(ENCH_SUBMERGED))
```
[30.4611]
[38.7251]
```
        if(mons_is_submerged(monster))
```

Replacement in crawl-ref/source/mon-util.cc at line 2390 [9.1699344]

B:BD[14.481992] → [39.3061:3103]

    return (m->has_ench(ENCH_SUBMERGED));

[14.481992]

[40.247910]

    if (m->has_ench(ENCH_SUBMERGED))
        return (true);
    if (grd(m->pos()) == DNGN_DEEP_WATER
        && !monster_habitable_grid(m, DNGN_DEEP_WATER))
    {
        return (true);
    }
    return (false);

Insertion in crawl-ref/source/mon-util.cc at line 3219 [9.1699344]
[5.2734]
[5.2734]
```
    {
```
Insertion in crawl-ref/source/mon-util.cc at line 3221 [9.1699344]
[5.2757]
[5.2757]
```
    }
```
Deletion in crawl-ref/source/mon-util.cc at line 3298 [9.1699344]
B:BD[41.2698] → [33.4838:4877]
```
            || mons_is_zombified(this)
```

Replacement in crawl-ref/source/mon-util.cc at line 5694 [9.1699344]

B:BD[27.56505] → [27.56505:56666]

        if (mgrd(*ai) == NON_MONSTER && monster_can_submerge(mon, grd(*ai)))
            if (one_chance_in(++okay_squares))
                target_square = *ai;

[27.56505]

[8.4751]

        if (mgrd(*ai) == NON_MONSTER && monster_can_submerge(mon, grd(*ai))
            && one_chance_in(++okay_squares))
        {
            target_square = *ai;
        }

Replacement in crawl-ref/source/mon-util.cc at line 5718 [9.1699344]
B:BD[8.5350] → [27.56704:56747]
```
    for ( adjacent_iterator ai; ai; ++ai )
```
[8.5350]
[27.56747]
```
    for (adjacent_iterator ai; ai; ++ai)
```
Replacement in crawl-ref/source/mon-util.cc at line 6797 [9.1699344]
B:BD[17.4246] → [17.4246:4286]
```
void monsters::apply_location_effects()
```
[17.4246]
[17.4286]
```
void monsters::apply_location_effects(const coord_def &oldpos)
```
Replacement in crawl-ref/source/mon-util.cc at line 6807 [9.1699344]
B:BD[17.4433] → [17.4433:4464]
```
        mons_check_pool(this);
```
[17.4433]
[42.1533]
```
        mons_check_pool(this, oldpos);
```
Replacement in crawl-ref/source/externs.h at line 1114 [9.3270163]
B:BD[32.7199] → [17.24079:24114]
```
    void apply_location_effects();
```
[32.7199]
[4.3531]
```
    void apply_location_effects(const coord_def &oldpos);
```

Insertion in crawl-ref/source/delay.cc at line 1689 [9.3963459]

[43.3749]

[44.1768]

            else if (at.context.find("emerges") != std::string::npos)
                text += " emerges from the water.";

Replacement in crawl-ref/source/debug.cc at line 4222 [9.4016436]

B:BD[45.3411] → [3.5823:5893]

    direction(moves, DIR_NONE, TARG_ANY, -1, true, false, true, true,

[45.3411]

[45.3469]

    direction(moves, DIR_NONE, TARG_ANY, -1, false, false, true, true,

Replacement in crawl-ref/source/beam.cc at line 2331 [9.4128068]

B:BD[46.3792] → [20.3443:3512]

        mons_check_pool(monster, pbolt.killer(), pbolt.beam_source);

[46.3792]

[46.4379]

        mons_check_pool(monster, monster->pos(), pbolt.killer(),
                        pbolt.beam_source);

Replacement in crawl-ref/source/beam.cc at line 2369 [9.4128068]

B:BD[47.10861] → [47.10861:10930]

        mons_check_pool(monster, pbolt.killer(), pbolt.beam_source);

[47.10861]

[47.10930]

        mons_check_pool(monster, monster->pos(), pbolt.killer(),
                        pbolt.beam_source);

So many files? That's probably some debugging messages included,

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 1119 [9.16817]

Insertion in crawl-ref/source/view.cc at line 1122 [9.16817]

Deletion in crawl-ref/source/traps.cc at line 144 [10.5308]

Replacement in crawl-ref/source/traps.cc at line 147 [10.5308]

Replacement in crawl-ref/source/traps.cc at line 166 [10.5308]

Replacement in crawl-ref/source/traps.cc at line 264 [10.5308]

Replacement in crawl-ref/source/terrain.cc at line 502 [10.26938]

Insertion in crawl-ref/source/state.cc at line 145 [11.1546]

Replacement in crawl-ref/source/player.cc at line 115 [9.962854]

Replacement in crawl-ref/source/player.cc at line 2607 [9.962854]

Replacement in crawl-ref/source/mstuff2.cc at line 699 [9.1340842]

Replacement in crawl-ref/source/monstuff.h at line 90 [9.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 1755 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 2228 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3769 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3884 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4398 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4453 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4956 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 4981 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5127 [9.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5139 [9.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 5147 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5639 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5725 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5807 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 5848 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6166 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6394 [9.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6430 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6443 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6448 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6463 [9.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 6487 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6531 [9.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6691 [9.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 6707 [9.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 6764 [9.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 6936 [9.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 2390 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3219 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3221 [9.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 3298 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5694 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5718 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6797 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6807 [9.1699344]

Replacement in crawl-ref/source/externs.h at line 1114 [9.3270163]

Insertion in crawl-ref/source/delay.cc at line 1689 [9.3963459]

Replacement in crawl-ref/source/debug.cc at line 4222 [9.4016436]

Replacement in crawl-ref/source/beam.cc at line 2331 [9.4128068]

Replacement in crawl-ref/source/beam.cc at line 2369 [9.4128068]