fiddlerwoaroof/crawl - Change HIRHNITBXDQPXPKSZKCBST7EGNWPYM2NKJARLKKCPISD74HBLK7AC

* Merfolk may wear heavy armour while swimming, though their armour

penalty is doubled in deep water.

Change "zombified ally" -> "mindless thrall" (and only count friendly monsters).
Call trackers_init_new_level() earlier, in load(), so that TileNewLevel() can use the correct travel information when drawing exclusions on the minimap.

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

Created by j-p-e-g on March 29, 2009

HIRHNITBXDQPXPKSZKCBST7EGNWPYM2NKJARLKKCPISD74HBLK7AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 181 [9.3]
[7.520]
[8.103]
```
#define DEBUG_XOM
```
Replacement in crawl-ref/source/view.cc at line 4150 [12.16817]
B:BD[10.897] → [11.674:714]
```
        Feature[i].minimap = MF_UNSEEN;
```
[10.897]
[12.91347]
```
        Feature[i].minimap        = MF_UNSEEN;
```
Deletion in crawl-ref/source/travel.h at line 67 [14.29464]
∅:D[13.1677] → [14.30312:30336]
B:BD[14.30312] → [14.30312:30336]
```
void update_excludes();
```
Deletion in crawl-ref/source/tilesdl.cc at line 393 [11.19415]
B:BD[11.25351] → [11.25351:25357]
```
    {
```
Replacement in crawl-ref/source/tilesdl.cc at line 414 [11.19415]
∅:D[15.404] → [11.26015:26060]
∅:D[4.596] → [11.26015:26060]
B:BD[11.26015] → [11.26015:26060]
```
                bg |=  tile_unseen_flag(gc);
```
[4.596]
[11.26060]
```
                bg |= tile_unseen_flag(gc);
```
Deletion in crawl-ref/source/tilesdl.cc at line 428 [11.19415]
B:BD[11.26374] → [11.26374:26380]
```
    }
```

Replacement in crawl-ref/source/tilesdl.cc at line 1230 [11.19415]

B:BD[11.39149] → [11.39149:39198]

    else if (f == MF_FLOOR || f == MF_MAP_FLOOR)

[11.39149]

[11.39198]

    else if (f == MF_FLOOR || f == MF_MAP_FLOOR || f == MF_WATER)

Replacement in crawl-ref/source/tilepick.cc at line 41 [18.96318]

B:BD[16.958] → [17.1196:1268]

    for (int y = 0; y < GYM; y++)
        for (int x = 0; x < GXM; x++)

[16.958]

[17.1268]

    for (unsigned int x = 0; x < GXM; x++)
        for (unsigned int y = 0; y < GYM; y++)

Replacement in crawl-ref/source/player.cc at line 2248 [12.962854]
∅:D[19.381] → [12.998182:998243]
B:BD[12.998182] → [12.998182:998243]
```
}                               // end player_light_armour()
```
[19.381]
[12.998243]
```
}
```

Replacement in crawl-ref/source/player.cc at line 2391 [12.962854]

B:BD[20.537] → [20.537:604]

            const int ev_bonus = std::min(9, std::max(2, ev / 4));

[20.537]

[20.604]

            // ... though a bit less so if swimming in heavy armour.
            int factor = 4;
            int min_bonus = 2;
            if (grd(you.pos()) == DNGN_DEEP_WATER && !player_light_armour())
            {
                factor = 6;
                min_bonus = 1;
            }
            const int ev_bonus = std::min(9, std::max(min_bonus, ev / factor));

Deletion in crawl-ref/source/misc.cc at line 1243 [12.1933596]
B:BD[21.8174] → [21.8174:8240]
```
    if (!player_light_armour())
        r.insert(EQ_BODY_ARMOUR);
```
Deletion in crawl-ref/source/misc.cc at line 1256 [12.1933596]
∅:D[22.3007] → [12.1943186:1943187]
∅:D[21.8401] → [12.1943186:1943187]
B:BD[12.1943186] → [12.1943186:1943187]
B:BD[12.1943254] → [12.1943254:1943477]
B:BD[12.1943477] → [21.8402:8451]
∅:D[22.3048] → [12.1943670:1943671]
∅:D[21.8451] → [12.1943670:1943671]
B:BD[12.1943670] → [12.1943670:1943671]
```
    // Perhaps a bit to easy for the player, but we allow merfolk
    // to slide out of heavy body armour freely when entering water,
    // rather than handling emcumbered swimming. -- bwr
    if (!player_light_armour())
        remove_one_equip(EQ_BODY_ARMOUR, false);
```
Deletion in crawl-ref/source/misc.cc at line 1836 [12.1933596]
B:BD[14.249142] → [23.130:229]
B:BD[23.229] → [24.18957:18958]
```
    // Tell stash-tracker and travel that we've changed levels.
    trackers_init_new_level(true);
```

