fiddlerwoaroof/crawl - Change AOAJ6D3OKSELEYKAT55XCVU5LYJ7SMCZKC6DIEGLLB3TF2LEENWQC

Handle monster paralysis as an enchantment instead of the old speed mangling

hack.

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

Created by dshaligram on February 10, 2007

AOAJ6D3OKSELEYKAT55XCVU5LYJ7SMCZKC6DIEGLLB3TF2LEENWQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.h at line 48 [7.1390580]
B:BD[7.1392061] → [7.1392061:1392125]
```
void monster_die(struct monsters *monster, char killer, int i);
```
[7.1392061]
[7.1392125]
```
void monster_die(monsters *monster, char killer, int i);
```
Replacement in crawl-ref/source/monstuff.cc at line 331 [7.1396662]
B:BD[7.1405585] → [7.1405585:1405648]
```
void monster_die(struct monsters *monster, char killer, int i)
```
[7.1405585]
[7.1405648]
```
void monster_die(monsters *monster, char killer, int i)
```

Insertion in crawl-ref/source/monstuff.cc at line 1858 [7.1396662]

[7.1454430]

        case ENCH_PARALYSIS:
            if (random2(120) < mod_speed( monster->hit_dice + 5, speed ))
                mons_del_ench(monster, ENCH_PARALYSIS);
            break;

Insertion in crawl-ref/source/monstuff.cc at line 3582 [7.1396662]

