fiddlerwoaroof/crawl - Change 2I5XEYRJKLUS7MO42MCR6KT2URGFQ3YDKTNTIBNKVKLX5LMG6CEQC

Remove spells from randart books that don't fit at least one of primary

and secondary spell type. Move definite articles in spell type synonyms in front of the adjective when one is used.

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

Created by j-p-e-g on December 18, 2008

2I5XEYRJKLUS7MO42MCR6KT2URGFQ3YDKTNTIBNKVKLX5LMG6CEQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-util.cc at line 97 [5.245665]
∅:D[3.576] → [4.1777:1835]
B:BD[5.247688] → [4.1777:1835]
```
}                               // end init_spell_descs()
```
[3.431]
[6.1064]
```
}
```

Replacement in crawl-ref/source/spl-book.cc at line 2151 [5.397614]

B:BD[7.360] → [7.360:428]

bool _spells_need_disc2(spell_type chosen_spells[], int d1, int d2)

[7.360]

[7.428]

static void _remove_nondiscipline_spells(spell_type chosen_spells[],
                                         int d1, int d2)

Insertion in crawl-ref/source/spl-book.cc at line 2154 [5.397614]
[7.430]
[7.430]
```
    int replace = -1;
```

Replacement in crawl-ref/source/spl-book.cc at line 2160 [5.397614]

B:BD[7.549] → [7.549:766]

        // If a spell matches the second type but not the first,
        // we need the second in the title.
        if (!spell_typematch( chosen_spells[i], d1 )
            && spell_typematch( chosen_spells[i], d2))

[7.549]

[7.766]

        // If a spell matches neither the first nor the second type
        // (that may be the same) remove it.
        if (!spell_typematch(chosen_spells[i], d1)
            && !spell_typematch(chosen_spells[i], d2))
        {
            chosen_spells[i] = SPELL_NO_SPELL;
            if (replace == -1)
                replace = i;
        }
        else if (replace != -1)

Replacement in crawl-ref/source/spl-book.cc at line 2171 [5.397614]

B:BD[7.776] → [7.776:803]

            return (true);

[7.776]

[7.803]

            chosen_spells[replace] = chosen_spells[i];
            chosen_spells[i] = SPELL_NO_SPELL;
            replace++;

Deletion in crawl-ref/source/spl-book.cc at line 2176 [5.397614]
B:BD[7.819] → [7.819:839]
```
    return (false);
```
Deletion in crawl-ref/source/spl-book.cc at line 2282 [5.397614]
∅:D[8.1043] → [9.9281:9329]
B:BD[9.9281] → [9.9281:9329]
```
        spell_vec[i] = (long) chosen_spells[i];
```
Insertion in crawl-ref/source/spl-book.cc at line 2293 [5.397614]
[8.1231]
[8.1231]
```
    int num1 = 1;
    int num2 = 0;
```
Insertion in crawl-ref/source/spl-book.cc at line 2300 [5.397614]
[8.1359]
[8.1359]
```
            num2 = num1;
```
Insertion in crawl-ref/source/spl-book.cc at line 2302 [5.397614]
[8.1381]
[8.1381]
```
            num1 = 1;
```

Replacement in crawl-ref/source/spl-book.cc at line 2304 [5.397614]

B:BD[8.1391] → [8.1391:1470]

        else if (max2 == max1 || count[k] > count[max2])
            max2 = k;

[8.1391]

[8.1470]

        else
        {
            if (count[k] == count[max1])
                num1++;
            if (max2 == max1 || count[k] > count[max2])
            {
                max2 = k;
                if (count[k] == count[max1])
                    num2 = num1;
                else
                    num2 = 1;
            }
            else if (count[k] == count[max2])
                num2++;
        }

Insertion in crawl-ref/source/spl-book.cc at line 2322 [5.397614]

[7.1030]

    // If there are several "secondary" disciplines with the same count
    // ignore all of them. Same, if the secondary discipline appears only once.
    if (num2 > 1 && num1 > num2 || count[max2] < 2)
        max2 = max1;
    // Remove spells that don't fit either discipline.
    _remove_nondiscipline_spells(chosen_spells, 1 << max1, 1 << max2);
    // Finally fill the spell vector.
    for (int i = 0; i < SPELLBOOK_SIZE; i++)
        spell_vec[i] = (long) chosen_spells[i];

Replacement in crawl-ref/source/spl-book.cc at line 2336 [5.397614]

