fiddlerwoaroof/crawl - Change 4UXFU3FZOCBSLDQ4S7MJKAE2H7VUHCNRDQMIY6NJ3PHYXWNGISDQC

Added throwing nets. These still need work, and thus

are not for 0.3. Obviously.

Summary: New item type MI_THROWING_NET. The enchantment of a net describes its state, i.e. whether it's brand-new or almost falling apart (happens at -8).

New attribute ATTR_CAUGHT (for monsters ENCH_CAUGHT) that means the victim cannot move and instead struggles against the net until it manages to wriggle out of it (takes a while depending on size) or it is destroyed. Monsters can still use items and spells when trapped.

New trap type TRAP_NET that currently is the only source of throwing nets, though Gladiators (and some types of hunters maybe?) should start with a few, and David suggested also allowing the creation of nets for shops.

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

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

4UXFU3FZOCBSLDQ4S7MJKAE2H7VUHCNRDQMIY6NJ3PHYXWNGISDQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 911 [8.39949]

B:BD[8.63347] → [9.509:552]

    if (kbhit() || you.duration[DUR_CONF])

[8.63347]

[8.63376]

    // Or if you got caught in a net.
    if (kbhit() || you.duration[DUR_CONF] || you.attribute[ATTR_CAUGHT])

Insertion in crawl-ref/source/spells4.cc at line 2992 [11.436250]

[10.145971]

[11.520804]

        
        // if we apport a net, free the monster under it
        if (mitm[item].base_type == OBJ_MISSILES
            && mitm[item].sub_type == MI_THROWING_NET)
        {
           int mon = mgrd[ beam.tx ][ beam.ty ];
           if (mon != NON_MONSTER && mons_is_caught(&menv[mon]))
           {
               (&menv[mon])->del_ench(ENCH_CAUGHT, true);
           }
        }

Insertion in crawl-ref/source/spells1.cc at line 120 [11.616635]

[11.619202]

[3.147]

            if (you.attribute[ATTR_CAUGHT])
                you.attribute[ATTR_CAUGHT] = 0;

Insertion in crawl-ref/source/spells1.cc at line 170 [11.616635]

[11.620512]

        
        if (you.attribute[ATTR_CAUGHT])
            you.attribute[ATTR_CAUGHT] = 0;

Insertion in crawl-ref/source/player.cc at line 5343 [11.962854]
[12.3301]
[12.3301]
```
bool player::caught() const
{
    return (attribute[ATTR_CAUGHT]);
}
```

Insertion in crawl-ref/source/mstuff2.cc at line 201 [11.1340842]

[11.1346963]

    case TRAP_NET:
    {
        if (one_chance_in(3))
        {
            if (trapKnown)
            {
                simple_monster_message(monster,
                                        " fails to trigger a net trap.");
            }
            return;
        }
        
        if (random2(monster->ev) > 8)
        {
            if (monsterNearby && !simple_monster_message(monster,
                                 " nimbly jumps out of the way of a falling net."))
            {
                mpr("A large net falls down!");
            }
        }
        else
        {
            if (monsterNearby)
            {
                std::string msg = "A large net falls down";
                if (player_monster_visible( monster ))
                {
                    msg += " onto ";
                    msg += monster->name(DESC_NOCAP_THE);
                }
                msg += "!";
                mpr(msg.c_str());
                monster_caught_in_net(monster);
            }
        }
        
        trap_item( OBJ_MISSILES, MI_THROWING_NET,
                   env.trap[which_trap].x, env.trap[which_trap].y );
        grd[env.trap[which_trap].x][env.trap[which_trap].y] = DNGN_FLOOR;
        env.trap[which_trap].type = TRAP_UNASSIGNED;
        break;
    }

Insertion in crawl-ref/source/mstuff2.cc at line 933 [11.1340842]

[6.3977]

[13.1788]

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

Insertion in crawl-ref/source/monstuff.cc at line 1126 [11.1396662]
[14.1281]
[11.1427520]
```
    const bool old_mon_caught = mons_is_caught(monster);
```

Insertion in crawl-ref/source/monstuff.cc at line 1169 [11.1396662]

[2.315]

[11.1428578]


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

Insertion in crawl-ref/source/monstuff.cc at line 1179 [11.1396662]

[11.1428579]

                 if (mitm[net].base_type == OBJ_MISSILES
                     && mitm[net].sub_type == MI_THROWING_NET)
                 {
                     break;
                 }
            }
            dec_mitm_item_quantity( net, 1 );
            if (see_grid(monster->x, monster->y))
            {
                if (player_monster_visible(monster))
                {
                    mprf("The net rips apart, and %s comes free!",
                         monster->name(DESC_NOCAP_THE).c_str());
                }
                else
                {
                    mpr("All of a sudden the net rips apart!");
                }
            }
        }
        else
            monster->add_ench(ENCH_CAUGHT);
    }

Insertion in crawl-ref/source/monstuff.cc at line 1228 [11.1396662]

[6.4105]

[10.420352]

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

Replacement in crawl-ref/source/monstuff.cc at line 2460 [11.1396662]
B:BD[11.1476488] → [11.1476488:1476518]
```
        if (one_chance_in(7))
```
[11.1476488]
[11.1476518]
```
        if (one_chance_in(7) || mons_is_caught(monster) && one_chance_in(3))
```

Replacement in crawl-ref/source/monstuff.cc at line 2727 [11.1396662]

B:BD[11.1483884] → [11.1483884:1483936]

                if (monster->behaviour == BEH_FLEE)

[11.1483884]

[11.1483936]

                if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_CAUGHT))

Replacement in crawl-ref/source/monstuff.cc at line 2737 [11.1396662]

B:BD[11.1484193] → [11.1484193:1484241]

            if (monster->behaviour == BEH_FLEE)

