fiddlerwoaroof/crawl - Change F7Q7QRZACTDPP6KH3AB5J6B6B5PRVV4FURTOIGXHRHWNVSQT3TVAC

Previous commit applied to trunk:

cleanup of weird_colour()
hooves mutation one level only
fixes for vampire food level checks
Xom gifts interrupt travel

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

Created by j-p-e-g on September 20, 2007

F7Q7QRZACTDPP6KH3AB5J6B6B5PRVV4FURTOIGXHRHWNVSQT3TVAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 170 [6.3]
[6.5261]
[6.5261]
```
    stop_running();
```

Replacement in crawl-ref/source/skills2.cc at line 1934 [8.647133]

B:BD[7.3328] → [7.3328:3400]

                                           "<blue>progress</blue> and "

[7.3328]

[7.3400]

                                           "<cyan>progress</cyan> and "

Replacement in crawl-ref/source/religion.cc at line 512 [8.804403]
∅:D[9.186] → [10.172919:172967]
B:BD[10.172919] → [10.172919:172967]
```
            if (you.hunger_state == HS_STARVING
```
[9.186]
[9.187]
```
            if (you.hunger_state <= HS_STARVING
```

Replacement in crawl-ref/source/player.cc at line 522 [8.962854]

B:BD[4.861] → [4.861:911]

               || you.mutation[MUT_HOOVES] >= 2))

[4.861]

[4.911]

               || you.mutation[MUT_HOOVES]))

Replacement in crawl-ref/source/player.cc at line 847 [8.962854]

B:BD[11.3862] → [11.3862:3903]

        if (you.hunger_state == HS_FULL)

[11.3862]

[11.3903]

        if (you.hunger_state <= HS_STARVING)
            return 0; // no regeneration for starving vampires
        else if (you.hunger_state <= HS_HUNGRY)
            return (rr / 2);
        else if (you.hunger_state >= HS_FULL)

Deletion in crawl-ref/source/player.cc at line 858 [8.962854]

B:BD[11.4090] → [11.4090:4280]

        else if (you.hunger_state == HS_HUNGRY)
            return (rr / 2);
        else if (you.hunger_state == HS_STARVING)
            return 0; // no regeneration for starving vampires

Replacement in crawl-ref/source/player.cc at line 3296 [8.962854]

B:BD[8.1032223] → [11.6536:6648]

    if (you.duration[DUR_REGENERATION] &&
        (you.species != SP_VAMPIRE || you.hunger_state >= HS_HUNGRY))

[8.1032223]

[11.6648]

    if (you.duration[DUR_REGENERATION]
        && (you.species != SP_VAMPIRE || you.hunger_state >= HS_HUNGRY)
        || you.species == SP_VAMPIRE && you.hunger_state >= HS_FULL)

Replacement in crawl-ref/source/output.cc at line 1369 [8.1088282]

B:BD[11.7545] → [11.7545:7614]

        || you.species == SP_VAMPIRE && you.hunger_state == HS_FULL)

[11.7545]

[11.7614]

        || you.species == SP_VAMPIRE && you.hunger_state >= HS_FULL)

Replacement in crawl-ref/source/output.cc at line 1374 [8.1088282]
∅:D[11.7696] → [12.3748:3782]
B:BD[12.3748] → [12.3748:3782]
```
        text += "regenerating, ";
```
[11.7696]
[11.7697]
```
            text += "regenerating, ";
```
Replacement in crawl-ref/source/newgame.cc at line 1950 [8.1132300]
B:BD[13.596] → [5.356:394]
```
        you.mutation[MUT_HOOVES] = 2;
```
[13.596]
[14.805]
```
        you.mutation[MUT_HOOVES] = 1;
```

Replacement in crawl-ref/source/mutation.cc at line 1109 [8.1263003]

B:BD[15.3618] → [3.1484:1773]

        if (you.hunger_state == HS_FULL)
            result += "<green>Your natural rate of healing is unusually fast.</green>" EOL;
        else if (you.hunger_state == HS_HUNGRY)
            result += "<green>You heal slowly.</green>" EOL;
        else if (you.hunger_state < HS_HUNGRY)

