fiddlerwoaroof/crawl - Change LRNA65FNZCSZBRU64O3UBUQ72J6ZL6WCWANADSL5VUAURQXJL6GQC

Move experience draining for players and monsters to the actor

interface, and use it in necromancy miscasts that drain experience.

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

Created by dolorous on January 17, 2009

LRNA65FNZCSZBRU64O3UBUQ72J6ZL6WCWANADSL5VUAURQXJL6GQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 3846 [6.293070]

B:BD[4.20432] → [5.41390:41496]

            if (target->atype() == ACT_PLAYER && !player_prot_life()
                && one_chance_in(3))

[4.20432]

[4.20489]

            you_msg      = "You are engulfed in negative energy!";
            mon_msg_seen = "@The_monster@ is engulfed in negative energy!";
            if (lethality_margin == 0 || you.experience > 0
                || !avoid_lethal(you.hp))

Replacement in crawl-ref/source/spl-cast.cc at line 3852 [6.293070]

B:BD[4.20503] → [7.5754:5864]

                if (lethality_margin == 0 || you.experience > 0
                    || !avoid_lethal(you.hp))

[4.20503]

[7.5864]

                if (!target->res_negative_energy() && one_chance_in(3))

Replacement in crawl-ref/source/spl-cast.cc at line 3854 [6.293070]

B:BD[7.5882] → [7.5882:5915]

                    drain_exp();

[7.5882]

[7.5915]

                    target->drain_exp(act_source);
                    break;

Replacement in crawl-ref/source/spl-cast.cc at line 3857 [6.293070]
∅:D[7.5933] → [6.369778:369801]
∅:D[4.20532] → [6.369778:369801]
B:BD[6.369778] → [6.369778:369801]
B:BD[6.369801] → [4.20533:20599]
```
                break;
            }               // otherwise it just flows through...
```
[7.5933]
[6.369801]
```
            }
            // If draining failed, just flow through...
```

Replacement in crawl-ref/source/spl-cast.cc at line 3879 [6.293070]

B:BD[4.20929] → [5.41813:41927]

        // Don't use two last cases for monsters.
        switch (random2(target->atype() == ACT_PLAYER ? 6 : 4))

[4.20929]

[4.20957]

        // Don't use last case for monsters.
        switch (random2(target->atype() == ACT_PLAYER ? 6 : 5))

Replacement in crawl-ref/source/spl-cast.cc at line 3918 [6.293070]

B:BD[4.21718] → [7.5961:6062]

            if (lethality_margin > 0 && you.experience == 0
                && avoid_lethal(you.hp))

[4.21718]

[7.6062]

            you_msg      = "You are engulfed in negative energy!";
            mon_msg_seen = "@The_monster@ is engulfed in negative energy!";
            if (lethality_margin == 0 || you.experience > 0
                || !avoid_lethal(you.hp))

Replacement in crawl-ref/source/spl-cast.cc at line 3924 [6.293070]

B:BD[7.6076] → [7.6076:6100]

                return;

[7.6076]

[7.6100]

                if (!target->res_negative_energy())
                {
                    target->drain_exp(act_source);
                    break;
                }

Deletion in crawl-ref/source/spl-cast.cc at line 3930 [6.293070]
B:BD[7.6114] → [7.6114:6115]
∅:D[7.6115] → [5.42701:42758]
B:BD[4.21718] → [5.42701:42758]
```
            mpr("You are engulfed in negative energy!");
```
Replacement in crawl-ref/source/spl-cast.cc at line 3931 [6.293070]
B:BD[5.42759] → [5.42759:42796]
∅:D[8.1450] → [4.21858:21872]
∅:D[9.1713] → [4.21858:21872]
∅:D[10.2216] → [4.21858:21872]
∅:D[11.2432] → [4.21858:21872]
∅:D[12.2915] → [4.21858:21872]
∅:D[13.4815] → [4.21858:21872]
∅:D[5.42796] → [4.21858:21872]
B:BD[4.21858] → [4.21858:21872]
B:BD[4.21872] → [5.42797:42826]
```
            if (!player_prot_life())
            {
                drain_exp();
```
[5.42759]
[5.42826]
```
            // If draining failed, just flow through if it's the player...
            if (target->atype() == ACT_MONSTER)
```
Deletion in crawl-ref/source/spl-cast.cc at line 3934 [6.293070]
B:BD[5.42849] → [5.42849:42915]
```
            }               // otherwise it just flows through...
```
Deletion in crawl-ref/source/spl-cast.cc at line 3938 [6.293070]
B:BD[6.373517] → [5.42989:42990]

Replacement in crawl-ref/source/player.cc at line 6966 [6.962854]