[11.1484193]

[11.1484241]

            if (monster->behaviour == BEH_FLEE || monster->has_ench(ENCH_CAUGHT))

Replacement in crawl-ref/source/monstuff.cc at line 2880 [11.1396662]

B:BD[11.1488668] → [11.1488668:1488736]

            if (monster->hit_points <= monster->max_hit_points / 2)

[11.1488668]

[11.1488736]

            if (monster->hit_points <= monster->max_hit_points / 2
                || mons_is_caught(monster))

Insertion in crawl-ref/source/monstuff.cc at line 3256 [11.1396662]

[11.1493183]

        // monsters caught in a net try to get away
        // this is only urgent if you are around
        if (!finalAnswer && monsterNearby && mons_is_caught(monster)
            && one_chance_in(3))
        {
            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]))
            {
                spell_cast = hspell_pass[5];
                finalAnswer = true;
            }
        }

Replacement in crawl-ref/source/monstuff.cc at line 3745 [11.1396662]
B:BD[15.1936] → [15.1936:1937]
[15.1936]
[10.431239]
```
        
```

Replacement in crawl-ref/source/monstuff.cc at line 3780 [11.1396662]

B:BD[11.1510237] → [10.433144:433240]

        // calculates mmov_x, mmov_y based on monster target.
        handle_movement(monster);

[11.1510237]

[11.1510532]

        if (!mons_is_caught(monster))
        {
            // calculates mmov_x, mmov_y based on monster target.
            handle_movement(monster);

Replacement in crawl-ref/source/monstuff.cc at line 3785 [11.1396662]
B:BD[11.1510533] → [10.433241:433263]
```
        brkk = false;
```
[11.1510533]
[11.1510754]
```
            brkk = false;
```

Replacement in crawl-ref/source/monstuff.cc at line 3787 [11.1396662]

B:BD[11.1510755] → [16.1652:1692]

∅:D[16.1692] → [10.433317:433370]

B:BD[10.433317] → [10.433317:433370]

B:BD[10.433370] → [17.10433:10488]

∅:D[17.10488] → [10.433432:433442]

B:BD[10.433432] → [10.433432:433442]

B:BD[10.433442] → [16.1693:1735]

        if (mons_is_confused( monster )
            || (monster->type == MONS_AIR_ELEMENTAL 
                && monster->has_ench(ENCH_SUBMERGED)))
        {
            std::vector<coord_def> moves;

[11.1510755]

[16.1735]

             if (mons_is_confused( monster )
                 || (monster->type == MONS_AIR_ELEMENTAL
                     && monster->has_ench(ENCH_SUBMERGED)))
             {
                 std::vector<coord_def> moves;

Replacement in crawl-ref/source/monstuff.cc at line 3793 [11.1396662]

B:BD[16.1736] → [16.1736:2225]

            int pfound = 0;
            for (int yi = -1; yi <= 1; ++yi)
            {
                for (int xi = -1; xi <= 1; ++xi)
                {
                    coord_def c = monster->pos() + coord_def(xi, yi);
                    if (in_bounds(c) && !grid_is_solid(grd(c))
                        && one_chance_in(++pfound))
                    {
                        mmov_x = xi;
                        mmov_y = yi;
                    }
                }
            }

[16.1736]

[16.2225]

                 int pfound = 0;
                 for (int yi = -1; yi <= 1; ++yi)
                 {
                     for (int xi = -1; xi <= 1; ++xi)
                     {
                         coord_def c = monster->pos() + coord_def(xi, yi);
                         if (in_bounds(c) && !grid_is_solid(grd(c))
                             && one_chance_in(++pfound))
                         {
                             mmov_x = xi;
                             mmov_y = yi;
                         }
                     }
                 }

Replacement in crawl-ref/source/monstuff.cc at line 3808 [11.1396662]

B:BD[16.2226] → [18.73:114]

∅:D[18.114] → [16.2260:2297]

B:BD[16.2260] → [16.2260:2297]

            if (random2(2 + pfound) < 2)
                mmov_x = mmov_y = 0;

[16.2226]

[11.1510936]

                 if (random2(2 + pfound) < 2)
                     mmov_x = mmov_y = 0;

Replacement in crawl-ref/source/monstuff.cc at line 3811 [11.1396662]

B:BD[11.1510937] → [10.433517:433612]

B:BD[10.433612] → [16.2298:2390]

∅:D[16.2390] → [10.433718:433774]

B:BD[10.433718] → [10.433718:433774]

            // bounds check: don't let confused monsters try to run
            // off the map
            if (monster->x + mmov_x < 0 
                    || monster->x + mmov_x >= GXM)
            {
                mmov_x = 0;
            }

[11.1510937]

[11.1511068]

                 // bounds check: don't let confused monsters try to run
                 // off the map
                 if (monster->x + mmov_x < 0
                         || monster->x + mmov_x >= GXM)
                 {
                     mmov_x = 0;
                 }

Replacement in crawl-ref/source/monstuff.cc at line 3819 [11.1396662]

B:BD[11.1511069] → [16.2391:2483]

∅:D[16.2483] → [10.433881:433937]

B:BD[10.433881] → [10.433881:433937]

            if (monster->y + mmov_y < 0 
                    || monster->y + mmov_y >= GYM)
            {
                mmov_y = 0;
            }

[11.1511069]

[11.1511142]

                 if (monster->y + mmov_y < 0
                         || monster->y + mmov_y >= GYM)
                 {
                     mmov_y = 0;
                 }

Replacement in crawl-ref/source/monstuff.cc at line 3825 [11.1396662]

B:BD[11.1511143] → [16.2484:2652]

            if (grid_is_solid(
                    grd[ monster->x + mmov_x ][ monster->y + mmov_y ]))
            {
                mmov_x = mmov_y = 0;
            }

[11.1511143]

[16.2652]

                 if (grid_is_solid(
                         grd[ monster->x + mmov_x ][ monster->y + mmov_y ]))
                 {
                     mmov_x = mmov_y = 0;
                 }

Replacement in crawl-ref/source/monstuff.cc at line 3831 [11.1396662]

∅:D[16.2653] → [10.433938:434079]

B:BD[11.1511143] → [10.433938:434079]

B:BD[10.434079] → [16.2654:2778]

            if (mgrd[monster->x + mmov_x][monster->y + mmov_y] != NON_MONSTER
                && (mmov_x != 0 || mmov_y != 0))
            {
                monsters_fight(
                    i,
                    mgrd[monster->x + mmov_x][monster->y + mmov_y]);

[16.2653]

[16.2778]

                 if (mgrd[monster->x + mmov_x][monster->y + mmov_y] != NON_MONSTER
                     && (mmov_x != 0 || mmov_y != 0))
                 {
                     monsters_fight(
                         i,
                         mgrd[monster->x + mmov_x][monster->y + mmov_y]);

Replacement in crawl-ref/source/monstuff.cc at line 3838 [11.1396662]

B:BD[16.2795] → [16.2795:2824]

∅:D[16.2824] → [10.434079:434135]

B:BD[10.434079] → [10.434079:434135]

B:BD[11.1512055] → [10.434258:434282]

∅:D[10.434282] → [11.1512055:1512056]

B:BD[11.1512055] → [11.1512055:1512056]

B:BD[11.1512056] → [10.434283:434323]

                brkk = true;
                mmov_x = 0;
                mmov_y = 0;
            }
        }
        if (brkk)
            continue;

[16.2795]

[11.1512168]

                     brkk = true;
                     mmov_x = 0;
                     mmov_y = 0;
                 }
             }

Insertion in crawl-ref/source/monstuff.cc at line 3844 [11.1396662]

[11.1512169]

[10.434324]

             if (brkk)
                 continue;
        }

