fiddlerwoaroof/crawl - Change YT23TCUEE6A3I7EX6WIZYHCPRYJDE74IZKR5YKPHKOFSYJCKFUCQC

Fix [1867328]: Attacking a monster trapped in a net now counts as

stabbing.

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

Created by dolorous on April 9, 2008

YT23TCUEE6A3I7EX6WIZYHCPRYJDE74IZKR5YKPHKOFSYJCKFUCQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/fight.cc at line 568 [5.3140790]
B:BD[2.2844] → [2.2844:2849]
```
    
```
[2.2844]
[2.2849]
Replacement in crawl-ref/source/fight.cc at line 607 [5.3140790]
B:BD[6.4455] → [6.4455:4464]
```
        
```
[6.4455]
[6.4464]
Replacement in crawl-ref/source/fight.cc at line 623 [5.3140790]
B:BD[6.5045] → [6.5045:5050]
```
    
```
[6.5045]
[6.5050]
Replacement in crawl-ref/source/fight.cc at line 670 [5.3140790]
B:BD[6.6525] → [6.6525:6538]
```
            
```
[6.6525]
[6.6538]
Replacement in crawl-ref/source/fight.cc at line 673 [5.3140790]
B:BD[6.6586] → [6.6586:6591]
```
    
```
[6.6586]
[6.6591]
Replacement in crawl-ref/source/fight.cc at line 675 [5.3140790]
B:BD[6.6645] → [6.6645:6650]
```
    
```
[6.6645]
[6.6650]
Replacement in crawl-ref/source/fight.cc at line 740 [5.3140790]
B:BD[3.8734] → [3.8734:8773]
∅:D[3.8773] → [6.6759:6768]
B:BD[6.6759] → [6.6759:6768]
```
        player_hurt_monster();        
        
```
[3.8734]
[7.5543]
```
        player_hurt_monster();
```
Replacement in crawl-ref/source/fight.cc at line 744 [5.3140790]
B:BD[8.34001] → [8.34001:34010]
```
        
```
[8.34001]
[8.34010]
Replacement in crawl-ref/source/fight.cc at line 747 [5.3140790]
B:BD[8.34078] → [9.1148:1161]
```
            
```
[8.34078]
[10.2754]
Replacement in crawl-ref/source/fight.cc at line 749 [5.3140790]
B:BD[10.2795] → [6.6769:6778]
```
        
```
[10.2795]
[6.6778]

Replacement in crawl-ref/source/fight.cc at line 1219 [5.3140790]

B:BD[5.3160244] → [8.44064:44130]

    mprf( MSGCH_DIAGNOSTICS, "your to-hit: %d; defender EV: %d",

[5.3160244]

[11.57307]

    mprf( MSGCH_DIAGNOSTICS, "your to-hit: %d; defender EV: %d",

Replacement in crawl-ref/source/fight.cc at line 1349 [5.3140790]
B:BD[12.1650] → [12.1650:1663]
```
            
```
[12.1650]
[13.20454]
Replacement in crawl-ref/source/fight.cc at line 1353 [5.3140790]
B:BD[14.977] → [14.977:986]
```
        
```
[14.977]
[14.986]
Replacement in crawl-ref/source/fight.cc at line 1388 [5.3140790]
B:BD[8.47906] → [8.47906:47919]
```
            
```
[8.47906]
[8.47919]
Replacement in crawl-ref/source/fight.cc at line 1391 [5.3140790]
B:BD[8.47987] → [8.47987:48000]
```
            
```
[8.47987]
[8.48000]
Replacement in crawl-ref/source/fight.cc at line 1466 [5.3140790]
B:BD[8.49986] → [8.49986:49999]
```
            
```
[8.49986]
[8.49999]
Replacement in crawl-ref/source/fight.cc at line 1483 [5.3140790]
B:BD[8.50295] → [8.50295:50330]
```
    int weap_type = WPN_UNKNOWN;  
```
[8.50295]
[5.3164433]
```
    int weap_type = WPN_UNKNOWN;
```
Replacement in crawl-ref/source/fight.cc at line 1691 [5.3140790]
B:BD[15.914] → [15.914:924]
```
    }    
```
[15.914]
[15.924]
```
    }
```
Replacement in crawl-ref/source/fight.cc at line 1741 [5.3140790]
B:BD[8.55674] → [8.55674:55679]
```
    
```
[8.55674]
[16.2647]
Replacement in crawl-ref/source/fight.cc at line 2542 [5.3140790]
B:BD[8.68528] → [8.68528:68533]
```
    
```
[8.68528]
[8.68533]

Deletion in crawl-ref/source/fight.cc at line 2771 [5.3140790]

B:BD[17.437] → [4.2705:2856]

    }
    // paralysed
    if (def->has_ench(ENCH_PARALYSIS))
    {
        stab_attempt = true;
        roll_needed = false;
        stab_bonus = 1;

Replacement in crawl-ref/source/fight.cc at line 2773 [5.3140790]

∅:D[18.510] → [8.74044:74097]

B:BD[5.3193757] → [8.74044:74097]

    // sleeping
    if (def->behaviour == BEH_SLEEP)

[18.510]

[8.74097]

    // trapped in a net, paralysed, or sleeping
    if (def->has_ench(ENCH_HELD) || def->has_ench(ENCH_PARALYSIS)
        || def->behaviour == BEH_SLEEP)

Replacement in crawl-ref/source/fight.cc at line 2782 [5.3140790]
B:BD[5.3194126] → [8.74192:74222]
```
    // helpless (plants, etc)
```
[5.3194126]
[8.74222]
```
    // helpless (plants, etc.)
```

Fix [1867328]: Attacking a monster trapped in a net now counts as

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/fight.cc at line 568 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 607 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 623 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 670 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 673 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 675 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 740 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 744 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 747 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 749 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1219 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1349 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1353 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1388 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1391 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1466 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1483 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1691 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 1741 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 2542 [5.3140790]

Deletion in crawl-ref/source/fight.cc at line 2771 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 2773 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 2782 [5.3140790]