fiddlerwoaroof/crawl - Change IQ62EJHYKMOSPZ2M2S5KSYYLGPOQ5A6TDCXA3EHHCWBER7QVTFLAC

Outsource more miscellaneous names besides colors (glowing color types,

writing types for Tomes of Destruction), and move them into their own file. Also, tweak the message for glowing colors used by scrolls of random uselessness so that they no longer have to start with consonants.

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

Created by dolorous on May 26, 2008

IQ62EJHYKMOSPZ2M2S5KSYYLGPOQ5A6TDCXA3EHHCWBER7QVTFLAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mstuff2.cc at line 2311 [7.1340842]

B:BD[5.220] → [6.1371:1428]

            "'s eyes glow " + weird_glow_colour() + '.';

[5.220]

[8.17891]

            "'s eyes glow " + weird_glowing_colour() + '.';

Replacement in crawl-ref/source/misc.h at line 99 [7.1928926]
B:BD[7.1932955] → [6.1443:1476]
```
std::string weird_glow_colour();
```
[7.1932955]
[7.1933008]
```
std::string weird_glowing_colour();
```
Replacement in crawl-ref/source/misc.cc at line 2377 [7.1933596]
B:BD[9.22191] → [6.1478:1512]
```
static std::string weird_colour()
```
[9.22191]
[6.1512]
```
std::string weird_glowing_colour()
```

Replacement in crawl-ref/source/misc.cc at line 2379 [7.1933596]

B:BD[6.1514] → [3.2603:2662]

    std::string result = getRandNameString("colour_name");

[6.1514]

[6.1609]

    std::string result = getRandNameString("glowing_colour_name");

Replacement in crawl-ref/source/misc.cc at line 2388 [7.1933596]

B:BD[7.1974612] → [10.897:992]

∅:D[10.992] → [7.1974684:1974685]

B:BD[7.1974684] → [7.1974684:1974685]

B:BD[7.1974685] → [2.2580:2609]

∅:D[2.2609] → [10.993:1277]

B:BD[7.1974714] → [10.993:1277]

B:BD[10.1277] → [2.2610:2727]

∅:D[2.2727] → [10.1314:1345]

B:BD[10.1314] → [10.1314:1345]

    int temp_rand;             // for probability determinations {dlb}
    std::string result;
    temp_rand = random2(14);
    result =
        (temp_rand == 0) ? "writhing" :
        (temp_rand == 1) ? "bold" :
        (temp_rand == 2) ? "faint" :
        (temp_rand == 3) ? "spidery" :
        (temp_rand == 4) ? "blocky" :
        (temp_rand == 5) ? "angular" :
        (temp_rand == 6) ? "shimmering" :
        (temp_rand == 7) ? "glowing" :
        (temp_rand == 8) ? "pulsating" :
        (temp_rand == 9) ? "sinuous"
                         : "";

[7.1974612]

[7.1974714]

    std::string result = getRandNameString("writing_name");

Replacement in crawl-ref/source/misc.cc at line 2390 [7.1933596]
B:BD[7.1974715] → [10.1346:1394]
∅:D[10.1394] → [7.1975163:1975164]
B:BD[7.1975163] → [7.1975163:1975164]
B:BD[7.1975164] → [6.2691:2721]
```
    if (!result.empty())
        result += ' ';
    result += weird_colour();
```
[7.1974715]
[7.1975282]
```
    lowercase(result);
```

Deletion in crawl-ref/source/misc.cc at line 2392 [7.1933596]

B:BD[7.1976047] → [10.1992:2011]

∅:D[10.2011] → [7.1976073:1976104]

B:BD[7.1976073] → [7.1976073:1976104]

B:BD[7.1976104] → [10.2012:2223]

B:BD[10.2223] → [2.2728:2767]

∅:D[2.2767] → [10.2261:2455]

B:BD[10.2261] → [10.2261:2455]

∅:D[10.2455] → [7.1976666:1976667]

B:BD[7.1976666] → [7.1976666:1976667]

    result += ' ';
    temp_rand = random2(14);
    result +=
        (temp_rand == 0) ? "writing" :
        (temp_rand == 1) ? "scrawl" :
        (temp_rand == 2) ? "sigils" :
        (temp_rand == 3) ? "runes" :
        (temp_rand == 4) ? "hieroglyphics" :
        (temp_rand == 5) ? "figures" :
        (temp_rand == 6) ? "print-out" :
        (temp_rand == 7) ? "binary code" :
        (temp_rand == 8) ? "glyphs" :
        (temp_rand == 9) ? "symbols"
                         : "text";

