fiddlerwoaroof/crawl - Change CPNHNCRBZMUV7CYPWFKICGRW57LDRGJPCMFSJV6NB72YBGR67BNQC

Expand immolation and cleansing flame as well, so that monsters may be

able to use scrolls of immolation or holy word in the future. Also, add a power parameter to immolation, so that it can be reused for an exploding Tome of Destruction.

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

Created by dolorous on January 19, 2009

CPNHNCRBZMUV7CYPWFKICGRW57LDRGJPCMFSJV6NB72YBGR67BNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1357 [5.293070]

B:BD[3.4108] → [4.352:406]

        cleansing_flame(powc, CLEANSING_FLAME_SPELL);

[3.4108]

[5.323418]

        cleansing_flame(powc, CLEANSING_FLAME_SPELL, you.pos(), &you);

Replacement in crawl-ref/source/religion.cc at line 5565 [5.804403]

B:BD[4.2796] → [4.2796:2842]

                        CLEANSING_FLAME_TSO);

[4.2796]

[6.4077]

                        CLEANSING_FLAME_TSO, you.pos());

Replacement in crawl-ref/source/item_use.cc at line 4293 [5.2781507]
B:BD[7.19643] → [8.2556:2594]
```
        immolation(IMMOLATION_SPELL);
```
[7.19643]
[5.2850879]
```
        immolation(10, IMMOLATION_SPELL, you.pos(), true, &you);
```

Replacement in crawl-ref/source/item_use.cc at line 4911 [5.2781507]

B:BD[5.2863291] → [8.2688:2741]

        immolation(IMMOLATION_SCROLL, alreadyknown);

[5.2863291]

[5.2863573]

        immolation(10, IMMOLATION_SCROLL, you.pos(), alreadyknown, &you);

Deletion in crawl-ref/source/it_use3.cc at line 887 [5.2870456]

B:BD[5.2896909] → [5.2896909:2896910]

B:BD[5.2896910] → [9.1426:1445]

B:BD[9.1445] → [10.4325:4808]


        bolt beam;
        beam.flavour       = BEAM_FIRE;
        beam.type          = dchar_glyph(DCHAR_FIRED_BURST);
        beam.damage        = dice_def(3, 15);
        beam.target        = you.pos();
        beam.name          = "fiery explosion";
        beam.colour        = RED;
        beam.beam_source   = NON_MONSTER;
        beam.thrower       = KILL_YOU;
        beam.aux_source    = "an exploding Tome of Destruction";
        beam.ex_size       = 2;
        beam.is_explosion  = true;

Replacement in crawl-ref/source/it_use3.cc at line 888 [5.2870456]
B:BD[2.2752] → [2.2752:2776]
```
        beam.explode();
```
[2.2752]
[5.2897475]
```
        immolation(15, IMMOLATION_TOME, you.pos(), false, &you);
```

Replacement in crawl-ref/source/enum.h at line 1354 [5.3287960]

B:BD[8.2852] → [4.3381:3443]

    IMMOLATION_SPELL   = -3  // effect when fixing fire brand

[8.2852]

[8.2880]

    IMMOLATION_SPELL   = -3, // effect when fixing fire brand
    IMMOLATION_TOME    = -4  // exploding Tome of Destruction

Replacement in crawl-ref/source/effects.h at line 118 [5.3378996]

B:BD[8.2887] → [8.2887:2936]

void immolation(int caster, bool known = false);

[8.2887]

[4.3445]

void immolation(int pow, int caster, coord_def where, bool known = false,
                actor *attacker = NULL);

Replacement in crawl-ref/source/effects.h at line 121 [5.3378996]

B:BD[4.3446] → [4.3446:3489]

void cleansing_flame(int pow, int caster);

[4.3446]

[11.3039]

void cleansing_flame(int pow, int caster, coord_def where,
                     actor *attacker = NULL);

Replacement in crawl-ref/source/effects.cc at line 293 [5.3382105]

B:BD[8.2941] → [8.2941:2981]

void immolation(int caster, bool known)

[8.2941]

[8.2981]

void immolation(int pow, int caster, coord_def where, bool known,
                actor *attacker)

Insertion in crawl-ref/source/effects.cc at line 312 [5.3382105]

[8.3244]

            break;
        case IMMOLATION_TOME:
            aux = "an exploding Tome of Destruction";

Replacement in crawl-ref/source/effects.cc at line 322 [5.3382105]

B:BD[4.3669] → [4.3669:3747]

    beam.damage        = dice_def(3, 10);
    beam.target        = you.pos();

[4.3669]

[4.3747]

    beam.damage        = dice_def(3, pow);
    beam.target        = where;

Deletion in crawl-ref/source/effects.cc at line 326 [5.3382105]

B:BD[4.3821] → [4.3821:3939]

    beam.beam_source   = NON_MONSTER;
    beam.thrower       = (caster == IMMOLATION_GENERIC) ? KILL_MISC : KILL_YOU;

Insertion in crawl-ref/source/effects.cc at line 331 [5.3382105]

[4.4148]


    const monsters *atk = (attacker->atype() == ACT_PLAYER ? NULL :
                           dynamic_cast<const monsters*>(attacker));
    if (caster == IMMOLATION_GENERIC)
    {
        beam.thrower     = KILL_MISC;
        beam.beam_source = NON_MONSTER;
    }
    else if (attacker == NULL)
    {
        beam.thrower     = KILL_YOU;
        beam.beam_source = NON_MONSTER;
    }
    else
    {
        beam.thrower     = KILL_MON;
        beam.beam_source = monster_index(atk);
    }

Replacement in crawl-ref/source/effects.cc at line 354 [5.3382105]

B:BD[4.4172] → [4.4172:4214]

void cleansing_flame(int pow, int caster)

[4.4172]

[4.4214]

void cleansing_flame(int pow, int caster, coord_def where,
                     actor *attacker)

Deletion in crawl-ref/source/effects.cc at line 379 [5.3382105]

B:BD[4.4637] → [4.4637:4881]

    beam.thrower      = (caster == CLEANSING_FLAME_GENERIC
                            || caster == CLEANSING_FLAME_TSO) ? KILL_MISC
                                                              : KILL_YOU;
    beam.beam_source  = NON_MONSTER;

Insertion in crawl-ref/source/effects.cc at line 383 [5.3382105]

[8.3800]

[12.4796]

    const monsters *atk = (attacker->atype() == ACT_PLAYER ? NULL :
                           dynamic_cast<const monsters*>(attacker));
    if (caster == CLEANSING_FLAME_GENERIC || caster == CLEANSING_FLAME_TSO)
    {
        beam.thrower     = KILL_MISC;
        beam.beam_source = NON_MONSTER;
    }
    else if (attacker == NULL)
    {
        beam.thrower     = KILL_YOU;
        beam.beam_source = NON_MONSTER;
    }
    else
    {
        beam.thrower     = KILL_MON;
        beam.beam_source = monster_index(atk);
    }

Replacement in crawl-ref/source/abl-show.cc at line 1507 [5.4494389]

B:BD[4.5328] → [4.5328:5381]

                        CLEANSING_FLAME_INVOCATION);

[4.5328]

[5.4521168]

                        CLEANSING_FLAME_INVOCATION, you.pos(), &you);