Deletion in crawl-ref/source/itemprop.cc at line 1264 [25.646661]

B:BD[25.681522] → [26.8784:8828]

∅:D[26.8828] → [25.681565:681772]

B:BD[25.681565] → [25.681565:681772]

            // Cannot swim in heavy armour.
            if (player_is_swimming() && !is_light_armour( item ))
            {
                if (!quiet)
                   mpr("You can't swim in that!");
                return (false);
            }

Deletion in crawl-ref/source/item_use.cc at line 989 [12.2781507]
∅:D[27.6475] → [12.2801061:2801093]
B:BD[12.2801061] → [12.2801061:2801093]
B:BD[12.2801093] → [2.2539:2575]
∅:D[2.2575] → [28.2083:2141]
B:BD[12.2801128] → [28.2083:2141]
∅:D[28.2141] → [25.735854:735888]
B:BD[12.2801157] → [25.735854:735888]
B:BD[25.735888] → [28.2142:2179]
∅:D[28.2179] → [12.2801241:2801247]
∅:D[25.735928] → [12.2801241:2801247]
B:BD[12.2801241] → [12.2801241:2801247]
B:BD[12.2801247] → [28.2180:2201]
∅:D[28.2201] → [12.2801267:2801310]
B:BD[12.2801267] → [12.2801267:2801310]
```
        return (false);
    }
    // Cannot swim in heavy armour.
    if (!ignore_temporary
        && player_is_swimming()
        && slot == EQ_BODY_ARMOUR
        && !is_light_armour( item ))
    {
        if (verbose)
           mpr("You can't swim in that!");
```

Replacement in crawl-ref/source/files.cc at line 971 [12.3084589]

B:BD[29.9064] → [5.2772:2813]

        if (!mons_can_use_stairs(fmenv))

[29.9064]

[5.2813]

        if (mons_wont_attack(fmenv) && !mons_can_use_stairs(fmenv))

Replacement in crawl-ref/source/files.cc at line 988 [12.3084589]

B:BD[5.3024] → [5.3024:3199]

            mprf("Your zombified all%s stay%s behind.",
                 non_stair_using_allies > 1 ? "ies" : "y",
                 non_stair_using_allies > 1 ? ""    : "s");

[5.3024]

[5.3199]

            mprf("Your mindless thrall%s stay%s behind.",
                 non_stair_using_allies > 1 ? "s" : "",
                 non_stair_using_allies > 1 ? ""  : "s");

Insertion in crawl-ref/source/files.cc at line 1252 [12.3084589]

[30.15217]