[2.451]

}
// Give the monster its action energy (aka speed_increment).
static void monster_add_energy(monsters *monster)
{
    int energy_gained = (monster->speed * you.time_taken) / 10;
    // Slow monsters might get 0 here. Maybe we should factor in
    // *how* slow it is...but a 10-to-1 move ratio seems more than
    // enough.
    if ( energy_gained == 0 && monster->speed != 0 )
        energy_gained = 1;
    monster->speed_increment += energy_gained;
    if (you.slow > 0)
        monster->speed_increment += energy_gained;
}
// Do natural regeneration for monster.
static void monster_regenerate(monsters *monster)
{
    // regenerate:
    if (monster_descriptor(monster->type, MDSC_REGENERATES)
        
        || (monster->type == MONS_FIRE_ELEMENTAL 
            && (grd[monster->x][monster->y] == DNGN_LAVA
                || env.cgrid[monster->x][monster->y] == CLOUD_FIRE
                || env.cgrid[monster->x][monster->y] == CLOUD_FIRE_MON))
        || (monster->type == MONS_WATER_ELEMENTAL 
            && (grd[monster->x][monster->y] == DNGN_SHALLOW_WATER
                || grd[monster->x][monster->y] == DNGN_DEEP_WATER))
        || (monster->type == MONS_AIR_ELEMENTAL
            && env.cgrid[monster->x][monster->y] == EMPTY_CLOUD
            && one_chance_in(3))
        || one_chance_in(25))
    {
        heal_monster(monster, 1, false);
    }

Deletion in crawl-ref/source/monstuff.cc at line 3641 [7.1396662]

B:BD[8.429174] → [6.241:306]

∅:D[6.306] → [7.1506672:1506673]

∅:D[8.429174] → [7.1506672:1506673]

B:BD[7.1506672] → [7.1506672:1506673]

B:BD[7.1506673] → [6.307:582]


    int energy_gained = (monster->speed * you.time_taken) / 10;
    // Slow monsters might get 0 here. Maybe we should factor in
    // *how* slow it is...but a 10-to-1 move ratio seems more than
    // enough.
    if ( energy_gained == 0 && monster->speed != 0 )
        energy_gained = 1;
    monster->speed_increment += energy_gained;

Replacement in crawl-ref/source/monstuff.cc at line 3642 [7.1396662]
B:BD[8.429248] → [8.429248:429270]
∅:D[8.429270] → [7.1506712:1506718]
B:BD[7.1506712] → [7.1506712:1506718]
B:BD[7.1506718] → [6.583:634]
∅:D[6.634] → [8.429347:429353]
B:BD[8.429347] → [8.429347:429353]
```
    if (you.slow > 0)
    {
        monster->speed_increment += energy_gained;
    }
```
[8.429248]
[7.1506763]
```
    monster_add_energy(monster);
```
Deletion in crawl-ref/source/monstuff.cc at line 3702 [7.1396662]
∅:D[8.431138] → [7.1508805:1508806]
B:BD[7.1508805] → [7.1508805:1508806]
B:BD[7.1508806] → [8.431139:431174]
```
        handle_behaviour(monster);
```
Insertion in crawl-ref/source/monstuff.cc at line 3705 [7.1396662]
[8.431238]
[7.1509073]
```
        monster_regenerate(monster);
```

Insertion in crawl-ref/source/monstuff.cc at line 3708 [7.1396662]

[7.1509074]

[8.431239]

        if (mons_is_paralysed(monster))
            continue;
        
        handle_behaviour(monster);

Deletion in crawl-ref/source/monstuff.cc at line 3719 [7.1396662]

∅:D[8.431508] → [7.1509259:1509260]

B:BD[7.1509259] → [7.1509259:1509260]

B:BD[7.1509260] → [8.431509:431596]

∅:D[8.431596] → [7.1509362:1509363]

B:BD[7.1509362] → [7.1509362:1509363]

B:BD[7.1509363] → [8.431597:431860]


        // regenerate:
        if (monster_descriptor(monster->type, MDSC_REGENERATES)
            || (monster->type == MONS_FIRE_ELEMENTAL 
                && (grd[monster->x][monster->y] == DNGN_LAVA
                    || env.cgrid[monster->x][monster->y] == CLOUD_FIRE
                    || env.cgrid[monster->x][monster->y] == CLOUD_FIRE_MON))

Deletion in crawl-ref/source/monstuff.cc at line 3720 [7.1396662]

B:BD[8.431861] → [8.431861:432058]

∅:D[8.432058] → [7.1509407:1509408]

B:BD[7.1509407] → [7.1509407:1509408]

B:BD[7.1509408] → [8.432059:432216]

∅:D[8.432216] → [7.1509600:1509601]

B:BD[7.1509600] → [7.1509600:1509601]

B:BD[7.1509601] → [8.432217:432316]

∅:D[8.432316] → [7.1509644:1509645]

B:BD[7.1509644] → [7.1509644:1509645]

            || (monster->type == MONS_WATER_ELEMENTAL 
                && (grd[monster->x][monster->y] == DNGN_SHALLOW_WATER
                    || grd[monster->x][monster->y] == DNGN_DEEP_WATER))
            || (monster->type == MONS_AIR_ELEMENTAL
                && env.cgrid[monster->x][monster->y] == EMPTY_CLOUD
                && one_chance_in(3))
            || one_chance_in(25))
        {
            heal_monster(monster, 1, false);
        }

Replacement in crawl-ref/source/mon-util.cc at line 1696 [7.1699344]
B:BD[8.481992] → [8.481992:482043]
```
    return (mons_has_ench( mon, ENCH_SUBMERGED ));
```
[8.481992]
[9.247910]
```
    return (mons_has_ench(mon, ENCH_SUBMERGED));
```

Replacement in crawl-ref/source/mon-util.cc at line 1701 [7.1699344]

B:BD[9.247961] → [8.482087:482157]

    // maybe this should be 70
    return (m->speed_increment <= 60);

[9.247961]

[9.248337]

    return (mons_has_ench(m, ENCH_PARALYSIS));

Insertion in crawl-ref/source/mon-util.cc at line 1846 [7.1699344]

[7.1737149]

    if (ench == ENCH_PARALYSIS)
    {
        if (!quiet)
            simple_monster_message(mon, " is no longer paralysed.");
        behaviour_event(mon, ME_EVAL);
    }

Insertion in crawl-ref/source/externs.h at line 258 [7.3270163]

[8.895538]

[8.895951]


    // Returns YOU_KILL or MON_KILL, depending on the source of the beam.
    int  killer() const;

Insertion in crawl-ref/source/externs.h at line 627 [7.3270163]

[5.146620]

[7.3281164]


    coord_def pos() const
    {
        return coord_def(x, y);
    }

Replacement in crawl-ref/source/enum.h at line 1224 [7.3287960]

B:BD[7.3314440] → [7.3314440:3314507]

    ENCH_SHORT_LIVED,                  //   74 for ball lightning

[7.3314440]

[7.3314507]

    ENCH_SHORT_LIVED,                  //   74 for ball lightning
    ENCH_PARALYSIS,

Insertion in crawl-ref/source/beam.cc at line 84 [7.4128068]
[7.4131133]
[7.4131133]
```
static void beam_paralyses_monster( bolt &pbolt, monsters *monster );
```
Insertion in crawl-ref/source/beam.cc at line 93 [7.4128068]
[7.4131458]
[8.1220318]
```
static void monster_die(monsters *mons, const bolt &beam);
```
Insertion in crawl-ref/source/beam.cc at line 106 [7.4128068]
[3.329]
[3.329]
```
// Kludge to suppress multiple redundant messages for a single beam.
```

Insertion in crawl-ref/source/beam.cc at line 124 [7.4128068]

[8.1220679]

static void monster_die(monsters *mons, const bolt &beam)
{
    monster_die(mons, beam.killer(), beam.beam_source);
}

Deletion in crawl-ref/source/beam.cc at line 1859 [7.4128068]

B:BD[7.4189962] → [7.4189962:4190075]

    bool is_near = mons_near(monster);  // single caluclation permissible {dlb}
    char buff[ ITEMNAME_SIZE ];

Replacement in crawl-ref/source/beam.cc at line 1912 [7.4128068]

B:BD[7.4191744] → [7.4191744:4191815]

                                        "'s wounds heal themselves!"))

