fiddlerwoaroof/crawl - Change QXI6JLO5RGDKUG5H7RBMQTTT3234L2NGHJTMWAF6UJEBJDBDMMNAC

Implement divination miscasts for orange statues, fix silver and orange statues to attack monsters as they attack the player. Also fix clouds not being cleared on level reset in dungeon.cc.

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

Created by dshaligram on December 29, 2008

QXI6JLO5RGDKUG5H7RBMQTTT3234L2NGHJTMWAF6UJEBJDBDMMNAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 2464 [5.293070]
[4.16079]
[4.16079]
```
#ifdef DEBUG_DIAGNOSTICS
```
Insertion in crawl-ref/source/spl-cast.cc at line 2467 [5.293070]
[4.16201]
[4.16201]
```
#endif
```

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

B:BD[4.16744] → [6.358:426]

∅:D[6.426] → [7.334:586]

B:BD[7.334] → [7.334:586]

            // XXX: Monsters currently have no divination miscasts.
            do
            {
                int exp = (random2(SPTYP_LAST_EXPONENT));
                sp_type = (spschool_flag_type) (1 << exp);
            } while (sp_type == SPTYP_DIVINATION
                     && target->atype() == ACT_MONSTER);

[4.16744]

[4.16853]

            int exp = (random2(SPTYP_LAST_EXPONENT));
            sp_type = (spschool_flag_type) (1 << exp);

Replacement in crawl-ref/source/spl-cast.cc at line 2788 [5.293070]
B:BD[4.23381] → [4.23381:23421]
```
            target->slow_down(pot_pow);
```
[4.23381]
[4.23421]
```
            target->slow_down(act_source, pot_pow);
```
Replacement in crawl-ref/source/spl-cast.cc at line 2791 [5.293070]
B:BD[4.23468] → [4.23468:23507]
```
            target->paralyse(pot_pow);
```
[4.23468]
[4.23507]
```
            target->paralyse(act_source, pot_pow);
```
Replacement in crawl-ref/source/spl-cast.cc at line 2794 [5.293070]
B:BD[4.23554] → [4.23554:23592]
```
            target->confuse(pot_pow);
```
[4.23554]
[4.23592]
```
            target->confuse(act_source, pot_pow);
```

Insertion in crawl-ref/source/spl-cast.cc at line 3662 [5.293070]

[8.17987]

[4.38845]

    switch (severity)
    {
    case 0:         // just a harmless message
        mon_msg_seen = "@The_monster@ looks momentarily confused.";
        break;
    case 1:         // more annoying things
        switch (random2(2))
        {
        case 0:
            mon_msg_seen = "@The_monster@ looks slightly disoriented.";
            break;
        case 1:
            mon_target->confuse(
                act_source,
                1 + random2(3 + act_source->get_experience_level()));
            break;
        }
        break;
    case 2:         // even more annoying things
        mon_msg_seen = "@The_monster@ shudders.";
        mon_target->confuse(
            act_source,
            5 + random2(3 + act_source->get_experience_level()));
        break;
    case 3:         // nasty
        mon_msg_seen = "@The_monster@ reels.";
        if (one_chance_in(7))
            mon_target->forget_random_spell();
        mon_target->confuse(
            act_source,
            8 + random2(3 + act_source->get_experience_level()));
        break;
    }

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

B:BD[9.3694] → [10.2978:3021]

            you.paralyse(3 + random2(10));

[9.3694]

[9.3739]

            you.paralyse(NULL, 3 + random2(10));

Replacement in crawl-ref/source/player.cc at line 6830 [5.962854]
B:BD[11.6498] → [11.6498:6528]
```
void player::confuse(int str)
```
[11.6498]
[11.6528]
```
void player::confuse(actor *who, int str)
```
Replacement in crawl-ref/source/player.cc at line 6835 [5.962854]
B:BD[11.6558] → [11.6558:6589]
```
void player::paralyse(int str)
```
[11.6558]
[11.6589]
```
void player::paralyse(actor *who, int str)
```
Replacement in crawl-ref/source/player.cc at line 6849 [5.962854]
B:BD[12.4056] → [12.4056:4086]
```
void player::petrify(int str)
```
[12.4056]
[12.4086]
```
void player::petrify(actor *who, int str)
```
Replacement in crawl-ref/source/player.cc at line 6862 [5.962854]
B:BD[11.6804] → [11.6804:6836]
```
void player::slow_down(int str)
```
[11.6804]
[11.6836]
```
void player::slow_down(actor *foe, int str)
```
Insertion in crawl-ref/source/mstuff2.cc at line 27 [5.1340842]
[5.1341696]
[13.58895]
```
#include "Kills.h"
```

