fiddlerwoaroof/crawl - Change WWR4IDWLXP4XLBWDZBA5GFG7CRKUJQNRK7FFUFOISK6OJTMYQPFQC

s/island/shoal/

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

Created by haranp on April 27, 2007

WWR4IDWLXP4XLBWDZBA5GFG7CRKUJQNRK7FFUFOISK6OJTMYQPFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1853 [6.16817]
B:BD[4.16600] → [5.5:44]
```
        case DNGN_RETURN_FROM_ISLANDS:
```
[4.16600]
[4.16600]
```
        case DNGN_RETURN_FROM_SHOALS:
```
Replacement in crawl-ref/source/view.cc at line 1877 [6.16817]
B:BD[4.17274] → [5.45:78]
```
        case DNGN_ENTER_ISLANDS:
```
[4.17274]
[4.17274]
```
        case DNGN_ENTER_SHOALS:
```
Replacement in crawl-ref/source/view.cc at line 3025 [6.16817]
B:BD[7.55262] → [5.79:112]
```
        case DNGN_ENTER_ISLANDS:
```
[7.55262]
[7.55298]
```
        case DNGN_ENTER_SHOALS:
```
Replacement in crawl-ref/source/view.cc at line 3056 [6.16817]
B:BD[7.56428] → [5.113:152]
```
        case DNGN_RETURN_FROM_ISLANDS:
```
[7.56428]
[7.56465]
```
        case DNGN_RETURN_FROM_SHOALS:
```
Replacement in crawl-ref/source/travel.cc at line 524 [4.39949]
B:BD[4.57064] → [5.164:210]
```
    traversable_terrain[DNGN_ENTER_ISLANDS] =
```
[4.57064]
[4.57064]
```
    traversable_terrain[DNGN_ENTER_SHOALS] =
```

Replacement in crawl-ref/source/travel.cc at line 538 [4.39949]

B:BD[4.57742] → [5.211:263]

    traversable_terrain[DNGN_RETURN_FROM_ISLANDS] =

[4.57742]

    traversable_terrain[DNGN_RETURN_FROM_SHOALS] =

Replacement in crawl-ref/source/travel.cc at line 648 [4.39949]
B:BD[4.61117] → [5.264:293]
```
    case DNGN_ENTER_ISLANDS:
```
[4.61117]
[4.61117]
```
    case DNGN_ENTER_SHOALS:
```
Replacement in crawl-ref/source/travel.cc at line 662 [4.39949]
B:BD[4.61574] → [5.294:329]
```
    case DNGN_RETURN_FROM_ISLANDS:
```
[4.61574]
[4.61574]
```
    case DNGN_RETURN_FROM_SHOALS:
```

Replacement in crawl-ref/source/newgame.cc at line 360 [6.1132300]

B:BD[5.773] → [5.773:823]

        branches[BRANCH_ISLANDS].startdepth = -1;

[5.773]

[5.823]

        branches[BRANCH_SHOALS].startdepth = -1;

Replacement in crawl-ref/source/newgame.cc at line 365 [6.1132300]

B:BD[5.892] → [5.892:958]

        branches[BRANCH_ISLANDS].startdepth = random_range(2, 7);

[5.892]

[5.958]

        branches[BRANCH_SHOALS].startdepth = random_range(2, 7);

Replacement in crawl-ref/source/monplace.cc at line 856 [6.1641732]

B:BD[5.2580] → [5.2580:2648]

        if ( one_chance_in(5) || player_in_branch(BRANCH_ISLANDS) )

[5.2580]

[5.2648]

        if ( one_chance_in(5) || player_in_branch(BRANCH_SHOALS) )

Replacement in crawl-ref/source/mon-pick.h at line 78 [6.1765686]

B:BD[8.5078] → [5.2861:2928]

int mons_islands_level(int mcls);
int mons_islands_rare(int mcls);

[8.5078]

int mons_shoals_level(int mcls);
int mons_shoals_rare(int mcls);

