fiddlerwoaroof/crawl - Change SUIDQIK6BZDJSYSFG6AK5A6K76EKGPKBKGGRCIU2AN6XOTCUHOBAC

Add more player duration cleanups, and fix ouch() napalm death sources.

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

Created by dolorous on November 12, 2008

SUIDQIK6BZDJSYSFG6AK5A6K76EKGPKBKGGRCIU2AN6XOTCUHOBAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.h at line 47 [5.611815]
B:BD[5.614198] → [5.614198:614232]
```
void cast_cure_poison(int mabil);
```
[5.614198]
[2.170]
```
void cast_cure_poison(int pow);
```
Replacement in crawl-ref/source/spells1.cc at line 1016 [5.616635]
B:BD[5.628609] → [5.628609:628642]
```
void cast_cure_poison(int mabil)
```
[5.628609]
[5.628642]
```
void cast_cure_poison(int pow)
```
Replacement in crawl-ref/source/spells1.cc at line 1018 [5.616635]
B:BD[5.628644] → [6.1776:1814]
∅:D[7.919] → [5.628665:628706]
∅:D[6.1814] → [5.628665:628706]
B:BD[5.628665] → [5.628665:628706]
```
    if (!you.duration[DUR_POISONING])
        canned_msg(MSG_NOTHING_HAPPENS);
```
[5.628644]
[5.628706]
```
    if (you.duration[DUR_POISONING] > 0)
        reduce_poison_player(2 + random2(pow) + random2(3));
```

Replacement in crawl-ref/source/spells1.cc at line 1021 [5.616635]

B:BD[5.628715] → [5.628715:628793]

        reduce_poison_player( 2 + random2(mabil) + random2(3) );
    return;

[5.628715]

[8.494]

        canned_msg(MSG_NOTHING_HAPPENS);

Insertion in crawl-ref/source/player.h at line 417 [5.945993]
[9.3596]
[5.962163]
```
bool confuse_player(int amount, bool resistable = true);
```

Replacement in crawl-ref/source/player.h at line 420 [5.945993]

B:BD[5.962164] → [10.32540:32609]

B:BD[10.32609] → [11.2446:2494]

/* @return true iff they were poisoned (false if they are immune) */
void curare_hits_player(int agent, int degree);

[5.962164]

[11.2494]

bool curare_hits_player(int agent, int degree);

Insertion in crawl-ref/source/player.h at line 422 [5.945993]
[11.2546]
[11.2546]
```
void dec_poison_player();
```
Deletion in crawl-ref/source/player.h at line 428 [5.945993]
∅:D[12.3276] → [13.2446:2543]
B:BD[5.962260] → [13.2446:2543]
∅:D[13.2543] → [5.962361:962362]
B:BD[5.962361] → [5.962361:962362]
```
bool confuse_player(int amount, bool resistable = true);
void reduce_confuse_player(int amount);
```
Deletion in crawl-ref/source/player.h at line 434 [5.945993]
B:BD[5.962478] → [10.32664:32705]
```
/* return true iff they were diseased */
```
Replacement in crawl-ref/source/player.cc at line 5019 [5.962854]
B:BD[5.1063604] → [11.2609:2656]
```
void curare_hits_player(int agent, int degree)
```
[5.1063604]
[11.2656]
```
bool confuse_player(int amount, bool resistable)
```

Replacement in crawl-ref/source/player.cc at line 5021 [5.962854]

B:BD[11.2658] → [11.2658:2707]

    const bool res_poison = player_res_poison();

[11.2658]

[11.2707]

    if (amount <= 0)
        return (false);
    if (resistable && wearing_amulet(AMU_CLARITY))
    {
        mpr("You feel momentarily confused.");
        return (false);
    }
    const int old_value = you.duration[DUR_CONF];
    you.duration[DUR_CONF] += amount;
    if (you.duration[DUR_CONF] > 40)
        you.duration[DUR_CONF] = 40;
    if (you.duration[DUR_CONF] > old_value)
    {
        you.check_awaken(500);
        mprf(MSGCH_WARN, "You are %sconfused.",
             old_value > 0 ? "more " : "");
        learned_something_new(TUT_YOU_ENCHANTED);
        xom_is_stimulated(you.duration[DUR_CONF] - old_value);
    }

Insertion in crawl-ref/source/player.cc at line 5048 [5.962854]
[11.2708]
[11.2708]
```
    return (true);
}
bool curare_hits_player(int agent, int degree)
{
```

Insertion in crawl-ref/source/player.cc at line 5054 [5.962854]

[11.2735]


    const bool res_poison = player_res_poison() > 0;
    int hurted = 0;