Replacement in crawl-ref/source/mstuff2.cc at line 2241 [5.1340842]

B:BD[14.409578] → [15.510:588]

    if ((mons_player_visible(mons) || one_chance_in(3)) && !one_chance_in(3))

[14.409578]

[14.409668]

    actor *foe = mons->get_foe();
    if (foe && mons->can_see(foe) && !one_chance_in(3))

Replacement in crawl-ref/source/mstuff2.cc at line 2252 [5.1340842]

B:BD[16.2746] → [17.2566:2620]

                BEH_HOSTILE, 5, you.pos(), MHITYOU));

[16.2746]

[14.410156]

                BEH_HOSTILE, 5, foe->pos(), MHITYOU));

Replacement in crawl-ref/source/mstuff2.cc at line 2260 [5.1340842]

B:BD[14.410253] → [14.410253:410309]

B:BD[14.410309] → [18.21573:21603]

    if ((mons_player_visible(mons) || one_chance_in(3))
        && !one_chance_in(3))

[14.410253]

[14.410343]

    actor *foe = mons->get_foe();
    if (foe && mons->can_see(foe) && !one_chance_in(3))

Replacement in crawl-ref/source/mstuff2.cc at line 2263 [5.1340842]

B:BD[14.410349] → [14.410349:410415]

        mpr("A hostile presence attacks your mind!", MSGCH_WARN);

[14.410349]

[14.410415]

        if (you.can_see(foe))
        {
            if (foe == &you)
                mprf(MSGCH_WARN, "A hostile presence attacks your mind!");
            else if (you.can_see(mons))
                mprf(MSGCH_WARN, "%s fixes %s piercing gaze on %s.",
                     mons->name(DESC_CAP_THE).c_str(),
                     mons->pronoun(PRONOUN_NOCAP_POSSESSIVE).c_str(),
                     foe->name(DESC_NOCAP_THE).c_str());
        }

Replacement in crawl-ref/source/mstuff2.cc at line 2274 [5.1340842]