Replacement in crawl-ref/source/mon-pick.cc at line 1877 [6.1767507]
B:BD[5.2931] → [5.2931:2964]
```
int mons_islands_level(int mcls)
```
[5.2931]
[5.2964]
```
int mons_shoals_level(int mcls)
```
Replacement in crawl-ref/source/mon-pick.cc at line 1879 [6.1767507]
B:BD[5.2966] → [5.2966:3018]
```
    int mlev = absdungeon_depth(BRANCH_ISLANDS, 1);
```
[5.2966]
[5.3018]
```
    int mlev = absdungeon_depth(BRANCH_SHOALS, 1);
```
Replacement in crawl-ref/source/mon-pick.cc at line 1918 [6.1767507]
B:BD[5.3524] → [5.3524:3556]
```
int mons_islands_rare(int mcls)
```
[5.3524]
[5.3556]
```
int mons_shoals_rare(int mcls)
```
Replacement in crawl-ref/source/makeitem.cc at line 786 [9.927]
B:BD[9.21436] → [9.21436:21467]
```
            case RUNE_ISLANDS:
```
[9.21436]
[9.21467]
```
            case RUNE_SHOALS:
```

Replacement in crawl-ref/source/items.cc at line 615 [6.2584728]

B:BD[5.4094] → [5.4094:4197]

            case DNGN_ENTER_ISLANDS:
                mpr("There is a staircase to the Islands here.");

[5.4094]

[6.2602709]

            case DNGN_ENTER_SHOALS:
                mpr("There is a staircase to the Shoals here.");

Replacement in crawl-ref/source/items.cc at line 628 [6.2584728]
B:BD[6.2603170] → [5.4198:4241]
```
            case DNGN_RETURN_FROM_ISLANDS:
```
[6.2603170]
[6.2603170]
```
            case DNGN_RETURN_FROM_SHOALS:
```
Replacement in crawl-ref/source/itemname.cc at line 663 [6.2667494]
B:BD[3.17262] → [3.17262:17306]
```
    case RUNE_ISLANDS:     return "liquid";
```
[3.17262]
[3.17306]
```
    case RUNE_SHOALS:      return "liquid";
```
Replacement in crawl-ref/source/enum.h at line 465 [6.3287960]
B:BD[8.11121] → [5.4342:4362]
```
    BRANCH_ISLANDS,
```
[8.11121]
[6.3300036]
```
    BRANCH_SHOALS,
```
Replacement in crawl-ref/source/enum.h at line 1021 [6.3287960]
B:BD[6.3309987] → [5.4363:4387]
```
    DNGN_ENTER_ISLANDS,
```
[6.3309987]
[7.911767]
```
    DNGN_ENTER_SHOALS,
```
Replacement in crawl-ref/source/enum.h at line 1039 [6.3287960]
B:BD[6.3310448] → [5.4388:4418]
```
    DNGN_RETURN_FROM_ISLANDS,
```
[6.3310448]
[7.911897]
```
    DNGN_RETURN_FROM_SHOALS,
```
Replacement in crawl-ref/source/enum.h at line 2847 [6.3287960]
B:BD[10.790] → [5.4419:4458]
```
    RUNE_ISLANDS     = BRANCH_ISLANDS,
```
[10.790]
[6.3354542]
```
    RUNE_SHOALS      = BRANCH_SHOALS,
```
Replacement in crawl-ref/source/dungeon.cc at line 102 [6.3429798]
B:BD[5.4492] → [5.4492:4523]
```
static void prepare_islands();
```
[5.4492]
[6.3432555]
```
static void prepare_shoals();
```

Replacement in crawl-ref/source/dungeon.cc at line 395 [6.3429798]

B:BD[5.4816] → [5.4816:4863]

            !player_in_branch(BRANCH_ISLANDS))

[5.4816]

[6.3437440]

            !player_in_branch(BRANCH_SHOALS))

Replacement in crawl-ref/source/dungeon.cc at line 541 [6.3429798]

B:BD[11.2373] → [5.4864:4938]

    else if (player_in_branch(BRANCH_ISLANDS))
        prepare_islands();

[11.2373]

    else if (player_in_branch(BRANCH_SHOALS))
        prepare_shoals();

