fiddlerwoaroof/crawl - Change DS2GZKISEP2DM2VU6EJ525Q7W3WVOKJXG5PY2OY4VNFCLBHVVOTAC

More general stuff.

Beogh's water walk ability != swimming
monsters won't throw nets at you if you're already caught
Moved a few more messages into MSGCH_EXAMINE_FILTER.
Added information on new options.

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

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

DS2GZKISEP2DM2VU6EJ525Q7W3WVOKJXG5PY2OY4VNFCLBHVVOTAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 477 [7.39949]

B:BD[6.462] → [6.462:535]

        signed char water = player_can_swim()? TRAVERSABLE : IMPASSABLE;

[6.462]

[8.7520]

        signed char water = player_likes_water()? TRAVERSABLE : IMPASSABLE;

Insertion in crawl-ref/source/player.h at line 163 [9.945993]
[8.24275]
[9.951521]
```
bool player_likes_water();
```
Replacement in crawl-ref/source/player.cc at line 249 [9.962854]
B:BD[10.340910] → [11.1135:1178]
```
            else if ( !player_can_swim() )
```
[10.340910]
[10.340928]
```
            else if ( !player_likes_water() )
```

Replacement in crawl-ref/source/player.cc at line 350 [9.962854]

B:BD[12.375] → [13.989:1059]

                || (grid == DNGN_DEEP_WATER && !player_can_swim())));

[12.375]

[12.443]

                || (grid == DNGN_DEEP_WATER && !player_likes_water()) ));

Replacement in crawl-ref/source/player.cc at line 373 [9.962854]
B:BD[9.965593] → [9.965593:965629]
```
    return (!player_is_levitating()
```
[9.965593]
[14.2073]
```
    return (!player_is_levitating() && !beogh_water_walk()
```

Insertion in crawl-ref/source/player.cc at line 375 [9.962854]

[14.2131]

[9.965760]

}
bool player_likes_water(void)
{
     return (player_can_swim() || beogh_water_walk());

Replacement in crawl-ref/source/player.cc at line 5018 [9.962854]

B:BD[14.2888] → [11.1219:1334]

    return (species == SP_MERFOLK ||
            (you.religion == GOD_BEOGH && you.piety >= piety_breakpoint(4)));

[14.2888]

[14.2924]

    return (species == SP_MERFOLK);

Insertion in crawl-ref/source/monstuff.cc at line 3539 [9.1396662]

[15.3915]

[9.1505889]

        return (false);
    // throwing a net at a target that is already caught would be
    // completely useless, so bail out
    if (mitm[mon_item].base_type == OBJ_MISSILES
        && mitm[mon_item].sub_type == MI_THROWING_NET
        && (beem.target_x == you.x_pos && beem.target_y == you.y_pos
            && you.caught()))
    {

Insertion in crawl-ref/source/monstuff.cc at line 3549 [9.1396662]
[9.1505913]
[9.1505913]
```
    }
```

Insertion in crawl-ref/source/misc.cc at line 2131 [9.1933596]

[9.1977118]

    
    // sanity check
    if (terrain != DNGN_LAVA && beogh_water_walk())
        return (false);

Replacement in crawl-ref/source/direct.cc at line 494 [9.3697945]

B:BD[16.8152] → [16.8152:8211]

                mpr("You haven't got a previous target.");

[16.8152]

[16.8248]

                mpr("You haven't got a previous target.", MSGCH_EXAMINE_FILTER);

Replacement in crawl-ref/source/direct.cc at line 505 [9.3697945]

B:BD[16.8559] → [16.8559:8625]

                    mpr("You can't see that creature any more.");

[16.8559]

[16.8666]

                    mpr("You can't see that creature any more.", MSGCH_EXAMINE_FILTER);

Replacement in crawl-ref/source/direct.cc at line 629 [9.3697945]

B:BD[16.11587] → [16.11587:11655]

                mpr("Sorry, you can't target what you can't see.");

[16.11587]

[16.11692]

                mpr("Sorry, you can't target what you can't see.", MSGCH_EXAMINE_FILTER);

Replacement in crawl-ref/source/direct.cc at line 1216 [9.3697945]

B:BD[17.5740] → [5.920:978]

    mpr((prefix + feat + suffix).c_str(), MSGCH_EXAMINE);

[17.5740]

[17.5783]

    msg_channel_type channel = MSGCH_EXAMINE;
    
    // water is not terribly important if you don't mind it
    if ((grd[you.x_pos][you.y_pos] == DNGN_DEEP_WATER
        || grd[you.x_pos][you.y_pos] == DNGN_SHALLOW_WATER)
        && player_likes_water())
    {
        channel = MSGCH_EXAMINE_FILTER;
    }
    mpr((prefix + feat + suffix).c_str(), channel);

Replacement in crawl-ref/source/direct.cc at line 1849 [9.3697945]

B:BD[5.1817] → [5.1817:1856]

        if (grd[mx][my] == DNGN_FLOOR)

[5.1817]

[5.1856]

        if (grd[mx][my] == DNGN_FLOOR
            || grd[mx][my] == DNGN_SHALLOW_WATER
            || grd[mx][my] == DNGN_DEEP_WATER)
        {

Insertion in crawl-ref/source/direct.cc at line 1854 [9.3697945]
[5.1900]
[5.1900]
```
        }
```

Replacement in crawl-ref/source/describe.cc at line 2249 [9.3736416]

B:BD[2.5196] → [2.5196:5294]

        return "A potion which grants you "
            "temporary resistance to the elements.$";

[2.5196]

[18.5782]

        return "A potion which grants you temporary resistance to the elements "
               "and poison.$";

Replacement in crawl-ref/source/acr.cc at line 1659 [9.4397395]

B:BD[4.12744] → [4.12744:12793]

        else
           mpr("Unknown command.");

[4.12744]

[9.4437443]

        else // well, not examine, but...
           mpr("Unknown command.", MSGCH_EXAMINE_FILTER);

Insertion in crawl-ref/docs/crawl_options.txt at line 46 [19.63392]
[3.981]
[3.981]
```
		runrest_ignore_monster,
```

Insertion in crawl-ref/docs/crawl_options.txt at line 657 [19.63392]

[20.22585]

runrest_ignore_monster = <string>:<distance>
        This only works if runrest.lua has been sourced already in init.txt.
	Any monster containing the string will only interrupt your activity
	if the distance between you and the monster is less than the 
	specified number. E.g. with
	  runrest_ingore_monster = fish:3
	all of big fish, jellyfish, giant goldfish and lavafish will be 
	considered safe for travel, explore and resting as long as the distance
	is at least 3.

Insertion in crawl-ref/docs/crawl_options.txt at line 1194 [19.63392]

[20.39576]

note_all_skill_levels = false
        This is a shortcut for note_skill_levels = 1,2,..,27. If you set this 
	to true, all skill levels are noteworthy.