Replacement in crawl-ref/source/monstuff.cc at line 3893 [11.1396662]

B:BD[11.1513696] → [10.435563:435804]

        // see if we move into (and fight) an unfriendly monster
        int targmon = mgrd[monster->x + mmov_x][monster->y + mmov_y];
        if (targmon != NON_MONSTER
            && targmon != i 
            && !mons_aligned(i, targmon))

[11.1513696]

[10.435804]

        if (!mons_is_caught(monster))

Replacement in crawl-ref/source/monstuff.cc at line 3895 [11.1396662]

B:BD[10.435814] → [10.435814:435898]

            // figure out if they fight
            if (monsters_fight(i, targmon))

[10.435814]

[10.435898]

            // see if we move into (and fight) an unfriendly monster
            int targmon = mgrd[monster->x + mmov_x][monster->y + mmov_y];
            if (targmon != NON_MONSTER
                && targmon != i
                && !mons_aligned(i, targmon))

Replacement in crawl-ref/source/monstuff.cc at line 3901 [11.1396662]

B:BD[10.435912] → [10.435912:435968]

                if (testbits(monster->flags, MF_BATTY))

[10.435912]

[11.1513805]

                // figure out if they fight
                if (monsters_fight(i, targmon))

Replacement in crawl-ref/source/monstuff.cc at line 3904 [11.1396662]

B:BD[11.1513823] → [10.435969:436217]

                    monster->behaviour = BEH_WANDER;
                    monster->target_x = 10 + random2(GXM - 10);
                    monster->target_y = 10 + random2(GYM - 10);
                    // monster->speed_increment -= monster->speed;

[11.1513823]

[10.436217]

                    if (testbits(monster->flags, MF_BATTY))
                    {
                        monster->behaviour = BEH_WANDER;
                        monster->target_x = 10 + random2(GXM - 10);
                        monster->target_y = 10 + random2(GYM - 10);
                        // monster->speed_increment -= monster->speed;
                    }
                    mmov_x = 0;
                    mmov_y = 0;
                    brkk = true;

Deletion in crawl-ref/source/monstuff.cc at line 3916 [11.1396662]
∅:D[10.436235] → [11.1514318:1514319]
B:BD[11.1514318] → [11.1514318:1514319]
B:BD[11.1514319] → [10.436236:436321]
```
                mmov_x = 0;
                mmov_y = 0;
                brkk = true;
```
Deletion in crawl-ref/source/monstuff.cc at line 3917 [11.1396662]
B:BD[10.436335] → [10.436335:436345]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 3918 [11.1396662]

B:BD[11.1514763] → [10.436346:436386]

        if (brkk)
            continue;

[11.1514763]

[11.1514857]

            if (brkk)
                continue;

Replacement in crawl-ref/source/monstuff.cc at line 3921 [11.1396662]

B:BD[11.1514858] → [10.436387:436580]

∅:D[10.436580] → [11.1514972:1514973]

B:BD[11.1514972] → [11.1514972:1514973]