[7.4191744]

[8.1232709]

                                           "'s wounds heal themselves!"))

Replacement in crawl-ref/source/beam.cc at line 1924 [7.4128068]

B:BD[7.4192151] → [7.4192151:4192262]

B:BD[7.4192262] → [8.1232809:1232850]

∅:D[8.1232850] → [7.4192302:4192303]

B:BD[7.4192302] → [7.4192302:4192303]

B:BD[7.4192303] → [8.1232851:1232963]

∅:D[8.1232963] → [7.4192418:4192648]

B:BD[7.4192418] → [7.4192418:4192648]

B:BD[7.4192648] → [4.1665:1888]

∅:D[4.1888] → [7.4193008:4193500]

B:BD[7.4193008] → [7.4193008:4193500]

        monster->speed_increment = 0;
        if (simple_monster_message(monster, " suddenly stops moving!"))
            pbolt.obvious_effect = true;
        if (grd[monster->x][monster->y] == DNGN_LAVA
            || grid_is_water(grd[monster->x][monster->y]))
        {
            if (mons_flies(monster) == 1)
            {
                // don't worry about invisibility - you should be able to
                // see if something has fallen into the lava
                if (is_near)
                    mprf("%s falls into the %s!",
                         ptr_monam(monster, DESC_CAP_THE),
                         (grd[monster->x][monster->y] == DNGN_LAVA) ? "lava" :
                         "water");
                switch (pbolt.thrower)
                {
                case KILL_YOU:
                case KILL_YOU_MISSILE:
                    monster_die(monster, KILL_YOU, pbolt.beam_source);
                    break;      /*  "    " */
                case KILL_MON:
                case KILL_MON_MISSILE:
                    monster_die(monster, KILL_MON_MISSILE, pbolt.beam_source);
                    break;      /* dragon breath &c */
                }
            }
        }

[7.4192151]

[7.4193500]

        beam_paralyses_monster(pbolt, monster);

Replacement in crawl-ref/source/beam.cc at line 1939 [7.4128068]

B:BD[7.4194067] → [7.4194067:4194191]

        strncpy( buff, ptr_monam( monster, DESC_CAP_THE ), sizeof(buff) );
        if (mons_add_ench(monster, ENCH_INVIS))

[7.4194067]

[7.4194191]

    {
        const std::string monster_name = ptr_monam(monster, DESC_CAP_THE);
        
        if (!mons_has_ench(monster, ENCH_INVIS)
            && mons_add_ench(monster, ENCH_INVIS))

Replacement in crawl-ref/source/beam.cc at line 1949 [7.4128068]

B:BD[7.4194399] → [7.4194399:4194632]

                snprintf( info, INFO_SIZE, "%s flickers %s", 
                          buff, player_see_invis() ? "for a moment." 
                                                   : "and vanishes!" );
                mpr( info );

[7.4194399]

[7.4194632]

                mprf("%s flickers %s",
                     monster_name.c_str(),
                     player_see_invis() ? "for a moment." 
                                        : "and vanishes!" );

Replacement in crawl-ref/source/beam.cc at line 1958 [7.4128068]
B:BD[7.4194728] → [7.4194728:4194729]
[7.4194728]
[7.4194729]
```
    }
```
Replacement in crawl-ref/source/beam.cc at line 1980 [7.4128068]
B:BD[8.1233250] → [8.1233250:1233302]
```
static void slow_monster(monsters *mon, int degree)
```
[8.1233250]
[8.1233302]
```
static void slow_monster(monsters *mon, int /* degree */)
```

Insertion in crawl-ref/source/beam.cc at line 1985 [7.4128068]

[8.1233378]

}
static void beam_paralyses_monster(bolt &pbolt, monsters *monster)
{
    if (!mons_has_ench(monster, ENCH_PARALYSIS)
        && mons_add_ench(monster, ENCH_PARALYSIS))
    {
        if (simple_monster_message(monster, " suddenly stops moving!"))
            pbolt.obvious_effect = true;
        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);
            }
        }
    }