[15.3618]

[3.1773]

        if (you.hunger_state <= HS_STARVING)

Insertion in crawl-ref/source/mutation.cc at line 1111 [8.1263003]

[3.1834]

[16.447]

        else if (you.hunger_state <= HS_HUNGRY)
            result += "<green>You heal slowly.</green>" EOL;
        else if (you.hunger_state >= HS_FULL)
            result += "<green>Your natural rate of healing is unusually fast.</green>" EOL;

Replacement in crawl-ref/source/mutation.cc at line 1452 [8.1263003]

B:BD[8.1305486] → [8.1305486:1305550]

        && (you.species == SP_NAGA || you.species == SP_CENTAUR

[8.1305486]

[8.1305550]

        && (you.species == SP_NAGA || you.mutation[MUT_HOOVES]

Replacement in crawl-ref/source/mutation.cc at line 2395 [8.1263003]

B:BD[8.1335214] → [8.1335214:1335278]

        if (you.species != SP_CENTAUR && you.species != SP_NAGA

[8.1335214]

[8.1335278]

        if (you.species != SP_NAGA && !you.mutation[MUT_HOOVES]

Replacement in crawl-ref/source/mstuff2.cc at line 2086 [8.1340842]

B:BD[2.220] → [2.220:285]

            "'s eyes glow " + weird_colours(random2(256)) + '.';

[2.220]

[17.17891]

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

Replacement in crawl-ref/source/misc.h at line 84 [8.1928926]
B:BD[8.1932955] → [18.789:836]
```
std::string weird_colours(unsigned char coll);
```
[8.1932955]
[8.1933008]
```
std::string weird_glow_colour();
```

Insertion in crawl-ref/source/misc.cc at line 1110 [8.1933596]

[19.22191]

[18.868]

static std::string weird_colour()
{
    int temp_rand;             // for probability determinations {dlb}
    std::string result;
    temp_rand = random2(25);
    result =
        (temp_rand ==  0) ? "red" :
        (temp_rand ==  1) ? "purple" :
        (temp_rand ==  2) ? "orange" :
        (temp_rand ==  3) ? "green" :
        (temp_rand ==  4) ? "magenta" :
        (temp_rand ==  5) ? "black" :
        (temp_rand ==  6) ? "blue" :
        (temp_rand ==  7) ? "grey" :
        (temp_rand ==  8) ? "umber" :
        (temp_rand ==  9) ? "charcoal" :
        (temp_rand == 10) ? "bronze" :
        (temp_rand == 11) ? "silver" :
        (temp_rand == 12) ? "gold" :
        (temp_rand == 13) ? "pink" :
        (temp_rand == 14) ? "yellow" :
        (temp_rand == 15) ? "white" :
        (temp_rand == 16) ? "brown" :
        (temp_rand == 17) ? "aubergine" :
        (temp_rand == 18) ? "ochre" :
        (temp_rand == 19) ? "leaf green" :
        (temp_rand == 20) ? "mauve" :
        (temp_rand == 21) ? "azure" :
        (temp_rand == 22) ? "lime green" :
        (temp_rand == 23) ? "scarlet" :
        (temp_rand == 24) ? "chartreuse"
                          : "colourless";
    return result;
}

Replacement in crawl-ref/source/misc.cc at line 1167 [8.1933596]
B:BD[8.1975253] → [8.1975253:1975282]
```
    temp_rand = random2(14);
```
[8.1975164]
[8.1975282]
```
    result += weird_colour();
```

Deletion in crawl-ref/source/misc.cc at line 1169 [8.1933596]

B:BD[8.1975283] → [18.1395:1991]

∅:D[18.1991] → [8.1976046:1976047]

B:BD[8.1976046] → [8.1976046:1976047]

    result +=
        (temp_rand ==  0) ? "yellow" :
        (temp_rand ==  1) ? "brown" :
        (temp_rand ==  2) ? "black" :
        (temp_rand ==  3) ? "purple" :
        (temp_rand ==  4) ? "orange" :
        (temp_rand ==  5) ? "lime-green" :
        (temp_rand ==  6) ? "blue" :
        (temp_rand ==  7) ? "grey" :
        (temp_rand ==  8) ? "silver" :
        (temp_rand ==  9) ? "gold" :
        (temp_rand == 10) ? "umber" :
        (temp_rand == 11) ? "charcoal" :
        (temp_rand == 12) ? "pastel" :
        (temp_rand == 13) ? "mauve"
                          : "colourless";

Replacement in crawl-ref/source/misc.cc at line 1199 [8.1933596]
B:BD[8.1979557] → [18.2478:2524]
```
std::string weird_colours(unsigned char coll)
```
[8.1979557]
[8.1979609]
```
std::string weird_glow_colour()
```

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

B:BD[8.1979611] → [8.1979611:1979689]

    unsigned char coll_div16 = coll / 16; // conceivable max is then 16 {dlb}

[8.1979611]

[18.2525]

    int temp_rand;             // for probability determinations {dlb}

Insertion in crawl-ref/source/misc.cc at line 1205 [8.1933596]
[8.1979726]
[18.2550]
```
    temp_rand = random2(8);
```

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

B:BD[18.2563] → [18.2563:3036]

        (coll_div16 == 0 || coll_div16 ==  7) ? "brilliant" :
        (coll_div16 == 1 || coll_div16 ==  8) ? "pale" :
        (coll_div16 == 2 || coll_div16 ==  9) ? "mottled" :
        (coll_div16 == 3 || coll_div16 == 10) ? "shimmering" :
        (coll_div16 == 4 || coll_div16 == 11) ? "bright" :
        (coll_div16 == 5 || coll_div16 == 12) ? "dark" :
        (coll_div16 == 6 || coll_div16 == 13) ? "shining"
                                              : "faint";

[18.2563]

[8.1980256]

        (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";

Replacement in crawl-ref/source/misc.cc at line 1218 [8.1933596]
B:BD[8.1980279] → [8.1980279:1980321]
```
    while (coll > 17)
        coll -= 10;
```
[8.1980279]
[8.1980321]
```
    result += weird_colour();
```

Deletion in crawl-ref/source/misc.cc at line 1220 [8.1933596]

B:BD[8.1980322] → [18.3057:3710]

∅:D[18.3710] → [8.1981095:1981096]

B:BD[8.1981095] → [8.1981095:1981096]

    result +=
        (coll ==  0) ? "red" :
        (coll ==  1) ? "purple" :
        (coll ==  2) ? "green" :
        (coll ==  3) ? "orange" :
        (coll ==  4) ? "magenta" :
        (coll ==  5) ? "black" :
        (coll ==  6) ? "grey" :
        (coll ==  7) ? "silver" :
        (coll ==  8) ? "gold" :
        (coll ==  9) ? "pink" :
        (coll == 10) ? "yellow" :
        (coll == 11) ? "white" :
        (coll == 12) ? "brown" :
        (coll == 13) ? "aubergine" :
        (coll == 14) ? "ochre" :
        (coll == 15) ? "leaf green" :
        (coll == 16) ? "mauve" :
        (coll == 17) ? "azure"
                     : "colourless";

Replacement in crawl-ref/source/itemprop.cc at line 1059 [10.646661]
B:BD[5.1642] → [5.1642:1689]
```
            if (you.mutation[MUT_HOOVES] >= 2)
```
[5.1642]
[5.1689]
```
            if (you.mutation[MUT_HOOVES])
```

Replacement in crawl-ref/source/itemprop.cc at line 1118 [10.646661]

B:BD[10.680302] → [10.680302:680353]

                if (you.mutation[MUT_HOOVES] >= 2)

[10.680302]

[10.680353]

                if (you.mutation[MUT_HOOVES])

Replacement in crawl-ref/source/item_use.cc at line 772 [8.2781507]
B:BD[8.2799189] → [5.1846:1889]
```
        if (you.mutation[MUT_HOOVES] >= 2)
```
[8.2799189]
[5.1889]
```
        if (you.mutation[MUT_HOOVES])
```

Replacement in crawl-ref/source/fight.cc at line 189 [8.3140790]

B:BD[11.20833] → [11.20833:20968]

            if (you.hunger_state == HS_HUNGRY)
                your_to_hit += 1;
            else if (you.hunger_state == HS_STARVING)

[11.20833]

[11.20968]

            if (you.hunger_state <= HS_STARVING)

Insertion in crawl-ref/source/fight.cc at line 191 [8.3140790]

[11.21002]

            else if (you.hunger_state <= HS_HUNGRY)
                your_to_hit += 1;

Replacement in crawl-ref/source/fight.cc at line 195 [8.3140790]

B:BD[11.21018] → [11.21018:21093]

    else if (you.species != SP_VAMPIRE && you.hunger_state == HS_STARVING)

[11.21018]

[20.15755]

    else if (you.species != SP_VAMPIRE && you.hunger_state <= HS_STARVING)

Replacement in crawl-ref/source/fight.cc at line 1092 [8.3140790]

B:BD[21.46350] → [22.3073:3143]

    if (you.hunger_state == HS_STARVING && you.species != SP_VAMPIRE)

[21.46350]

[21.46391]

    if (you.hunger_state <= HS_STARVING && you.species != SP_VAMPIRE)

Replacement in crawl-ref/source/fight.cc at line 2338 [8.3140790]
B:BD[21.71419] → [21.71419:71460]
```
    if (you.hunger_state == HS_STARVING)
```
[21.71419]
[21.71460]
```
    if (you.hunger_state <= HS_STARVING)
```

Replacement in crawl-ref/source/effects.cc at line 390 [8.3382105]

B:BD[8.3391009] → [18.3997:4071]

        msg::stream << "The dust glows a " << weird_colours(random2(256))

[8.3391009]

[18.4071]

        msg::stream << "The dust glows a " << weird_glow_colour()

Replacement in crawl-ref/source/effects.cc at line 403 [8.3382105]

B:BD[18.4197] → [18.4197:4265]

                        << " glows " << weird_colours(random2(256))

[18.4197]

[18.4265]

                        << " glows " << weird_glow_colour()

Previous commit applied to trunk:

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/xom.cc at line 170 [6.3]

Replacement in crawl-ref/source/skills2.cc at line 1934 [8.647133]

Replacement in crawl-ref/source/religion.cc at line 512 [8.804403]

Replacement in crawl-ref/source/player.cc at line 522 [8.962854]

Replacement in crawl-ref/source/player.cc at line 847 [8.962854]

Deletion in crawl-ref/source/player.cc at line 858 [8.962854]

Replacement in crawl-ref/source/player.cc at line 3296 [8.962854]

Replacement in crawl-ref/source/output.cc at line 1369 [8.1088282]

Replacement in crawl-ref/source/output.cc at line 1374 [8.1088282]

Replacement in crawl-ref/source/newgame.cc at line 1950 [8.1132300]

Replacement in crawl-ref/source/mutation.cc at line 1109 [8.1263003]

Insertion in crawl-ref/source/mutation.cc at line 1111 [8.1263003]

Replacement in crawl-ref/source/mutation.cc at line 1452 [8.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2395 [8.1263003]

Replacement in crawl-ref/source/mstuff2.cc at line 2086 [8.1340842]

Replacement in crawl-ref/source/misc.h at line 84 [8.1928926]

Insertion in crawl-ref/source/misc.cc at line 1110 [8.1933596]

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

Deletion in crawl-ref/source/misc.cc at line 1169 [8.1933596]

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

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

Insertion in crawl-ref/source/misc.cc at line 1205 [8.1933596]

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

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