B:BD[11.1514973] → [10.436581:436610]

        if (monster->x + mmov_x == you.x_pos
            && monster->y + mmov_y == you.y_pos)
        {
            bool isFriendly = mons_friendly(monster);
            bool attacked = false;
            if (!isFriendly)

[11.1514858]

[10.436610]

            if (monster->x + mmov_x == you.x_pos
                && monster->y + mmov_y == you.y_pos)

Replacement in crawl-ref/source/monstuff.cc at line 3924 [11.1396662]

B:BD[10.436624] → [10.436624:436692]

                monster_attack(i);
                attacked = true;

[10.436624]

[11.1515078]

                bool isFriendly = mons_friendly(monster);
                bool attacked = false;

Replacement in crawl-ref/source/monstuff.cc at line 3927 [11.1396662]
B:BD[11.1515079] → [10.436693:436749]
```
                if (testbits(monster->flags, MF_BATTY))
```
[11.1515079]
[11.1515360]
```
                if (!isFriendly)
```

Replacement in crawl-ref/source/monstuff.cc at line 3929 [11.1396662]

B:BD[11.1515378] → [10.436750:436931]

                    monster->behaviour = BEH_WANDER;
                    monster->target_x = 10 + random2(GXM - 10);
                    monster->target_y = 10 + random2(GYM - 10);

[11.1515378]

[11.1516028]

                    monster_attack(i);
                    attacked = true;
                    if (testbits(monster->flags, MF_BATTY))
                    {
                        monster->behaviour = BEH_WANDER;
                        monster->target_x = 10 + random2(GXM - 10);
                        monster->target_y = 10 + random2(GYM - 10);
                    }

Deletion in crawl-ref/source/monstuff.cc at line 3939 [11.1396662]
B:BD[11.1516046] → [10.436932:436946]
```
            }
```

Replacement in crawl-ref/source/monstuff.cc at line 3940 [11.1396662]

B:BD[11.1516047] → [10.436947:437117]

            if ((monster->type == MONS_GIANT_SPORE
                    || monster->type == MONS_BALL_LIGHTNING)
                && monster->hit_points < 1)
            {

[11.1516047]

[11.1516103]

                if ((monster->type == MONS_GIANT_SPORE
                        || monster->type == MONS_BALL_LIGHTNING)
                    && monster->hit_points < 1)
                {

Replacement in crawl-ref/source/monstuff.cc at line 3945 [11.1396662]

B:BD[11.1516104] → [10.437118:437301]

                // detach monster from the grid first, so it
                // doesn't get hit by its own explosion (GDL)
                mgrd[monster->x][monster->y] = NON_MONSTER;

[11.1516104]

[11.1516337]

                    // detach monster from the grid first, so it
                    // doesn't get hit by its own explosion (GDL)
                    mgrd[monster->x][monster->y] = NON_MONSTER;

Replacement in crawl-ref/source/monstuff.cc at line 3949 [11.1396662]

B:BD[11.1516338] → [10.437302:437425]

                spore_goes_pop(monster);
                monster_cleanup(monster);
                continue;
            }

[11.1516338]

[11.1516481]

                    spore_goes_pop(monster);
                    monster_cleanup(monster);
                    continue;
                }

Replacement in crawl-ref/source/monstuff.cc at line 3954 [11.1396662]

B:BD[11.1516482] → [10.437426:437559]

            if (attacked)
            {
                mmov_x = 0;
                mmov_y = 0;
                continue;   //break;

[11.1516482]

[10.437559]

                if (attacked)
                {
                    mmov_x = 0;
                    mmov_y = 0;
                    continue;   //break;
                }

Deletion in crawl-ref/source/monstuff.cc at line 3961 [11.1396662]
B:BD[10.437573] → [10.437573:437583]
```
        }
```

Replacement in crawl-ref/source/monstuff.cc at line 3962 [11.1396662]

B:BD[11.1516826] → [10.437584:437675]

        if (invalid_monster(monster) || mons_is_stationary(monster))
            continue;

[11.1516826]

[11.1517028]

            if (invalid_monster(monster) || mons_is_stationary(monster))
                continue;

Replacement in crawl-ref/source/monstuff.cc at line 3965 [11.1396662]
B:BD[11.1517029] → [10.437676:437707]
∅:D[10.437707] → [11.1517236:1517237]
B:BD[11.1517236] → [11.1517236:1517237]
```
        monster_move(monster);
```
[11.1517029]
[10.437708]
```
            monster_move(monster);
        }
```
Insertion in crawl-ref/source/monstuff.cc at line 4087 [11.1396662]
[11.1520154]
[11.1520154]
```
        bool eaten_net = false;
```

Insertion in crawl-ref/source/monstuff.cc at line 4105 [11.1396662]

[11.1521363]

                
                if (mons_is_caught(monster) && mitm[item].base_type == OBJ_MISSILES
                    && mitm[item].sub_type == MI_THROWING_NET)
                {
                    monster->del_ench(ENCH_CAUGHT, true);
                    eaten_net = true;
                }

Insertion in crawl-ref/source/monstuff.cc at line 4146 [11.1396662]

[11.1522552]

            if (eaten_net)
                simple_monster_message(monster, " devours the net!");

Replacement in crawl-ref/source/monspeak.cc at line 128 [11.1558496]
B:BD[19.2745] → [19.2745:2750]
```
    
```
[19.2745]
[19.2750]

Insertion in crawl-ref/source/monspeak.cc at line 376 [11.1558496]

[11.1567098]

    else if (monster->has_ench(ENCH_CAUGHT))
    {
        if (mons_friendly(monster))
        {
            switch(random2(8))
            {
              case 0:
                  strcat(info, " says, \"Help me, ");
                  strcat(info, you.your_name);
                  strcat(info, ", please!\"");
                  break;
              case 1:
                  strcat(info, " cries, \"MUMMY!\"");
                  break;
              case 2:
                  strcat(info, " shouts, \"");
                  strcat(info, you.your_name);
                  strcat(info, "! Can't you see I need your help?\"");
                  break;
              case 3:
                  strcat(info, " shouts, \"I could do with a little help here, you know.\"");
                  break;
              case 4:
                  strcat(info, " mumbles something.");
                  break;
              case 5:
                  strcat(info, " says, \"Umm, ");
                  strcat(info, you.your_name);
                  strcat(info, "? Help?\"");
                  break;
              case 6:
                  strcat(info, " cries.");
                  break;
              case 7:
                  strcat(info, " cries, \"Why me?");
                  break;
            }
        }
        else // unfriendly monsters
        {
            switch(random2(12))
            {
              case 0:
                  strcat(info, " screams, \"HEY! This isn't fair!\"");
                  break;
              case 1:
                  strcat(info, " screams, \"Help! Get me out of here!\"");
                  break;
              case 2:
                  strcat(info, " begs, \"Could you help me? I swear I won't hurt you.\"");
                  break;
              case 3:
                  strcat(info, " yells, \"LEMME GO!\"");
                  break;
              case 4:
                  strcat(info, " cries, \"Please! I'll never do it again!\"");
                  break;
              case 5:
                  strcat(info, " mutters, \"Just what did I do to deserve this?\"");
                  break;
              case 6:
                  strcat(info, " asks, \"Hey, want to switch places?\"");
                  break;
              case 7:
                  strcat(info, " cries, \"I hate you!\"");
                  break;
              case 8:
                  strcat(info, " snarls, \"This is all your fault!\"");
                  break;
              case 9:
                  strcat(info, " says, \"I meant to do this, just so you know.\"");
                  break;
              case 10:
                  strcat(info, " shouts, \"This is all a huge misunderstanding!");
                  break;
              case 11:
                  strcat(info, " cries, \"Why me?\"");
                  break;
            }
        }
    }

Insertion in crawl-ref/source/mon-util.h at line 305 [11.1682293]
[20.30422]
[20.30422]
```
bool ms_quick_get_away( const monsters *mon, spell_type monspell );
```
Insertion in crawl-ref/source/mon-util.h at line 335 [11.1682293]
[10.464437]
[10.464437]
```
bool mons_is_caught(const monsters *m);
```
Insertion in crawl-ref/source/mon-util.cc at line 1690 [11.1699344]
[10.482317]
[10.482317]
```
}
bool mons_is_caught(const monsters *m)
{
    return (m->has_ench(ENCH_CAUGHT));
```

Replacement in crawl-ref/source/mon-util.cc at line 1735 [11.1699344]

B:BD[10.483388] → [10.483388:483433]

                    || mons_is_fleeing(m)));