Deletion in crawl-ref/source/misc.cc at line 2407 [7.1933596]
B:BD[7.1979557] → [6.2722:2754]
∅:D[10.2524] → [7.1979609:1979611]
∅:D[6.2754] → [7.1979609:1979611]
B:BD[7.1979609] → [7.1979609:1979611]
B:BD[7.1979611] → [6.2755:2826]
∅:D[6.2826] → [10.2525:2549]
B:BD[7.1979689] → [10.2525:2549]
∅:D[10.2549] → [7.1979689:1979726]
B:BD[7.1979689] → [7.1979689:1979726]
B:BD[7.1979726] → [6.2827:2855]
∅:D[6.2855] → [10.2550:2563]
B:BD[7.1979726] → [10.2550:2563]
B:BD[10.2563] → [2.2768:3073]
∅:D[10.3036] → [7.1980256:1980257]
∅:D[2.3073] → [7.1980256:1980257]
∅:D[6.3169] → [7.1980256:1980257]
B:BD[7.1980256] → [7.1980256:1980257]
B:BD[7.1980257] → [10.3037:3056]
∅:D[10.3056] → [7.1980278:1980279]
B:BD[7.1980278] → [7.1980278:1980279]
B:BD[7.1980279] → [6.3170:3200]
∅:D[6.3200] → [7.1980321:1980322]
B:BD[7.1980321] → [7.1980321:1980322]
B:BD[7.1981096] → [10.3711:3732]
∅:D[10.3732] → [7.1981163:1981164]
B:BD[7.1981163] → [7.1981163:1981164]
```
std::string weird_glow_colour()
{
    int temp_rand;             // for probability determinations {dlb}
    std::string result;
    // Must start with a consonant!
    temp_rand = random2(8);
    result =
        (temp_rand == 0) ? "brilliant" :
        (temp_rand == 1) ? "pale" :
        (temp_rand == 2) ? "mottled" :
        (temp_rand == 3) ? "shimmering" :
        (temp_rand == 4) ? "bright" :
        (temp_rand == 5) ? "dark" :
        (temp_rand == 6) ? "shining"
                         : "faint";
    result += ' ';
    result += weird_colour();
    return result;
}
```

Replacement in crawl-ref/source/effects.cc at line 739 [7.3382105]

B:BD[7.3391009] → [6.3737:3803]

∅:D[6.3803] → [10.4071:4119]

B:BD[10.4071] → [10.4071:4119]

        msg::stream << "The dust glows a " << weird_glow_colour()
                    << " colour!" << std::endl;

[7.3391009]

[7.3391172]

        msg::stream << "The dust glows " << weird_glowing_colour()
                    << "!" << std::endl;

Replacement in crawl-ref/source/effects.cc at line 752 [7.3382105]

B:BD[10.4197] → [6.3804:3864]

                        << " glows " << weird_glow_colour()

[10.4197]

[10.4265]

                        << " glows " << weird_glowing_colour()

Insertion in crawl-ref/source/database.cc at line 77 [12.13932]

[4.2760]

[11.2684]

            // This doesn't really belong here, but *can* be used by randarts...
            "database/miscname.txt", // names for miscellaneous things

Deletion in crawl-ref/source/dat/database/rand_all.txt at line 190 [13.35476]
B:BD[13.37511] → [13.37511:37523]
B:BD[13.37523] → [3.2833:2865]
∅:D[3.2865] → [13.37523:37529]
B:BD[13.37523] → [13.37523:37529]
B:BD[13.37529] → [3.2866:2874]
∅:D[3.2874] → [13.37529:37530]
B:BD[13.37529] → [13.37529:37530]
B:BD[13.37530] → [3.2875:2993]
∅:D[3.2993] → [13.37534:37543]
B:BD[13.37534] → [13.37534:37543]
B:BD[13.37543] → [3.2994:3000]
∅:D[3.3000] → [13.37543:37551]
B:BD[13.37543] → [13.37543:37551]
B:BD[13.37551] → [3.3001:3053]
∅:D[3.3053] → [13.37551:37556]
B:BD[13.37551] → [13.37551:37556]
```
colour_name
Aubergine
Azure
Beige
Black
Blue
Bronze
Brown
Charcoal
Chartreuse
Cyan
Gold
Green
Grey
Indigo
Leaf Green
Lime Green
Magenta
Marigold
Mauve
Ochre
Orange
Pink
Purple
Red
Rubric
Scarlet
Silver
Umber
White
Yellow
%%%%
```

File addition: miscname.txt (----------)

[13.14636]

######################################################
# Miscellaneous
# -------------
# miscname.txt: lookup miscellaneous names
#
# This file contains a list of names for miscellaneous things.
# This is currently only used for colours and writing types.
#
# Note that randarts may use these as well.
######################################################
%%%%
glowing_adj
Brilliant
Pale
Mottled
Shimmering
Bright
Dark
Shining
Faint
%%%%
colour_name
Aubergine
Azure
Beige
Black
Blue
Bronze
Brown
Charcoal
Chartreuse
Cyan
Gold
Green
Grey
Indigo
Leaf Green
Lime Green
Magenta
Marigold
Mauve
Ochre
Orange
Pink
Purple
Red
Rubric
Scarlet
Silver
Umber
White
Yellow
%%%%
glowing_colour_name
@glowing_adj@ @colour_name@
%%%%
writing_adj
Writhing
Bold
Faint
Spidery
Blocky
Angular
Shimmering
Glowing
Pulsating
Sinuous
%%%%
writing_noun
Writing
Scrawl
Sigils
Runes
Hieroglyphics
Figures
Print-Out
Binary Code
Glyphs
Symbols
Text
%%%%
writing_name
@writing_adj@ @writing_noun@
@colour_name@ @writing_noun@
@glowing_colour_name@ @writing_noun@
@writing_adj@ @colour_name@ @writing_noun@
%%%%