fiddlerwoaroof/crawl - Change BRGAZR5AXWC2IALBVXO5SB354IRQEIRHSK55RZPGFI4AGIOD4LUQC

Throwing nets again.

Added a number of functions that allow to differentiate between a net that currently traps a monster and one that doesn't, even if they are on the same square. This usually works but can fail if there's already a net lying on the target square.

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

Created by j-p-e-g on August 20, 2007

BRGAZR5AXWC2IALBVXO5SB354IRQEIRHSK55RZPGFI4AGIOD4LUQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 2995 [4.436250]

B:BD[3.376] → [3.376:431]

            && mitm[item].sub_type == MI_THROWING_NET)

[3.376]

[3.431]

            && mitm[item].sub_type == MI_THROWING_NET
            && item_is_stationary(mitm[item]))

Replacement in crawl-ref/source/spells4.cc at line 2999 [4.436250]

B:BD[3.490] → [3.490:568]

           if (mon != NON_MONSTER && mons_is_caught(&menv[mon]))
           {

[3.490]

[3.568]

           remove_item_stationary(mitm[item]);
           
           if (mon != NON_MONSTER)

Deletion in crawl-ref/source/spells4.cc at line 3003 [4.436250]
B:BD[3.626] → [3.626:639]
```
           }
```

Insertion in crawl-ref/source/spells1.cc at line 121 [4.616635]

[3.700]

            {
                int net = get_trapping_net(you.x_pos, you.y_pos);
                if (net != NON_ITEM)
                    remove_item_stationary(mitm[net]);

Insertion in crawl-ref/source/spells1.cc at line 127 [4.616635]
[3.748]
[3.748]
```
            }
```

Insertion in crawl-ref/source/spells1.cc at line 178 [4.616635]

[3.799]

        {
            int net = get_trapping_net(you.x_pos, you.y_pos);
            if (net != NON_ITEM)
                remove_item_stationary(mitm[net]);

Insertion in crawl-ref/source/spells1.cc at line 184 [4.616635]
[3.843]
[4.620512]
```
        }
```

Insertion in crawl-ref/source/player.cc at line 3298 [4.962854]

[4.1034114]

[5.5240]

    if (you.attribute[ATTR_CAUGHT])
        mpr( "You are trapped in a net." );

Insertion in crawl-ref/source/output.cc at line 1468 [4.1088282]

[6.6214]


    if (you.disease
        || you.species == SP_VAMPIRE && you.hunger_state < HS_HUNGRY)
    {
        text += "non-regenerating, ";
    }
    if (you.attribute[ATTR_CAUGHT])
        text += "trapped, ";

Insertion in crawl-ref/source/output.cc at line 1487 [4.1088282]
[6.6562]
[7.1538]
```
             
```

Deletion in crawl-ref/source/output.cc at line 1505 [4.1088282]

B:BD[6.7170] → [6.7170:7171]

B:BD[6.7171] → [8.7704:7843]


    if (you.disease 
        || you.species == SP_VAMPIRE && you.hunger_state < HS_HUNGRY)
    {
        text += "non-regenerating";
    }

Deletion in crawl-ref/source/mstuff2.cc at line 236 [4.1340842]
B:BD[3.1962] → [3.1962:1971]
```
        
```

Insertion in crawl-ref/source/mstuff2.cc at line 238 [4.1340842]

[3.2090]

                   
        if (mons_is_caught(monster))
            mark_net_trapping(monster->x, monster->y);

Replacement in crawl-ref/source/monstuff.cc at line 1174 [4.1396662]

B:BD[3.2486] → [3.2486:2649]

            int net, next;
            for (net = igrd[monster->x][monster->y]; net != NON_ITEM; net = next)
            {
                 next = mitm[net].link;

[3.2486]

[4.1428578]

            int net = get_trapping_net(monster->x, monster->y);
            if (net != NON_ITEM)
                destroy_item(net);

Deletion in crawl-ref/source/monstuff.cc at line 1178 [4.1396662]

B:BD[4.1428579] → [3.2650:2897]

                 if (mitm[net].base_type == OBJ_MISSILES
                     && mitm[net].sub_type == MI_THROWING_NET)
                 {
                     break;
                 }
            }
            dec_mitm_item_quantity( net, 1 );

Insertion in crawl-ref/source/mon-util.cc at line 3665 [4.1699344]

[3.13187]

    {
        int net = get_trapping_net(x,y);
        if (net != NON_ITEM)
            remove_item_stationary(mitm[net]);

Replacement in crawl-ref/source/mon-util.cc at line 3673 [4.1699344]
B:BD[9.16875] → [9.16875:16876]
[9.16875]
[9.16876]
```
    }
```

Replacement in crawl-ref/source/mon-util.cc at line 3904 [4.1699344]

B:BD[3.13472] → [3.13472:13777]

        int net, next;
        for (net = igrd[x][y]; net != NON_ITEM; net = next)
        {
             next = mitm[net].link;
             if (mitm[net].base_type == OBJ_MISSILES
                 && mitm[net].sub_type == MI_THROWING_NET)
             {
                break;
             }
        }

[3.13472]

[3.13777]

        int net = get_trapping_net(x,y);

Replacement in crawl-ref/source/mon-util.cc at line 3996 [4.1699344]
B:BD[3.17111] → [3.17111:17161]
```
                dec_mitm_item_quantity( net, 1 );
```
[3.17111]
[3.17161]
```
                destroy_item(net);
```

Insertion in crawl-ref/source/misc.h at line 65 [4.1928926]

[4.1930987]

[3.17539]

int get_trapping_net(int x, int y, bool trapped = true);
void mark_net_trapping(int x, int y);

Insertion in crawl-ref/source/misc.cc at line 812 [4.1933596]

[10.545083]

    }
}
// returns the number of a net on a given square
// if trapped only stationary ones are counted
// otherwise the first net found is returned
int get_trapping_net(int x, int y, bool trapped)
{
    int net, next;
    for (net = igrd[x][y]; net != NON_ITEM; net = next)
    {
         next = mitm[net].link;
         if (mitm[net].base_type == OBJ_MISSILES
             && mitm[net].sub_type == MI_THROWING_NET
             && (!trapped || item_is_stationary(mitm[net])))
         {
             return (net);
         }
    }
    return (NON_ITEM);
}
// if there are more than one net on this square
// split off one of them for checking/setting values
static void maybe_split_nets(item_def &item, int x, int y)
{
    if (item.quantity == 1)
    {
        set_item_stationary(item);
        return;
    }
    item_def it;
    it.base_type = item.base_type;
    it.sub_type = item.sub_type;
    it.plus = item.plus;
    it.plus2 = item.plus2;
    it.flags = item.flags;
    it.special = item.special;
    it.quantity = --item.quantity;
    item_colour(it);
    item.quantity = 1;
    set_item_stationary(item);
    copy_item_to_grid( it, x, y );
}
void mark_net_trapping(int x, int y)
{
    int net = get_trapping_net(x,y);
    if (net == NON_ITEM)
    {
        net = get_trapping_net(x,y, false);
        if (net != NON_ITEM)
            maybe_split_nets(mitm[net], x, y);

Insertion in crawl-ref/source/misc.cc at line 1766 [4.1933596]

[3.19003]

            if (you.attribute[ATTR_CAUGHT])
                mark_net_trapping(you.x_pos, you.y_pos);

Replacement in crawl-ref/source/misc.cc at line 1880 [4.1933596]

B:BD[3.19933] → [3.19933:20057]

    int net, next;
    for (net = igrd[mon->x][mon->y]; net != NON_ITEM; net = next)
    {
         next = mitm[net].link;

[3.19933]

[3.20057]

    int net = get_trapping_net(mon->x, mon->y);

Deletion in crawl-ref/source/misc.cc at line 1882 [4.1933596]

B:BD[3.20058] → [3.20058:20209]

         if (mitm[net].base_type == OBJ_MISSILES
             && mitm[net].sub_type == MI_THROWING_NET)
         {
            break;
         }
    }

Deletion in crawl-ref/source/misc.cc at line 1908 [4.1933596]

B:BD[3.21018] → [3.21018:21107]

                net_destroyed = true;
                dec_mitm_item_quantity( net, 1 );

Replacement in crawl-ref/source/misc.cc at line 1909 [4.1933596]
B:BD[3.21157] → [3.21157:21158]
[3.21157]
[3.21158]
```
                destroy_item(net);
                net_destroyed = true;
```
Insertion in crawl-ref/source/misc.cc at line 1931 [4.1933596]
[3.21714]
[3.21714]
```
    remove_item_stationary(mitm[net]);
    
```

Replacement in crawl-ref/source/misc.cc at line 1942 [4.1933596]

B:BD[3.21908] → [3.21908:22190]

    int net, next;
    for (net = igrd[you.x_pos][you.y_pos]; net != NON_ITEM; net = next)
    {
         next = mitm[net].link;
         if (mitm[net].base_type == OBJ_MISSILES
             && mitm[net].sub_type == MI_THROWING_NET)
         {
             break;
         }
    }

[3.21908]

[3.22190]

    int net = get_trapping_net(you.x_pos, you.y_pos);

Insertion in crawl-ref/source/misc.cc at line 1998 [4.1933596]
[3.23621]
[3.23621]
```
            remove_item_stationary(mitm[net]);
```

Replacement in crawl-ref/source/misc.cc at line 2291 [4.1933596]

B:BD[4.1983409] → [4.1983409:1983468]

        if (mitm[ igrd[beam_x][beam_y] ].link != NON_ITEM)

[4.1983409]

[4.1983468]

        if (mitm[ igrd[beam_x][beam_y] ].link != NON_ITEM
            && (item.base_type != OBJ_MISSILES || item.sub_type != MI_THROWING_NET))

Replacement in crawl-ref/source/items.cc at line 1305 [4.2584728]

B:BD[3.23974] → [3.23974:24024]

        && mitm[obj].sub_type == MI_THROWING_NET)

[3.23974]

[3.24024]

        && mitm[obj].sub_type == MI_THROWING_NET && item_is_stationary(mitm[obj]))

Deletion in crawl-ref/source/items.cc at line 1307 [4.2584728]
B:BD[3.24030] → [3.24030:24051]
```
        quant_got--;
```
Replacement in crawl-ref/source/items.cc at line 1308 [4.2584728]
B:BD[3.24110] → [3.24110:24158]
```
        if (!quant_got)
            return (1);
```
[3.24110]
[3.24158]
```
        return (1);
```

Insertion in crawl-ref/source/itemprop.h at line 29 [10.641567]

[10.642096]

// stationary:
void set_item_stationary( item_def &item );
void remove_item_stationary( item_def &item );
bool item_is_stationary( const item_def &item );

Insertion in crawl-ref/source/itemprop.cc at line 452 [10.646661]

[10.666102]

}
//
// Is item stationary (cannot be picked up?)
//
void set_item_stationary( item_def &item )
{
    item.flags |= ISFLAG_STATIONARY;
}
void remove_item_stationary( item_def &item )
{
    item.flags &= (~ISFLAG_STATIONARY);

Insertion in crawl-ref/source/itemprop.cc at line 467 [10.646661]

[10.666105]

bool item_is_stationary( const item_def &item )
{
    return (item.flags & ISFLAG_STATIONARY);
}

Replacement in crawl-ref/source/enum.h at line 1525 [4.3287960]

B:BD[4.3321270] → [10.916386:916500]

    ISFLAG_RESERVED_1        = 0x00000200,  // reserved 
    ISFLAG_RESERVED_2        = 0x00000400,  // reserved

[4.3321270]

[10.916500]

    ISFLAG_STATIONARY        = 0x00000200,  // cannot be picked up (traps)
    ISFLAG_RESERVED_2        = 0x00000400,  // reserved

Insertion in crawl-ref/source/beam.cc at line 2396 [4.4128068]

[3.26661]

        
        if (you.x_pos == x && you.y_pos == y && !you.attribute[ATTR_CAUGHT]
            || mgrd[x][y] == NON_MONSTER || !mons_is_caught(&menv[mgrd[x][y]]))
        {
            return;
        }
        
        mark_net_trapping(x,y);

Insertion in crawl-ref/source/acr.cc at line 1012 [4.4397395]
[11.404]
[11.404]
```
    
```

Insertion in crawl-ref/source/acr.cc at line 1014 [4.4397395]

[11.409]

    if (you.attribute[ATTR_CAUGHT])
    {
        mpr("You're trapped in a net!");
        return;
    }

Insertion in crawl-ref/source/acr.cc at line 1047 [4.4397395]

[12.10574]

[10.1261440]

    if (you.attribute[ATTR_CAUGHT])
    {
        mpr("You're trapped in a net!");
        return;
    }

Insertion in crawl-ref/source/acr.cc at line 1257 [4.4397395]

[13.853]

[2.5830]

           break;
        }
        else if (you.attribute[ATTR_CAUGHT])
        {
           mpr("You cannot throw anything while trapped in a net!");

Insertion in crawl-ref/source/acr.cc at line 1275 [4.4397395]

[8.26086]

[14.90902]

        else if (you.attribute[ATTR_CAUGHT])
        {
           mpr("You cannot shoot anything while trapped in a net!");
           break;
        }