fiddlerwoaroof/crawl - Change 46I36AWFYIFDOUPKFEMJSJTPQ27CQP7FNKOLT3ZOBUI6SF4EL7RQC

Clean up sticky flame handling.

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

Created by dolorous on November 7, 2008

46I36AWFYIFDOUPKFEMJSJTPQ27CQP7FNKOLT3ZOBUI6SF4EL7RQC

Dependencies

In channels

main

Change contents

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

[4.3400]

[5.1064394]

}
bool napalm_player(int amount)
{
    if (player_res_sticky_flame() || amount <= 0)
        return (false);
    const int old_value = you.duration[DUR_LIQUID_FLAMES];
    you.duration[DUR_LIQUID_FLAMES] += amount;
    if (you.duration[DUR_LIQUID_FLAMES] > 40)
        you.duration[DUR_LIQUID_FLAMES] = 40;
    if (you.duration[DUR_LIQUID_FLAMES] > old_value)
        mpr("You are covered in liquid flames!", MSGCH_WARN);
    return (true);

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

[5.1064396]


void dec_napalm_player()
{
    if (you.duration[DUR_LIQUID_FLAMES] > 1)
    {
        you.duration[DUR_LIQUID_FLAMES]--;
        mpr("You are covered in liquid flames!", MSGCH_WARN);

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

[5.1064397]

[6.2676]

        expose_player_to_element(BEAM_NAPALM, 12);
        const int res_fire = player_res_fire();
        if (res_fire > 0)
        {
            ouch((((random2avg(9, 2) + 1) * you.time_taken) /
                    (1 + (res_fire * res_fire))) / 10, NON_MONSTER,
                    KILLED_BY_BURNING);
        }
        if (res_fire <= 0)
        {
            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10, 0,
                 KILLED_BY_BURNING);
        }
        if (res_fire < 0)
        {
            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10, 0,
                 KILLED_BY_BURNING);
        }
        if (you.duration[DUR_CONDENSATION_SHIELD] > 0)
            remove_condensation_shield();
    }
    else if (you.duration[DUR_LIQUID_FLAMES] == 1)
        you.duration[DUR_LIQUID_FLAMES] = 0;
}

Insertion in crawl-ref/source/fight.h at line 221 [5.3139131]
[7.55905]
[7.55905]
```
    void mons_do_napalm();
```

Insertion in crawl-ref/source/fight.cc at line 3506 [5.3140790]

[4.3980]

