fiddlerwoaroof/crawl - Change JRMVNXBOAVFIEKN3AP3EN63PO5ATZPM2MWQYGWZJFP2LCDOLU36AC

Consolidate the two immolation routines (the scroll and the effect when

affixing a fire brand) into one function.

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

Created by dolorous on November 25, 2008

JRMVNXBOAVFIEKN3AP3EN63PO5ATZPM2MWQYGWZJFP2LCDOLU36AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/item_use.cc at line 3877 [7.2781507]

B:BD[5.19643] → [6.3571:3604]

∅:D[6.3604] → [7.2850469:2850470]

∅:D[5.19643] → [7.2850469:2850470]

B:BD[7.2850469] → [7.2850469:2850470]

B:BD[7.2850470] → [6.3605:3767]

B:BD[6.3767] → [4.2556:2603]

∅:D[4.2603] → [6.3816:4081]

B:BD[6.3816] → [6.3816:4081]

∅:D[6.4081] → [7.2850853:2850854]

∅:D[8.761657] → [7.2850853:2850854]

B:BD[7.2850853] → [7.2850853:2850854]

B:BD[7.2850854] → [6.4082:4121]

        {
            bolt beam;
            beam.name       = "fiery explosion";
            beam.aux_source = "a fiery explosion";
            beam.type       = dchar_glyph(DCHAR_FIRED_BURST);
            beam.damage     = dice_def(3, 10);
            beam.flavour    = BEAM_FIRE;
            beam.target     = you.pos();
            beam.colour     = RED;
            beam.thrower    = KILL_YOU;
            beam.ex_size    = 2;
            beam.is_tracer  = false;
            beam.is_explosion = true;
            explosion(beam);
        }

[5.19643]

[7.2850879]

        immolation(IMMOLATION_SPELL);

Replacement in crawl-ref/source/item_use.cc at line 4467 [7.2781507]

B:BD[9.16286] → [10.3345:3394]

∅:D[10.3394] → [8.762493:762540]

∅:D[9.16286] → [8.762493:762540]

∅:D[11.81786] → [8.762493:762540]

B:BD[8.762493] → [8.762493:762540]

∅:D[8.762540] → [7.2862793:2862794]

B:BD[7.2862793] → [7.2862793:2862794]

B:BD[7.2862794] → [3.6731:6783]

∅:D[3.6783] → [9.16326:16327]

B:BD[9.16326] → [9.16326:16327]

B:BD[9.16327] → [3.6784:6883]

∅:D[3.6883] → [9.16327:16387]

B:BD[9.16327] → [9.16327:16387]

B:BD[9.16387] → [3.6884:6929]

∅:D[3.6929] → [12.65066:65105]

B:BD[9.16434] → [12.65066:65105]

∅:D[12.65105] → [9.16512:16592]

B:BD[9.16512] → [9.16512:16592]

∅:D[9.16592] → [7.2863113:2863171]

B:BD[7.2863113] → [7.2863113:2863171]

B:BD[7.2863171] → [9.16593:16724]

∅:D[9.16724] → [8.762581:762615]

B:BD[7.2863290] → [8.762581:762615]

        set_ident_type( scroll, ID_KNOWN_TYPE );
        dec_inv_item_quantity( item_slot, 1 );
        bolt beam;
        beam.is_tracer = false;
        // unsure about this: BEAM_EXPLOSION instead? {dlb}
        beam.flavour      = BEAM_FIRE;
        beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
        beam.damage       = dice_def(3, 10);
        beam.target       = you.pos();
        beam.name         = "fiery explosion";
        beam.colour       = RED;
        // your explosion, (not someone else's explosion)
        beam.thrower      = KILL_YOU;
        beam.aux_source   = "reading a scroll of immolation";
        beam.ex_size      = 2;
        beam.is_explosion = true;

[9.16286]

[7.2863290]

        set_ident_type(scroll, ID_KNOWN_TYPE);
        dec_inv_item_quantity(item_slot, 1);

Replacement in crawl-ref/source/item_use.cc at line 4470 [7.2781507]

B:BD[7.2863291] → [13.600:667]

B:BD[13.667] → [2.3290:3354]

        if (!alreadyknown)
            beam.effect_known = false;
        explosion(beam, false, false, true, true, true, false);

[7.2863291]

[7.2863573]

        immolation(IMMOLATION_SCROLL, alreadyknown);

Insertion in crawl-ref/source/enum.h at line 1299 [7.3287960]

[7.3320449]

[8.916306]

enum immolation_source_type
{
    IMMOLATION_GENERIC = -1,
    IMMOLATION_SCROLL  = -2,
    IMMOLATION_SPELL   = -3
};

Insertion in crawl-ref/source/effects.h at line 114 [7.3378996]
[14.13847]
[15.3039]
```
void immolation(int caster, bool known = false);
```

Insertion in crawl-ref/source/effects.cc at line 265 [7.3382105]

[14.14364]

[16.5891]

}
void immolation(int caster, bool known)
{
    const char *aux = "immolation";
    if (caster < 0)
    {
        switch (caster)
        {
        case IMMOLATION_SCROLL:
            aux = "scroll of immolation";
            break;
        case IMMOLATION_SPELL:
            aux = "a fiery explosion";
            break;
        }
        caster = IMMOLATION_GENERIC;
    }
    bolt beam;
    beam.flavour      = BEAM_FIRE;
    beam.type         = dchar_glyph(DCHAR_FIRED_BURST);
    beam.damage       = dice_def(3, 10);
    beam.target       = you.pos();
    beam.name         = "fiery explosion";
    beam.colour       = RED;
    beam.thrower      = (caster == IMMOLATION_GENERIC) ? KILL_MISC : KILL_YOU;
    beam.aux_source   = aux;
    beam.ex_size      = 2;
    beam.is_tracer    = false;
    beam.is_explosion = true;
    beam.effect_known = known;
    explosion(beam, false, false, true, true, true,
              caster != IMMOLATION_SCROLL);

Replacement in crawl-ref/source/effects.cc at line 307 [7.3382105]
B:BD[17.8865] → [17.8865:8915]
```
    return (who.empty()? who : " (" + who + ")");
```
[17.8865]
[17.8915]
```
    return (who.empty() ? who : " (" + who + ")");
```