fiddlerwoaroof/crawl - Change YF6CE2VBFK6K4V34PKBVYVQUTJRDDDCF2M5RMUGW6V6N2M4SUPLAC

Reorganize again.

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

Created by dolorous on June 10, 2008

YF6CE2VBFK6K4V34PKBVYVQUTJRDDDCF2M5RMUGW6V6N2M4SUPLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spl-cast.cc at line 1460 [6.293070]

[4.255]

[5.279]

    case SPELL_SUMMON_DRAGON:
        cast_summon_dragon(powc, god_gift);
        break;

Deletion in crawl-ref/source/spl-cast.cc at line 1470 [6.293070]
∅:D[7.221] → [8.306:322]
∅:D[9.254] → [8.306:322]
∅:D[2.737] → [8.306:322]
∅:D[10.1027] → [8.306:322]
B:BD[8.306] → [8.306:322]
∅:D[8.322] → [11.193:223]
B:BD[5.340] → [11.193:223]
B:BD[11.223] → [2.738:782]
∅:D[2.782] → [12.161:216]
∅:D[10.1091] → [12.161:216]
B:BD[8.357] → [12.161:216]
B:BD[12.216] → [2.783:836]
```
        break;
    case SPELL_SUMMON_DRAGON:
        cast_summon_dragon(powc, god_gift);
        break;
    case SPELL_CONJURE_BALL_LIGHTNING:
        cast_conjure_ball_lightning(powc, god_gift);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1473 [6.293070]

B:BD[13.207] → [3.7892:7961]

        // Temporarily turns a wielded weapon into a dancing weapon.

[13.207]

[14.231]

        // Temporarily turn a wielded weapon into a dancing weapon.

Insertion in crawl-ref/source/spl-cast.cc at line 1478 [6.293070]

[15.177]

    case SPELL_CONJURE_BALL_LIGHTNING:
        cast_conjure_ball_lightning(powc);
        break;

Insertion in crawl-ref/source/spells2.h at line 107 [6.562867]
[16.229]
[6.567398]

Insertion in crawl-ref/source/spells2.h at line 109 [6.562867]

[6.567399]

// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: spell
 * *********************************************************************** */
bool summon_animals(int pow);

Deletion in crawl-ref/source/spells2.h at line 139 [6.562867]

B:BD[12.268] → [12.268:334]

∅:D[17.226] → [18.342:343]

∅:D[12.334] → [18.342:343]

∅:D[8.650] → [18.342:343]

B:BD[18.342] → [18.342:343]

B:BD[18.343] → [19.288:516]

B:BD[19.516] → [14.346:483]

bool cast_conjure_ball_lightning(int pow, bool god_gift = false);
// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - religion - spell
 * *********************************************************************** */
bool cast_tukimas_dance(int pow, bool god_gift = false,
                        bool force_hostile = false, bool quiet_failure = false);

Replacement in crawl-ref/source/spells2.h at line 151 [6.562867]
B:BD[6.567771] → [6.567771:567793]
```
 * called from: spell
```
[6.567771]
[6.567793]
```
 * called from: ability - religion - spell
