fiddlerwoaroof/crawl - Change L2HE3KCNREOYBGUNAJPWJDFFVIM7VMLCCGU4DZPVENAPF23F2GSQC

Fix non-active hooves/talons not conflicting.

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

Created by haranp on March 5, 2009

L2HE3KCNREOYBGUNAJPWJDFFVIM7VMLCCGU4DZPVENAPF23F2GSQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mutation.cc at line 1969 [5.1263003]

B:BD[4.8848] → [4.8848:8898]

        { MUT_FANGS,        MUT_BEAK            }

[4.8848]

[4.8898]

        { MUT_FANGS,        MUT_BEAK            },
        { MUT_HOOVES,       MUT_TALONS          }

Insertion in crawl-ref/source/mutation.cc at line 1972 [5.1263003]
[4.8905]
[4.8905]

Insertion in crawl-ref/source/mutation.cc at line 2015 [5.1263003]

[4.10441]

}
static bool _physiology_mutation_conflict(mutation_type mutat)
{
    // Only Nagas and Draconians can get this one.
    if (mutat == MUT_STINGER
        && you.species != SP_NAGA && !player_genus(GENPC_DRACONIAN))
    {
        return (true);
    }
    if ((mutat == MUT_HOOVES || mutat == MUT_TALONS) && !player_has_feet())
        return (true);
    // Already innate.
    if (mutat == MUT_BREATHE_POISON && you.species != SP_NAGA)
        return (true);
    // Red Draconians can already breathe flames.
    if (mutat == MUT_BREATHE_FLAMES && you.species == SP_RED_DRACONIAN)
        return (true);
    // Green Draconians can already breathe poison, so they don't need
    // to spit it.
    if (mutat == MUT_SPIT_POISON && you.species == SP_GREEN_DRACONIAN)
        return (true);
    // Only Draconians can get wings.
    if (mutat == MUT_BIG_WINGS && !player_genus(GENPC_DRACONIAN))
        return (true);
    // Vampires' healing and thirst rates depend on their blood level.
    if (you.species == SP_VAMPIRE
        && (mutat == MUT_CARNIVOROUS || mutat == MUT_HERBIVOROUS
            || mutat == MUT_REGENERATION || mutat == MUT_SLOW_HEALING
            || mutat == MUT_FAST_METABOLISM || mutat == MUT_SLOW_METABOLISM))
    {
        return (true);
    }
    return (false);

Deletion in crawl-ref/source/mutation.cc at line 2218 [5.1263003]
∅:D[6.2632] → [5.1304738:1304745]
∅:D[7.18607] → [5.1304738:1304745]
B:BD[5.1304738] → [5.1304738:1304745]
B:BD[5.1305218] → [7.18763:18814]
∅:D[7.18814] → [5.1305265:1305371]
∅:D[8.21380] → [5.1305265:1305371]
B:BD[5.1305265] → [5.1305265:1305371]
B:BD[5.1305371] → [7.18815:18839]
∅:D[7.18839] → [5.1305393:1305400]
B:BD[5.1305393] → [5.1305393:1305400]
∅:D[9.3626] → [7.18840:18898]
B:BD[5.1305400] → [7.18840:18898]
∅:D[7.18898] → [10.3087:3140]
B:BD[5.1305458] → [10.3087:3140]
∅:D[10.3140] → [11.3676:3708]
B:BD[11.3676] → [11.3676:3708]
∅:D[12.304] → [5.1305624:1305630]
∅:D[11.3708] → [5.1305624:1305630]
B:BD[5.1305624] → [5.1305624:1305630]
B:BD[5.1305630] → [7.18899:18923]
```
    }
    // Only Nagas and Draconians can get this one.
    if (mutat == MUT_STINGER
        && !(you.species == SP_NAGA || player_genus(GENPC_DRACONIAN)))
    {
        return (false);
    }
    // Putting boots on after they are forced off. -- bwr
    if ((mutat == MUT_HOOVES || mutat == MUT_TALONS)
         && !player_has_feet())
    {
        return (false);
```
Replacement in crawl-ref/source/mutation.cc at line 2220 [5.1263003]
B:BD[13.946] → [7.18996:19019]
∅:D[7.19019] → [13.946:1009]
∅:D[8.21449] → [13.946:1009]
B:BD[13.946] → [13.946:1009]
```
    // Already innate.
    if (mutat == MUT_BREATHE_POISON && you.species != SP_NAGA)
```
[13.946]
[7.19020]
```
    if (_physiology_mutation_conflict(mutat))
```

Deletion in crawl-ref/source/mutation.cc at line 2223 [5.1263003]

B:BD[14.10883] → [2.2387:2720]

∅:D[2.2720] → [7.19045:19083]

B:BD[14.10883] → [7.19045:19083]

∅:D[14.10883] → [5.1305659:1305725]

∅:D[7.19083] → [5.1305659:1305725]

∅:D[8.21487] → [5.1305659:1305725]

B:BD[5.1305659] → [5.1305659:1305725]

B:BD[5.1305725] → [7.19084:19108]

∅:D[7.19108] → [5.1305747:1305748]

B:BD[5.1305747] → [5.1305747:1305748]

B:BD[5.1305748] → [3.2629:2700]

∅:D[3.2700] → [15.2548:2582]

∅:D[16.2722] → [15.2548:2582]

B:BD[8.21547] → [15.2548:2582]

B:BD[15.2582] → [3.2701:2914]

∅:D[15.2725] → [8.21656:21662]

∅:D[3.2914] → [8.21656:21662]

B:BD[8.21656] → [8.21656:21662]

B:BD[8.21662] → [7.19109:19133]

∅:D[7.19133] → [8.21684:21691]

B:BD[8.21684] → [8.21684:21691]

    // Red Draconians can already breathe flames.
    if (mutat == MUT_BREATHE_FLAMES && you.species == SP_RED_DRACONIAN)
        return (false);
    // Green Draconians can already breathe poison, so they don't need
    // to spit it.
    if (mutat == MUT_SPIT_POISON && you.species == SP_GREEN_DRACONIAN)
        return (false);
    // Only Draconians can get wings.
    if (mutat == MUT_BIG_WINGS && !player_genus(GENPC_DRACONIAN))
        return (false);
    // Vampires' healing and thirst rates depend on their blood level.
    if (you.species == SP_VAMPIRE
        && (mutat == MUT_CARNIVOROUS || mutat == MUT_HERBIVOROUS
            || mutat == MUT_REGENERATION || mutat == MUT_SLOW_HEALING
            || mutat == MUT_FAST_METABOLISM || mutat == MUT_SLOW_METABOLISM))
    {
        return (false);
    }

Replacement in crawl-ref/source/mutation.cc at line 2433 [5.1263003]
B:BD[5.1318961] → [17.47291:47337]
```
    // For all those various scale mutations.
```
[5.1318961]
[17.47337]
```
    // For all those scale mutations.
```

Fix non-active hooves/talons not conflicting.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mutation.cc at line 1969 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 1972 [5.1263003]

Insertion in crawl-ref/source/mutation.cc at line 2015 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 2218 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2220 [5.1263003]

Deletion in crawl-ref/source/mutation.cc at line 2223 [5.1263003]

Replacement in crawl-ref/source/mutation.cc at line 2433 [5.1263003]