fiddlerwoaroof/crawl - Change IZ5YT2GANAFYBACERZYTFQE2H66NM4Y3K5ADYNYF2IUADY23HJ4QC

Net fix (reduced trapping turns) also for trunk.

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

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

IZ5YT2GANAFYBACERZYTFQE2H66NM4Y3K5ADYNYF2IUADY23HJ4QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/traps.cc at line 624 [4.5308]
[3.512]
[3.512]
```
    // Human, Elf, ...: medium (0)
```

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

[3.717]


    if (escape == 0) // middle-sized creatures are at a disadvantage
    {
        escape += coinflip();
        damage -= coinflip();
    }

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

B:BD[3.1195] → [3.1195:1256]

        damage += random2(you.mutation[MUT_CLAWS]);

[3.1195]

[3.1256]

    {
        if (you.mutation[MUT_CLAWS] == 1)
            damage += coinflip();
        else
            damage += you.mutation[MUT_CLAWS] - 1;
    }

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

B:BD[3.1464] → [3.1464:1533]

        damage += random2(-hold/3 + 1); // ... and easier to destroy

[3.1464]

[3.1533]

        damage += random2(-hold/3) + 1; // ... and easier to destroy

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

B:BD[4.20380] → [3.2468:2524]

    int do_what = damage_or_escape_net(mitm[net].plus);

[4.20380]

[2.133]

    int hold = mitm[net].plus;
    int do_what = damage_or_escape_net(hold);

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

B:BD[3.2609] → [3.2609:2670]

         mitm[net].plus, you.attribute[ATTR_HELD], do_what);

[3.2609]

[3.2670]

         hold, you.attribute[ATTR_HELD], do_what);

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

B:BD[3.3064] → [3.3064:3151]

∅:D[3.3151] → [4.20662:20671]

B:BD[4.20662] → [4.20662:20671]

                         
        int damage = 1;
        damage += random2(-do_what);

[3.3064]

[4.20840]


        int damage = -do_what;
        if (damage < 1)
            damage = 1;

Replacement in crawl-ref/source/traps.cc at line 737 [4.5308]
∅:D[3.3222] → [4.20919:20953]
B:BD[4.20919] → [4.20919:20953]
```
        mitm[net].plus -= damage;
```
[3.3222]
[3.3223]
```
        hold -= damage;
        mitm[net].plus = hold;
```
Replacement in crawl-ref/source/traps.cc at line 740 [4.5308]
∅:D[3.3224] → [4.20962:20995]
B:BD[4.20962] → [4.20962:20995]
```
        if (mitm[net].plus < -7)
```
[3.3224]
[4.20995]
```
        if (hold < -7)
```

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

B:BD[3.3765] → [3.3765:3827]

        if (you.attribute[ATTR_HELD] > 1 && one_chance_in(3))

[3.3765]

[4.21358]

        if (you.attribute[ATTR_HELD] > 1 && coinflip())
        {

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

[4.21398]

[3.3828]

            
            if (you.attribute[ATTR_HELD] > 1 && hold < -random2(5))
                you.attribute[ATTR_HELD]--;
        }

Replacement in crawl-ref/source/traps.cc at line 772 [4.5308]
B:BD[3.3908] → [3.3908:3956]
```
        int escape = random2(do_what);
        
```
[3.3908]
[3.3956]
```
        int escape = do_what;
```

Replacement in crawl-ref/source/beam.cc at line 2419 [6.4128068]

B:BD[5.26616] → [5.26616:26661]

B:BD[5.26661] → [7.4426:4435]

B:BD[7.4435] → [8.352:376]

B:BD[8.376] → [9.3297:3374]

∅:D[9.3374] → [8.451:548]

B:BD[8.451] → [8.451:548]

∅:D[8.548] → [10.2636:2710]

B:BD[7.4435] → [10.2636:2710]

B:BD[10.2710] → [8.549:629]

        copy_item_to_grid( *item, x, y, 1 );
        
        // nobody there
        if ((you.x_pos != x || you.y_pos != y) && mgrd[x][y] == NON_MONSTER)
            return;
            
        // player or monster on position but hasn't been caught
        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]]))

[5.26616]

[7.4591]

        // 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]]))

Replacement in crawl-ref/source/beam.cc at line 2423 [6.4128068]

B:BD[7.4601] → [7.4601:4621]

            return;

[7.4601]

[7.4621]

            // if no trapping net found mark this one
            if (get_trapping_net(x,y, true) == NON_ITEM)
                set_item_stationary(*item);

Replacement in crawl-ref/source/beam.cc at line 2428 [6.4128068]

B:BD[7.4640] → [8.630:700]

∅:D[8.700] → [7.4640:4672]

B:BD[7.4640] → [7.4640:4672]

        // somebody on square who HAS been caught, maybe by this net?
        mark_net_trapping(x,y);

[7.4640]

[5.26661]

        copy_item_to_grid( *item, x, y, 1 );