fiddlerwoaroof/crawl - Change NNG27Y5ZQAZX6UD7F7M4F6KEZBEDFXPEEC3LFUSX4ESKT7K6UJQAC

Better handling of confused monsters - they can finally accidentally hit other

monsters, fall into water, etc.

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

Created by dshaligram on February 25, 2007

NNG27Y5ZQAZX6UD7F7M4F6KEZBEDFXPEEC3LFUSX4ESKT7K6UJQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.h at line 48 [3.1390580]

B:BD[3.1392061] → [4.72:129]

void monster_die(monsters *monster, char killer, int i);

[3.1392061]

[3.1392125]

void monster_die(monsters *monster, char killer, int i, bool silent = false);
void mons_check_pool(monsters *monster, int killer = KILL_MISC);

Replacement in crawl-ref/source/monstuff.cc at line 331 [3.1396662]

B:BD[3.1405585] → [4.131:187]

void monster_die(monsters *monster, char killer, int i)

[3.1405585]

[3.1405648]

void monster_die(monsters *monster, char killer, int i, bool silent)

Replacement in crawl-ref/source/monstuff.cc at line 339 [3.1396662]

B:BD[3.1405759] → [3.1405759:1405839]

    bool death_message = mons_near(monster) && player_monster_visible(monster);

[3.1405759]

[3.1405839]

    bool death_message =
        !silent && mons_near(monster) && player_monster_visible(monster);

Replacement in crawl-ref/source/monstuff.cc at line 384 [3.1396662]

B:BD[3.1407134] → [3.1407134:1407258]

        simple_monster_message( monster, " dissipates!", MSGCH_MONSTER_DAMAGE,
                                MDAM_DEAD );

[3.1407134]

[3.1407258]

        if (!silent)
            simple_monster_message( monster, " dissipates!",
                                    MSGCH_MONSTER_DAMAGE, MDAM_DEAD );

Replacement in crawl-ref/source/monstuff.cc at line 402 [3.1396662]

B:BD[3.1407765] → [3.1407765:1407888]

        simple_monster_message( monster, " vaporizes!", MSGCH_MONSTER_DAMAGE,
                                MDAM_DEAD );

[3.1407765]

[3.1407888]

        if (!silent)
            simple_monster_message(
                monster, " vaporizes!", MSGCH_MONSTER_DAMAGE,
                MDAM_DEAD );

Replacement in crawl-ref/source/monstuff.cc at line 419 [3.1396662]