B:BD[8.1499] → [7.1082:1248]

    if (max1 != max2
        && (count[max2] > 1 || _spells_need_disc2(chosen_spells,
                                                  1 << max1, 1 << max2)))
    {

[8.1499]

[8.1572]

    if (max1 == max2)
        disc2 = disc1;
    else

Deletion in crawl-ref/source/spl-book.cc at line 2340 [5.397614]
B:BD[8.1599] → [7.1249:1255]
∅:D[7.1255] → [8.1599:1631]
B:BD[8.1599] → [8.1599:1631]
```
    }
    else
        disc2 = disc1;
```
Replacement in crawl-ref/source/spl-book.cc at line 2392 [5.397614]
B:BD[9.9555] → [7.2424:2457]
```
        name += type_name + " ";
```
[9.9555]
[10.527]
```
        std::string bookname = type_name + " ";
```

Replacement in crawl-ref/source/spl-book.cc at line 2397 [5.397614]

B:BD[10.559] → [7.2576:2624]

            name += spelltype_long_name(disc1);

[10.559]

[10.607]

            bookname += spelltype_long_name(disc1);

Replacement in crawl-ref/source/spl-book.cc at line 2399 [5.397614]

B:BD[10.620] → [10.620:651]

            name += type_name;

[10.620]

[9.9624]

        {
            if (type_name.find("the ", 0) != std::string::npos)
            {
                type_name = replace_all(type_name, "the ", "");
                bookname = "the " + bookname;
            }
            bookname += type_name;
        }
        name += bookname;

Insertion in crawl-ref/source/dat/database/randname.txt at line 991 [11.14728]

[2.2820]

[10.3187]

# variants starting with the definite article will get "the" prepended
# to the adjective version

Replacement in crawl-ref/source/dat/database/randname.txt at line 1013 [11.14728]
B:BD[12.3633] → [12.3633:3652]
```
w:1 Damage Dealing
```
[12.3633]
[10.3212]
```
w:1
Damage Dealing
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1038 [11.14728]
B:BD[10.3286] → [13.2696:2706]
```
Volcanoes
```
[10.3286]
[10.3300]
```
the Volcanoes
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1040 [11.14728]
B:BD[10.3301] → [13.2707:2713]
```
Blaze
```
[10.3301]
[10.3311]
```
the Blaze
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1044 [11.14728]
B:BD[10.3322] → [13.2714:2723]
```
Arsonist
```
[10.3322]
[10.3335]
```
the Arsonist
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1054 [11.14728]
B:BD[10.3362] → [10.3362:3373]
```
Snowflakes
```
[10.3362]
[10.3373]
```
the Snowflakes
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1056 [11.14728]
B:BD[10.3374] → [13.2724:2733]
```
Glaciers
```
[10.3374]
[10.3387]
```
the Glacier
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1058 [11.14728]
B:BD[10.3388] → [13.2734:2744]
```
Frostbite
```
[10.3388]
[10.3402]
```
the Frostbite
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1121 [11.14728]
B:BD[12.3907] → [12.3907:3917]
```
Entourage
```
[12.3907]
[12.3917]
```
the Entourage
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1125 [11.14728]
B:BD[12.3930] → [12.3930:3937]
```
Escort
```
[12.3930]
[14.3066]
```
the Escort
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 1129 [11.14728]
[14.3080]
[10.3635]
```
w:2
Slavery
```
Insertion in crawl-ref/source/dat/database/randname.txt at line 1148 [11.14728]
[2.2889]
[10.3663]
```
Visions
Truth
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1189 [11.14728]
B:BD[12.4057] → [12.4057:4062]
```
Rock
```
[12.4057]
[10.3800]
```
the Rocks
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 1201 [11.14728]
B:BD[10.3850] → [13.2756:2762]
```
Birds
```
[10.3850]
[10.3860]
```
the Birds
```

Remove spells from randart books that don't fit at least one of primary

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-util.cc at line 97 [5.245665]

Replacement in crawl-ref/source/spl-book.cc at line 2151 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2154 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2160 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2171 [5.397614]

Deletion in crawl-ref/source/spl-book.cc at line 2176 [5.397614]

Deletion in crawl-ref/source/spl-book.cc at line 2282 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2293 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2300 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2302 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2304 [5.397614]

Insertion in crawl-ref/source/spl-book.cc at line 2322 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2336 [5.397614]

Deletion in crawl-ref/source/spl-book.cc at line 2340 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2392 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2397 [5.397614]

Replacement in crawl-ref/source/spl-book.cc at line 2399 [5.397614]

Insertion in crawl-ref/source/dat/database/randname.txt at line 991 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1013 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1038 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1040 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1044 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1054 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1056 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1058 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1121 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1125 [11.14728]

Insertion in crawl-ref/source/dat/database/randname.txt at line 1129 [11.14728]

Insertion in crawl-ref/source/dat/database/randname.txt at line 1148 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1189 [11.14728]

Replacement in crawl-ref/source/dat/database/randname.txt at line 1201 [11.14728]