fiddlerwoaroof/crawl - Change TFHMBVXTRA2LXBHE7L7OEWK37JQN5DWZ3HOACMN7PRWVJNCS4TYQC

For Tiles, use some of the other wall types in the Abyss as well to make

it more interesting. The rest is mostly clean-up.

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

Created by j-p-e-g on July 1, 2008

TFHMBVXTRA2LXBHE7L7OEWK37JQN5DWZ3HOACMN7PRWVJNCS4TYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 2566 [6.5936]

B:BD[5.30179] → [5.30179:30254]

∅:D[5.30254] → [7.5598:5599]

B:BD[8.2284] → [7.5598:5599]

B:BD[7.5599] → [5.30255:30406]

∅:D[5.30406] → [9.26740:26756]

B:BD[9.26740] → [9.26740:26756]

B:BD[9.26756] → [10.20178:20301]

∅:D[10.20301] → [5.30540:30799]

B:BD[5.30540] → [5.30540:30799]

∅:D[5.30799] → [9.27160:27166]

B:BD[9.27160] → [9.27160:27166]

B:BD[9.27166] → [5.30800:31253]

∅:D[5.31253] → [9.27560:27567]

B:BD[9.27560] → [9.27560:27567]

B:BD[9.27567] → [5.31254:31329]

        if (Options.tutorial_type != TUT_BERSERK_CHAR)
            return;
        text << "While unsporting, it is sometimes useful to attack a "
                "fleeing monster by throwing something after it. To do this, "
#ifdef USE_TILE
                "you can choose your firing ammunition by <w>left-clicking</w> "
                "on it with your mouse. "
                "In the case of weapons (rather than missiles) you need to "
                "be pressing <w>Ctrl</w> at the same time, to distinguish "
                "the action from wielding. Then target the monster by "
                "clicking on it."
#else
                "press <w>f</w>, choose a throwing weapon, e.g. one of your "
                "spears, use <w>+</w> to select a monster and press "
                "<w>.</w>, <w>f</w> or <w>Enter</w>. The closest monster "
                "will be autoselected. If you've got the fire_order option "
                "set you can directly use <w>ff</w> or <w>f+.</w> instead; "
                "the game will pick the first weapon that fits the option."
#endif
                "\nIf you miss, you can fire at it again with <w>ff</w>.";

[5.30179]

[5.31329]

        text << "Now that monster is scared of you! Note that you do not "
                "absolutely have to follow it. Rather, you can let it run "
                "away. Sometimes, though, it can be useful to attack a "
                "fleeing creature by throwing something after it. If you "
                "have any daggers or hand axes in your <w>i</w>nventory you "
                "can look at one of them to read an explanation of how to do "
                "this.";

Replacement in crawl-ref/source/tile2.cc at line 993 [11.13289]

B:BD[11.40924] → [12.2372:2405]

        wall  = IDX_WALL_UNDEAD;

[11.40924]

[13.505]

        switch (env.rock_colour)
        {
        case YELLOW:
        case BROWN:
            wall = IDX_WALL_HIVE;
            break;
        case RED:
        case LIGHTRED:
            wall = IDX_WALL_PEBBLE_RED;
            break;
        case GREEN:
        case LIGHTGREEN:
            wall = IDX_WALL_SLIME;
            break;
        case BLUE:
            wall = IDX_WALL_ICE;
            break;
        case LIGHTGRAY:
        case WHITE:
            wall = IDX_WALL_HALL;
            break;
        default:
            wall = IDX_WALL_UNDEAD;
            break;
        }

Replacement in crawl-ref/source/tile2.cc at line 2073 [11.13289]
B:BD[14.13996] → [14.13996:14024]
```
         doll.parts[i] = 0;
```
[14.13996]
[11.74004]
```
        doll.parts[i] = 0;
```

Replacement in crawl-ref/source/lev-pand.cc at line 166 [15.2574562]