[10.483388]

[10.483433]

                    || mons_is_fleeing(m)
                    || mons_is_caught(m)));

Insertion in crawl-ref/source/mon-util.cc at line 1853 [11.1699344]

[11.1744478]

// spells for a quick get-away
// currently only used to get out of a net
bool ms_quick_get_away( const monsters *mon, spell_type monspell )
{
    switch (monspell)
    {
      case SPELL_TELEPORT_SELF:
      case SPELL_BLINK:
        return true;
      default:
        return false;
    }
}

Insertion in crawl-ref/source/mon-util.cc at line 2731 [11.1699344]

[21.14468]

    
    // monster may not pick up trapping net
    if (mons_is_caught(this) && item.sub_type == MI_THROWING_NET)
        return (false);

Insertion in crawl-ref/source/mon-util.cc at line 3026 [11.1699344]
[22.1070]
[22.1070]
```
}
bool monsters::caught() const
{
    return (mons_is_caught(this));
```
Insertion in crawl-ref/source/mon-util.cc at line 3065 [11.1699344]
[12.13910]
[12.13910]
```
    else if (caught())
        evasion /= (body_size(PSIZE_BODY) + 2);
```

Insertion in crawl-ref/source/mon-util.cc at line 3662 [11.1699344]

[17.16860]

        break;
    case ENCH_CAUGHT:
        if (!quiet)
            simple_monster_message(this, " breaks free.");

Insertion in crawl-ref/source/mon-util.cc at line 3788 [11.1699344]

[17.19155]

        case ENCH_CAUGHT:
            del_ench(i->first);
            break;

Insertion in crawl-ref/source/mon-util.cc at line 3893 [11.1699344]

[17.19989]


    case ENCH_CAUGHT:
    {
        if (mons_is_paralysed(this) || this->behaviour == BEH_SLEEP)
            break;
        
        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;
             }
        }
        if (net == NON_ITEM) // really shouldn't happen!
        {
            del_ench(ENCH_CAUGHT);
            break;
        }

Insertion in crawl-ref/source/mon-util.cc at line 3917 [11.1699344]

[17.19990]

        // handled in handle_pickup
        if (mons_itemuse(type) == MONUSE_EATS_ITEMS)
            break;
        
        // the enchantment doubles as the durability of a net
        // the more corroded it gets, the more easily it will break
        int hold = mitm[net].plus; // this will usually be negative
        int mon_size = body_size(PSIZE_BODY);
            
        // smaller monsters can escape more quickly
        if (mon_size < random2(SIZE_BIG)  // BIG = 5
            && !has_ench(ENCH_BERSERK))
        {
            if (mons_near(this) && !player_monster_visible(this))
                mpr("Something wriggles in the net.");
            else
                simple_monster_message(this, " struggles to escape the net.");
            // confused monsters have trouble finding the exit
            if (has_ench(ENCH_CONFUSION) && !one_chance_in(5))
                break;
            decay_enchantment(me, 2*(NUM_SIZE_LEVELS - mon_size) - hold);
            
            // frayed nets are easier to escape
            if (mon_size <= -(hold-1)/2)
                decay_enchantment(me, (NUM_SIZE_LEVELS - mon_size));
        }
        else // large (and above) monsters always thrash the net and destroy it
        {    // e.g. ogre, large zombie (large); centaur, nage, hydra (big)
        
            if (mons_near(this) && !player_monster_visible(this))
                mpr("Something wriggles in the net.");
            else
                simple_monster_message(this, " struggles against the net.");
            // confused monsters more likely to struggle without result
            if (has_ench(ENCH_CONFUSION) && one_chance_in(3))
                break;
            // nets get destroyed more quickly for larger monsters
            // and if already strongly frayed
            int damage = 0;
            
            // tiny: 1/6, little: 2/5, small: 3/4, medium and above: always
            if (random2(SIZE_GIANT - mon_size) <= mon_size)
                damage++;
            // extra damage for large (50%) and big (always)
            if (mon_size == SIZE_BIG || mon_size == SIZE_LARGE && coinflip())
                damage++;
            // overall damage per struggle:
            // tiny   -> 1/6
            // little -> 2/5
            // small  -> 3/4
            // medium -> 1
            // large  -> 1,5
            // big    -> 2
            // extra damage if already damaged
            if (random2(body_size(PSIZE_BODY) - hold + 1) >= 4)
                damage++;
            // berserking doubles damage dealt
            if (has_ench(ENCH_BERSERK))
                damage *= 2;
                
            mitm[net].plus -= damage;
            
            if (mitm[net].plus < -7)
            {
                if (mons_near(this))
                {
                    if (player_monster_visible(this))
                    {
                        mprf("The net rips apart, and %s comes free!",
                             name(DESC_NOCAP_THE).c_str());
                    }
                    else
                    {
                        mpr("All of a sudden the net rips apart!");
                    }
                }
                dec_mitm_item_quantity( net, 1 );
                del_ench(ENCH_CAUGHT, true);
            }
        }
        break;
    }