Replacement in crawl-ref/source/player.cc at line 5061 [5.962854]
B:BD[11.2772] → [11.2772:2810]
```
        int hurted = roll_dice(2, 6);
```
[11.2772]
[11.2810]
```
        hurted = roll_dice(2, 6);
```
Insertion in crawl-ref/source/player.cc at line 5075 [5.962854]
[11.3159]
[11.3159]
```
    return (hurted > 0);
```
Replacement in crawl-ref/source/player.cc at line 5081 [5.962854]
B:BD[5.1063651] → [14.16902:16956]
```
    if (!force && player_res_poison() || amount <= 0)
```
[5.1063651]
[14.16956]
```
    if (!force && player_res_poison() > 0 || amount <= 0)
```

Insertion in crawl-ref/source/player.cc at line 5099 [5.962854]

[14.17000]

[5.1064072]

}
void dec_poison_player()
{
    if (you.duration[DUR_POISONING] > 0)
    {
        if (x_chance_in_y(you.duration[DUR_POISONING], 5))
        {
            int hurted = 1;
            msg_channel_type channel = MSGCH_PLAIN;
            const char *adj = "";
            if (you.duration[DUR_POISONING] > 10
                && random2(you.duration[DUR_POISONING]) >= 8)
            {
                hurted = random2(10) + 5;
                channel = MSGCH_DANGER;
                adj = "extremely ";
            }
            else if (you.duration[DUR_POISONING] > 5 && coinflip())
            {
                hurted = coinflip() ? 3 : 2;
                channel = MSGCH_WARN;
                adj = "very ";
            }
            ouch(hurted, NON_MONSTER, KILLED_BY_POISON);
            mprf(channel, "You feel %ssick.", adj);
            if ((you.hp == 1 && one_chance_in(3)) || one_chance_in(8))
                reduce_poison_player(1);
        }
    }

Replacement in crawl-ref/source/player.cc at line 5136 [5.962854]
B:BD[5.1064117] → [6.6076:6133]
```
    if (you.duration[DUR_POISONING] == 0 || amount <= 0)
```
[5.1064117]
[5.1064157]
```
    if (amount <= 0)
```
Insertion in crawl-ref/source/player.cc at line 5139 [5.962854]
[5.1064174]
[6.6134]
```
    const int old_value = you.duration[DUR_POISONING];
```

Replacement in crawl-ref/source/player.cc at line 5142 [5.962854]

B:BD[5.1064201] → [6.6178:6220]

    if (you.duration[DUR_POISONING] <= 0)

[5.1064201]

[5.1064226]

    if (you.duration[DUR_POISONING] < 0)
        you.duration[DUR_POISONING] = 0;
    if (you.duration[DUR_POISONING] < old_value)

Replacement in crawl-ref/source/player.cc at line 5147 [5.962854]

B:BD[5.1064232] → [6.6221:6262]

B:BD[6.6262] → [11.3292:3341]

        you.duration[DUR_POISONING] = 0;
        mpr("You feel better.", MSGCH_RECOVERY);

[5.1064232]

[5.1064307]

        mprf(MSGCH_RECOVERY, "You feel %sbetter.",
             you.duration[DUR_POISONING] > 0 ? "a little " : "");

Deletion in crawl-ref/source/player.cc at line 5150 [5.962854]
B:BD[5.1064313] → [5.1064313:1064322]
B:BD[5.1064322] → [11.3342:3400]
```
    else
        mpr("You feel a little better.", MSGCH_RECOVERY);
```

Replacement in crawl-ref/source/player.cc at line 5154 [5.962854]

B:BD[4.2483] → [4.2483:2533]

    if (player_res_sticky_flame() || amount <= 0)

[4.2483]

[4.2533]

    if (player_res_sticky_flame() > 0 || amount <= 0)

Replacement in crawl-ref/source/player.cc at line 5190 [5.962854]

B:BD[4.3435] → [4.3435:3540]

            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10, 0,
                 KILLED_BY_BURNING);

[4.3435]

[4.3540]

            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10,
                 NON_MONSTER, KILLED_BY_BURNING);

Replacement in crawl-ref/source/player.cc at line 5196 [5.962854]

B:BD[4.3587] → [4.3587:3692]

            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10, 0,
                 KILLED_BY_BURNING);

[4.3587]

[4.3692]

            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10,
                 NON_MONSTER, KILLED_BY_BURNING);