B:BD[15.2579585] → [15.2579585:2579702]

    // set at least some specific monsters for the special levels - this
    // can also be used to set some colours

[15.2579585]

[16.284]

    // Set at least some specific monsters for the special levels - this
    // can also be used to set some colours.

Replacement in crawl-ref/source/files.cc at line 1201 [15.3084589]
∅:D[17.1290] → [15.3108846:3108901]
B:BD[15.3108846] → [15.3108846:3108901]
```
    }                       // end of moving followers
```
[17.1290]
[15.3108901]
```
    }
```
Replacement in crawl-ref/source/files.cc at line 1700 [15.3084589]
B:BD[18.3011] → [18.3011:3031]
```
    return success;
```
[18.3011]
[19.4324]
```
    return (success);
```

Replacement in crawl-ref/source/effects.cc at line 2117 [15.3382105]

∅:D[20.3826] → [21.9858:9909]

B:BD[21.9858] → [21.9858:9909]

B:BD[21.9915] → [21.9915:9970]

    for ( int x = X_BOUND_1; x <= X_BOUND_2; ++x )
        for ( int y = Y_BOUND_1; y <= Y_BOUND_2; ++y )

[20.3826]

[21.9970]

    for (int x = X_BOUND_1; x <= X_BOUND_2; ++x)
        for (int y = Y_BOUND_1; y <= Y_BOUND_2; ++y)

Replacement in crawl-ref/source/effects.cc at line 2120 [15.3382105]

B:BD[21.9980] → [21.9980:10043]

            if ( distance(x,y,you.x_pos,you.y_pos) < radius2 )

[21.9980]

[21.10043]

            if (distance(x,y,you.x_pos,you.y_pos) < radius2)

Insertion in crawl-ref/source/dungeon.cc at line 448 [15.3429798]
[22.2313]
[22.2313]
Replacement in crawl-ref/source/acr.cc at line 4089 [15.4397395]
∅:D[2.7386] → [15.4470970:4471062]
∅:D[23.552636] → [15.4470970:4471062]
B:BD[15.4470970] → [15.4470970:4471062]
```
    // set vision radius to player's current vision
    setLOSRadius( you.current_vision );
```
[2.7386]
[15.4471152]
```
    // Set vision radius to player's current vision.
    setLOSRadius(you.current_vision);
```

Insertion in crawl-ref/source/abyss.cc at line 41 [15.4482606]

[24.377]

[25.39390]

// If not_seen is true, don't place the feature where it can be seen from
// the centre.

Replacement in crawl-ref/source/abyss.cc at line 47 [15.4482606]

B:BD[25.39625] → [25.39625:39670]

                                 int tries )

[25.39625]

[24.652]

                                 int tries, bool not_seen = false )

Insertion in crawl-ref/source/abyss.cc at line 55 [15.4482606]
[24.896]
[24.896]

Insertion in crawl-ref/source/abyss.cc at line 59 [15.4482606]

[24.996]

        if (not_seen && grid_see_grid(cp.x, cp.y, centre.x, centre.y))
            continue;

Replacement in crawl-ref/source/abyss.cc at line 106 [15.4482606]

∅:D[3.7936] → [25.39671:39731]

B:BD[26.14347] → [25.39671:39731]

B:BD[25.39731] → [3.7937:8001]

        _place_feature_near( coord_def(45, 35), LOS_RADIUS,
                             DNGN_FLOOR, DNGN_EXIT_ABYSS, 50 );

[3.7936]

[3.8001]

        _place_feature_near( coord_def(45, 35), LOS_RADIUS + 2,
                             DNGN_FLOOR, DNGN_EXIT_ABYSS, 50, true );