Insertion in crawl-ref/source/mon-util.cc at line 4545 [11.1699344]

[5.7253]

    case ENCH_CAUGHT:
        cturn = 90 / mod_speed(25, mons->speed);
        break;

Insertion in crawl-ref/source/misc.h at line 26 [11.1928926]

[11.1929467]

bool trap_item(object_class_type base_type, char sub_type,
               char beam_x, char beam_y);

Replacement in crawl-ref/source/misc.h at line 42 [11.1928926]
B:BD[11.1930177] → [11.1930177:1930178]
[11.1930177]
[11.1930178]
```
void remove_net_from( monsters *mon );
void free_self_from_net( bool damage_net = true );
```
Replacement in crawl-ref/source/misc.h at line 65 [11.1928926]
B:BD[11.1930987] → [11.1930987:1930988]
[11.1930987]
[11.1930988]
```
void monster_caught_in_net(monsters *mon);
void player_caught_in_net(void);
```

Deletion in crawl-ref/source/misc.cc at line 77 [11.1933596]

B:BD[11.1934651] → [23.888:1003]

static bool trap_item(object_class_type base_type, char sub_type,
                      char beam_x, char beam_y);

Insertion in crawl-ref/source/misc.cc at line 814 [11.1933596]

[10.545091]

[11.1942942]


void monster_caught_in_net(monsters *mon)
{
    if (mon->body_size(PSIZE_BODY) >= SIZE_GIANT)
        return;

Insertion in crawl-ref/source/misc.cc at line 820 [11.1933596]

[11.1942943]

    if (mon->type == MONS_FIRE_VORTEX || mon->type == MONS_SPATIAL_VORTEX)
        return;
    if (!mons_is_caught(mon) && mon->add_ench(ENCH_CAUGHT))
    {
        if (mons_near(mon) && !player_monster_visible(mon))
            mpr("Something gets caught in the net!");
        else
            simple_monster_message(mon, " is caught in the net!");
    }
}
void player_caught_in_net()
{
    if (you.body_size(PSIZE_BODY) >= SIZE_GIANT)
        return;
    if (!you.attribute[ATTR_CAUGHT])
    {
        you.attribute[ATTR_CAUGHT] = 10;
        mpr("You become entangled in the net!");
    }
}

Insertion in crawl-ref/source/misc.cc at line 1603 [11.1933596]

[11.1968735]

    case TRAP_NET:
        base_type = OBJ_MISSILES;
        sub_type = MI_THROWING_NET;
        break;

Insertion in crawl-ref/source/misc.cc at line 1688 [11.1933596]

[11.1971077]


    case TRAP_NET:
        if (trap_known && one_chance_in(3))
            mpr("A net swings high above you.");
        else
        {
            if (random2limit(player_evasion(), 40)
                        + (random2(you.dex) / 3) + (trap_known ? 3 : 0) > 12)
            {
                mpr("A net drops to the ground!");
            }
            else
            {
                mpr("A large net falls onto you!");
                player_caught_in_net();
            }

Insertion in crawl-ref/source/misc.cc at line 1706 [11.1933596]

[11.1971078]

            trap_item( OBJ_MISSILES, MI_THROWING_NET, env.trap[i].x, env.trap[i].y );
            grd[env.trap[i].x][env.trap[i].y] = DNGN_FLOOR;
            env.trap[i].type = TRAP_UNASSIGNED;
        }
        break;

Replacement in crawl-ref/source/misc.cc at line 1764 [11.1933596]

B:BD[11.1972361] → [11.1972361:1972415]

            handle_traps(env.trap[i].type, i, false);

[11.1972361]

[11.1972415]

            if (env.trap[i].type == TRAP_NET &&
                (env.trap[i].x != you.x_pos || env.trap[i].y != you.y_pos))
            {
                if (coinflip())
                    return;

Insertion in crawl-ref/source/misc.cc at line 1770 [11.1933596]

[11.1972416]

                mpr("You stumble into the trap!");
                move_player_to_grid( env.trap[i].x, env.trap[i].y, true, false, true);
            }
            else
                handle_traps(env.trap[i].type, i, false);

Replacement in crawl-ref/source/misc.cc at line 1790 [11.1933596]