Replacement in crawl-ref/source/beam.cc at line 2038 [7.4128068]

B:BD[8.1234103] → [8.1234103:1234303]

                const int thrower = YOU_KILL(beam.thrower) ? 
                                    KILL_YOU_MISSILE : KILL_MON_MISSILE;
                monster_die(monster, thrower, beam.beam_source);

[8.1234103]

[8.1234303]

                monster_die(monster, beam);

Replacement in crawl-ref/source/beam.cc at line 3433 [7.4128068]
B:BD[8.1247539] → [8.1247539:1247592]
```
        monster_die(mon, thrower, beam.beam_source);
```
[8.1247539]
[8.1247592]
```
        monster_die(mon, beam);
```
Replacement in crawl-ref/source/beam.cc at line 3651 [7.4128068]
B:BD[7.4241127] → [7.4241127:4241180]
```
        monster_die(mon, thrower, beam.beam_source);
```
[7.4241127]
[7.4241180]
```
        monster_die(mon, beam);
```
Replacement in crawl-ref/source/beam.cc at line 3758 [7.4128068]
B:BD[7.4243458] → [7.4243458:4243518]
```
            monster_die(mon, KILL_RESET, beam.beam_source);
```
[7.4243458]
[7.4243518]
```
            monster_die(mon, beam);
```

Deletion in crawl-ref/source/beam.cc at line 3916 [7.4128068]

B:BD[7.4247611] → [7.4247611:4247716]


    int thrower = KILL_YOU_MISSILE;
    if (MON_KILL(beam.thrower))
        thrower = KILL_MON_MISSILE;

Replacement in crawl-ref/source/beam.cc at line 3918 [7.4128068]
B:BD[7.4247746] → [7.4247746:4247799]
```
        monster_die(mon, thrower, beam.beam_source);
```
[7.4247746]
[7.4247799]
```
        monster_die(mon, beam);
```

Insertion in crawl-ref/source/beam.cc at line 4404 [7.4128068]

[8.1255028]


int bolt::killer() const
{
    if (flavour == BEAM_BANISH)
        return (KILL_RESET);
    
    switch (thrower)
    {
    case KILL_YOU:
    case KILL_YOU_MISSILE:
        return (flavour == BEAM_PARALYSIS? KILL_YOU : KILL_YOU_MISSILE);
    case KILL_MON:
    case KILL_MON_MISSILE:
        return (KILL_MON_MISSILE);
    default:
        return (KILL_MON_MISSILE);
    }
}

Handle monster paralysis as an enchantment instead of the old speed mangling

Dependencies

In channels

Change contents

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

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

Insertion in crawl-ref/source/monstuff.cc at line 1858 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3582 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 3641 [7.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 3642 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 3702 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3705 [7.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 3708 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 3719 [7.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 3720 [7.1396662]

Replacement in crawl-ref/source/mon-util.cc at line 1696 [7.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 1701 [7.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1846 [7.1699344]

Insertion in crawl-ref/source/externs.h at line 258 [7.3270163]

Insertion in crawl-ref/source/externs.h at line 627 [7.3270163]

Replacement in crawl-ref/source/enum.h at line 1224 [7.3287960]

Insertion in crawl-ref/source/beam.cc at line 84 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 93 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 106 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 124 [7.4128068]

Deletion in crawl-ref/source/beam.cc at line 1859 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 1912 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 1924 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 1939 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 1949 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 1958 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 1980 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 1985 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 2038 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 3433 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 3651 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 3758 [7.4128068]

Deletion in crawl-ref/source/beam.cc at line 3916 [7.4128068]

Replacement in crawl-ref/source/beam.cc at line 3918 [7.4128068]

Insertion in crawl-ref/source/beam.cc at line 4404 [7.4128068]