Replacement in crawl-ref/source/dungeon.cc at line 577 [6.3429798]
B:BD[5.5027] → [5.5027:5070]
```
        !player_in_branch(BRANCH_ISLANDS))
```
[5.5027]
[6.3443387]
```
        !player_in_branch(BRANCH_SHOALS))
```
Replacement in crawl-ref/source/dungeon.cc at line 753 [6.3429798]
B:BD[2.1612] → [2.1612:1642]
```
static void prepare_islands()
```
[2.1612]
[2.1642]
```
static void prepare_shoals()
```

Replacement in crawl-ref/source/dungeon.cc at line 856 [6.3429798]

B:BD[2.3166] → [2.3166:3220]

                                   0, RUNE_ISLANDS );

[2.3166]

[2.3220]

                                   0, RUNE_SHOALS );

Replacement in crawl-ref/source/direct.cc at line 1275 [6.3697945]

B:BD[4.471715] → [5.10086:10163]

    case DNGN_ENTER_ISLANDS:
        return ("A staircase to the Islands.");

[4.471715]

    case DNGN_ENTER_SHOALS:
        return ("A staircase to the Shoals.");

Replacement in crawl-ref/source/direct.cc at line 1286 [6.3697945]
B:BD[4.472048] → [5.10164:10199]
```
    case DNGN_RETURN_FROM_ISLANDS:
```
[4.472048]
[4.472048]
```
    case DNGN_RETURN_FROM_SHOALS:
```

Replacement in crawl-ref/source/branch.cc at line 66 [8.14355]

B:BD[5.10232] → [5.10232:10365]

    { BRANCH_ISLANDS, BRANCH_LAIR, 5, 4,
      DNGN_ENTER_ISLANDS, DNGN_RETURN_FROM_ISLANDS,
      "Islands", "the Islands", "Isle",

[5.10232]

[5.10365]

    { BRANCH_SHOALS, BRANCH_LAIR, 5, 4,
      DNGN_ENTER_SHOALS, DNGN_RETURN_FROM_SHOALS,
      "Shoals", "the Shoals", "Shoal",

Replacement in crawl-ref/source/branch.cc at line 71 [8.14355]
B:BD[5.10409] → [5.10409:10454]
```
      mons_islands_rare, mons_islands_level,
```
[5.10409]
[5.10454]
```
      mons_shoals_rare, mons_shoals_level,
```

s/island/shoal/

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 1853 [6.16817]

Replacement in crawl-ref/source/view.cc at line 1877 [6.16817]

Replacement in crawl-ref/source/view.cc at line 3025 [6.16817]

Replacement in crawl-ref/source/view.cc at line 3056 [6.16817]

Replacement in crawl-ref/source/travel.cc at line 524 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 538 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 648 [4.39949]

Replacement in crawl-ref/source/travel.cc at line 662 [4.39949]

Replacement in crawl-ref/source/newgame.cc at line 360 [6.1132300]

Replacement in crawl-ref/source/newgame.cc at line 365 [6.1132300]

Replacement in crawl-ref/source/monplace.cc at line 856 [6.1641732]

Replacement in crawl-ref/source/mon-pick.h at line 78 [6.1765686]

Replacement in crawl-ref/source/mon-pick.cc at line 1877 [6.1767507]

Replacement in crawl-ref/source/mon-pick.cc at line 1879 [6.1767507]

Replacement in crawl-ref/source/mon-pick.cc at line 1918 [6.1767507]

Replacement in crawl-ref/source/makeitem.cc at line 786 [9.927]

Replacement in crawl-ref/source/items.cc at line 615 [6.2584728]

Replacement in crawl-ref/source/items.cc at line 628 [6.2584728]

Replacement in crawl-ref/source/itemname.cc at line 663 [6.2667494]

Replacement in crawl-ref/source/enum.h at line 465 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 1021 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 1039 [6.3287960]

Replacement in crawl-ref/source/enum.h at line 2847 [6.3287960]

Replacement in crawl-ref/source/dungeon.cc at line 102 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 395 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 541 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 577 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 753 [6.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 856 [6.3429798]

Replacement in crawl-ref/source/direct.cc at line 1275 [6.3697945]

Replacement in crawl-ref/source/direct.cc at line 1286 [6.3697945]

Replacement in crawl-ref/source/branch.cc at line 66 [8.14355]

Replacement in crawl-ref/source/branch.cc at line 71 [8.14355]