Deletion in crawl-ref/source/player.cc at line 5205 [5.962854]
B:BD[4.3902] → [4.3902:3905]
∅:D[4.3905] → [13.2676:2725]
B:BD[5.1064397] → [13.2676:2725]
∅:D[15.462] → [5.1064448:1064471]
∅:D[13.2725] → [5.1064448:1064471]
B:BD[5.1064448] → [5.1064448:1064471]
B:BD[5.1064471] → [14.17001:17025]
∅:D[15.485] → [5.1064487:1064545]
∅:D[14.17025] → [5.1064487:1064545]
B:BD[5.1064487] → [5.1064487:1064545]
B:BD[5.1064545] → [13.2726:2773]
∅:D[13.2773] → [14.17026:17050]
B:BD[5.1064594] → [14.17026:17050]
∅:D[15.508] → [5.1064610:1064617]
∅:D[14.17050] → [5.1064610:1064617]
B:BD[5.1064610] → [5.1064610:1064617]
B:BD[5.1064617] → [6.6263:6351]
∅:D[6.6351] → [5.1064677:1064678]
B:BD[5.1064677] → [5.1064677:1064678]
B:BD[5.1064678] → [6.6352:6426]
∅:D[6.6426] → [5.1064724:1064725]
B:BD[5.1064724] → [5.1064724:1064725]
B:BD[5.1064725] → [6.6427:6471]
∅:D[6.6471] → [5.1064755:1064761]
B:BD[5.1064755] → [5.1064755:1064761]
B:BD[5.1064929] → [16.586:617]
B:BD[16.617] → [13.2774:2775]
∅:D[13.2775] → [17.5479:5574]
B:BD[16.617] → [17.5479:5574]
B:BD[17.5574] → [13.2776:2777]
∅:D[13.2777] → [18.72764:72814]
∅:D[17.5574] → [18.72764:72814]
∅:D[19.13675] → [18.72764:72814]
B:BD[5.1064950] → [18.72764:72814]
B:BD[18.72814] → [10.32862:32863]
B:BD[10.32863] → [6.6472:6535]
∅:D[6.6535] → [5.1064950:1064956]
∅:D[10.32912] → [5.1064950:1064956]
∅:D[18.72814] → [5.1064950:1064956]
B:BD[5.1064950] → [5.1064950:1064956]
B:BD[5.1064956] → [13.2778:2779]
∅:D[13.2779] → [14.17051:17070]
B:BD[5.1064956] → [14.17051:17070]
∅:D[15.526] → [5.1064956:1064959]
∅:D[14.17070] → [5.1064956:1064959]
B:BD[5.1064956] → [5.1064956:1064959]
B:BD[5.1064959] → [13.2780:2819]
∅:D[13.2819] → [5.1065000:1065002]
B:BD[5.1065000] → [5.1065000:1065002]
B:BD[5.1065002] → [6.6536:6588]
∅:D[6.6588] → [5.1065040:1065057]
B:BD[5.1065040] → [5.1065040:1065057]
B:BD[5.1065057] → [6.6589:6627]
∅:D[6.6627] → [5.1065081:1065082]
B:BD[5.1065081] → [5.1065081:1065082]
B:BD[5.1065082] → [6.6628:6665]
∅:D[6.6665] → [5.1065105:1065111]
B:BD[5.1065105] → [5.1065105:1065111]
B:BD[5.1065111] → [6.6666:6702]
B:BD[6.6702] → [13.2820:2860]
∅:D[13.2860] → [5.1065175:1065181]
B:BD[5.1065175] → [5.1065175:1065181]
```
}
bool confuse_player(int amount, bool resistable)
{
    if (amount <= 0)
        return (false);
    if (resistable && wearing_amulet(AMU_CLARITY))
    {
        mpr("You feel momentarily confused.");
        return (false);
    }
    const int old_value = you.duration[DUR_CONF];
    you.duration[DUR_CONF] += amount;
    if (you.duration[DUR_CONF] > 40)
        you.duration[DUR_CONF] = 40;
    if (you.duration[DUR_CONF] > old_value)
    {
        you.check_awaken(500);
        mprf(MSGCH_WARN, "You are %sconfused.",
             (old_value > 0) ? "more " : "" );
        learned_something_new(TUT_YOU_ENCHANTED);
        xom_is_stimulated(you.duration[DUR_CONF] - old_value);
    }
    return (true);
}
void reduce_confuse_player(int amount)
{
    if (you.duration[DUR_CONF] == 0 || amount <= 0)
        return;
    you.duration[DUR_CONF] -= amount;
    if (you.duration[DUR_CONF] <= 0)
    {
        you.duration[DUR_CONF] = 0;
        mpr("You feel less confused.");
    }
```
Insertion in crawl-ref/source/ouch.cc at line 797 [5.1104358]
[3.4436]
[3.4436]
```
        monsters *mon = &menv[death_source];
```
Insertion in crawl-ref/source/ouch.cc at line 800 [5.1104358]
[3.4437]
[20.2830]
```
        if (!mon->alive())
            return;
```
Deletion in crawl-ref/source/ouch.cc at line 805 [5.1104358]
B:BD[20.2884] → [20.2884:2930]
```
        monsters *mon = &menv[death_source];
```
Deletion in crawl-ref/source/beam.cc at line 2374 [5.4128068]
∅:D[8.10939] → [21.1233381:1233431]
B:BD[21.1233381] → [21.1233381:1233431]
```
// Returns true if the curare killed the monster.
```
Insertion in crawl-ref/source/beam.cc at line 2381 [5.4128068]
[21.1233744]
[21.1233744]
```
    int hurted = 0;
```
Replacement in crawl-ref/source/beam.cc at line 2385 [5.4128068]
B:BD[21.1233785] → [21.1233785:1233823]
```
        int hurted = roll_dice(2, 6);
```
[21.1233785]
[21.1233823]
```
        hurted = roll_dice(2, 6);
```
Replacement in crawl-ref/source/beam.cc at line 2405 [5.4128068]
B:BD[21.1234536] → [22.9053:9085]
```
    return (!monster->alive());
```
[21.1234536]
[21.1234558]
```
    return (hurted > 0);
```
Insertion in crawl-ref/source/beam.cc at line 4455 [5.4128068]
[5.4241579]
[5.4241580]
```
        bool wake_mimic = true;
```
Replacement in crawl-ref/source/beam.cc at line 4459 [5.4128068]
∅:D[23.4336] → [24.38262:38280]
∅:D[25.5561] → [24.38262:38280]
B:BD[26.9475] → [24.38262:38280]
```
        if (item)
```
[25.5561]
[5.4241810]
```
        if (item && item->base_type == OBJ_MISSILES)
```

