fiddlerwoaroof/crawl - Change 3BJ2OOF4F524G6UKVGOZVT6W3FSTSHHTKRJADUBZCHDXZWV3KANQC

Fixing a number of bugs on throwing nets, so it's all in

all a net improvement. ;)

I'm reusing item.plus2 as a marker for trapping monsters or not. AFAIK, missiles don't need those, and it makes stacking so much easier.

Gladiators start with Throwing skill 1, except for Kobolds (don't get a net) who get an additional level at Dodging.

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

Created by j-p-e-g on September 19, 2007

3BJ2OOF4F524G6UKVGOZVT6W3FSTSHHTKRJADUBZCHDXZWV3KANQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/traps.cc at line 34 [4.5308]
[4.6022]
[4.6022]
```
#include "transfor.h"
```

Replacement in crawl-ref/source/traps.cc at line 112 [4.5308]

B:BD[4.7937] → [4.7937:8019]

    bool mon_flies = mons->flies();
    if (mon_flies && !mons_is_confused(mons))

[4.7937]

[4.8019]

    bool mon_flies = mons->flies() == FL_FLY;
    if (mon_flies && (!mons_is_confused(mons) || one_chance_in(3)))

Replacement in crawl-ref/source/traps.cc at line 145 [4.5308]

B:BD[4.8829] → [4.8829:8869]

    if (you.flies() && !you.confused())

[4.8829]

[4.8869]

    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_AIR)
    {
        mpr("The net passes right through you!");
        return;
    }
    if (you.flies() == FL_FLY && (!you.confused() || one_chance_in(3)))

Replacement in crawl-ref/source/traps.cc at line 164 [4.5308]
B:BD[4.9199] → [4.9199:9224]
```
        if (you.flies())
```
[4.9199]
[4.9224]
```
        if (you.flies() == FL_FLY)
```
Deletion in crawl-ref/source/traps.cc at line 170 [4.5308]
B:BD[4.9379] → [4.9379:9384]
```
    
```
Replacement in crawl-ref/source/traps.cc at line 588 [4.5308]
B:BD[4.21057] → [4.21057:21103]
```
            dec_mitm_item_quantity( net, 1 );
```
[4.21057]
[4.21103]
```
            destroy_item(net);
```
Insertion in crawl-ref/source/transfor.cc at line 32 [5.143977]
[5.144554]
[5.144554]
```
#include "traps.h"
```

Insertion in crawl-ref/source/transfor.cc at line 340 [5.143977]

[6.97286]

[5.152422]

        
        if (you.attribute[ATTR_HELD])
        {
            mpr("The net rips apart!");
            you.attribute[ATTR_HELD] = 0;
            int net = get_trapping_net(you.x_pos, you.y_pos);
            if (net != NON_ITEM)
                destroy_item(net);
        }

Insertion in crawl-ref/source/transfor.cc at line 414 [5.143977]

[6.97403]

[5.154335]

        
        if (you.attribute[ATTR_HELD])
        {
            mpr("You drift through the net!");
            you.attribute[ATTR_HELD] = 0;
            int net = get_trapping_net(you.x_pos, you.y_pos);
            if (net != NON_ITEM)
                remove_item_stationary(mitm[net]);
        }

Replacement in crawl-ref/source/newgame.cc at line 3877 [5.1132300]
B:BD[7.236] → [3.313:347]
```
	if (you.species != SP_KOBOLD)
	{
```
[7.236]
[3.347]
```
        if (you.species != SP_KOBOLD)
        {
```

Replacement in crawl-ref/source/newgame.cc at line 3884 [5.1132300]

B:BD[3.562] → [3.562:565]

[3.562]

[5.1227161]

            you.skills[SK_THROWING] = 1;
        }
        else
            you.skills[SK_DODGING] = 1;

Replacement in crawl-ref/source/newgame.cc at line 3896 [5.1132300]
B:BD[5.1227331] → [7.427:463]
```
        you.skills[SK_DODGING] = 2;
```
[5.1227331]
[5.1227467]
```
        you.skills[SK_DODGING] += 2;
```

Insertion in crawl-ref/source/monstuff.cc at line 407 [5.1396662]

[8.7307]

    
    if (mons_is_caught(monster))
    {
        int net = get_trapping_net(monster->x,monster->y);
        if (net != NON_ITEM)
            remove_item_stationary(mitm[net]);
    }

Insertion in crawl-ref/source/monstuff.cc at line 1222 [5.1396662]

[9.3327]

        else if (mons_is_insubstantial(monster->type)
                 || monster->type == MONS_OOZE || monster->type == MONS_PULSATING_LUMP)
        {
            int net = get_trapping_net(monster->x, monster->y);
            if (net != NON_ITEM)
                remove_item_stationary(mitm[net]);
                
            if (mons_is_insubstantial(monster->type))
                simple_monster_message(monster, " drifts right through the net!");
            else
                simple_monster_message(monster, " oozes right through the net!");
        }

Insertion in crawl-ref/source/monstuff.cc at line 1249 [5.1396662]

[5.1428841]

    if (monster->has_ench(ENCH_HELD))
        monster->del_ench(ENCH_HELD, true);

Deletion in crawl-ref/source/monstuff.cc at line 1266 [5.1396662]
B:BD[9.3401] → [10.847:929]
∅:D[10.929] → [6.420352:420353]
∅:D[9.3487] → [6.420352:420353]
∅:D[11.4105] → [6.420352:420353]
B:BD[6.420352] → [6.420352:420353]
```
    if (monster->has_ench(ENCH_HELD))
        monster->del_ench(ENCH_HELD, true);
```
Replacement in crawl-ref/source/monstuff.cc at line 3400 [5.1396662]
B:BD[9.4018] → [9.4018:4051]
```
            && one_chance_in(3))
```
[9.4018]
[9.4051]
```
            && one_chance_in(4))
```

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