[7.71099]

    }
}
void melee_attack::mons_do_napalm()
{
    if (defender->res_sticky_flame() > 0)
        return;
    if (one_chance_in(20) || (damage_done > 2 && one_chance_in(3)))
    {
        if (needs_message)
        {
            mprf("%s %s covered in liquid flames%s",
                 def_name(DESC_CAP_THE).c_str(),
                 defender->conj_verb("are").c_str(),
                 special_attack_punctuation().c_str());
        }
        if (defender->atype() == ACT_PLAYER)
            napalm_player(random2avg(7, 3) + 1);
        else
        {
            napalm_monster(def, mons_friendly(atk) ? KC_FRIENDLY : KC_OTHER,
                           std::min(4, 1 + random2(atk->hit_dice) / 2));
        }

Replacement in crawl-ref/source/fight.cc at line 3815 [5.3140790]

B:BD[8.7344] → [2.2556:2602]

∅:D[2.2602] → [9.2598:2618]

B:BD[9.2598] → [9.2598:2618]

∅:D[9.2618] → [10.2556:2628]

B:BD[8.7344] → [10.2556:2628]

∅:D[10.2628] → [8.7416:8078]

B:BD[8.7416] → [8.7416:8078]

        if (defender->res_sticky_flame() > 0)
            break;
        if (one_chance_in(20) || (damage_done > 2 && one_chance_in(3)))
        {
            if (needs_message)
            {
                mprf("%s %s covered in liquid flames%s",
                     def_name(DESC_CAP_THE).c_str(),
                     defender->conj_verb("are").c_str(),
                     special_attack_punctuation().c_str());
            }
            if (defender->atype() == ACT_PLAYER)
                sticky_flame_player();
            else
            {
                sticky_flame_monster(monster_index(def),
                                     mons_friendly(atk) ? KC_FRIENDLY : KC_OTHER,
                                     std::min(4, 1 + random2(atk->hit_dice) / 2));
            }
        }

[8.7344]

[8.8078]

        mons_do_napalm();

Deletion in crawl-ref/source/beam.h at line 103 [5.4124541]
B:BD[8.8533] → [8.8533:8561]
B:BD[8.8562] → [8.8562:8632]
```
void sticky_flame_player();
void sticky_flame_monster(int mn, kill_category who, int hurt_final);
```

Insertion in crawl-ref/source/beam.h at line 132 [5.4124541]

[4.4527]

[11.10832]

bool napalm_monster(monsters *monster, kill_category who, int levels = 1,
                    bool verbose = true);

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

B:BD[5.4197325] → [8.8634:8759]

// Actually napalms the player.
void sticky_flame_player()
{
    you.duration[DUR_LIQUID_FLAMES] += random2avg(7, 3) + 1;
}

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

B:BD[8.8805] → [8.8805:8870]

void sticky_flame_monster(int mn, kill_category who, int levels)

[8.8805]

[5.4197433]

bool napalm_monster(monsters *monster, kill_category who, int levels,
                    bool verbose)

Deletion in crawl-ref/source/beam.cc at line 2441 [5.4128068]
B:BD[5.4197435] → [12.37617:37652]
∅:D[12.37652] → [5.4197562:4197563]
B:BD[5.4197562] → [5.4197562:4197563]
```
    monsters *monster = &menv[mn];
```
Replacement in crawl-ref/source/beam.cc at line 2442 [5.4128068]
∅:D[12.37680] → [5.4197592:4197608]
B:BD[5.4197592] → [5.4197592:4197608]
```
        return;
```
[12.37680]
[5.4197608]
```
        return (false);
    if (mons_res_sticky_flame(monster) > 0 || levels <= 0)
        return (false);
```

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

B:BD[5.4197609] → [13.32328:32368]

∅:D[13.32368] → [5.4197645:4197661]

B:BD[5.4197645] → [5.4197645:4197661]

    if (mons_res_sticky_flame(monster))
        return;

[5.4197609]

[5.4198149]

    const mon_enchant old_flame = monster->get_ench(ENCH_STICKY_FLAME);
    monster->add_ench(mon_enchant(ENCH_STICKY_FLAME, levels, who));
    const mon_enchant new_flame = monster->get_ench(ENCH_STICKY_FLAME);

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

B:BD[5.4198150] → [12.37681:37753]

    if (monster->add_ench(mon_enchant(ENCH_STICKY_FLAME, levels, who)))

[5.4198150]

[14.34665]

    // Actually do the napalming.  The order is important here.
    if (new_flame.degree > old_flame.degree)

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

∅:D[14.34671] → [15.2837:2911]

B:BD[12.37753] → [15.2837:2911]

        simple_monster_message(monster, " is covered in liquid flames!");

[14.34671]

[14.34672]

        if (verbose)
            simple_monster_message(monster, " is covered in liquid flames!");

Insertion in crawl-ref/source/beam.cc at line 2458 [5.4128068]
[14.34757]
[13.32369]
```
    return (new_flame.degree > old_flame.degree);
```
Replacement in crawl-ref/source/beam.cc at line 3908 [5.4128068]
B:BD[16.26045] → [8.8950:8985]
```
            sticky_flame_player();
```
[16.26045]
[16.26046]
```
            napalm_player(random2avg(7, 3) + 1);
```

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

B:BD[5.4241496] → [8.8986:9052]

            sticky_flame_monster(tid, _whose_kill(beam), levels);

[17.3211]

[5.4241569]

            napalm_monster(mon, _whose_kill(beam), levels);

Deletion in crawl-ref/source/acr.cc at line 2522 [5.4397395]

B:BD[18.3302] → [18.3302:3303]

B:BD[18.3303] → [19.24839:24913]

∅:D[19.24913] → [5.4439664:4439695]

B:BD[5.4439664] → [5.4439664:4439695]

B:BD[5.4439695] → [19.24914:25028]

∅:D[19.25028] → [5.4439801:4439991]

B:BD[5.4439801] → [5.4439801:4439991]

B:BD[5.4439991] → [20.2675:2737]

∅:D[20.2737] → [21.1267266:1267317]

B:BD[5.4440055] → [21.1267266:1267317]

∅:D[21.1267317] → [5.4440093:4440130]

B:BD[5.4440093] → [5.4440093:4440130]

B:BD[5.4440130] → [22.8724:8894]

∅:D[22.8894] → [5.4440272:4440282]

B:BD[5.4440272] → [5.4440272:4440282]


    // Paradox: It both lasts longer & does more damage overall if you're
    //          moving slower.
    // Rationalisation: I guess it gets rubbed off/falls off/etc if you
    //                  move around more.
    if (you.duration[DUR_LIQUID_FLAMES] > 0)
        you.duration[DUR_LIQUID_FLAMES]--;
    if (you.duration[DUR_LIQUID_FLAMES] != 0)
    {
        const int res_fire = player_res_fire();
        mpr("You are covered in liquid flames!", MSGCH_WARN);
        expose_player_to_element(BEAM_NAPALM, 12);
        if (res_fire > 0)
        {
            ouch((((random2avg(9, 2) + 1) * you.time_taken) /
                    (1 + (res_fire * res_fire))) / 10, NON_MONSTER,
                    KILLED_BY_BURNING);
        }

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

B:BD[5.4440283] → [5.4440283:4440388]

B:BD[5.4440388] → [21.1267318:1267355]

∅:D[21.1267355] → [5.4440456:4440466]

B:BD[5.4440456] → [5.4440456:4440466]

        if (res_fire <= 0)
        {
            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10, 0,
                 KILLED_BY_BURNING);
        }

[5.4440283]

[5.4440466]

    // Sticky flame paradox: It both lasts longer and does more damage
    // overall if you're moving more slowly.
    //
    // Rationalisation: I guess it gets rubbed off/falls off/etc. if you
    // move around more.
    dec_napalm_player();

Deletion in crawl-ref/source/acr.cc at line 2530 [5.4397395]
B:BD[5.4440467] → [5.4440467:4440571]
B:BD[5.4440571] → [21.1267356:1267393]
∅:D[21.1267393] → [5.4440639:4440705]
B:BD[5.4440639] → [5.4440639:4440705]
B:BD[5.4440705] → [3.3863:3905]
∅:D[3.3905] → [5.4440885:4440891]
B:BD[5.4440885] → [5.4440885:4440891]
B:BD[5.4440891] → [23.17805:17806]
```
        if (res_fire < 0)
        {
            ouch(((random2avg(9, 2) + 1) * you.time_taken) / 10, 0,
                 KILLED_BY_BURNING);
        }
        if (you.duration[DUR_CONDENSATION_SHIELD] > 0)
            remove_condensation_shield();
    }
```