B:BD[3.1408287] → [3.1408287:1408416]

        simple_monster_message(monster, " falls from the air.",
                               MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

[3.1408287]

[3.1408416]

        if (!silent)
            simple_monster_message(monster, " falls from the air.",
                                   MSGCH_MONSTER_DAMAGE, MDAM_DEAD);

Replacement in crawl-ref/source/monstuff.cc at line 441 [3.1396662]

∅:D[5.243951] → [3.1408854:1409093]

B:BD[3.1408854] → [3.1408854:1409093]

            strcpy(info, "You ");
            strcat(info, (wounded_damaged(monster->type)) ? "destroy" : "kill");
            strcat(info, " ");
            strcat(info, ptr_monam(monster, DESC_NOCAP_THE));
            strcat(info, "!");

[5.243951]

[3.1409093]

            if (!silent)
            {
                strcpy(info, "You ");
                strcat(info,
                       (wounded_damaged(monster->type)) ? "destroy" : "kill");
                strcat(info, " ");
                strcat(info, ptr_monam(monster, DESC_NOCAP_THE));
                strcat(info, "!");
            }

Replacement in crawl-ref/source/monstuff.cc at line 557 [3.1396662]

B:BD[3.1412873] → [3.1412873:1412996]

            simple_monster_message(monster, " dies!", MSGCH_MONSTER_DAMAGE,
                                   MDAM_DEAD);

[3.1412873]

[3.1412996]

            if (!silent)
                simple_monster_message(monster, " dies!", MSGCH_MONSTER_DAMAGE,
                                       MDAM_DEAD);

Replacement in crawl-ref/source/monstuff.cc at line 646 [3.1396662]

B:BD[3.1414911] → [3.1414911:1415034]

            simple_monster_message(monster, " dies!", MSGCH_MONSTER_DAMAGE,
                                   MDAM_DEAD);

[3.1414911]

[3.1415034]

            if (!silent)
                simple_monster_message(monster, " dies!", MSGCH_MONSTER_DAMAGE,
                                       MDAM_DEAD);

Replacement in crawl-ref/source/monstuff.cc at line 655 [3.1396662]

B:BD[3.1415300] → [3.1415300:1415418]

            simple_monster_message( monster,
                                    " disappears in a puff of smoke!" );

[3.1415300]

[3.1415418]

            if (!silent)
                simple_monster_message( monster,
                                        " disappears in a puff of smoke!" );

Replacement in crawl-ref/source/monstuff.cc at line 3778 [3.1396662]
B:BD[3.1510755] → [6.433264:433317]
```
        if (mons_has_ench( monster, ENCH_CONFUSION )
```
[3.1510755]
[6.433317]
```
        if (mons_is_confused( monster )
```

Replacement in crawl-ref/source/monstuff.cc at line 3782 [3.1396662]

B:BD[6.433442] → [6.433442:433516]

            mmov_x = random2(3) - 1;
            mmov_y = random2(3) - 1;

[6.433442]

[3.1510936]

            std::vector<coord_def> moves;
            int pfound = 0;
            for (int yi = -1; yi <= 1; ++yi)
            {
                for (int xi = -1; xi <= 1; ++xi)
                {
                    coord_def c = monster->pos() + coord_def(xi, yi);
                    if (in_bounds(c) && !grid_is_solid(grd(c))
                        && one_chance_in(++pfound))
                    {
                        mmov_x = xi;
                        mmov_y = yi;
                    }
                }
            }
            if (one_chance_in(3))
                mmov_x = mmov_y = 0;

Replacement in crawl-ref/source/monstuff.cc at line 3804 [3.1396662]

B:BD[6.433612] → [6.433612:433718]

            if (monster->target_x + mmov_x < 0 
                    || monster->target_x + mmov_x >= GXM)

[6.433612]

[6.433718]

            if (monster->x + mmov_x < 0 
                    || monster->x + mmov_x >= GXM)

Replacement in crawl-ref/source/monstuff.cc at line 3810 [3.1396662]

B:BD[3.1511069] → [6.433775:433881]

            if (monster->target_y + mmov_y < 0 
                    || monster->target_y + mmov_y >= GYM)

[3.1511069]

[6.433881]

            if (monster->y + mmov_y < 0 
                    || monster->y + mmov_y >= GYM)

Insertion in crawl-ref/source/monstuff.cc at line 3816 [3.1396662]

[3.1511143]

[6.433938]

            if (grid_is_solid(
                    grd[ monster->x + mmov_x ][ monster->y + mmov_y ]))
            {
                mmov_x = mmov_y = 0;
            }

Insertion in crawl-ref/source/monstuff.cc at line 3825 [3.1396662]

[6.434079]

                monsters_fight(
                    i,
                    mgrd[monster->x + mmov_x][monster->y + mmov_y]);
                
                brkk = true;

Deletion in crawl-ref/source/monstuff.cc at line 3832 [3.1396662]
∅:D[6.434135] → [3.1511604:1511605]
B:BD[3.1511604] → [3.1511604:1511605]
B:BD[3.1511605] → [6.434136:434223]
∅:D[6.434223] → [3.1511937:1511955]
B:BD[3.1511937] → [3.1511937:1511955]
B:BD[3.1511955] → [6.434224:434257]
∅:D[6.434257] → [3.1512037:1512055]
B:BD[3.1512037] → [3.1512037:1512055]
```
                if (monsters_fight(i, mgrd[monster->x + mmov_x][monster->y + mmov_y]))
                {
                    brkk = true;
                }
```

Insertion in crawl-ref/source/monstuff.cc at line 4474 [3.1396662]

[6.443583]

[3.1529639]

static void do_move_monster(monsters *monster, int xi, int yi)
{
    const int fx = monster->x + xi,
        fy = monster->y + yi;
    if (!in_bounds(fx, fy))
        return;
    if (fx == you.x_pos && fy == you.y_pos)
    {
        monster_attack( monster_index(monster) );
        return;
    }
    
    if (!xi && !yi)
    {
        const int mx = monster_index(monster);
        monsters_fight( mx, mx );
        return;
    }
    if (mgrd[fx][fy] != NON_MONSTER)
    {
        monsters_fight( monster_index(monster), mgrd[fx][fy] );
        return;
    }
    if (!xi && !yi)
        return;
    mgrd[monster->x][monster->y] = NON_MONSTER;
    
    /* this appears to be the real one, ie where the movement occurs: */
    monster->x = fx;
    monster->y = fy;
    
    if (monster->type == MONS_CURSE_TOE)
    {
        // Curse toes are a special case; they can only move at half their
        // attack rate. To simulate that, the toe loses more energy.
        monster->speed_increment -= 5;
    }
    
    /* need to put in something so that monster picks up multiple
       items (eg ammunition) identical to those it's carrying. */
    mgrd[monster->x][monster->y] = monster_index(monster);
    // monsters stepping on traps:
    mons_trap(monster);
    mons_check_pool(monster);
}
void mons_check_pool(monsters *mons, int killer)
{
    // Levitating/flying monsters don't make contact with the terrain.
    const int lev = mons->levitates();
    if (lev == 2 || (lev && !mons->paralysed()))
        return;
    
    const int grid = grd(mons->pos());
    if (grid == DNGN_LAVA || grid_is_water(grid))
    {
        const bool message = mons_near(mons);
        
        // don't worry about invisibility - you should be able to
        // see if something has fallen into the lava
        if (message)
            mprf("%s falls into the %s!",
                 ptr_monam(mons, DESC_CAP_THE),
                 (grid == DNGN_LAVA ? "lava" : "water"));
        // Even fire resistant monsters perish in lava!
        if (!monster_habitable_grid(mons, grid))
        {
            if (message)
            {
                if (grid == DNGN_LAVA)
                    simple_monster_message(mons, " is incinerated!");
                else
                    simple_monster_message(mons, " drowns.");
            }
            
            monster_die(mons, killer, 0, true);
        }
    }
}

Insertion in crawl-ref/source/monstuff.cc at line 4570 [3.1396662]

[3.1529903]

    if (monster->confused())
    {
        if (mmov_x || mmov_y || one_chance_in(15))
            do_move_monster(monster, mmov_x, mmov_y);
        return;
    }

Deletion in crawl-ref/source/monstuff.cc at line 4998 [3.1396662]
B:BD[3.1544869] → [3.1544869:1544918]
```
    mgrd[monster->x][monster->y] = NON_MONSTER;
```

Deletion in crawl-ref/source/monstuff.cc at line 5050 [3.1396662]

∅:D[6.446668] → [3.1546222:1546370]

B:BD[3.1546222] → [3.1546222:1546370]

B:BD[3.1546370] → [6.446669:446969]

        }
        /* this appears to be the real one, ie where the movement occurs: */
        monster->x += mmov_x;
        monster->y += mmov_y;
        if (monster->type == MONS_CURSE_TOE)
        {
            // Curse toes are a special case; they can only move at half their
            // attack rate. To simulate that, the toe loses another action's
            // worth of energy when moving.
            monster->speed_increment -= 10;

Insertion in crawl-ref/source/monstuff.cc at line 5054 [3.1396662]
[3.1546391]
[3.1546391]
```
        mmov_x = mmov_y = 0;
        
```

Replacement in crawl-ref/source/monstuff.cc at line 5062 [3.1396662]

B:BD[3.1546600] → [3.1546600:1546827]

B:BD[3.1546827] → [6.446980:447016]

∅:D[6.447016] → [3.1546993:1547033]

B:BD[3.1546993] → [3.1546993:1547033]

    /* need to put in something so that monster picks up multiple
       items (eg ammunition) identical to those it's carrying. */
    mgrd[monster->x][monster->y] = monster_index(monster);
    // monsters stepping on traps:
    if (mmov_x != 0 || mmov_y != 0)
    {
        mons_trap(monster);
    }

[3.1546600]

[3.1547033]

    if (mmov_x || mmov_y || (monster->confused() && one_chance_in(6)))
        do_move_monster(monster, mmov_x, mmov_y);

Deletion in crawl-ref/source/monstuff.cc at line 5066 [3.1396662]
B:BD[3.1547088] → [3.1547088:1547089]
Replacement in crawl-ref/source/monplace.cc at line 62 [3.1641732]
B:BD[6.451704] → [6.451704:451748]
```
// Can this monster happily on actual_grid?
```
[6.451704]
[6.451748]
```
// Can this monster survive on actual_grid?
```

Replacement in crawl-ref/source/fight.cc at line 2499 [3.3140790]

B:BD[2.68645] → [2.68645:68953]

    
    mprf("%s %s %s%s%s%s",
         attacker->name(DESC_CAP_THE).c_str(),
         attacker->conj_verb( mons_attack_verb(attk) ).c_str(),
         mons_defender_name().c_str(),
         debug_damage_number().c_str(),
         mons_weapon_desc().c_str(),
         attack_strength_punctuation().c_str());

[2.68645]

[2.68953]


    if (needs_message)
        mprf("%s %s %s%s%s%s",
             attacker->name(DESC_CAP_THE).c_str(),
             attacker->conj_verb( mons_attack_verb(attk) ).c_str(),
             mons_defender_name().c_str(),
             debug_damage_number().c_str(),
             mons_weapon_desc().c_str(),
             attack_strength_punctuation().c_str());

Replacement in crawl-ref/source/fight.cc at line 2512 [3.3140790]

B:BD[2.69027] → [2.69027:69226]

    mprf("%s %s %s but doesn't do any damage.",
         attacker->name(DESC_CAP_THE).c_str(),
         attacker->conj_verb( mons_attack_verb(attk) ).c_str(),
         mons_defender_name().c_str());

[2.69027]

[2.69226]

    if (needs_message)
        mprf("%s %s %s but doesn't do any damage.",
             attacker->name(DESC_CAP_THE).c_str(),
             attacker->conj_verb( mons_attack_verb(attk) ).c_str(),
             mons_defender_name().c_str());

Replacement in crawl-ref/source/beam.cc at line 1995 [3.4128068]

B:BD[4.3792] → [4.3792:4379]

        const int grid = grd(monster->pos());
        if (grid == DNGN_LAVA || grid_is_water(grid))
        {
            if (mons_flies(monster) == 1)
            {
                // don't worry about invisibility - you should be able to
                // see if something has fallen into the lava
                if (mons_near(monster))
                    mprf("%s falls into the %s!",
                         ptr_monam(monster, DESC_CAP_THE),
                         (grid == DNGN_LAVA ? "lava" : "water"));
                monster_die(monster, pbolt);
            }
        }

[4.3792]

[4.4379]

        mons_check_pool(monster);