Replacement in crawl-ref/source/beam.cc at line 4461 [5.4128068]

B:BD[5.4241820] → [24.38281:38381]

            if (item->base_type == OBJ_MISSILES
                && item->special == SPMSL_POISONED)

[5.4241820]

[5.4242111]

            if (item->special == SPMSL_POISONED)

Replacement in crawl-ref/source/beam.cc at line 4489 [5.4128068]

B:BD[24.39399] → [24.39399:39473]

                    poison_monster( mon, _whose_kill(beam), num_levels );

[24.39399]

[24.39473]

                    poison_monster(mon, _whose_kill(beam), num_levels);

Replacement in crawl-ref/source/beam.cc at line 4492 [5.4128068]

∅:D[27.1596] → [5.4242202:4242213]

B:BD[5.4242202] → [5.4242202:4242213]

B:BD[5.4242213] → [21.1250566:1250598]

B:BD[21.1250598] → [24.39492:39590]

∅:D[24.39590] → [21.1250657:1250667]

B:BD[21.1250657] → [21.1250657:1250667]

B:BD[21.1250667] → [28.534:583]

B:BD[28.583] → [29.19396:19471]

        }
        bool wake_mimic = true;
        if (item && item->base_type == OBJ_MISSILES
            && item->special == SPMSL_CURARE)
        {
            if (beam.ench_power == AUTOMATIC_HIT
                && curare_hits_monster( beam, mon, _whose_kill(beam), 2 ))

[27.1596]

[28.657]

            else if (item->special == SPMSL_CURARE)

Replacement in crawl-ref/source/beam.cc at line 4494 [5.4128068]

∅:D[28.671] → [21.1250744:1250780]

∅:D[30.38248] → [21.1250744:1250780]

B:BD[21.1250744] → [21.1250744:1250780]

                wake_mimic = false;

[28.671]

[28.672]

                if (beam.ench_power == AUTOMATIC_HIT
                    && curare_hits_monster(beam, mon, _whose_kill(beam), 2)
                    && !mon->alive())
                {
                    wake_mimic = false;
                }

Replacement in crawl-ref/source/beam.cc at line 4503 [5.4128068]
B:BD[21.1250791] → [21.1250791:1250845]
```
        if (wake_mimic && mons_is_mimic( mon->type ))
```
[21.1250791]
[5.4242253]
```
        if (wake_mimic && mons_is_mimic(mon->type))
```
Deletion in crawl-ref/source/acr.cc at line 2920 [5.4397395]
B:BD[5.4457316] → [5.4457316:4457317]
B:BD[5.4457317] → [6.18300:18341]
∅:D[6.18341] → [5.4457341:4457347]
∅:D[7.91775] → [5.4457341:4457347]
B:BD[5.4457341] → [5.4457341:4457347]
B:BD[5.4457347] → [31.15316:15375]
∅:D[31.15375] → [5.4457391:4457401]
∅:D[6.18403] → [5.4457391:4457401]
∅:D[7.91823] → [5.4457391:4457401]
B:BD[5.4457391] → [5.4457391:4457401]
B:BD[5.4457401] → [6.18404:18499]
∅:D[6.18499] → [5.4457462:4457476]
∅:D[7.91891] → [5.4457462:4457476]
B:BD[5.4457462] → [5.4457462:4457476]
B:BD[5.4457476] → [32.9074:9144]
∅:D[32.9144] → [5.4457536:4457613]
B:BD[5.4457536] → [5.4457536:4457613]
B:BD[5.4457613] → [6.18500:18568]
∅:D[6.18568] → [5.4457664:4457678]
∅:D[7.91946] → [5.4457664:4457678]
B:BD[5.4457664] → [5.4457664:4457678]
B:BD[5.4457678] → [32.9145:9220]
∅:D[32.9220] → [5.4457742:4457843]
B:BD[5.4457742] → [5.4457742:4457843]
B:BD[5.4457843] → [33.4249:4311]
∅:D[33.4311] → [32.9221:9277]
B:BD[5.4457904] → [32.9221:9277]
∅:D[32.9277] → [5.4457950:4458003]
B:BD[5.4457950] → [5.4457950:4458003]
```
    if (you.duration[DUR_POISONING] > 0)
    {
        if (x_chance_in_y(you.duration[DUR_POISONING], 5))
        {
            if (you.duration[DUR_POISONING] > 10 && random2(you.duration[DUR_POISONING]) >= 8)
            {
                ouch(random2(10) + 5, NON_MONSTER, KILLED_BY_POISON);
                mpr("You feel extremely sick.", MSGCH_DANGER);
            }
            else if (you.duration[DUR_POISONING] > 5 && coinflip())
            {
                ouch((coinflip() ? 3 : 2), NON_MONSTER, KILLED_BY_POISON);
                mpr("You feel very sick.", MSGCH_WARN);
            }
            else
            {
                // "the poison running through your veins.");
                ouch(1, NON_MONSTER, KILLED_BY_POISON);
                mpr("You feel sick.");
            }
```

Replacement in crawl-ref/source/acr.cc at line 2921 [5.4397395]

B:BD[5.4458004] → [5.4458004:4458132]

            if ((you.hp == 1 && one_chance_in(3)) || one_chance_in(8))
                reduce_poison_player(1);
        }
    }

