fiddlerwoaroof/crawl - Change W74555HMPXUQ72AGKBXC5P3STMMX5DZAW6ZESUDLNVJBCAG43PLAC

Implement the returning brand for ammunition. This mostly uses the same

code as weapons of returning, but such ammunition has the same chance of being randomly destroyed when thrown as non-returning ammunition. Note that the brand is not actually generated anywhere yet.

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

Created by dolorous on December 8, 2007

W74555HMPXUQ72AGKBXC5P3STMMX5DZAW6ZESUDLNVJBCAG43PLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.h at line 68 [7.1336995]

[7.1339362]

bool mons_thrown_object_destroyed( item_def *item, int x, int y,
                                   bool returning, int midx );

Replacement in crawl-ref/source/mstuff2.cc at line 1088 [7.1340842]

B:BD[8.227] → [8.227:304]

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

[8.227]

[7.1366644]

    bool returning = (get_weapon_brand(mitm[hand_used]) == SPWPN_RETURNING ||
                      get_ammo_brand(mitm[hand_used]) == SPMSL_RETURNING);

Insertion in crawl-ref/source/mstuff2.cc at line 1421 [7.1340842]

[8.609]

[7.1374168]


    // The item can be destroyed before returning.
    if (really_returns && mons_thrown_object_destroyed(&item, pbolt.target_x,
                                                       pbolt.target_y, true,
                                                       pbolt.beam_source))
    {
        really_returns = false;
    }

Insertion in crawl-ref/source/mstuff2.cc at line 1452 [7.1340842]

[7.1374338]


bool mons_thrown_object_destroyed( item_def *item, int x, int y,
                                   bool returning, int midx )
{
    ASSERT( item != NULL );
    bool destroyed = ((item->base_type != OBJ_MISSILES ||
                       item->sub_type != MI_THROWING_NET) && coinflip());
    bool hostile_grid = grid_destroys_items(grd[x][y]);
    // Non-returning items thrown into item-destroying grids are always
    // destroyed.  Returning items are only destroyed if they would have
    // been randomly destroyed anyway.
    if (returning && !destroyed)
        hostile_grid = false;
    if (hostile_grid)
    {
        // No destruction sound here.  Too much message spam otherwise.
        item_was_destroyed(*item, midx);
        destroyed = true;
    }
    return destroyed;
}

Replacement in crawl-ref/source/itemprop.h at line 357 [10.641567]

B:BD[9.83066] → [9.83066:83113]

    SPMSL_CURARE                       //    5

[9.83066]

[9.83113]

    SPMSL_CURARE,                      //    5
    SPMSL_RETURNING                    //    6

Insertion in crawl-ref/source/itemname.cc at line 1121 [7.2667494]

[11.29555]

            case SPMSL_RETURNING:
                buff << ((terse) ? " (return)" : " of returning");
                break;

Insertion in crawl-ref/source/item_use.h at line 172 [7.2777340]
[12.579]
[10.728709]
```
bool thrown_object_destroyed( item_def *item, int x, int y, bool returning );
```

Replacement in crawl-ref/source/item_use.cc at line 2071 [7.2781507]

B:BD[7.2825397] → [2.657:736]

∅:D[2.736] → [13.5542:5609]

B:BD[8.2322] → [13.5542:5609]

        returning = (get_weapon_brand(item) == SPWPN_RETURNING && !teleport &&
                     !one_chance_in(1 + skill_bump(SK_THROWING)));

[7.2825397]

        returning = ((get_weapon_brand(item) == SPWPN_RETURNING ||
                      get_ammo_brand(item) == SPMSL_RETURNING) &&
                          !teleport &&
                          !one_chance_in(1 + skill_bump(SK_THROWING)));

Insertion in crawl-ref/source/item_use.cc at line 2353 [7.2781507]

[8.2445]

[10.751665]


        // The item can be destroyed before returning.
        if (returning && thrown_object_destroyed(&item, pbolt.target_x,
                                                 pbolt.target_y, true))
        {
            returning = false;
        }

Insertion in crawl-ref/source/item_use.cc at line 2390 [7.2781507]

[7.2830742]