```

Replacement in crawl-ref/source/spells2.h at line 153 [6.562867]

∅:D[20.824] → [21.537:567]

∅:D[22.1357] → [21.537:567]

B:BD[21.537] → [21.537:567]

bool summon_animals(int pow);

[6.567871]

[6.567903]

bool cast_tukimas_dance(int pow, bool god_gift = false,
                        bool force_hostile = false, bool quiet_failure = false);

Insertion in crawl-ref/source/spells2.h at line 156 [6.562867]

[6.567904]

// last updated 24may2000 {dlb}
/* ***********************************************************************
 * called from: ability - spell
 * *********************************************************************** */
bool cast_conjure_ball_lightning(int pow);

Deletion in crawl-ref/source/spells2.cc at line 1635 [6.569242]

B:BD[12.415] → [12.415:1363]

B:BD[12.1363] → [23.1716:1772]

∅:D[23.1772] → [12.1419:1550]

B:BD[12.1419] → [12.1419:1550]

∅:D[12.1550] → [8.4000:4006]

B:BD[8.4000] → [8.4000:4006]

B:BD[8.4006] → [12.1551:1617]

∅:D[12.1617] → [8.4006:4056]

B:BD[8.4006] → [8.4006:4056]

∅:D[8.4056] → [6.605481:605482]

B:BD[6.605481] → [6.605481:605482]

B:BD[6.605482] → [8.4057:4081]

B:BD[8.4081] → [19.887:888]

B:BD[19.888] → [14.485:597]

∅:D[14.597] → [19.992:1353]

B:BD[19.992] → [19.992:1353]

∅:D[19.1353] → [8.4081:4082]

B:BD[8.4081] → [8.4081:4082]

B:BD[8.4082] → [19.1354:1921]

B:BD[19.1921] → [23.1773:1829]

∅:D[23.1829] → [19.1977:3010]

B:BD[19.1977] → [19.1977:3010]

}
bool cast_conjure_ball_lightning(int pow, bool god_gift)
{
    bool success = false;
    // Restricted so that the situation doesn't get too gross.  Each of
    // these will explode for 3d20 damage. -- bwr
    const int how_many = std::min(8, 3 + random2(2 + pow / 50));
    for (int i = 0; i < how_many; ++i)
    {
        int tx = -1, ty = -1;
        for (int j = 0; j < 10; ++j)
        {
            if (!random_near_space(you.x_pos, you.y_pos, tx, ty, true, true)
                && distance(you.x_pos, you.y_pos, tx, ty) <= 5)
            {
                break;
            }
        }
        // If we fail, we'll try the ol' summon next to player trick.
        if (tx == -1 || ty == -1)
        {
            tx = you.x_pos;
            ty = you.y_pos;
        }
        int monster =
            mons_place(
                mgen_data(MONS_BALL_LIGHTNING, BEH_FRIENDLY, 0,
                          coord_def(tx, ty), MHITNOT,
                          god_gift ? MG_GOD_GIFT : 0));
        if (monster != -1)
        {
            success = true;
            menv[monster].add_ench(ENCH_SHORT_LIVED);
        }
    }
    if (success)
        mpr("You create some ball lightning!");
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}
bool cast_tukimas_dance(int pow, bool god_gift,
                        bool force_hostile, bool quiet_failure)
{
    bool success = true;
    const int dur = std::min(2 + (random2(pow) / 5), 6);
    const int wpn = you.equip[EQ_WEAPON];
    // See if wielded item is appropriate.
    if (wpn == -1
        || you.inv[wpn].base_type != OBJ_WEAPONS
        || is_range_weapon(you.inv[wpn])
        || is_fixed_artefact(you.inv[wpn]))
    {
        success = false;
    }
    // See if we can get an mitm for the dancing weapon.
    const int i = get_item_slot();
    if (i == NON_ITEM)
        success = false;
    int monster;
    if (success)
    {
        // Cursed weapons become hostile.
        const bool friendly = (!force_hostile && !item_cursed(you.inv[wpn]));
        monster =
            create_monster(
                mgen_data(MONS_DANCING_WEAPON,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                          dur, you.pos(),
                          friendly ? you.pet_target : MHITYOU,
                          god_gift ? MG_GOD_GIFT : 0));
        if (monster == -1)
            success = false;
    }
    if (!success)
    {
        destroy_item(i);
        if (!quiet_failure)
        {
            if (wpn != -1)
                mpr("Your weapon vibrates crazily for a second.");
            else
                msg::stream << "Your " << your_hand(true) << " twitch."
                            << std::endl;
        }
        return (false);
    }
    // We are successful.  Unwield the weapon, removing any wield effects.
    unwield_item();
    // Copy the unwielded item.
    mitm[i] = you.inv[wpn];
    mitm[i].quantity = 1;
    mitm[i].x = 0;
    mitm[i].y = 0;
    mitm[i].link = NON_ITEM;
    // Mark the weapon as thrown, so that we'll autograb it when the
    // tango's done.
    mitm[i].flags |= ISFLAG_THROWN;
    mprf("%s dances into the air!", you.inv[wpn].name(DESC_CAP_YOUR).c_str());
    you.inv[wpn].quantity = 0;
    menv[monster].inv[MSLOT_WEAPON] = i;
    menv[monster].colour = mitm[i].colour;
    burden_change();
    return (true);

Insertion in crawl-ref/source/spells2.cc at line 1760 [6.569242]

[6.611778]


bool cast_tukimas_dance(int pow, bool god_gift,
                        bool force_hostile, bool quiet_failure)
{
    bool success = true;
    const int dur = std::min(2 + (random2(pow) / 5), 6);
    const int wpn = you.equip[EQ_WEAPON];
    // See if wielded item is appropriate.
    if (wpn == -1
        || you.inv[wpn].base_type != OBJ_WEAPONS
        || is_range_weapon(you.inv[wpn])
        || is_fixed_artefact(you.inv[wpn]))
    {
        success = false;
    }
    // See if we can get an mitm for the dancing weapon.
    const int i = get_item_slot();
    if (i == NON_ITEM)
        success = false;
    int monster;
    if (success)
    {
        // Cursed weapons become hostile.
        const bool friendly = (!force_hostile && !item_cursed(you.inv[wpn]));
        monster =
            create_monster(
                mgen_data(MONS_DANCING_WEAPON,
                          friendly ? BEH_FRIENDLY : BEH_HOSTILE,
                          dur, you.pos(),
                          friendly ? you.pet_target : MHITYOU,
                          god_gift ? MG_GOD_GIFT : 0));
        if (monster == -1)
            success = false;
    }
    if (!success)
    {
        destroy_item(i);
        if (!quiet_failure)
        {
            if (wpn != -1)
                mpr("Your weapon vibrates crazily for a second.");
            else
                msg::stream << "Your " << your_hand(true) << " twitch."
                            << std::endl;
        }
        return (false);
    }
    // We are successful.  Unwield the weapon, removing any wield effects.
    unwield_item();
    // Copy the unwielded item.
    mitm[i] = you.inv[wpn];
    mitm[i].quantity = 1;
    mitm[i].x = 0;
    mitm[i].y = 0;
    mitm[i].link = NON_ITEM;
    // Mark the weapon as thrown, so that we'll autograb it when the
    // tango's done.
    mitm[i].flags |= ISFLAG_THROWN;
    mprf("%s dances into the air!", you.inv[wpn].name(DESC_CAP_YOUR).c_str());
    you.inv[wpn].quantity = 0;
    menv[monster].inv[MSLOT_WEAPON] = i;
    menv[monster].colour = mitm[i].colour;
    burden_change();
    return (true);
}
bool cast_conjure_ball_lightning(int pow)
{
    bool success = false;
    // Restricted so that the situation doesn't get too gross.  Each of
    // these will explode for 3d20 damage. -- bwr
    const int how_many = std::min(8, 3 + random2(2 + pow / 50));
    for (int i = 0; i < how_many; ++i)
    {
        int tx = -1, ty = -1;
        for (int j = 0; j < 10; ++j)
        {
            if (!random_near_space(you.x_pos, you.y_pos, tx, ty, true, true)
                && distance(you.x_pos, you.y_pos, tx, ty) <= 5)
            {
                break;
            }
        }
        // If we fail, we'll try the ol' summon next to player trick.
        if (tx == -1 || ty == -1)
        {
            tx = you.x_pos;
            ty = you.y_pos;
        }
        int monster =
            mons_place(
                mgen_data(MONS_BALL_LIGHTNING, BEH_FRIENDLY, 0,
                          coord_def(tx, ty), MHITNOT));
        if (monster != -1)
        {
            success = true;
            menv[monster].add_ench(ENCH_SHORT_LIVED);
        }
    }
    if (success)
        mpr("You create some ball lightning!");
    else
        canned_msg(MSG_NOTHING_HAPPENS);
    return (success);
}