[31.2857]

    // Tell stash-tracker and travel that we've changed levels.
    if (load_mode != LOAD_VISITOR)
    {
        // Tell stash-tracker and travel that we've changed levels.
        trackers_init_new_level(true);

Deletion in crawl-ref/source/files.cc at line 1258 [12.3084589]
B:BD[31.2873] → [3.2752:2787]
```
    if (load_mode != LOAD_VISITOR)
```
Insertion in crawl-ref/source/files.cc at line 1260 [12.3084589]
[31.2944]
[31.2944]
```
    }
```

Replacement in crawl-ref/source/fight.cc at line 224 [12.3140790]

B:BD[12.3146733] → [12.3146733:3146859]

        const int ev_pen = property( you.inv[you.equip[EQ_BODY_ARMOUR]],
                                     PARM_EVASION );

[12.3146733]

[12.3146859]

        int ev_pen = property( you.inv[you.equip[EQ_BODY_ARMOUR]],
                               PARM_EVASION );
        // Wearing heavy armour in water is particularly cumbersome.
        if (you.species == SP_MERFOLK && grd(you.pos()) == DNGN_DEEP_WATER
            && player_is_swimming())
        {
            ev_pen *= 2;
        }

Replacement in crawl-ref/source/enum.h at line 1536 [12.3287960]
B:BD[11.173043] → [11.173043:173058]
```
    MF_UNSEEN,
```
[11.173043]
[11.173058]
```
    MF_UNSEEN,          //  0
```
Replacement in crawl-ref/source/enum.h at line 1541 [12.3287960]
B:BD[11.173120] → [11.173120:173133]
```
    MF_DOOR,
```
[11.173120]
[11.173133]
```
    MF_DOOR,            //  5
```
Replacement in crawl-ref/source/enum.h at line 1546 [12.3287960]
B:BD[11.173210] → [11.173210:173230]
```
    MF_MONS_NO_EXP,
```
[11.173210]
[11.173230]
```
    MF_MONS_NO_EXP,     // 10
```
Replacement in crawl-ref/source/enum.h at line 1551 [12.3287960]
B:BD[11.173303] → [11.173303:173317]
```
    MF_WATER,
```
[11.173303]
[11.173317]
```
    MF_WATER,           // 15
```
Replacement in crawl-ref/source/enum.h at line 1556 [12.3287960]
B:BD[11.173374] → [11.173374:173389]
```
    MF_PLAYER,
```
[11.173374]
[11.173389]
```
    MF_PLAYER,          // 20
```
Replacement in crawl-ref/source/enum.h at line 1559 [12.3287960]
B:BD[11.173402] → [11.173402:173414]
```
    MF_SKIP
```
[11.173402]
[11.173414]
```
    MF_SKIP             // 22
```

Replacement in crawl-ref/source/describe.cc at line 1641 [12.3736416]

B:BD[32.6325] → [32.6325:6386]

        std::string name = (is_memorised(stype)) ? "*" : "";

[32.6325]

[32.6386]

        std::string name = (is_memorised(stype) ? "*" : "");

Replacement in crawl-ref/source/command.cc at line 1413 [12.4082507]
B:BD[33.16933] → [33.16933:16954]
```
    inf.title = key;
```
[33.16933]
[33.16954]
```
    inf.title  = key;
```
Insertion in crawl-ref/docs/changes.stone_soup at line 63 [36.210753]
[34.3331]
[35.2922]
```
* Monsters will now shout when woken, unless stabbed.
```
Replacement in crawl-ref/docs/changes.stone_soup at line 116 [36.210753]
B:BD[37.3655] → [6.8415:8458]
```
* ?fear don't turn allies hostile anymore.
```
[37.3655]
[38.3099]
```
* ?fear doesn't turn allies hostile anymore.
```

* Merfolk may wear heavy armour while swimming, though their armour

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/xom.cc at line 181 [9.3]

Replacement in crawl-ref/source/view.cc at line 4150 [12.16817]

Deletion in crawl-ref/source/travel.h at line 67 [14.29464]

Deletion in crawl-ref/source/tilesdl.cc at line 393 [11.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 414 [11.19415]

Deletion in crawl-ref/source/tilesdl.cc at line 428 [11.19415]

Replacement in crawl-ref/source/tilesdl.cc at line 1230 [11.19415]

Replacement in crawl-ref/source/tilepick.cc at line 41 [18.96318]

Replacement in crawl-ref/source/player.cc at line 2248 [12.962854]

Replacement in crawl-ref/source/player.cc at line 2391 [12.962854]

Deletion in crawl-ref/source/misc.cc at line 1243 [12.1933596]

Deletion in crawl-ref/source/misc.cc at line 1256 [12.1933596]

Deletion in crawl-ref/source/misc.cc at line 1836 [12.1933596]

Deletion in crawl-ref/source/itemprop.cc at line 1264 [25.646661]

Deletion in crawl-ref/source/item_use.cc at line 989 [12.2781507]

Replacement in crawl-ref/source/files.cc at line 971 [12.3084589]

Replacement in crawl-ref/source/files.cc at line 988 [12.3084589]

Insertion in crawl-ref/source/files.cc at line 1252 [12.3084589]

Deletion in crawl-ref/source/files.cc at line 1258 [12.3084589]

Insertion in crawl-ref/source/files.cc at line 1260 [12.3084589]

Replacement in crawl-ref/source/fight.cc at line 224 [12.3140790]

Replacement in crawl-ref/source/enum.h at line 1536 [12.3287960]

Replacement in crawl-ref/source/enum.h at line 1541 [12.3287960]

Replacement in crawl-ref/source/enum.h at line 1546 [12.3287960]

Replacement in crawl-ref/source/enum.h at line 1551 [12.3287960]

Replacement in crawl-ref/source/enum.h at line 1556 [12.3287960]

Replacement in crawl-ref/source/enum.h at line 1559 [12.3287960]

Replacement in crawl-ref/source/describe.cc at line 1641 [12.3736416]

Replacement in crawl-ref/source/command.cc at line 1413 [12.4082507]

Insertion in crawl-ref/docs/changes.stone_soup at line 63 [36.210753]

Replacement in crawl-ref/docs/changes.stone_soup at line 116 [36.210753]