fiddlerwoaroof/crawl - Change KJO5N6UIPKQ6TZNNOWZEHUAWZNUW7CAHLIW2ARX47K4SIE3N5LYAC

Clean up dancing_weapon().

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

Created by dolorous on June 8, 2008

KJO5N6UIPKQ6TZNNOWZEHUAWZNUW7CAHLIW2ARX47K4SIE3N5LYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 30 [7.3]
B:BD[7.475] → [7.475:496]
```
#include "spells3.h"
```
[7.475]
[7.496]
```
#include "spells2.h"
```
Insertion in crawl-ref/source/xom.cc at line 880 [7.3]
[8.39]
[7.25361]
```
            // Nasty, but fun.
```

Replacement in crawl-ref/source/xom.cc at line 882 [7.3]

B:BD[7.25395] → [3.4:82]

                success = dancing_weapon(100, true, true); // Nasty, but fun.

[7.25395]

[7.25461]

                success = dancing_weapon(100, true, true, true);

Deletion in crawl-ref/source/spells3.h at line 79 [9.526814]

B:BD[9.529036] → [9.529036:529251]

B:BD[9.529251] → [10.352:409]

B:BD[10.409] → [4.166:215]


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

Deletion in crawl-ref/source/spells3.cc at line 39 [9.531613]
∅:D[11.478] → [9.532254:532275]
B:BD[9.532254] → [9.532254:532275]
```
#include "it_use2.h"
```
Deletion in crawl-ref/source/spells3.cc at line 471 [9.531613]
B:BD[9.543381] → [9.543381:543387]
B:BD[9.543387] → [2.151:153]
∅:D[2.153] → [9.543440:543441]
B:BD[9.543440] → [9.543440:543441]
B:BD[9.543441] → [10.457:506]
B:BD[10.506] → [4.217:257]
∅:D[4.257] → [9.543490:543492]
∅:D[12.301] → [9.543490:543492]
∅:D[8.533] → [9.543490:543492]
∅:D[10.543] → [9.543490:543492]
∅:D[13.579] → [9.543490:543492]
B:BD[9.543490] → [9.543490:543492]
B:BD[9.543492] → [13.580:605]
∅:D[14.214] → [9.543700:543701]
∅:D[15.594] → [9.543700:543701]
∅:D[13.623] → [9.543700:543701]
∅:D[16.1323] → [9.543700:543701]
B:BD[9.543700] → [9.543700:543701]
B:BD[9.543701] → [13.624:724]
∅:D[17.354] → [9.543743:543744]
∅:D[15.672] → [9.543743:543744]
∅:D[13.724] → [9.543743:543744]
∅:D[18.732] → [9.543743:543744]
B:BD[9.543743] → [9.543743:543744]
B:BD[9.543744] → [19.147300:147343]
∅:D[19.147343] → [9.543787:543854]
B:BD[9.543787] → [9.543787:543854]
B:BD[9.543854] → [12.302:388]
∅:D[12.388] → [9.543952:543958]
B:BD[9.543952] → [9.543952:543958]
B:BD[9.543958] → [13.725:750]
∅:D[14.238] → [9.543985:544049]
∅:D[13.750] → [9.543985:544049]
B:BD[9.543985] → [9.543985:544049]
B:BD[9.544049] → [14.239:268]
B:BD[14.268] → [6.167:168]
∅:D[6.168] → [9.544074:544097]
∅:D[14.268] → [9.544074:544097]
B:BD[9.544074] → [9.544074:544097]
B:BD[9.544097] → [13.751:776]
B:BD[13.776] → [6.169:187]
∅:D[6.187] → [9.544124:544125]
∅:D[14.292] → [9.544124:544125]
∅:D[13.776] → [9.544124:544125]
B:BD[9.544124] → [9.544124:544125]
B:BD[9.544125] → [13.777:794]
∅:D[12.406] → [14.312:318]
∅:D[13.794] → [14.312:318]
B:BD[14.312] → [14.312:318]
B:BD[14.318] → [13.795:909]
∅:D[20.319] → [21.274:275]
∅:D[13.909] → [21.274:275]
B:BD[21.274] → [21.274:275]
B:BD[21.275] → [13.910:928]
∅:D[13.928] → [22.6263:6291]
B:BD[22.6263] → [22.6263:6291]
B:BD[22.6291] → [13.929:1205]
```
    }
}
bool dancing_weapon(int pow, 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:
    int i = get_item_slot();
    if (i == NON_ITEM)
        success = false;
    int monster;
    if (success)
    {
        // Cursed weapons become hostile.
        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));
        if (monster == -1)
            success = false;
```
Deletion in crawl-ref/source/spells3.cc at line 472 [9.531613]
∅:D[14.678] → [9.544384:544385]
B:BD[9.544384] → [9.544384:544385]
B:BD[9.544385] → [13.1206:1224]
∅:D[12.626] → [9.544404:544410]
∅:D[14.697] → [9.544404:544410]
∅:D[13.1224] → [9.544404:544410]
B:BD[9.544404] → [9.544404:544410]
B:BD[9.544410] → [14.698:723]
B:BD[14.723] → [12.627:628]
B:BD[12.628] → [4.258:286]
∅:D[4.286] → [12.649:895]
∅:D[10.569] → [12.649:895]
∅:D[13.1245] → [12.649:895]
B:BD[12.649] → [12.649:895]
B:BD[12.895] → [13.1246:1270]
∅:D[8.556] → [9.544559:544566]
∅:D[14.946] → [9.544559:544566]
∅:D[13.1270] → [9.544559:544566]
B:BD[9.544559] → [9.544559:544566]
B:BD[9.544566] → [13.1271:1366]
∅:D[23.291] → [9.544664:544665]
∅:D[13.1366] → [9.544664:544665]
B:BD[9.544664] → [9.544664:544665]
B:BD[9.544665] → [13.1367:1399]
∅:D[13.1399] → [9.544730:544852]
B:BD[9.544730] → [9.544730:544852]
B:BD[9.544852] → [13.1400:1490]
∅:D[13.1490] → [24.110:147]
B:BD[24.110] → [24.110:147]
B:BD[24.147] → [16.1324:1403]
∅:D[16.1403] → [9.544989:544990]
B:BD[9.544989] → [9.544989:544990]
B:BD[9.544990] → [12.896:927]
∅:D[12.927] → [9.545054:545055]
B:BD[9.545054] → [9.545054:545055]
B:BD[9.545055] → [13.1491:1575]
∅:D[13.1575] → [25.151:172]
B:BD[19.147429] → [25.151:172]
B:BD[25.172] → [8.557:558]
B:BD[8.558] → [13.1576:1595]
```
    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.h at line 183 [9.562867]

[26.343]

[27.347]

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

Insertion in crawl-ref/source/spells2.cc at line 42 [9.569242]
[9.570248]
[28.46850]
```
#include "it_use2.h"
```

Insertion in crawl-ref/source/spells2.cc at line 2343 [9.569242]

[29.4081]


bool dancing_weapon(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;
    }

Insertion in crawl-ref/source/spells2.cc at line 2362 [9.569242]

[29.4082]

[5.2032]

    // 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 ? MF_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);
}

Clean up dancing_weapon().

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 30 [7.3]

Insertion in crawl-ref/source/xom.cc at line 880 [7.3]

Replacement in crawl-ref/source/xom.cc at line 882 [7.3]

Deletion in crawl-ref/source/spells3.h at line 79 [9.526814]

Deletion in crawl-ref/source/spells3.cc at line 39 [9.531613]

Deletion in crawl-ref/source/spells3.cc at line 471 [9.531613]

Deletion in crawl-ref/source/spells3.cc at line 472 [9.531613]

Insertion in crawl-ref/source/spells2.h at line 183 [9.562867]

Insertion in crawl-ref/source/spells2.cc at line 42 [9.569242]

Insertion in crawl-ref/source/spells2.cc at line 2343 [9.569242]

Insertion in crawl-ref/source/spells2.cc at line 2362 [9.569242]