fiddlerwoaroof/crawl - Change BOJPQUU6D4LHA2PGXUZBGTOW54G7ISKFXC4UQHLBSVAI7KQGYW6QC

Applying modified (by me) mutation patches of dolorous',

mostly clean-up and output changes.

More consistent output for Centaurs and chars with hoof mutation (patch 1794849).
Remove "deterioration" (ghouls type) from % screen. d. is right in that this was misleading. (1795995)
Change "no piety" message for Yredelemnul. Okay, this is not mutation-related and of no consequence to boot (Yred doesn't accept offerings), but why not? (1796199)
Mutation output now lists unremovable mutations first (innate and demonspawn).

It's all fairly small stuff, but is it small enough to branch? I think yes, but asking doesn't hurt, right?

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

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

BOJPQUU6D4LHA2PGXUZBGTOW54G7ISKFXC4UQHLBSVAI7KQGYW6QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stuff.cc at line 612 [6.224557]

B:BD[5.163] → [5.163:230]

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

[5.163]

[5.230]

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

Replacement in crawl-ref/source/spl-cast.cc at line 3152 [6.293070]

B:BD[3.33812] → [3.33812:33873]

                 (you.species == SP_CENTAUR) ? "hooves feel"

[3.33812]

[3.33873]

                 (you.mutation[MUT_HOOVES])  ? "hooves feel"

Replacement in crawl-ref/source/religion.cc at line 104 [6.804403]
B:BD[4.698] → [4.698:728]
```
        " crumble% to dust.",
```
[4.698]
[4.728]
```
        " slowly crumble% to dust.",
```
Deletion in crawl-ref/source/output.cc at line 1641 [6.1088282]
B:BD[7.64268] → [8.175:212]
```
          text += ", deterioration";
```
Insertion in crawl-ref/source/newgame.cc at line 1950 [6.1132300]
[2.596]
[9.805]
```
        you.mutation[MUT_HOOVES] = 2;
```

Replacement in crawl-ref/source/mutation.cc at line 245 [6.1263003]

B:BD[6.1271058] → [6.1271058:1271130]

    {"You have sharp fingernails.", "Your fingernails are very sharp.",

[6.1271058]

[6.1271130]


    {"You have sharp fingernails.", "You have very sharp fingernails.",

Deletion in crawl-ref/source/mutation.cc at line 947 [6.1263003]
B:BD[10.2249] → [10.2249:2318]
∅:D[10.2367] → [11.1595:1620]
B:BD[11.1595] → [11.1595:1620]
∅:D[11.1620] → [6.1295624:1295640]
∅:D[12.394366] → [6.1295624:1295640]
B:BD[6.1295624] → [6.1295624:1295640]
```
    case SP_CENTAUR:
        result += "You cannot wear boots." EOL;
        have_any = true;
        break;
```
Insertion in crawl-ref/source/mutation.cc at line 1139 [6.1263003]
[6.1298856]
[13.1900]
```
    // first add (non-removable) inborn abilities and demon powers
```

Replacement in crawl-ref/source/mutation.cc at line 1142 [6.1263003]

B:BD[6.1298892] → [6.1298892:1298926]

        if (you.mutation[i] != 0)

[6.1298892]

[6.1298926]

        // mutation is actually a demonic power
        if (you.mutation[i] != 0 && you.demon_pow[i])

Replacement in crawl-ref/source/mutation.cc at line 1155 [6.1263003]
∅:D[9.1682] → [11.3952:4004]
B:BD[6.1299257] → [11.3952:4004]
B:BD[11.4004] → [9.1683:1719]
```
            // mutation is actually a demonic power
            if ( you.demon_pow[i] )
```
[9.1682]
[9.1719]
```
            if ( you.species == SP_DEMONSPAWN )
```

Replacement in crawl-ref/source/mutation.cc at line 1157 [6.1263003]

B:BD[9.1733] → [9.1733:2131]

B:BD[9.2131] → [14.334:379]

∅:D[14.379] → [9.2180:2273]

B:BD[9.2180] → [9.2180:2273]

                if ( you.species == SP_DEMONSPAWN )
                {
                    if ( you.demon_pow[i] < you.mutation[i] )
                        colourname = "lightred";
                    else
                        colourname = "red";
                }
                else            // innate ability
                {
                    if ( you.demon_pow[i] < you.mutation[i] )
                        colourname = "cyan";
                    else
                        colourname = "lightblue";
                }

[9.1733]

[9.2273]

                if ( you.demon_pow[i] < you.mutation[i] )
                    colourname = "lightred";
                else
                    colourname = "red";

Replacement in crawl-ref/source/mutation.cc at line 1162 [6.1263003]
∅:D[9.2287] → [6.1299320:1299321]
∅:D[11.4245] → [6.1299320:1299321]
B:BD[6.1299320] → [6.1299320:1299321]
B:BD[6.1299321] → [9.2288:2324]
```
            if ( you.demon_pow[i] )
```
[9.2287]
[9.2324]
```
            else            // innate ability
```

Replacement in crawl-ref/source/mutation.cc at line 1164 [6.1263003]

B:BD[9.2338] → [9.2338:2438]

                result += '<';
                result += colourname;
                result += '>';

[9.2338]

[9.2438]

                if ( you.demon_pow[i] < you.mutation[i] )
                    colourname = "cyan";
                else
                    colourname = "lightblue";

Insertion in crawl-ref/source/mutation.cc at line 1169 [6.1263003]

[9.2452]

[15.958]


            result += '<';
            result += colourname;
            result += '>';

Replacement in crawl-ref/source/mutation.cc at line 1175 [6.1263003]

∅:D[15.1026] → [9.2453:2618]

B:BD[11.4286] → [9.2453:2618]

            if ( you.demon_pow[i] )
            {
                result += "</";
                result += colourname;
                result += '>';
            }

[15.1026]

[11.4452]

            
            result += "</";
            result += colourname;
            result += '>';
            result += EOL;
        }
    }
    // now add removable mutations
    for (int i = 0; i < NUM_MUTATIONS; i++)
    {
        if (you.mutation[i] != 0 && !you.demon_pow[i])
        {
            have_any = true;
            result += mutation_name(static_cast<mutation_type>(i));

Insertion in crawl-ref/source/itemprop.cc at line 1055 [12.646661]

[12.678787]


            if (you.mutation[MUT_HOOVES] >= 2)
            {
                if (!quiet)
                    mpr("You can't wear boots with hooves!");
                return (false);
            }

Replacement in crawl-ref/source/item_use.cc at line 771 [6.2781507]

B:BD[6.2799189] → [12.735436:735501]

        if (you.species == SP_NAGA || you.species == SP_CENTAUR)

[6.2799189]

[6.2799270]

        if (you.mutation[MUT_HOOVES] >= 2)
        {
            if (verbose)
                mpr("You can't wear boots with hooves!");
            return (false);
        }
        if (you.species == SP_NAGA)

Replacement in crawl-ref/source/fight.cc at line 617 [6.3140790]

B:BD[16.35724] → [17.2654:2779]

                if ((you.species != SP_CENTAUR && you.species != SP_KENKU
                     && !you.mutation[MUT_HOOVES])

[16.35724]

[16.35801]

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

Replacement in crawl-ref/source/fight.cc at line 645 [6.3140790]

∅:D[17.3164] → [16.36295:36347]

B:BD[16.36295] → [16.36295:36347]

B:BD[16.36347] → [17.3165:3275]

            aux_damage = ((you.mutation[MUT_HOOVES]
                           || you.species == SP_CENTAUR
                           || clawed_kick) ? 10 : 5);

[17.3164]

[16.36415]

            aux_damage = ((you.mutation[MUT_HOOVES] || clawed_kick) ? 10 : 5);

Replacement in crawl-ref/source/delay.cc at line 705 [6.3963459]

B:BD[12.1008964] → [12.1008964:1009039]

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

[12.1008964]

[12.1009039]

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