fiddlerwoaroof/crawl - Change SJDOBXECX7F3ZPPVR7FPURE53D47PP2TFIF4SB6XPS456PZV3DQAC

Nets that hold you cannot be destroyed by Ely's Destroy Weapon ability.

(Fix 1825520).

Monsters will be held in nets longer. Doesn't influence time needed to destroy it, so ogres and such will still get out quickly. Needs more testing, I guess.

Intelligent friendlies will try to avoid traps you (the player) know about, and the chance for triggering known blade and net traps is much lower. Also, friendly casters are much less likely to spam you with "spells" if there are no enemies around.

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

Created by j-p-e-g on November 4, 2007

SJDOBXECX7F3ZPPVR7FPURE53D47PP2TFIF4SB6XPS456PZV3DQAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 1807 [5.804403]

B:BD[4.1053] → [4.1053:1103]

            && mitm[i].base_type != OBJ_MISSILES)

[4.1053]

[4.1103]

            && mitm[i].base_type != OBJ_MISSILES
            || item_is_stationary(mitm[i])) // held in a net

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

B:BD[5.1343282] → [5.1343282:1343354]

    // Trap damage to monsters is not a function of level, beacuse they

[5.1343282]

[5.1343354]

    // Trap damage to monsters is not a function of level, because they

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

B:BD[5.1345669] → [5.1345669:1345699]

        if (one_chance_in(5))

[5.1345669]

[5.1345699]

        if (one_chance_in(5)
            || trapKnown && intelligent_ally(monster) && coinflip())

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

B:BD[5.1345952] → [6.6978:7021]

        else if (random2(monster->ev) > 8)

[5.1345952]

[5.1346000]

        
        if (random2(monster->ev) > 8
            || trapKnown && intelligent_ally(monster) && random2(monster->ev) > 8)

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

B:BD[7.974] → [7.974:1004]

        if (one_chance_in(3))

[7.974]

[7.1004]

        if (one_chance_in(3)
            || trapKnown && intelligent_ally(monster) && coinflip())

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

B:BD[7.1230] → [7.1230:1268]

        if (random2(monster->ev) > 8)

[7.1230]

[7.1268]

        if (random2(monster->ev) > 8
            || trapKnown && intelligent_ally(monster) && random2(monster->ev) > 8)

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

B:BD[3.10031] → [3.10031:10075]

        if (!monster->will_trigger_shaft())

[3.10031]

[3.10075]

        if (!monster->will_trigger_shaft()
            || trapKnown && intelligent_ally(monster))

Insertion in crawl-ref/source/monstuff.cc at line 49 [5.1396662]
[8.63487]
[5.1397730]
```
#include "misc.h"
```

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

[9.28311]

[5.1489876]

static bool enemies_around(const monsters *monster)
{
    if (mons_friendly(monster))
        return (!mons_near(monster) || !i_feel_safe());
    else
        return (mons_near(monster));
}

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

B:BD[5.1491791] → [5.1491791:1491896]

        // forces the casting of dig when player not visible - this is EVIL!
        if (!monsterNearby)

[5.1491791]

[5.1491896]

        if (!enemies_around(monster))

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

[5.1491906]

[9.28487]

            // forces the casting of dig when player not visible - this is EVIL!

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

B:BD[5.1493066] → [5.1493066:1493112]

            else if (monster->foe == MHITYOU)

[5.1493066]

[5.1493112]

            else if (monster->foe == MHITYOU && !monsterNearby)

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

B:BD[7.3900] → [7.3900:4018]

        // this is only urgent if you are around
        if (!finalAnswer && monsterNearby && mons_is_caught(monster)

[7.3900]

[2.2257]

        // this is only urgent if enemies are around
        if (!finalAnswer && enemies_around(monster) && mons_is_caught(monster)

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

[5.1494117]

            // if nothing found by now, safe friendlies will rarely cast
            if (mons_friendly(monster) && !enemies_around(monster)
                && !one_chance_in(8))
            {
                return (false);
            }

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

[3.10459]

        
    // permanent intelligent friendlies will try to avoid traps
    // the player knows about (this could be annoying in a corridor)
    if (grd[monster->x][monster->y] != DNGN_UNDISCOVERED_TRAP
        && trap_category(trap.type) != DNGN_TRAP_MAGICAL // magic doesn't matter
        && intelligent_ally(monster))
    {
        const int x = monster->x;
        const int y = monster->y;
        // test for corridor-like environment (simple hack)
        if (!(grd[x-1][y] < DNGN_MINMOVE && grd[x+1][y] < DNGN_MINMOVE
              || grd[x][y-1] < DNGN_MINMOVE && grd[x][y+1] < DNGN_MINMOVE))
        {
            return (monster->hit_points == monster->max_hit_points);
        }
    }

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

[3.10460]

[10.1988]

    // friendlies will try not to be parted from you
    if (intelligent_ally(monster) && trap.type == TRAP_TELEPORT
        && mons_near(monster))
    {
        return (false);
    }

Insertion in crawl-ref/source/mon-util.h at line 428 [5.1682293]
[11.10600]
[5.1692694]
```
bool intelligent_ally(const monsters *mon);
```

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

[5.1732917]

[11.11311]

}
bool intelligent_ally(const monsters *monster)
{
    return (monster->attitude == ATT_FRIENDLY
            && mons_intel(monster->type) >= I_NORMAL);

Insertion in crawl-ref/source/mon-util.cc at line 1694 [5.1699344]
[5.1732975]
[5.1732975]
Replacement in crawl-ref/source/mon-util.cc at line 5175 [5.1699344]
∅:D[12.1406] → [7.17276:17325]
B:BD[7.17276] → [7.17276:17325]
```
        cturn = 90 / mod_speed(25, mons->speed);
```
[12.1406]
[7.17325]
```
        cturn = 120 / mod_speed(25, mons->speed);
```

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

B:BD[13.23306] → [13.23306:23368]

    // put an appostraphe after the "s": "Chris" -> "Chris'",

[13.23306]

[13.23368]

    // put an apostrophe after the "s": "Chris" -> "Chris'",