fiddlerwoaroof/crawl - Change XDACRDVLDEUFUBN4L7ES5WBD3YSLBHMRZ4Q5PXIUMOK44D3TLWSAC

Smarter exclusions, yay!

Exclusions are now treated similarly to annotations and automatically added to the overmap (with the monster name if centered on a monster).
Exclusions remember whether they were placed automatically and if so, what monster triggered it.
If a grid that was previously autoexcluded comes back into sight and no longer contains the monster that triggered the autoexclusion (dead, moved away or invisible), the autoexclusion is removed again.

I updated the tags, so it should be save compatible but I'm not making any promises.

Also fix the Wild magic card not being documented correctly.

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

Created by j-p-e-g on September 15, 2009

XDACRDVLDEUFUBN4L7ES5WBD3YSLBHMRZ4Q5PXIUMOK44D3TLWSAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.cc at line 5339 [8.16817]

[6.2721]

[7.894]

                if (in_bounds(gc) && see_grid(gc) && is_exclude_root(gc))
                    maybe_remove_autoexclusion(gc);

Replacement in crawl-ref/source/travel.h at line 63 [10.29464]

B:BD[9.1289] → [9.1289:1381]

void toggle_exclude(const coord_def &p);
void set_exclude(const coord_def &p, int radius2);

[9.1289]

[10.30248]

void toggle_exclude(const coord_def &p, bool autoexcl = false);
void set_exclude(const coord_def &p, int radius2, bool autoexcl = false);
void maybe_remove_autoexclusion(const coord_def &p);
std::string get_exclusion_desc();

Insertion in crawl-ref/source/travel.h at line 68 [10.29464]
[10.30271]
[11.1630]

Replacement in crawl-ref/source/travel.h at line 357 [10.29464]

B:BD[9.1449] → [12.2578:2786]

    coord_def     pos;       // exclusion centre
    int           radius;    // exclusion radisu
    env_show_grid show;      // los from exclusion centre
    bool          uptodate;  // Is show up to date?

[9.1449]

[9.1490]

    coord_def     pos;         // exclusion centre
    int           radius;      // exclusion radius
    bool          autoexclude; // Was set automatically.
    int           mon;         // Monster around which exclusion is centered.
    env_show_grid show;        // los from exclusion centre
    bool          uptodate;    // Is show up to date?

Replacement in crawl-ref/source/travel.h at line 366 [10.29464]

∅:D[13.352] → [9.1491:1578]

B:BD[9.1491] → [9.1491:1578]

    travel_exclude(const coord_def &p, int r = LOS_RADIUS)
        : pos(p), radius(r)

[13.352]

[9.1578]

    travel_exclude(const coord_def &p, int r = LOS_RADIUS,
                   bool autoexcl = false, int mons = NON_MONSTER)
        : pos(p), radius(r), autoexclude(autoexcl), mon(mons)

Replacement in crawl-ref/source/travel.h at line 387 [10.29464]
B:BD[14.956] → [14.956:980]
```
    void load(reader&);
```
[14.956]
[10.36873]
```
    void load(reader&, char minorVersion);
```
Replacement in crawl-ref/source/travel.h at line 499 [10.29464]
B:BD[14.1011] → [14.1011:1035]
```
    void load(reader&);
```
[14.1011]
[10.39561]
```
    void load(reader&, char minorVersion);
```
Insertion in crawl-ref/source/travel.cc at line 427 [10.39949]
[10.47297]
[15.353]
```
    clear_level_exclusion_annotation();
```
Replacement in crawl-ref/source/travel.cc at line 460 [10.39949]
B:BD[9.3054] → [9.3054:3094]
```
void toggle_exclude(const coord_def &p)
```
[9.3054]
[9.3094]
```
void toggle_exclude(const coord_def &p, bool autoexcl)
```
Replacement in crawl-ref/source/travel.cc at line 465 [10.39949]
B:BD[9.3160] → [2.329:365]
```
        set_exclude(p, LOS_RADIUS);
```
[9.3160]
[16.712]
```
        set_exclude(p, LOS_RADIUS, autoexcl);
```
Insertion in crawl-ref/source/travel.cc at line 470 [10.39949]
[16.769]
[9.3196]
```
    set_level_exclusion_annotation(get_exclusion_desc());
```