bool thrown_object_destroyed( item_def *item, int x, int y, bool returning )
{
    ASSERT( item != NULL );
    int chance = 0;
    bool destroyed = false;
    bool hostile_grid = false;
    if (item->base_type == OBJ_MISSILES)
    {
        // [dshaligram] Removed influence of Throwing on ammo preservation.
        // The effect is nigh impossible to perceive.
        switch (item->sub_type)
        {
        case MI_NEEDLE:
            chance = (get_ammo_brand(*item) == SPMSL_CURARE ? 3 : 6);
            break;
        case MI_SLING_BULLET:
        case MI_STONE:  chance = 4; break;
        case MI_DART:   chance = 3; break;
        case MI_ARROW:  chance = 4; break;
        case MI_BOLT:   chance = 4; break;
        case MI_JAVELIN: chance = 10; break;
        case MI_THROWING_NET: break; // doesn't get destroyed by throwing

Insertion in crawl-ref/source/item_use.cc at line 2416 [7.2781507]

[7.2830743]

[10.751721]

        case MI_LARGE_ROCK:
        default:
            chance = 25;
            break;
        }
    }
    destroyed = (chance == 0) ? false : one_chance_in(chance);
    hostile_grid = grid_destroys_items(grd[x][y]);
    // Non-returning items thrown into item-destroying grids are always
    // destroyed.  Returning items are only destroyed if they would have
    // been randomly destroyed anyway.
    if (returning && !destroyed)
        hostile_grid = false;
    if (hostile_grid)
    {
        if (player_can_hear(x, y))
            mprf(MSGCH_SOUND, grid_item_destruction_message(grd[x][y]));
        item_was_destroyed(*item, NON_MONSTER);
        destroyed = true;
    }
    return destroyed;
}

Insertion in crawl-ref/source/describe.cc at line 1401 [7.3736416]

[6.567]

            break;
        case SPMSL_RETURNING:
            description += "$A skilled user can throw it in such a way "
                "that it will return to its owner. ";

Insertion in crawl-ref/source/beam.cc at line 42 [7.4128068]
[7.4129009]
[7.4129009]
```
#include "item_use.h"
```

Deletion in crawl-ref/source/beam.cc at line 2435 [7.4128068]

B:BD[10.1237254] → [14.459:476]

B:BD[14.476] → [15.438:480]

∅:D[15.480] → [14.587:593]

B:BD[14.587] → [14.587:593]

B:BD[14.593] → [15.481:524]

B:BD[15.524] → [16.49999:50062]

∅:D[16.50062] → [15.562:635]

B:BD[15.562] → [15.562:635]

B:BD[15.635] → [17.7311:7365]

∅:D[15.635] → [7.4205172:4205188]

∅:D[14.662] → [7.4205172:4205188]

∅:D[17.7365] → [7.4205172:4205188]

∅:D[10.1237254] → [7.4205172:4205188]

B:BD[7.4205172] → [7.4205172:4205188]

B:BD[7.4205188] → [14.663:669]

∅:D[14.669] → [7.4205188:4205189]

B:BD[7.4205188] → [7.4205188:4205189]

B:BD[7.4205189] → [18.26526:26616]

B:BD[18.26616] → [5.1317:1527]

∅:D[19.629] → [20.4591:4601]

∅:D[5.1527] → [20.4591:4601]

B:BD[20.4591] → [20.4591:4601]

B:BD[20.4601] → [5.1528:1683]

∅:D[5.1683] → [20.4621:4640]

B:BD[20.4621] → [20.4621:4640]