B:BD[14.6135] → [15.8759:8822]

void player::drain_stat(int stat, int amount, actor* attacker)

[14.6135]

[14.6181]

void player::drain_stat(int stat, int amount, actor *attacker)

Insertion in crawl-ref/source/player.cc at line 6990 [6.962854]
[14.6498]
[16.4021]
```
void player::drain_exp(actor *who)
{
    ::drain_exp();
}
```
Replacement in crawl-ref/source/player.cc at line 7033 [6.962854]
B:BD[14.6838] → [14.6838:6864]
```
    ::slow_player( str );
```
[14.6838]
[14.6864]
```
    ::slow_player(str);
```

Insertion in crawl-ref/source/mon-util.cc at line 5875 [6.1699344]

[17.1555]

}
void monsters::drain_exp(actor *agent)
{
    if (res_negative_energy())
        return;
    if (one_chance_in(5))
    {
        hit_dice--;
        experience = 0;
    }
    max_hit_points -= 2 + random2(3);
    hurt(agent, 2 + random2(3), BEAM_NEG);

Replacement in crawl-ref/source/mon-util.cc at line 7157 [6.1699344]

B:BD[18.5411] → [18.5411:5466]

            this->hurt(NULL, dam, BEAM_POISON, false);

[18.5411]

[19.22596]

            hurt(NULL, dam, BEAM_POISON, false);

Replacement in crawl-ref/source/mon-util.cc at line 7181 [6.1699344]

B:BD[19.23370] → [18.5500:5575]

            this->hurt(NULL, 1); // nonlethal so we don't care about agent

[19.23370]

[20.7002]

            hurt(NULL, 1); // nonlethal so we don't care about agent

Replacement in crawl-ref/source/mon-util.cc at line 7201 [6.1699344]

B:BD[18.5834] → [18.5834:5889]

            this->hurt(NULL, dam, BEAM_NAPALM, false);

[18.5834]

[19.24343]

            hurt(NULL, dam, BEAM_NAPALM, false);

Replacement in crawl-ref/source/fight.cc at line 2065 [6.3140790]
B:BD[14.58690] → [14.58690:58707]
```
    drain_exp();
```
[14.58690]
[21.4375]
```
    defender->drain_exp(attacker);
```

Replacement in crawl-ref/source/fight.cc at line 2089 [6.3140790]

B:BD[22.3053] → [22.3053:3085]

B:BD[22.3085] → [3.9166:9256]

∅:D[22.3139] → [21.4495:4501]

∅:D[3.9256] → [21.4495:4501]

B:BD[23.557] → [21.4495:4501]

B:BD[21.4501] → [22.3140:3141]

B:BD[22.3141] → [3.9257:9381]

    if (one_chance_in(5))
    {
        defender_as_monster()->hit_dice--;
        defender_as_monster()->experience = 0;
    }
    defender_as_monster()->max_hit_points -= 2 + random2(3);
    defender->hurt(attacker, 2 + random2(3), BEAM_NEG, false);

[22.3053]

[24.4934]

    defender->drain_exp(attacker);

Insertion in crawl-ref/source/fight.cc at line 2092 [6.3140790]
[14.59627]
[14.59627]
Insertion in crawl-ref/source/externs.h at line 338 [6.3270163]
[25.2934]
[2.3340]
```
    virtual void drain_exp(actor *agent) = 0;
```
Insertion in crawl-ref/source/externs.h at line 1077 [6.3270163]
[14.87136]
[2.3412]
```
    void drain_exp(actor *);
```
Insertion in crawl-ref/source/externs.h at line 1507 [6.3270163]
[16.6983]
[2.3467]
```
    void drain_exp(actor *);
```

Move experience draining for players and monsters to the actor

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 3846 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3852 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3854 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3857 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3879 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3918 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3924 [6.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 3930 [6.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3931 [6.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 3934 [6.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 3938 [6.293070]

Replacement in crawl-ref/source/player.cc at line 6966 [6.962854]

Insertion in crawl-ref/source/player.cc at line 6990 [6.962854]

Replacement in crawl-ref/source/player.cc at line 7033 [6.962854]

Insertion in crawl-ref/source/mon-util.cc at line 5875 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7157 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7181 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 7201 [6.1699344]

Replacement in crawl-ref/source/fight.cc at line 2065 [6.3140790]

Replacement in crawl-ref/source/fight.cc at line 2089 [6.3140790]

Insertion in crawl-ref/source/fight.cc at line 2092 [6.3140790]

Insertion in crawl-ref/source/externs.h at line 338 [6.3270163]

Insertion in crawl-ref/source/externs.h at line 1077 [6.3270163]

Insertion in crawl-ref/source/externs.h at line 1507 [6.3270163]