B:BD[14.410416] → [4.72847:72915]

        MiscastEffect( &you, monster_index(mons), SPTYP_DIVINATION,

[14.410416]

[4.72915]

        MiscastEffect( foe, monster_index(mons), SPTYP_DIVINATION,

Replacement in crawl-ref/source/monstuff.cc at line 6559 [5.1396662]

B:BD[19.3373] → [20.2851:2889]

        if (mons_is_lurking(monster))

[19.3373]

[19.3417]

        if (mons_is_lurking(monster) || mons_is_submerged(monster))

Replacement in crawl-ref/source/mon-util.cc at line 5666 [5.1699344]
B:BD[11.16546] → [11.16546:16583]
```
void monsters::confuse(int strength)
```
[11.16546]
[11.16583]
```
void monsters::confuse(actor *atk, int strength)
```

Replacement in crawl-ref/source/mon-util.cc at line 5668 [5.1699344]

B:BD[11.16585] → [3.3914:3980]

    enchant_monster_with_flavour(this, BEAM_CONFUSION, strength);

[11.16585]

[11.16682]

    enchant_monster_with_flavour(this, atk, BEAM_CONFUSION, strength);

Replacement in crawl-ref/source/mon-util.cc at line 5671 [5.1699344]
B:BD[11.16685] → [11.16685:16723]
```
void monsters::paralyse(int strength)
```
[11.16685]
[11.16723]
```
void monsters::paralyse(actor *atk, int strength)
```

Replacement in crawl-ref/source/mon-util.cc at line 5673 [5.1699344]

B:BD[11.16725] → [3.3981:4047]

    enchant_monster_with_flavour(this, BEAM_PARALYSIS, strength);

[11.16725]

[12.5835]

    enchant_monster_with_flavour(this, atk, BEAM_PARALYSIS, strength);

Replacement in crawl-ref/source/mon-util.cc at line 5676 [5.1699344]
B:BD[12.5838] → [12.5838:5875]
```
void monsters::petrify(int strength)
```
[12.5838]
[12.5875]
```
void monsters::petrify(actor *atk, int strength)
```

Replacement in crawl-ref/source/mon-util.cc at line 5681 [5.1699344]

B:BD[12.5931] → [3.4048:4112]

    enchant_monster_with_flavour(this, BEAM_PETRIFY, strength);

[12.5931]

[11.16820]

    enchant_monster_with_flavour(this, atk, BEAM_PETRIFY, strength);

Replacement in crawl-ref/source/mon-util.cc at line 5684 [5.1699344]
B:BD[11.16823] → [11.16823:16862]
```
void monsters::slow_down(int strength)
```
[11.16823]
[11.16862]
```
void monsters::slow_down(actor *atk, int strength)
```

Replacement in crawl-ref/source/mon-util.cc at line 5686 [5.1699344]

B:BD[11.16864] → [3.4113:4174]

    enchant_monster_with_flavour(this, BEAM_SLOW, strength);

[11.16864]

[21.6790]

    enchant_monster_with_flavour(this, atk, BEAM_SLOW, strength);

Insertion in crawl-ref/source/mon-util.cc at line 5989 [5.1699344]

[22.6918]

[23.210]

void monsters::forget_random_spell()
{
    int which_spell = -1;
    int count = 0;
    for (int i = 0; i < NUM_MONSTER_SPELL_SLOTS; ++i)
        if (spells[i] != SPELL_NO_SPELL && one_chance_in(++count))
            which_spell = i;
    if (which_spell != -1)
        spells[which_spell] = SPELL_NO_SPELL;
}

Replacement in crawl-ref/source/mon-util.cc at line 7526 [5.1699344]

B:BD[24.6134] → [3.4175:4235]

        if (enchant_monster_with_flavour(this, BEAM_HASTE))

[24.6134]

[24.6357]

        if (enchant_monster_with_flavour(this, this, BEAM_HASTE))

Replacement in crawl-ref/source/mon-util.cc at line 7531 [5.1699344]

B:BD[24.6441] → [3.4236:4303]

        if (enchant_monster_with_flavour(this, BEAM_INVISIBILITY))

[24.6441]

[24.6674]

        if (enchant_monster_with_flavour(this, this, BEAM_INVISIBILITY))

Replacement in crawl-ref/source/it_use2.cc at line 220 [5.2904329]

B:BD[5.2908512] → [25.6658:6739]

        you.paralyse((2 + random2( 6 + you.duration[DUR_PARALYSIS] )) / factor);

[5.2908512]

[25.6739]

        you.paralyse(NULL,
                     (2 + random2( 6 + you.duration[DUR_PARALYSIS] )) / factor);

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

B:BD[2.244] → [2.244:295]

            defender->paralyse( roll_dice(1, 3) );

[2.244]

[2.295]

            defender->paralyse( attacker, roll_dice(1, 3) );

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

B:BD[2.308] → [2.308:360]

            defender->slow_down( roll_dice(1, 3) );

[2.308]

[2.360]

            defender->slow_down( attacker, roll_dice(1, 3) );

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

B:BD[11.76632] → [26.2881:2944]

            defender->confuse(1 + random2(3 + atk->hit_dice));

[11.76632]

[11.76699]

            defender->confuse(attacker, 1 + random2(3 + atk->hit_dice));

Replacement in crawl-ref/source/externs.h at line 341 [5.3270163]

∅:D[27.1560] → [11.84577:84622]

∅:D[28.52986] → [11.84577:84622]

B:BD[11.84577] → [11.84577:84622]

B:BD[11.84622] → [12.7978:8022]

∅:D[12.8022] → [11.84622:84712]

B:BD[11.84622] → [11.84622:84712]

    virtual void paralyse(int strength) = 0;
    virtual void petrify(int strength) = 0;
    virtual void slow_down(int strength) = 0;
    virtual void confuse(int strength) = 0;

[28.52986]

[11.84712]

    virtual void paralyse(actor *attacker, int strength) = 0;
    virtual void petrify(actor *attacker, int strength) = 0;
    virtual void slow_down(actor *attacker, int strength) = 0;
    virtual void confuse(actor *attacker, int strength) = 0;

Replacement in crawl-ref/source/externs.h at line 1064 [5.3270163]
∅:D[27.1590] → [11.86941:86969]
∅:D[28.53042] → [11.86941:86969]
B:BD[11.86941] → [11.86941:86969]
B:BD[11.86969] → [12.8135:8162]
∅:D[12.8162] → [11.86969:87030]
B:BD[11.86969] → [11.86969:87030]
```
    void paralyse(int str);
    void petrify(int str);
    void slow_down(int str);
    void confuse(int strength);
```
[28.53042]
[11.87030]
```
    void paralyse(actor *, int str);
    void petrify(actor *, int str);
    void slow_down(actor *, int str);
    void confuse(actor *, int strength);
```
Insertion in crawl-ref/source/externs.h at line 1326 [5.3270163]
[29.31596]
[22.11815]
```
    void forget_random_spell();
```
Replacement in crawl-ref/source/externs.h at line 1494 [5.3270163]
∅:D[27.1622] → [11.89203:89231]
∅:D[28.53074] → [11.89203:89231]
B:BD[11.89203] → [11.89203:89231]
B:BD[11.89231] → [12.8254:8281]
∅:D[12.8281] → [11.89231:89292]
B:BD[11.89231] → [11.89231:89292]
```
    void paralyse(int str);
    void petrify(int str);
    void slow_down(int str);
    void confuse(int strength);
```
[28.53074]
[11.89292]
```
    void paralyse(actor *, int str);
    void petrify(actor *, int str);
    void slow_down(actor *, int str);
    void confuse(actor *, int strength);
```

Insertion in crawl-ref/source/externs.h at line 1564 [5.3270163]

[30.765]

[4.85765]

    cloud_struct() : pos(), type(CLOUD_NONE), decay(0), spread_rate(0),
                     whose(KC_OTHER), killer(KILL_NONE)
    {
    }

Insertion in crawl-ref/source/dungeon.cc at line 928 [5.3429798]

[31.7262]

[32.11861]


    // Zap clouds
    env.cgrid.init(EMPTY_CLOUD);
    const cloud_struct empty;
    env.cloud.init(empty);

Insertion in crawl-ref/source/beam.h at line 121 [5.4124541]
[3.5579]
[33.828]
```
    void set_agent(actor *agent);
```

Replacement in crawl-ref/source/beam.h at line 249 [5.4124541]

B:BD[3.9032] → [3.9032:9149]

bool enchant_monster_with_flavour(monsters* mon, beam_type flavour,
                                  int powc = 0);

[3.9032]

[5.4126147]

bool enchant_monster_with_flavour(monsters* mon, actor *atk,
                                  beam_type flavour, int powc = 0);

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

B:BD[34.9052] → [3.23439:23501]

            enchant_monster_with_flavour(monster, BEAM_SLOW);

[34.9052]

[14.1234425]

            enchant_monster_with_flavour(monster, agent, BEAM_SLOW);

Replacement in crawl-ref/source/beam.cc at line 3596 [5.4128068]
B:BD[3.39695] → [3.39695:39730]
```
        you.petrify( ench_power );
```
[3.39695]
[3.39730]
```
        you.petrify( agent(), ench_power );
```

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

B:BD[5.4242809] → [3.59113:59191]

bool enchant_monster_with_flavour(monsters* mon, beam_type flavour, int powc)

[5.4242809]

[3.59191]

bool enchant_monster_with_flavour(monsters* mon, actor *foe,
                                  beam_type flavour, int powc)

Insertion in crawl-ref/source/beam.cc at line 4617 [5.4128068]
[3.59267]
[3.59267]
```
    dummy.set_agent(foe);
```

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

[34.13276]

void bolt::set_agent(actor *actor)
{
    // NULL actor is fine by us.
    if (!actor)
        return;
    if (actor->atype() == ACT_PLAYER)
    {
        thrower = KILL_YOU_MISSILE;
    }
    else
    {
        thrower = KILL_MON_MISSILE;
        beam_source = monster_index(dynamic_cast<monsters*>(actor));
    }
}

Implement divination miscasts for orange statues, fix silver and orange statues to attack monsters as they attack the player. Also fix clouds not being cleared on level reset in dungeon.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 2464 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 2467 [5.293070]

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

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

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

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

Insertion in crawl-ref/source/spl-cast.cc at line 3662 [5.293070]

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

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

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

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

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

Insertion in crawl-ref/source/mstuff2.cc at line 27 [5.1340842]