[5.4458004]

[5.4458132]

    dec_poison_player();

Replacement in crawl-ref/source/acr.cc at line 3151 [5.4397395]

B:BD[5.4462455] → [5.4462455:4462516]

            mpr( "You have starved to death.", MSGCH_FOOD );

[5.4462455]

[32.9278]

            mpr("You have starved to death.", MSGCH_FOOD);

Add more player duration cleanups, and fix ouch() napalm death sources.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells1.h at line 47 [5.611815]

Replacement in crawl-ref/source/spells1.cc at line 1016 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 1018 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 1021 [5.616635]

Insertion in crawl-ref/source/player.h at line 417 [5.945993]

Replacement in crawl-ref/source/player.h at line 420 [5.945993]

Insertion in crawl-ref/source/player.h at line 422 [5.945993]

Deletion in crawl-ref/source/player.h at line 428 [5.945993]

Deletion in crawl-ref/source/player.h at line 434 [5.945993]

Replacement in crawl-ref/source/player.cc at line 5019 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5021 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5048 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5054 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5061 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5075 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5081 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5099 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5136 [5.962854]

Insertion in crawl-ref/source/player.cc at line 5139 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5142 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5147 [5.962854]

Deletion in crawl-ref/source/player.cc at line 5150 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5154 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5190 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5196 [5.962854]

Deletion in crawl-ref/source/player.cc at line 5205 [5.962854]

Insertion in crawl-ref/source/ouch.cc at line 797 [5.1104358]

Insertion in crawl-ref/source/ouch.cc at line 800 [5.1104358]

Deletion in crawl-ref/source/ouch.cc at line 805 [5.1104358]

Deletion in crawl-ref/source/beam.cc at line 2374 [5.4128068]

Insertion in crawl-ref/source/beam.cc at line 2381 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 2385 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 2405 [5.4128068]

Insertion in crawl-ref/source/beam.cc at line 4455 [5.4128068]

Replacement in crawl-ref/source/beam.cc at line 4459 [5.4128068]