Replacement in crawl-ref/source/abyss.cc at line 237 [15.4482606]
∅:D[27.5178] → [28.28211:28227]
B:BD[15.4486733] → [28.28211:28227]
```
#if DEBUG_ABYSS
```
[27.5178]
[28.28227]
```
#ifdef DEBUG_ABYSS
```
Replacement in crawl-ref/source/abyss.cc at line 283 [15.4482606]
B:BD[28.28551] → [28.28551:28567]
```
#if DEBUG_ABYSS
```
[28.28551]
[28.28567]
```
#ifdef DEBUG_ABYSS
```
Replacement in crawl-ref/source/abyss.cc at line 312 [15.4482606]
∅:D[3.9998] → [28.28829:28845]
B:BD[28.28829] → [28.28829:28845]
```
#if DEBUG_ABYSS
```
[3.9998]
[3.9999]
```
#ifdef DEBUG_ABYSS
```
Replacement in crawl-ref/source/abyss.cc at line 432 [15.4482606]
B:BD[15.4487864] → [28.31589:31605]
```
#if DEBUG_ABYSS
```
[15.4487864]
[28.31605]
```
#ifdef DEBUG_ABYSS
```
Replacement in crawl-ref/source/abyss.cc at line 585 [15.4482606]
B:BD[15.4491250] → [28.31754:31770]
```
#if DEBUG_ABYSS
```
[15.4491250]
[28.31770]
```
#ifdef DEBUG_ABYSS
```
Replacement in crawl-ref/source/abyss.cc at line 594 [15.4482606]
B:BD[15.4491341] → [28.31881:31897]
```
#if DEBUG_ABYSS
```
[15.4491341]
[28.31897]
```
#ifdef DEBUG_ABYSS
```
Insertion in crawl-ref/source/abyss.cc at line 602 [15.4482606]
[4.2839]
[15.4491592]
```
#ifdef USE_TILE
    tile_init_flavor();
#endif
```
Deletion in crawl-ref/source/abyss.cc at line 607 [15.4482606]
∅:D[4.2879] → [29.17023:17029]
B:BD[29.17023] → [29.17023:17029]
```
    {
```
Deletion in crawl-ref/source/abyss.cc at line 609 [15.4482606]
∅:D[25.40748] → [29.17099:17105]
B:BD[29.17099] → [29.17099:17105]
```
    }
```

Insertion in crawl-ref/source/abyss.cc at line 638 [15.4482606]

[25.40866]

[28.32008]


#ifdef USE_TILE
    // Update the wall colours.
    TileLoadWall(true);
#endif

For Tiles, use some of the other wall types in the Abyss as well to make

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 2566 [6.5936]

Replacement in crawl-ref/source/tile2.cc at line 993 [11.13289]

Replacement in crawl-ref/source/tile2.cc at line 2073 [11.13289]

Replacement in crawl-ref/source/lev-pand.cc at line 166 [15.2574562]

Replacement in crawl-ref/source/files.cc at line 1201 [15.3084589]

Replacement in crawl-ref/source/files.cc at line 1700 [15.3084589]

Replacement in crawl-ref/source/effects.cc at line 2117 [15.3382105]

Replacement in crawl-ref/source/effects.cc at line 2120 [15.3382105]

Insertion in crawl-ref/source/dungeon.cc at line 448 [15.3429798]

Replacement in crawl-ref/source/acr.cc at line 4089 [15.4397395]

Insertion in crawl-ref/source/abyss.cc at line 41 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 47 [15.4482606]

Insertion in crawl-ref/source/abyss.cc at line 55 [15.4482606]

Insertion in crawl-ref/source/abyss.cc at line 59 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 106 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 237 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 283 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 312 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 432 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 585 [15.4482606]

Replacement in crawl-ref/source/abyss.cc at line 594 [15.4482606]

Insertion in crawl-ref/source/abyss.cc at line 602 [15.4482606]

Deletion in crawl-ref/source/abyss.cc at line 607 [15.4482606]

Deletion in crawl-ref/source/abyss.cc at line 609 [15.4482606]

Insertion in crawl-ref/source/abyss.cc at line 638 [15.4482606]