B:BD[11.1972670] → [11.1972670:1972709]

    if (env.trap[i].type != TRAP_BLADE

[11.1972670]

[11.1972709]

    if (env.trap[i].type == TRAP_NET)
        trap_item( OBJ_MISSILES, MI_THROWING_NET, beam.target_x, beam.target_y );
    else if (env.trap[i].type != TRAP_BLADE

Insertion in crawl-ref/source/misc.cc at line 1810 [11.1933596]

[11.1973298]

[11.1974572]


// attempts to take a net off a given monster
// Do not expect gratitude for this!
// ----------------------------------
void remove_net_from(monsters *mon)
{
    you.turn_is_over = true;
    
    int net, next;
    for (net = igrd[mon->x][mon->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;
         }
    }
    if (net == NON_ITEM)
    {
        mon->del_ench(ENCH_CAUGHT, true);
        return;
    }
    // factor in whether monster is paralysed or invisible
    int paralys = 0;
    if (mons_is_paralysed(mon)) // makes this easier
        paralys = random2(5);
        
    int invis = 0;
    if (!player_monster_visible(mon)) // makes this harder
        invis = 3 + random2(5);

Insertion in crawl-ref/source/misc.cc at line 1845 [11.1933596]

[11.1974573]

[4.868]

    bool net_destroyed = false;
    if ( random2(you.skills[SK_TRAPS_DOORS] + 2) + paralys
           <= random2( 2*mon->body_size(PSIZE_BODY) + 3 ) + invis)
    {
        if (one_chance_in(you.skills[SK_TRAPS_DOORS] + you.dex/2))
        {
            mitm[net].plus--;
            mpr("You tear at the net.");
            if (mitm[net].plus < -7)
            {
                mpr("Whoops! The net comes apart in your hands!");
                net_destroyed = true;
                dec_mitm_item_quantity( net, 1 );
                mon->del_ench(ENCH_CAUGHT, true);
            }
        }
        if (!net_destroyed)
        {
            if (player_monster_visible(mon))
            {
                mprf("You fail to remove the net from %s.",
                     mon->name(DESC_NOCAP_THE).c_str());
            }
            else
                mpr("You fail to remove the net.");
        }
        if (random2(you.dex) > 5 + random2( 2*mon->body_size(PSIZE_BODY) ))
            exercise(SK_TRAPS_DOORS, 1 + random2(mon->body_size(PSIZE_BODY)/2));
        return;
    }
     
    mon->del_ench(ENCH_CAUGHT, true);
    if (player_monster_visible(mon))
        mprf("You free %s.", mon->name(DESC_NOCAP_THE).c_str());
    else
        mpr("You loosen the net.");
}
void free_self_from_net(bool damage_net)
{
    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;
         }
    }
    if (net == NON_ITEM) // really shouldn't happen!
    {
        you.attribute[ATTR_CAUGHT] = 0;
        return;
    }
    int hold = mitm[net].plus;
    if (damage_net)
    {
        mpr("You struggle against the net.");
        int damage = 1;
        // extra damage for cutting weapons
        if (you.equip[EQ_WEAPON] != -1
            && can_cut_meat(you.inv[you.equip[EQ_WEAPON]]))
        {
            damage++;
        }
        
        if (you.body_size(PSIZE_BODY) > SIZE_MEDIUM)
            damage++;
            
        if (hold < 0 && !one_chance_in(-hold/2))
            damage++;
         
        if (you.duration[DUR_BERSERKER])
            damage *= 2;
            
        mitm[net].plus -= damage;
        
        if (mitm[net].plus < -7)
        {
            mpr("You rip the net and break free!");
            dec_mitm_item_quantity( net, 1 );
            you.attribute[ATTR_CAUGHT] = 0;
            return;
        }
   }
   else // you try to escape
   {
        mpr("You struggle to escape from the net.");
        you.attribute[ATTR_CAUGHT]--;
        if (you.body_size(PSIZE_BODY) < SIZE_MEDIUM)
            you.attribute[ATTR_CAUGHT]--;
            
        if (hold < 0 && !one_chance_in(-hold/2))
            you.attribute[ATTR_CAUGHT]--;
        if (you.attribute[ATTR_CAUGHT] <= 0)
        {
            mpr("You break free from the net!");
            you.attribute[ATTR_CAUGHT] = 0;
            return;
        }
   }
}

Insertion in crawl-ref/source/misc.cc at line 2275 [11.1933596]
[11.1984165]
[11.1984165]
```
    case TRAP_NET:
```

Insertion in crawl-ref/source/makeitem.cc at line 192 [25.927]

[24.4117]

[25.5197]

        break;
    case MI_THROWING_NET:
        item_colour = DARKGRAY;

Insertion in crawl-ref/source/makeitem.cc at line 222 [25.927]

[25.5698]

    case MI_THROWING_NET:
        item_colour = DARKGRAY;
        break;

Insertion in crawl-ref/source/items.cc at line 550 [11.2584728]
[10.633326]
[10.633326]
```
        {
```
Insertion in crawl-ref/source/items.cc at line 552 [11.2584728]
[10.633369]
[10.633369]
```
        }
```

Insertion in crawl-ref/source/items.cc at line 1304 [11.2584728]

[11.2614080]

[11.2614126]

    if (you.attribute[ATTR_CAUGHT] && mitm[obj].base_type == OBJ_MISSILES
        && mitm[obj].sub_type == MI_THROWING_NET)
    {
        quant_got--;
        mpr("You cannot pick up the net that traps you!");
        if (!quant_got)
            return (1);
    }

Replacement in crawl-ref/source/items.cc at line 1354 [11.2584728]
B:BD[11.2615227] → [11.2615227:2615228]
[11.2615227]
[11.2615228]
```
    
```

Replacement in crawl-ref/source/itemprop.cc at line 353 [10.646661]

∅:D[7.314] → [26.251:309]

B:BD[24.9278] → [26.251:309]

    { MI_JAVELIN,       "javelin",      10,   40, true },

[7.314]

[10.662756]

    { MI_JAVELIN,       "javelin",      10,   40, true  },
    { MI_THROWING_NET,  "throwing net",  0,   30, true  },

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

