fiddlerwoaroof/crawl - Change DXYAQFFVZ5YDUPT2MIKGAMVODSOJ4UJR5WTQKNCFMB5WJ6KH4D3QC

Clean up rotting in melee attacks to not kill the target directly and to

use special_damage_msg, as with draining.

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

Created by dolorous on January 20, 2009

DXYAQFFVZ5YDUPT2MIKGAMVODSOJ4UJR5WTQKNCFMB5WJ6KH4D3QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 6998 [7.962854]

B:BD[5.6215] → [6.2670:2726]

void player::rot(actor *who, int amount, int immediate)

[5.6215]

[5.6273]

bool player::rot(actor *who, int amount, int immediate, bool quiet)

Replacement in crawl-ref/source/player.cc at line 7001 [7.962854]
∅:D[6.2769] → [8.2619:2635]
∅:D[9.2856] → [8.2619:2635]
B:BD[8.2619] → [8.2619:2635]
```
        return;
```
[6.2769]
[8.2641]
```
        return (false);
```
Insertion in crawl-ref/source/player.cc at line 7010 [7.962854]
[4.2707]
[10.7269]
```
    return (true);
```

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

B:BD[11.2685] → [6.2874:2934]

void monsters::rot(actor *agent, int amount, int immediate)

[11.2685]

[11.2745]

bool monsters::rot(actor *agent, int amount, int immediate, bool quiet)

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

∅:D[6.2977] → [11.2774:2790]

B:BD[11.2774] → [11.2774:2790]

        return;

[6.2977]

[11.2790]

        return (false);
    if (!quiet && mons_near(this) && player_monster_visible(this))
    {
        mprf("%s %s!", name(DESC_CAP_THE).c_str(),
             amount > 0 ? "rots" : "looks less resilient");
    }

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

B:BD[11.2938] → [11.2938:3064]

B:BD[11.3064] → [6.3002:3066]

∅:D[6.3066] → [11.3131:3141]

B:BD[11.3131] → [11.3131:3141]

        if (mons_near(this) && player_monster_visible(this))
        {
            mprf("%s %s!", name(DESC_CAP_THE).c_str(),
                 amount > 0 ? "rots" : "looks less resilient");
        }

[11.2938]

[11.3141]

        // If quiet, don't clean up the monster in order to credit properly.
        hurt(agent, immediate, BEAM_MISSILE, !quiet);

Deletion in crawl-ref/source/mon-util.cc at line 5945 [7.1699344]
B:BD[11.3142] → [6.3067:3099]
∅:D[6.3099] → [11.3169:3170]
B:BD[11.3169] → [11.3169:3170]
```
        hurt(agent, immediate);
```
Insertion in crawl-ref/source/mon-util.cc at line 5954 [7.1699344]
[6.3254]
[11.3503]
```
    return (true);
```
Insertion in crawl-ref/source/fight.h at line 205 [7.3139131]
[5.54969]
[5.55020]
```
    void rot_defender(int amount, int immediate = 0);
```

Insertion in crawl-ref/source/fight.cc at line 2085 [7.3140790]

[12.2258]

void melee_attack::rot_defender(int amount, int immediate)
{
    if (defender->rot(attacker, amount, immediate, true))
    {
        if (defender->atype() == ACT_MONSTER && defender_visible)
        {
            special_damage_message =
                make_stringf(
                    "%s %s!",
                    def_name(DESC_CAP_THE).c_str(),
                    amount > 0 ? "rots" : "looks less resilient");
        }
    }
}

Replacement in crawl-ref/source/fight.cc at line 4316 [7.3140790]

B:BD[5.72590] → [2.2724:2802]

            defender->rot(attacker, 2 + random2(3), damage_done > 5 ? 1 : 0);

[5.72590]

[5.72662]

            rot_defender(2 + random2(3), damage_done > 5 ? 1 : 0);

Replacement in crawl-ref/source/fight.cc at line 4419 [7.3140790]

B:BD[5.75135] → [13.2816:2880]

                defender->rot(attacker, 0, coinflip() ? 2 : 1);

[5.75135]

[7.3238834]

                rot_defender(0, coinflip() ? 2 : 1);

Replacement in crawl-ref/source/externs.h at line 339 [7.3270163]

∅:D[3.3368] → [6.3340:3411]

∅:D[14.3535] → [6.3340:3411]

∅:D[15.4544] → [6.3340:3411]

B:BD[16.2934] → [6.3340:3411]

    virtual void rot(actor *agent, int amount, int immediate = 0) = 0;

[3.3368]

[11.3664]

    virtual bool rot(actor *agent, int amount, int immediate = 0,
                     bool quiet = false) = 0;

Replacement in crawl-ref/source/externs.h at line 1078 [7.3270163]
∅:D[3.3418] → [6.3412:3466]
∅:D[14.3565] → [6.3412:3466]
∅:D[15.4574] → [6.3412:3466]
B:BD[5.87136] → [6.3412:3466]
```
    void rot(actor *, int amount, int immediate = 0);
```
[3.3418]
[17.2971]
```
    bool rot(actor *, int amount, int immediate = 0, bool quiet = false);
```
Replacement in crawl-ref/source/externs.h at line 1510 [7.3270163]
∅:D[3.3468] → [6.3467:3521]
∅:D[14.3595] → [6.3467:3521]
∅:D[15.4604] → [6.3467:3521]
B:BD[18.6983] → [6.3467:3521]
```
    void rot(actor *, int amount, int immediate = 0);
```
[3.3468]
[17.3126]
```
    bool rot(actor *, int amount, int immediate = 0, bool quiet = false);
```

Clean up rotting in melee attacks to not kill the target directly and to

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 6998 [7.962854]

Replacement in crawl-ref/source/player.cc at line 7001 [7.962854]

Insertion in crawl-ref/source/player.cc at line 7010 [7.962854]

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

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

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

Deletion in crawl-ref/source/mon-util.cc at line 5945 [7.1699344]

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

Insertion in crawl-ref/source/fight.h at line 205 [7.3139131]

Insertion in crawl-ref/source/fight.cc at line 2085 [7.3140790]

Replacement in crawl-ref/source/fight.cc at line 4316 [7.3140790]

Replacement in crawl-ref/source/fight.cc at line 4419 [7.3140790]

Replacement in crawl-ref/source/externs.h at line 339 [7.3270163]

Replacement in crawl-ref/source/externs.h at line 1078 [7.3270163]

Replacement in crawl-ref/source/externs.h at line 1510 [7.3270163]