B:BD[9.4061] → [9.4061:4297]

            if (ms_quick_get_away( monster, hspell_pass[6]))
            {
                spell_cast = hspell_pass[6];
                finalAnswer = true;
            }
            else if (ms_quick_get_away( monster, hspell_pass[5]))

[9.4061]

[9.4297]

            for (int i = 0; i < 6; i++)

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

B:BD[9.4311] → [9.4311:4392]

                spell_cast = hspell_pass[5];
                finalAnswer = true;

[9.4311]

[9.4392]

                if (ms_quick_get_away( monster, hspell_pass[i] ))
                {
                    spell_cast = hspell_pass[5];
                    finalAnswer = true;
                    break;
                }

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

B:BD[9.9113] → [9.9113:9176]

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

[9.9113]

[9.9176]

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

Replacement in crawl-ref/source/mon-util.cc at line 1910 [5.1699344]

B:BD[9.12640] → [9.12640:12707]

bool ms_quick_get_away( const monsters *mon, spell_type monspell )

[9.12640]

[9.12707]

bool ms_quick_get_away( const monsters *mon /*unused*/, spell_type monspell )

Replacement in crawl-ref/source/mon-util.cc at line 2903 [5.1699344]

B:BD[9.12910] → [9.12910:12976]

    if (mons_is_caught(this) && item.sub_type == MI_THROWING_NET)

[9.12910]

[9.12976]

    if (mons_is_caught(this) && item.sub_type == MI_THROWING_NET
        && item_is_stationary(item))
    {

Insertion in crawl-ref/source/mon-util.cc at line 2907 [5.1699344]
[9.13000]
[9.13000]
```
    }
```
Replacement in crawl-ref/source/itemprop.cc at line 461 [6.646661]
B:BD[12.3969] → [12.3969:4006]
```
    item.flags |= ISFLAG_STATIONARY;
```
[12.3969]
[12.4006]
```
    item.plus2 = 1;
```
Replacement in crawl-ref/source/itemprop.cc at line 466 [6.646661]
B:BD[12.4057] → [12.4057:4097]
```
    item.flags &= (~ISFLAG_STATIONARY);
```
[12.4057]
[6.666102]
```
    item.plus2 = 0;
```
Replacement in crawl-ref/source/itemprop.cc at line 471 [6.646661]
B:BD[12.4148] → [12.4148:4193]
```
    return (item.flags & ISFLAG_STATIONARY);
```
[12.4148]
[12.4193]
```
    return (item.plus2);
```

Replacement in crawl-ref/source/itemprop.cc at line 622 [6.646661]

B:BD[6.668192] → [6.668192:668265]

        if (item.sub_type == MI_STONE || item.sub_type == MI_LARGE_ROCK)

[6.668192]

[6.668265]

        if (item.sub_type == MI_STONE || item.sub_type == MI_LARGE_ROCK
            || item.sub_type == MI_THROWING_NET)
        {

Insertion in crawl-ref/source/itemprop.cc at line 626 [6.646661]
[6.668285]
[6.668285]
```
        }
```

Replacement in crawl-ref/source/enum.h at line 1237 [5.3287960]

B:BD[5.3321270] → [12.4224:4299]

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

[5.3321270]

[12.4299]

    ISFLAG_RESERVED_1        = 0x00000200,  // reserved

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

B:BD[2.376] → [2.376:451]

        if (you.x_pos != x && you.y_pos != y && mgrd[x][y] == NON_MONSTER)

[2.376]

[2.451]

        if ((you.x_pos != x || you.y_pos != y) && mgrd[x][y] == NON_MONSTER)

Fixing a number of bugs on throwing nets, so it's all in

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/traps.cc at line 34 [4.5308]

Replacement in crawl-ref/source/traps.cc at line 112 [4.5308]

Replacement in crawl-ref/source/traps.cc at line 145 [4.5308]

Replacement in crawl-ref/source/traps.cc at line 164 [4.5308]

Deletion in crawl-ref/source/traps.cc at line 170 [4.5308]

Replacement in crawl-ref/source/traps.cc at line 588 [4.5308]

Insertion in crawl-ref/source/transfor.cc at line 32 [5.143977]

Insertion in crawl-ref/source/transfor.cc at line 340 [5.143977]

Insertion in crawl-ref/source/transfor.cc at line 414 [5.143977]

Replacement in crawl-ref/source/newgame.cc at line 3877 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3884 [5.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3896 [5.1132300]

Insertion in crawl-ref/source/monstuff.cc at line 407 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1222 [5.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 1249 [5.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 1266 [5.1396662]

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

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

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

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

Replacement in crawl-ref/source/mon-util.cc at line 1910 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2903 [5.1699344]

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

Replacement in crawl-ref/source/itemprop.cc at line 461 [6.646661]

Replacement in crawl-ref/source/itemprop.cc at line 466 [6.646661]

Replacement in crawl-ref/source/itemprop.cc at line 471 [6.646661]

Replacement in crawl-ref/source/itemprop.cc at line 622 [6.646661]

Insertion in crawl-ref/source/itemprop.cc at line 626 [6.646661]

Replacement in crawl-ref/source/enum.h at line 1237 [5.3287960]

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