fiddlerwoaroof/crawl - Change BY5XD4MZ34JNBO4Y3QFE7DKUW5VYW3NXJGQWF3YHZDC35LLO7MHQC

FR 2839615: comment on # of altars/shops sensed

FR: Magic mapping now comments on the number of altars and shops/portals sensed.

Also, take a note when a notable feature is first seen.

Created by Matthew Cline on October 25, 2009

BY5XD4MZ34JNBO4Y3QFE7DKUW5VYW3NXJGQWF3YHZDC35LLO7MHQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/view.cc at line 265 [5.16817]

B:BD[3.4658] → [4.27:313]

    if (!(env.map[x][y].flags & (MAP_MAGIC_MAPPED_FLAG | MAP_SEEN_FLAG))
        && grd[x][y] == DNGN_ENTER_LABYRINTH)
    {
        coord_def pos(x, y);
        take_note(Note(NOTE_SEEN_FEAT, 0, 0,
                       feature_description(pos, false, DESC_NOCAP_A).c_str()));
    }

Replacement in crawl-ref/source/view.cc at line 274 [5.16817]

B:BD[3.4803] → [4.314:599]

    if (!(env.map[x][y].flags & (MAP_MAGIC_MAPPED_FLAG | MAP_SEEN_FLAG))
        && grd[x][y] == DNGN_ENTER_LABYRINTH)
    {
        coord_def pos(x, y);
        take_note(Note(NOTE_SEEN_FEAT, 0, 0,
                       feature_description(pos, false, DESC_NOCAP_A).c_str()));
    }

[3.4803]

[4.599]

    const dungeon_feature_type feat = grd[x][y];

Replacement in crawl-ref/source/view.cc at line 276 [5.16817]

B:BD[4.600] → [4.600:833]

    // Magic mapping doesn't reveal the description of the portal vault
    // entrance.
    if (!(env.map[x][y].flags & MAP_SEEN_FLAG)
        && grd[x][y] == DNGN_ENTER_PORTAL_VAULT
        && you.level_type != LEVEL_PORTAL_VAULT)

[4.600]

[4.833]

    // First time we've seen a notable feature.
    if (!(env.map[x][y].flags & MAP_SEEN_FLAG) && is_notable_terrain(feat))

Replacement in crawl-ref/source/view.cc at line 279 [5.16817]

B:BD[4.839] → [4.839:993]

        coord_def pos(x, y);
        take_note(Note(NOTE_SEEN_FEAT, 0, 0,
                       feature_description(pos, false, DESC_NOCAP_A).c_str()));

[4.839]

[4.993]

        const bool boring =
            // A portal deeper into the Zigguart is boring.
            (feat == DNGN_ENTER_PORTAL_VAULT
             && you.level_type == LEVEL_PORTAL_VAULT)
            // Altars in the temple are boring.
            || (feat_is_altar(feat)
                && player_in_branch(BRANCH_ECUMENICAL_TEMPLE))
            // Only note the first entrance to the Abyss/Pan/Hell
            // which is found.
            || ((feat == DNGN_ENTER_ABYSS || feat == DNGN_ENTER_PANDEMONIUM
                 || feat == DNGN_ENTER_HELL)
                && overmap_knows_num_portals(feat) > 1)
            // There are at least three Zot entrances, and they're always
            // on D:27, so ignore them.
            || feat == DNGN_ENTER_ZOT;
        if (!boring)
        {
            coord_def pos(x, y);
            std::string desc = 
                feature_description(pos, false, DESC_NOCAP_A);
            take_note(Note(NOTE_SEEN_FEAT, 0, 0, desc.c_str()));
        }

Insertion in crawl-ref/source/view.cc at line 2882 [5.16817]
[6.4580]
[6.4580]
```
    int  num_altars        = 0;
    int  num_shops_portals = 0;
```
Insertion in crawl-ref/source/view.cc at line 2906 [5.16817]
[5.79678]
[7.5597]
```
        const dungeon_feature_type feat = grd(*ri);
```

Replacement in crawl-ref/source/view.cc at line 2910 [5.16817]

B:BD[5.79708] → [2.2009:2080]

        if (feat_is_solid(grd(*ri)) && !feat_is_closed_door(grd(*ri)))

[5.79708]

[7.5693]

        if (feat_is_solid(feat) && !feat_is_closed_door(feat))

Insertion in crawl-ref/source/view.cc at line 2931 [5.16817]

[8.1608]

[9.35]

                if (is_notable_terrain(feat))
                    seen_notable_thing(feat, *ri);

Insertion in crawl-ref/source/view.cc at line 2943 [5.16817]
[7.6496]
[9.75]
```
            {
```

Insertion in crawl-ref/source/view.cc at line 2946 [5.16817]

[6.4808]

                if (get_feature_dchar(feat) == DCHAR_ALTAR)
                    num_altars++;
                else if (get_feature_dchar(feat) == DCHAR_ARCH)
                    num_shops_portals++;
            }

Insertion in crawl-ref/source/view.cc at line 2960 [5.16817]

[6.4987]


        std::vector<std::string> sensed;
        if (num_altars > 0)
            sensed.push_back(make_stringf("%d altar%s", num_altars,
                                          num_altars > 1 ? "s" : ""));
        if (num_shops_portals > 0)
        {
            const char* plur = num_shops_portals > 1 ? "s" : "";
            sensed.push_back(make_stringf("%d shop%s/portal%s",
                                          num_shops_portals, plur, plur));
        }
        if (!sensed.empty())
            mpr_comma_separated_list("You sensed ", sensed);

Insertion in crawl-ref/source/overmap.h at line 17 [5.1068481]
[10.3096]
[11.7455]
```
int  overmap_knows_num_portals(dungeon_feature_type portal);
```

Insertion in crawl-ref/source/overmap.cc at line 189 [5.1070017]

[12.3497]

int overmap_knows_num_portals(dungeon_feature_type portal)
{
    int num = 0;
    for ( portal_map_type::const_iterator pl_iter = portals_present.begin();
          pl_iter != portals_present.end(); ++pl_iter )
    {
        if (portal_to_feature(pl_iter->second) == portal)
            num++;
    }
    return (num);
}