[24.10121]

[10.698445]

        if (bodysize < SIZE_MEDIUM && wpn.sub_type == MI_THROWING_NET)
            return (false);

Insertion in crawl-ref/source/item_use.cc at line 2049 [11.2781507]

[24.14010]

            case MI_THROWING_NET:
                // Nets use throwing and T&D skills
                // They don't do any damage!
                baseDam = 0;
                exDamBonus = 0;
                // but accuracy is important for this one
                baseHit = 1;
                exHitBonus += (skill_bump(SK_RANGED_COMBAT) * 7 / 2);
                // Adjust for strength and dex.
                exHitBonus = dex_adjust_thrown_tohit(exHitBonus);
                // Nets train throwing
                exercise(SK_RANGED_COMBAT, 1);
            break;

Insertion in crawl-ref/source/item_use.cc at line 2101 [11.2781507]

[11.2827872]

        else if (wepType == MI_THROWING_NET)
        {
            pbolt.rangeMax = pbolt.range = 2 + player_size(PSIZE_BODY);
        }

Insertion in crawl-ref/source/externs.h at line 199 [11.3270163]
[12.85953]
[12.85953]
```
    virtual bool caught() const = 0;
```
Replacement in crawl-ref/source/externs.h at line 207 [11.3270163]
B:BD[12.86112] → [12.86112:86154]
```
        return paralysed() || confused();
```
[12.86112]
[12.86154]
```
        return paralysed() || confused() || caught();
```
Insertion in crawl-ref/source/externs.h at line 899 [11.3270163]
[12.87516]
[22.1752]
```
    bool caught() const;
```
Insertion in crawl-ref/source/externs.h at line 1151 [11.3270163]
[12.89019]
[12.89019]
```
    bool caught() const;
```
Insertion in crawl-ref/source/enum.h at line 256 [11.3287960]
[11.3295002]
[9.14625]
```
    ATTR_CAUGHT,                // caught in a net
```
Insertion in crawl-ref/source/enum.h at line 1292 [11.3287960]
[27.11977]
[15.2558]
```
    ENCH_CAUGHT,         // caught in a net
```
Insertion in crawl-ref/source/enum.h at line 1922 [11.3287960]
[24.14876]
[11.3329886]
```
    MI_THROWING_NET,
```
Insertion in crawl-ref/source/enum.h at line 3769 [11.3287960]
[11.3373487]
[11.3373487]
```
    TRAP_NET,
```

Insertion in crawl-ref/source/dungeon.cc at line 1854 [11.3429798]

[28.10305]

[29.117986]

        
    if ((type == TRAP_DART || type == TRAP_ARROW) && one_chance_in(15))
        type = TRAP_NET;

Insertion in crawl-ref/source/direct.cc at line 1286 [11.3697945]
[30.36721]
[28.15833]
```
        case TRAP_NET:
            return ("net trap");
```

Insertion in crawl-ref/source/direct.cc at line 1564 [11.3697945]

[17.33662]

    case ENCH_CAUGHT:
        msg += " is entangled in a net.";
        break;

Replacement in crawl-ref/source/describe.cc at line 337 [11.3736416]
B:BD[10.983151] → [10.983151:983180]
```
    "bolt", "zot", "needle",
```
[10.983151]
[10.983180]
```
    "bolt", "net", "zot", "needle",
```

Insertion in crawl-ref/source/describe.cc at line 1377 [11.3736416]

[11.3776908]

[10.985318]

    case MI_THROWING_NET:
        description += "A throwing net as used by gladiators. ";
        if (!is_throwable(item, you.body_size()))
            description += "Unfortunately, it is too large for you to throw. ";
        if (item.plus < 0)
        {
            std::string how;
            if (item.plus > -3)
                how = "a little";
            else if (item.plus > -5)
                how = "somewhat";
            else if (item.plus > -7)
                how = "very";
            else
                how = "extremely";
            description += "It looks ";
            description += how;
            description += " worn.";
        }
        else if (item.plus > 1)
            description += "The net looks brand-new!";
        break;

Insertion in crawl-ref/source/beam.cc at line 2392 [11.4128068]

[11.4205189]

[31.636]

    // doesn't get destroyed by throwing
    if (item->sub_type == MI_THROWING_NET)
    {
        copy_item_to_grid( *item, x, y, 1 );
        return;
    }

Insertion in crawl-ref/source/beam.cc at line 3352 [11.4128068]

[11.4232330]

    
    if (beam.name.find("throwing net") != std::string::npos)
        player_caught_in_net();

Insertion in crawl-ref/source/beam.cc at line 3708 [11.4128068]

[11.4240700]

    if (beam.name.find("throwing net") != std::string::npos)
        monster_caught_in_net(mon);

Insertion in crawl-ref/source/acr.cc at line 2574 [11.4397395]

[11.4464654]


    if (you.attribute[ATTR_CAUGHT])
    {
        // struggles against net, damaging it
        free_self_from_net(true);
        you.turn_is_over = true;
        return;
    }

Insertion in crawl-ref/source/acr.cc at line 2602 [11.4397395]

[11.4464961]


            if (mons_is_caught(&menv[mon]))
            {
                std::string prompt  = "Do you want to try to take the net off ";
                            prompt += (&menv[mon])->name(DESC_NOCAP_THE);
                            prompt += '?';
                if (yesno(prompt.c_str(), true, 'n'))
                {
                    remove_net_from(&menv[mon]);
                    return;
                }
            }

Insertion in crawl-ref/source/acr.cc at line 2958 [11.4397395]

[10.1280617]

[11.4473079]


    if (you.attribute[ATTR_CAUGHT])
    {
        // tries to escape from net (without damaging it, takes longer)
        free_self_from_net(false);
        you.turn_is_over = true;
        return;
    }