fiddlerwoaroof/crawl - Change Z5KYAIVBP33DTRVEEP3SIWLWS4ZYVGYD3MQEFCVNHHPJEFX42UPAC

Fix [2769326]: Deep dwarf ghosts shouldn't regenerate.

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

Created by dolorous on April 18, 2009

Z5KYAIVBP33DTRVEEP3SIWLWS4ZYVGYD3MQEFCVNHHPJEFX42UPAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mon-util.cc at line 930 [3.1699344]

[2.2748]

    if (mon->type == MONS_PLAYER_GHOST && mon->ghost->species == SP_DEEP_DWARF)
        return (false);

Replacement in crawl-ref/source/mon-util.cc at line 1654 [3.1699344]
∅:D[4.6502] → [3.1719832:1719888]
B:BD[3.1719832] → [3.1719832:1719888]
```
    if (monster_descriptor( mclass, MDSC_REGENERATES ))
```
[4.6502]
[3.1719888]
```
    if (monster_descriptor(mclass, MDSC_REGENERATES))
```

Replacement in crawl-ref/source/mon-util.cc at line 1661 [3.1699344]

B:BD[3.1720025] → [3.1720025:1720112]

        for (int i = 0; i < 4; i++)
            max_melee += mons_damage( mclass, i );

[3.1720025]

[3.1720112]

        for (int i = 0; i < 4; ++i)
            max_melee += mons_damage(mclass, i);

Replacement in crawl-ref/source/effects.cc at line 3601 [3.3382105]

B:BD[5.19377] → [5.19377:19453]

        // XXX: Allow some spellcasting (like Healing and Teleport)? -- bwr

[5.19377]

[5.19453]

        // XXX: Allow some spellcasting (like Healing and Teleport)? - bwr

Replacement in crawl-ref/source/effects.cc at line 3605 [3.3382105]
B:BD[5.19600] → [6.3348:3408]
∅:D[6.3408] → [5.19662:19709]
B:BD[5.19662] → [5.19662:19709]
```
        if (monster_descriptor(mon->type, MDSC_REGENERATES)
            || mon->type == MONS_PLAYER_GHOST)
```
[5.19600]
[7.5554]
```
        if (mons_can_regenerate(mon))
```

Replacement in crawl-ref/source/effects.cc at line 3607 [3.3382105]

B:BD[7.5564] → [6.3409:3454]

∅:D[6.3454] → [5.19769:19779]

B:BD[5.19769] → [5.19769:19779]

B:BD[5.19779] → [2.2970:3013]

∅:D[8.2936] → [9.3060:3229]

∅:D[2.3013] → [9.3060:3229]

B:BD[5.19792] → [9.3060:3229]

            heal_monster(mon, turns, false);
        }
        else if (mons_can_regenerate(mon))
        {
            // Set a lower ceiling of 0.1 on the regen rate.
            const int regen_rate =
                std::max(mons_natural_regen_rate(mon) * 2, 5);

[7.5564]

[7.5565]

            if (monster_descriptor(mon->type, MDSC_REGENERATES)
                || mon->type == MONS_PLAYER_GHOST)
            {
                heal_monster(mon, turns, false);
            }
            else
            {
                // Set a lower ceiling of 0.1 on the regen rate.
                const int regen_rate =
                    std::max(mons_natural_regen_rate(mon) * 2, 5);

Replacement in crawl-ref/source/effects.cc at line 3618 [3.3382105]

B:BD[7.5566] → [6.3455:3558]

            heal_monster(mon, div_rand_round(turns * regen_rate, 50),
                         false);

[7.5566]

[5.19859]

                heal_monster(mon, div_rand_round(turns * regen_rate, 50),
                             false);
            }