fiddlerwoaroof/crawl - Change FA2V3G4NYTWJWUT7EWH75L3YOUX6YVOZ5LNRSFLO2XF273JKSUTAC

Fixup of gunofdis patch for returning weapons [1744612]:

Returning brand implemented for daggers, hand axes, and spears. Monsters will pick up and use (and hopefully be occasionally generated with) returning weapons, which they can both throw for ranged attacks and use hand-to-hand. The chance of a returning weapon not returning is proportional to ranged combat skill (for the player) or HD (for monsters.) If it doesn't return, it just acts as if it was thrown normally.

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

Created by haranp on June 28, 2007

FA2V3G4NYTWJWUT7EWH75L3YOUX6YVOZ5LNRSFLO2XF273JKSUTAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/mstuff2.cc at line 1009 [5.1340842]

B:BD[5.1366418] → [5.1366418:1366526]

    // this was assumed during cleanup down below:
    ASSERT( hand_used == monster->inv[MSLOT_MISSILE] );

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

B:BD[5.1366599] → [5.1366599:1366644]

    static char throw_buff[ ITEMNAME_SIZE ];

[5.1366599]

[5.1366644]

    char throw_buff[ ITEMNAME_SIZE ];
    bool returning = (get_weapon_brand(mitm[hand_used]) == SPWPN_RETURNING);

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

[5.1367881]

    if (returning)
    {
        launched = false;
        thrown = true;
    }

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

B:BD[5.1374137] → [5.1374137:1374168]

    fire_beam( pbolt, &item );

[5.1374137]

[5.1374168]

    bool really_returns;
    if ( returning && !one_chance_in(mons_power(monster->type) + 3) )
        really_returns = true;
    else
        really_returns = false;
    fire_beam( pbolt, really_returns ? NULL : &item );

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

B:BD[5.1374169] → [5.1374169:1374265]

    if (dec_mitm_item_quantity( hand_used, 1 ))
        monster->inv[MSLOT_MISSILE] = NON_ITEM;

[5.1374169]

[5.1374265]

    if ( really_returns )
    {
        msg::stream << "The weapon returns to "
                    << monster->name(DESC_NOCAP_THE)
                    << "'s hand!" << std::endl;
    }

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

[5.1374266]

    if ( !really_returns )
        if (dec_mitm_item_quantity( hand_used, 1 ))
            monster->inv[returning ? MSLOT_WEAPON : MSLOT_MISSILE] = NON_ITEM;

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

B:BD[5.1504668] → [5.1504668:1504722]

    const int mon_item = monster->inv[MSLOT_MISSILE];

[5.1504668]

[5.1504722]

    int mon_item;
    const int mon_wpn = monster->inv[MSLOT_WEAPON];
    bool returning = false;
    // weapons of returning can be thrown
    if ( mon_wpn != NON_ITEM &&
         get_weapon_brand(mitm[mon_wpn]) == SPWPN_RETURNING )
    {
        mon_item = mon_wpn;
        returning = true;
    }
    else
    {
        mon_item = monster->inv[MSLOT_MISSILE];
    }

Replacement in crawl-ref/source/monstuff.cc at line 3326 [5.1396662]
B:BD[5.1505859] → [5.1505859:1505889]
```
    if (!launched && !thrown)
```
[5.1505859]
[5.1505889]
```
    if (!launched && !thrown && !returning)
```

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

[5.1748710]


    if ( weapon != NON_ITEM &&
         get_weapon_brand(mitm[weapon]) == SPWPN_RETURNING )
        return true;

Insertion in crawl-ref/source/makeitem.cc at line 1327 [6.927]

[6.41359]

                        if (one_chance_in(4))
                            set_weapon_special(p, SPWPN_RETURNING);

Insertion in crawl-ref/source/makeitem.cc at line 1439 [6.927]

[6.45876]


                        if (mitm[p].sub_type == WPN_HAND_AXE &&
                            one_chance_in(10))
                            set_weapon_special(p, SPWPN_RETURNING);

Insertion in crawl-ref/source/makeitem.cc at line 1514 [6.927]

[6.48731]

                        if (mitm[p].sub_type == WPN_SPEAR && one_chance_in(6))
                            set_weapon_special(p, SPWPN_RETURNING);

Insertion in crawl-ref/source/itemname.cc at line 304 [5.2667494]

[2.2760]

    case SPWPN_RETURNING: return ((terse) ? " (return)" : " of returning");

Insertion in crawl-ref/source/item_use.cc at line 515 [5.2781507]

[5.2792742]

                    break;
                case SPWPN_RETURNING:
                    mpr("It wiggles slightly.");

Insertion in crawl-ref/source/item_use.cc at line 1374 [5.2781507]
[5.2812996]
[7.741302]
```
    bool returning = false;     // item will return to pack
```

Insertion in crawl-ref/source/item_use.cc at line 1798 [5.2781507]

[5.2825397]

        returning = (get_weapon_brand(item) == SPWPN_RETURNING &&
                     !one_chance_in(you.skills[SK_RANGED_COMBAT]+1));

Replacement in crawl-ref/source/item_use.cc at line 2004 [5.2781507]
∅:D[4.2176] → [7.751585:751620]
B:BD[7.751585] → [7.751585:751620]
```
        fire_beam( pbolt, &item );
```
[4.2176]
[7.751665]
```
        fire_beam(pbolt, returning ? NULL : &item);
```

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

B:BD[5.2830438] → [4.2177:2218]

    dec_inv_item_quantity( throw_2, 1 );

[5.2830438]

[4.2218]

    if ( returning )
        msg::stream << item.name(DESC_CAP_THE) << " returns to your pack!"
                    << std::endl;
    else
        dec_inv_item_quantity( throw_2, 1 );

Insertion in crawl-ref/source/enum.h at line 3175 [5.3287960]
[5.3359542]
[5.3359542]
```
    SPWPN_RETURNING,
```

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

B:BD[3.13894] → [3.13894:13967]

                        << str_monam(*mon, DESC_NOCAP_THE) << std::endl;

[3.13894]

[5.4239871]

                        << mon->name(DESC_NOCAP_THE) << '.' << std::endl;