B:BD[20.4640] → [5.1684:1729]

        return;
    if ( grid_destroys_items(grd[x][y]) )
    {
        // Too much message spam otherwise
        if ( YOU_KILL(beam.thrower) && player_can_hear(x, y) )
            mprf(MSGCH_SOUND, grid_item_destruction_message(grd[x][y]));
        item_was_destroyed(*item, beam.beam_source);
        return;
    }
    // doesn't get destroyed by throwing
    if (item->sub_type == MI_THROWING_NET)
    {
        // player or monster on position is caught in net
        if (you.x_pos == x && you.y_pos == y && you.attribute[ATTR_HELD]
            || mgrd[x][y] != NON_MONSTER && mons_is_caught(&menv[mgrd[x][y]]))
        {
            // if no trapping net found mark this one
            if (get_trapping_net(x,y, true) == NON_ITEM)
                set_item_stationary(*item);
        }
        
        copy_item_to_grid( *item, x, y, 1 );

Deletion in crawl-ref/source/beam.cc at line 2436 [7.4128068]
B:BD[18.26677] → [18.26677:26683]
```
    }
```

Replacement in crawl-ref/source/beam.cc at line 2437 [7.4128068]

∅:D[18.26684] → [15.636:684]

B:BD[7.4205189] → [15.636:684]

    if (YOU_KILL(beam.thrower)) // you threw it

[18.26684]

[7.4205312]

    if ((YOU_KILL(beam.thrower) &&
             !thrown_object_destroyed(item, x, y, false)) ||
        (MON_KILL(beam.thrower) &&
             !mons_thrown_object_destroyed(item, x, y, false,
                                           beam.beam_source)))

Replacement in crawl-ref/source/beam.cc at line 2443 [7.4128068]

B:BD[7.4205318] → [7.4205318:4205339]

B:BD[7.4205339] → [10.1237302:1237432]

∅:D[10.1237432] → [7.4205418:4205450]

B:BD[7.4205418] → [7.4205418:4205450]

        int chance;
        // [dshaligram] Removed influence of Throwing on ammo preservation.
        // The effect is nigh impossible to perceive.
        switch (item->sub_type)

[7.4205318]

[7.4205450]

        if (item->sub_type == MI_THROWING_NET)

Replacement in crawl-ref/source/beam.cc at line 2445 [7.4128068]

B:BD[7.4205460] → [10.1237433:1237545]

B:BD[10.1237545] → [21.366:396]

∅:D[21.396] → [10.1237545:1237717]

B:BD[10.1237545] → [10.1237545:1237717]

B:BD[10.1237717] → [3.469:514]

∅:D[22.412] → [7.4205825:4205871]

∅:D[21.441] → [7.4205825:4205871]

∅:D[3.514] → [7.4205825:4205871]

∅:D[23.20925] → [7.4205825:4205871]

∅:D[10.1237717] → [7.4205825:4205871]

B:BD[7.4205825] → [7.4205825:4205871]

B:BD[7.4205871] → [3.515:540]

∅:D[3.540] → [7.4205896:4205915]

B:BD[7.4205896] → [7.4205896:4205915]

        case MI_NEEDLE:
            chance = (get_ammo_brand(*item) == SPMSL_CURARE? 3 : 6);
            break;
        case MI_SLING_BULLET:
        case MI_STONE:  chance = 4; break;
        case MI_DART:   chance = 3; break;
        case MI_ARROW:  chance = 4; break;
        case MI_BOLT:   chance = 4; break;
        case MI_JAVELIN: chance = 10; break;
        case MI_LARGE_ROCK:
        default:
            chance = 25;
            break;

[7.4205460]

[7.4205915]

            // player or monster on position is caught in net
            if (you.x_pos == x && you.y_pos == y && you.attribute[ATTR_HELD]
                || mgrd[x][y] != NON_MONSTER &&
                    mons_is_caught(&menv[mgrd[x][y]]))
            {
                // if no trapping net found mark this one
                if (get_trapping_net(x,y, true) == NON_ITEM)
                    set_item_stationary(*item);
            }

Deletion in crawl-ref/source/beam.cc at line 2456 [7.4128068]
B:BD[7.4205926] → [7.4205926:4206052]
B:BD[7.4206052] → [4.371:472]
∅:D[4.472] → [7.4206208:4206214]
∅:D[14.742] → [7.4206208:4206214]
∅:D[24.19723] → [7.4206208:4206214]
∅:D[10.1237774] → [7.4206208:4206214]
B:BD[7.4206208] → [7.4206208:4206214]
```
        if (item->base_type != OBJ_MISSILES || !one_chance_in(chance))
            copy_item_to_grid( *item, x, y, 1 );
    }
    else if (MON_KILL(beam.thrower)
             && (item->base_type != OBJ_MISSILES || coinflip()))
    {
```