Replacement in crawl-ref/source/travel.cc at line 473 [10.39949]

B:BD[9.3199] → [9.3199:3248]

void set_exclude(const coord_def &p, int radius)

[9.3199]

[9.3248]

void set_exclude(const coord_def &p, int radius, bool autoexcl)

Replacement in crawl-ref/source/travel.cc at line 504 [10.39949]

B:BD[10.48091] → [9.3772:3832]

        curr_excludes.push_back(travel_exclude(p, radius));

[10.48091]

[10.48159]

        int montype = NON_MONSTER;
        const monsters *m = monster_at(p);
        if (m && mons_near(m) && you.can_see(m))
            montype = m->type;
        curr_excludes.push_back(travel_exclude(p, radius, autoexcl, montype));

Insertion in crawl-ref/source/travel.cc at line 516 [10.39949]

[10.48342]

[10.48721]

    }
}
// If a grid that was placed automatically no longer contains the original
// monster (or it is invisible), remove the exclusion.
void maybe_remove_autoexclusion(const coord_def &p)
{
    ASSERT(in_bounds(p) && see_grid(p) && is_exclude_root(p));
    for (int i = 0, count = curr_excludes.size(); i < count; ++i)
    {
        if (curr_excludes[i].pos == p)
        {
            if (curr_excludes[i].autoexclude)
            {
                const monsters *m = monster_at(p);
                if (!m || !you.can_see(m) || m->type != curr_excludes[i].mon)
                {
                    set_exclude(p, 0);
                    set_level_exclusion_annotation(get_exclusion_desc());
                }
            }
            break;
        }
    }
}
// Lists alls exclusions on the current level.
std::string get_exclusion_desc()
{
    std::vector<std::string> monsters;
    int count_other = 0;
    for (int i = 0, count = curr_excludes.size(); i < count; ++i)
    {
        if (curr_excludes[i].mon != NON_MONSTER)
            monsters.push_back(get_monster_data(curr_excludes[i].mon)->name);
        else
            count_other++;

Insertion in crawl-ref/source/travel.cc at line 555 [10.39949]

[10.48727]

[17.340]


    if (count_other > 0)
    {
        snprintf(info, INFO_SIZE, "%d %sexclusion%s",
                 count_other, monsters.empty() ? "" : "more ",
                 count_other > 1 ? "s" : "");
        monsters.push_back(info);
    }
    else if (monsters.empty())
        return "";
    std::string desc = "";
    if (monsters.size() > 1 || count_other == 0)
    {
        snprintf(info, INFO_SIZE, "exclusion%s: ",
                 monsters.size() > 1 ? "s" : "");
        desc += info;
    }
    return (desc + comma_separated_line(monsters.begin(), monsters.end(),
                                        ", and ", ", "));

Insertion in crawl-ref/source/travel.cc at line 3663 [10.39949]

[14.2497]

[10.123532]

            marshallBoolean(outf, excludes[i].autoexclude);
            marshallShort(outf, excludes[i].mon);

Replacement in crawl-ref/source/travel.cc at line 3669 [10.39949]
B:BD[10.123551] → [14.2498:2532]
```
void LevelInfo::load(reader& inf)
```
[10.123551]
[10.123614]
```
void LevelInfo::load(reader& inf, char minorVersion)
```

Replacement in crawl-ref/source/travel.cc at line 3705 [10.39949]

∅:D[14.2798] → [9.4894:4953]

B:BD[9.4894] → [9.4894:4953]

            excludes.push_back(travel_exclude(c, radius));

[14.2798]

[10.124586]

            bool autoexcl    = false;
            int mon          = NON_MONSTER;
            if (minorVersion >= TAG_ANNOTATE_EXCL)
            {
                autoexcl = unmarshallBoolean(inf);
                mon      = unmarshallShort(inf);
            }
            excludes.push_back(travel_exclude(c, radius, autoexcl, mon));

Replacement in crawl-ref/source/travel.cc at line 3974 [10.39949]
B:BD[10.129490] → [14.3062:3098]
```
void TravelCache::load(reader& inf)
```
[10.129490]
[10.129525]
```
void TravelCache::load(reader& inf, char minorVersion)
```
Replacement in crawl-ref/source/travel.cc at line 3993 [10.39949]
B:BD[10.130057] → [14.3262:3287]
```
        linfo.load(inf);
```
[10.130057]
[10.130083]
```
        linfo.load(inf, minorVersion);
```

Replacement in crawl-ref/source/tags.h at line 72 [8.161012]

B:BD[4.329] → [4.329:404]

    TAG_MINOR_VERSION  = 19      // Current version.  (Keep equal to max.)

[4.329]

[18.493]

    TAG_ANNOTATE_EXCL  = 20,     // Store exclusion information for annotations.
    TAG_MINOR_VERSION  = 20      // Current version.  (Keep equal to max.)

Insertion in crawl-ref/source/tags.cc at line 99 [8.164589]
[19.1382]
[8.167976]
```
extern std::map<level_id, std::string> level_exclusions;
```

Replacement in crawl-ref/source/tags.cc at line 170 [8.164589]

B:BD[20.3863] → [20.3863:3909]

static void tag_read_you_dungeon(reader &th);

[20.3863]

[3.252]

static void tag_read_you_dungeon(reader &th, char minorVersion);

Replacement in crawl-ref/source/tags.cc at line 726 [8.164589]

B:BD[21.1348] → [21.1348:1427]

    case TAG_YOU_DUNGEON:    tag_read_you_dungeon(th);                  break;

[21.1348]

[21.1427]

    case TAG_YOU_DUNGEON:    tag_read_you_dungeon(th, minorVersion);    break;

Insertion in crawl-ref/source/tags.cc at line 1136 [8.164589]

[19.1685]

[20.9597]

                marshall_level_id, marshallStringNoMax);
    marshallMap(th, level_exclusions,

Replacement in crawl-ref/source/tags.cc at line 1581 [8.164589]
B:BD[22.2891] → [20.10404:10449]
```
static void tag_read_you_dungeon(reader &th)
```
[22.2891]
[8.202829]
```
static void tag_read_you_dungeon(reader &th, char minorVersion)
```

Insertion in crawl-ref/source/tags.cc at line 1622 [8.164589]

[22.2958]

    if (minorVersion >= TAG_ANNOTATE_EXCL)
    {
        unmarshallMap(th, level_exclusions,
                      unmarshall_level_id, unmarshallStringNoMax);
    }

Replacement in crawl-ref/source/spells4.cc at line 1362 [8.436250]
B:BD[8.501507] → [8.501507:501529]
```
    bool hole = true;
```
[8.501507]
[8.501529]
```
    bool hole    = true;
```

Insertion in crawl-ref/source/overmap.h at line 27 [8.1068481]

[19.5845]


void set_level_exclusion_annotation(std::string str,
                                    level_id li = level_id::current());
void clear_level_exclusion_annotation(level_id li = level_id::current());

Replacement in crawl-ref/source/overmap.h at line 32 [8.1068481]

B:BD[19.5846] → [19.5846:5915]

std::string get_level_annotation(level_id li = level_id::current());

[19.5846]

[19.5915]

std::string get_level_annotation(level_id li = level_id::current(),
                                 bool skip_excl = false);

Insertion in crawl-ref/source/overmap.cc at line 60 [8.1070017]
[19.6167]
[8.1071122]
```
annotation_map_type level_exclusions;
```

Replacement in crawl-ref/source/overmap.cc at line 725 [8.1070017]

B:BD[19.7961] → [19.7961:8007]

std::string get_level_annotation(level_id li)

[19.7961]

[19.8007]

void set_level_exclusion_annotation(std::string str, level_id li)
{
    if (str.empty())
    {
        clear_level_exclusion_annotation(li);
        return;
    }
    level_exclusions[li] = str;
}
void clear_level_exclusion_annotation(level_id li)
{
    level_exclusions.erase(li);
}
std::string get_level_annotation(level_id li, bool skip_excl)

Replacement in crawl-ref/source/overmap.cc at line 745 [8.1070017]

B:BD[19.8082] → [19.8082:8120]

    if (i == level_annotations.end())

[19.8082]

[19.8120]

    if (skip_excl)
    {
        if (i == level_annotations.end())
            return "";
        return (i->second);
    }
    annotation_map_type::const_iterator j = level_exclusions.find(li);
    if (i == level_annotations.end() && j == level_exclusions.end())

Replacement in crawl-ref/source/overmap.cc at line 758 [8.1070017]

B:BD[19.8140] → [19.8140:8164]

    return (i->second);

[19.8140]

[19.8164]

    if (i == level_annotations.end())
        return (j->second);
    if (j == level_annotations.end())
        return (i->second);
    return (i->second + ", " + j->second);

Replacement in crawl-ref/source/overmap.cc at line 803 [8.1070017]

B:BD[19.9142] → [19.9142:9190]

        mpr(get_level_annotation(li).c_str() );

[19.9142]

[19.9190]

        mpr(get_level_annotation(li, true).c_str() );

Replacement in crawl-ref/source/overmap.cc at line 815 [8.1070017]

B:BD[19.9348] → [19.9348:9399]

        if (get_level_annotation(li).length() > 0)

[19.9348]

[19.9399]

        if (get_level_annotation(li, true).length() > 0)

Replacement in crawl-ref/source/misc.cc at line 2772 [8.1933596]
B:BD[23.6820] → [23.6820:6856]
```
        toggle_exclude(mon->pos());
```
[23.6820]
[23.6856]
```
        toggle_exclude(mon->pos(), true);
```
Insertion in crawl-ref/source/files.cc at line 1444 [8.3084589]
[24.15898]
[25.2410]
```
    {
```
Insertion in crawl-ref/source/files.cc at line 1446 [8.3084589]
[25.2464]
[26.16425]
```
//         set_level_exclusion_annotation(get_exclusion_desc());
    }
```
Replacement in crawl-ref/source/files.cc at line 1824 [8.3084589]
B:BD[14.14478] → [14.14478:14510]
```
        travel_cache.load(inf);
```
[14.14478]
[27.872980]
```
        travel_cache.load(inf, minorVersion);
```

Replacement in crawl-ref/source/dat/descript/items.txt at line 512 [29.62757]

B:BD[28.5051] → [28.5051:5148]

It may contain the following cards: the Potion, Focus, Shuffle, Experience, the Helix, the Sage.

[28.5051]

[30.24573]

It may contain the following cards: the Potion, Focus, Shuffle, Experience, Wild Magic, the Helix, the Sage.

Replacement in crawl-ref/source/dat/descript/items.txt at line 1312 [29.62757]

B:BD[5.3850] → [5.3850:4063]

scrolls, casting spells, praying or yelling in the reader's vicinity 
impossible. (Applies to reader too, of course.) This silence will not 
hide your presence, since its oppressive, unnatural effect will almost

[5.3850]

[5.4063]

scrolls, casting spells, praying or yelling in the reader's vicinity
impossible. (Applies to reader too, of course.) This silence will not
hide your presence, since its oppressive, unnatural effect will almost

Insertion in crawl-ref/source/dat/descript/cards.txt at line 105 [31.2804]

[28.6903]

[31.4158]

%%%%
Wild Magic card
This card causes wild magic, as if from miscasting a spell, to act upon you.
It is usually found in the deck of wonders.

Deletion in crawl-ref/source/dat/descript/cards.txt at line 259 [31.2804]
B:BD[28.9039] → [32.12744:12760]
∅:D[32.12760] → [28.9050:9128]
B:BD[28.9050] → [28.9050:9128]
B:BD[28.9128] → [33.4361:4425]
∅:D[34.3753] → [28.9185:9190]
∅:D[33.4425] → [28.9185:9190]
B:BD[28.9185] → [28.9185:9190]
```
Wild Magic card
This card causes wild magic, as if from miscasting a spell, to act upon you.
It is usually only found in Nemelex Xobeh's deck of punishment.
%%%%
```

Smarter exclusions, yay!

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/view.cc at line 5339 [8.16817]

Replacement in crawl-ref/source/travel.h at line 63 [10.29464]

Insertion in crawl-ref/source/travel.h at line 68 [10.29464]

Replacement in crawl-ref/source/travel.h at line 357 [10.29464]

Replacement in crawl-ref/source/travel.h at line 366 [10.29464]

Replacement in crawl-ref/source/travel.h at line 387 [10.29464]

Replacement in crawl-ref/source/travel.h at line 499 [10.29464]

Insertion in crawl-ref/source/travel.cc at line 427 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 460 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 465 [10.39949]

Insertion in crawl-ref/source/travel.cc at line 470 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 473 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 504 [10.39949]

Insertion in crawl-ref/source/travel.cc at line 516 [10.39949]

Insertion in crawl-ref/source/travel.cc at line 555 [10.39949]

Insertion in crawl-ref/source/travel.cc at line 3663 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 3669 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 3705 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 3974 [10.39949]

Replacement in crawl-ref/source/travel.cc at line 3993 [10.39949]

Replacement in crawl-ref/source/tags.h at line 72 [8.161012]

Insertion in crawl-ref/source/tags.cc at line 99 [8.164589]

Replacement in crawl-ref/source/tags.cc at line 170 [8.164589]

Replacement in crawl-ref/source/tags.cc at line 726 [8.164589]

Insertion in crawl-ref/source/tags.cc at line 1136 [8.164589]

Replacement in crawl-ref/source/tags.cc at line 1581 [8.164589]

Insertion in crawl-ref/source/tags.cc at line 1622 [8.164589]

Replacement in crawl-ref/source/spells4.cc at line 1362 [8.436250]

Insertion in crawl-ref/source/overmap.h at line 27 [8.1068481]

Replacement in crawl-ref/source/overmap.h at line 32 [8.1068481]

Insertion in crawl-ref/source/overmap.cc at line 60 [8.1070017]

Replacement in crawl-ref/source/overmap.cc at line 725 [8.1070017]

Replacement in crawl-ref/source/overmap.cc at line 745 [8.1070017]

Replacement in crawl-ref/source/overmap.cc at line 758 [8.1070017]

Replacement in crawl-ref/source/overmap.cc at line 803 [8.1070017]

Replacement in crawl-ref/source/overmap.cc at line 815 [8.1070017]

Replacement in crawl-ref/source/misc.cc at line 2772 [8.1933596]

Insertion in crawl-ref/source/files.cc at line 1444 [8.3084589]

Insertion in crawl-ref/source/files.cc at line 1446 [8.3084589]

Replacement in crawl-ref/source/files.cc at line 1824 [8.3084589]

Replacement in crawl-ref/source/dat/descript/items.txt at line 512 [29.62757]

Replacement in crawl-ref/source/dat/descript/items.txt at line 1312 [29.62757]

Insertion in crawl-ref/source/dat/descript/cards.txt at line 105 [31.2804]

Deletion in crawl-ref/source/dat/descript/cards.txt at line 259 [31.2804]