fiddlerwoaroof/crawl - Change S5RANRFX6SRLISGDLFVHDWHWXZ4IIEMM23FMY4IHK5PZQBLRTTYAC

Player and monster naga no longer flounder or lose stealth in shallow water, and water creatures do not get double damage vs naga in shallow water. This is on account of naga being very clever at keeping themselves stable with their tails :P The reduced movement speed in shallow water still applies, and invisible naga in shallow water are still revealed.

Removed Cerebov's shock resistance - he no longer uses lightning bolt.

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

Created by dshaligram on September 14, 2008

S5RANRFX6SRLISGDLFVHDWHWXZ4IIEMM23FMY4IHK5PZQBLRTTYAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 3639 [3.962854]
B:BD[3.1029117] → [4.1179:1218]
```
        else if ( !player_can_swim() )
```
[3.1029117]
[3.1029130]
```
        else if ( !player_can_swim() && !you.extra_balanced() )
```
Insertion in crawl-ref/source/player.cc at line 5727 [3.962854]
[5.3169]
[5.3169]
```
bool player::extra_balanced() const
{
    return (species == SP_NAGA);
}
```
Replacement in crawl-ref/source/player.cc at line 5734 [3.962854]
B:BD[5.3204] → [5.3204:3242]
```
    return in_water() && !can_swim();
```
[5.3204]
[5.3242]
```
    return in_water() && !can_swim() && !extra_balanced();
```

Insertion in crawl-ref/source/mon-util.cc at line 2997 [3.1699344]

[6.903]

[6.903]

}
bool monsters::extra_balanced() const
{
    return (mons_genus(type) == MONS_NAGA);

Replacement in crawl-ref/source/mon-util.cc at line 3012 [3.1699344]
∅:D[7.3583] → [5.8454:8489]
∅:D[8.8021] → [5.8454:8489]
B:BD[5.8454] → [5.8454:8489]
```
            && !mons_flies(this));
```
[8.8021]
[9.1731]
```
            && !mons_flies(this)
            && !extra_balanced());
```
Replacement in crawl-ref/source/mon-data.h at line 4255 [3.1826214]
B:BD[10.125534] → [2.8899:8958]
```
    MR_RES_ELEC | MR_RES_POISON | mrd(MR_RES_HELLFIRE, 3),
```
[10.125534]
[10.125585]
```
    MR_RES_POISON | mrd(MR_RES_HELLFIRE, 3),
```

Insertion in crawl-ref/source/externs.h at line 249 [3.3270163]

[11.27629]

[11.27629]

    // Returns true if the actor is exceptionally well balanced.
    virtual bool      extra_balanced() const = 0;

Insertion in crawl-ref/source/externs.h at line 851 [3.3270163]
[5.82914]
[12.3783]
```
    bool      extra_balanced() const;
```
Insertion in crawl-ref/source/externs.h at line 1179 [3.3270163]
[5.83725]
[12.3854]
```
    bool      extra_balanced() const;
```