fiddlerwoaroof/crawl - Change GA7RSKRL2B7OYL4NWCCMULF2QXJ27NALF7KWTSVXY272NS5KFGJQC

Turn kenkus' hardcoded pecking attack and inability to wear helmets into

an intrinsic beak mutation (assuming, of course, that the beak is what makes helmets unwearable).

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

Created by dolorous on November 18, 2008

GA7RSKRL2B7OYL4NWCCMULF2QXJ27NALF7KWTSVXY272NS5KFGJQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 884 [5.143977]

B:BD[5.158727] → [5.158727:158822]

B:BD[5.158822] → [6.264:319]

∅:D[6.319] → [5.158857:158926]

B:BD[5.158857] → [5.158857:158926]

    // if more cases are added to this if must also change in
    // item_use for naga barding
    if (ignore_temporary || !player_is_shapechanged())
        /* or a transformation which doesn't change overall shape */

[5.158726]

[5.158926]

    if (use_which == EQ_HELMET
        && (player_mutation_level(MUT_HORNS)
            || player_mutation_level(MUT_BEAK)))

Replacement in crawl-ref/source/transfor.cc at line 888 [5.143977]

B:BD[5.158932] → [7.135:171]

∅:D[7.171] → [5.158967:159024]

B:BD[5.158967] → [5.158967:159024]

B:BD[5.159334] → [5.159334:159461]

        if (use_which == EQ_HELMET)
        {
            switch (you.species)
            {
            case SP_KENKU:
                return (false);
            default:
                break;
            }
        }

[5.158932]

[5.159461]

        return (false);

Deletion in crawl-ref/source/transfor.cc at line 891 [5.143977]
B:BD[5.159468] → [8.461:529]
∅:D[8.529] → [5.159527:159552]
B:BD[5.159527] → [5.159527:159552]
```
    if (use_which == EQ_HELMET && player_mutation_level(MUT_HORNS))
        return (false);
```
Deletion in crawl-ref/source/player.cc at line 571 [5.962854]
B:BD[9.867] → [10.5364:5458]
∅:D[9.942] → [11.1549:1550]
∅:D[12.1888] → [11.1549:1550]
∅:D[10.5458] → [11.1549:1550]
B:BD[11.1549] → [11.1549:1550]
```
    if (player_mutation_level(MUT_HORNS) && eq == EQ_HELMET)
        return (special_armour);
```

Insertion in crawl-ref/source/player.cc at line 574 [5.962854]

[13.540]

[10.5536]

    if (eq == EQ_HELMET
       && (player_mutation_level(MUT_HORNS) || player_mutation_level(MUT_BEAK)))
    {
        return (special_armour);
    }

Deletion in crawl-ref/source/output.cc at line 2348 [5.1088282]
B:BD[14.64715] → [15.3515:3569]
```
          mutations.push_back("cannot wear helmets");
```

Insertion in crawl-ref/source/output.cc at line 2559 [5.1088282]

[15.5494]

[16.9571]

                break;
            case MUT_BEAK:
                current = "beak";

Insertion in crawl-ref/source/newgame.cc at line 2796 [5.1132300]
[17.570]
[17.570]
```
        you.mutation[MUT_BEAK] = 1;
```
Insertion in crawl-ref/source/mutation.cc at line 187 [5.1263003]
[5.1268371]
[5.1268371]
```
    {"You have a beak for a mouth.", "", ""},
```
Insertion in crawl-ref/source/mutation.cc at line 484 [5.1263003]
[5.1278940]
[5.1278940]
```
    {"Your mouth lengthens and hardens into a beak!", "", ""},
```
Insertion in crawl-ref/source/mutation.cc at line 724 [5.1263003]
[5.1287447]
[5.1287447]
```
    {"Your beak shortens and softens into a mouth.", "", ""},
```
Insertion in crawl-ref/source/mutation.cc at line 911 [5.1263003]
[3.3541]
[3.3541]
```
    { MUT_BEAK,                       1,  1, false,  true },
```
Deletion in crawl-ref/source/mutation.cc at line 918 [5.1263003]
B:BD[3.3847] → [3.3847:3908]
```
    { MUT_BLURRY_VISION,             10,  3,  true, false },
```
Insertion in crawl-ref/source/mutation.cc at line 919 [5.1263003]
[5.1293158]
[8.16082]
```
    { MUT_BLURRY_VISION,             10,  3,  true, false },
```
Deletion in crawl-ref/source/mutation.cc at line 931 [5.1263003]
B:BD[8.16633] → [8.16633:16694]
```
    { MUT_RAISE_DEAD,                 0,  1, false, false },
```
Insertion in crawl-ref/source/mutation.cc at line 932 [5.1263003]
[5.1293385]
[8.16695]
```
    { MUT_RAISE_DEAD,                 0,  1, false, false },
```
Deletion in crawl-ref/source/mutation.cc at line 944 [5.1263003]
B:BD[3.4093] → [3.4093:4154]
```
    { MUT_FANGS,                      1,  3, false,  true },
```
Insertion in crawl-ref/source/mutation.cc at line 945 [5.1263003]
[7.3043]
[3.4155]
```
    { MUT_FANGS,                      1,  3, false,  true },
```
Deletion in crawl-ref/source/mutation.cc at line 965 [5.1263003]
B:BD[8.18035] → [8.18035:18096]
```
    { MUT_HIGH_MAGIC,                 1,  3, false, false },
```
Insertion in crawl-ref/source/mutation.cc at line 966 [5.1263003]
[18.3009]
[3.4587]
```
    { MUT_HIGH_MAGIC,                 1,  3, false, false },
```
Deletion in crawl-ref/source/mutation.cc at line 968 [5.1263003]
∅:D[3.4648] → [8.18158:18219]
B:BD[8.18158] → [8.18158:18219]
```
    { RANDOM_MUTATION,                0,  3, false, false },
```
Deletion in crawl-ref/source/mutation.cc at line 1122 [5.1263003]
B:BD[5.1296272] → [17.861:911]
```
        result += "You cannot wear helmets." EOL;
```
Insertion in crawl-ref/source/mutation.cc at line 1128 [5.1263003]
[19.2455]
[5.1296476]
```
            have_any = true;
```
Deletion in crawl-ref/source/mutation.cc at line 1130 [5.1263003]
B:BD[5.1296486] → [2.67:92]
```
        have_any = true;
```
Insertion in crawl-ref/source/mutation.cc at line 1589 [5.1263003]
[20.37253]
[21.1751]
```
    case MUT_BEAK:
```

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

[5.1305400]

[22.18840]

    // No fangs with beaks, or vice versa.
    if ((mutat == MUT_FANGS && you.mutation[MUT_BEAK] > 0)
        || (mutat == MUT_BEAK && you.mutation[MUT_FANGS] > 0))
    {
        return (false);
    }

Deletion in crawl-ref/source/mutation.cc at line 1909 [5.1263003]
∅:D[23.10753] → [5.1305658:1305659]
B:BD[5.1305658] → [5.1305658:1305659]
B:BD[5.1305659] → [22.18924:18970]
∅:D[22.18970] → [24.281:336]
∅:D[8.21426] → [24.281:336]
B:BD[5.1305659] → [24.281:336]
B:BD[24.336] → [22.18971:18995]
```
    // No fangs sprouting from Kenkus' beaks.
    if (mutat == MUT_FANGS && you.species == SP_KENKU)
        return (false);
```
Insertion in crawl-ref/source/mutation.cc at line 2079 [5.1263003]
[25.215]
[26.2564]
```
    case MUT_BEAK:
```
Replacement in crawl-ref/source/mutation.cc at line 2082 [5.1263003]
B:BD[5.1311041] → [27.2849:2890]
```
        // Horns force hard helmets off.
```
[5.1311041]
[26.2677]
```
        // Horns and beaks force hard helmets off.
```
Replacement in crawl-ref/source/itemprop.cc at line 1239 [28.646661]
B:BD[28.680796] → [28.680796:680837]
```
            if (you.species == SP_KENKU)
```
[28.680796]
[28.680837]
```
            if (player_mutation_level(MUT_HORNS))
```

Replacement in crawl-ref/source/itemprop.cc at line 1242 [28.646661]

B:BD[28.680879] → [28.680879:680945]

                    mpr( "That helmet does not fit your head!" );

[28.680879]

[28.680945]

                    mpr( "You can't wear that with your horns!" );

Replacement in crawl-ref/source/itemprop.cc at line 1247 [28.646661]
B:BD[28.680993] → [8.27791:27841]
```
            if (player_mutation_level(MUT_HORNS))
```
[28.680993]
[28.681064]
```
            if (player_mutation_level(MUT_BEAK))
```

Replacement in crawl-ref/source/itemprop.cc at line 1250 [28.646661]

B:BD[28.681106] → [28.681106:681173]

                    mpr( "You can't wear that with your horns!" );

[28.681106]

[28.681173]

                    mpr( "You can't wear that with your beak!" );

Replacement in crawl-ref/source/item_use.cc at line 965 [5.2781507]

B:BD[29.380] → [29.380:480]

        if (you.species == SP_KENKU
            && (ignore_temporary || !player_is_shapechanged()))

[29.380]

[29.480]

        if (player_mutation_level(MUT_BEAK))

Replacement in crawl-ref/source/item_use.cc at line 968 [5.2781507]

B:BD[29.515] → [30.6300:6360]

                mpr("That helmet does not fit your head!");

[29.515]

[29.574]

                mpr("You can't wear that with your beak!");

Replacement in crawl-ref/source/fight.cc at line 944 [5.3140790]

B:BD[4.6055] → [4.6055:6105]

                       && you.species != SP_KENKU

[4.6055]

[31.36568]

                       && !player_mutation_level(MUT_BEAK)

Replacement in crawl-ref/source/fight.cc at line 960 [5.3140790]
B:BD[5.3155141] → [32.4806:4846]
```
            if (you.species == SP_KENKU
```
[5.3155141]
[32.4846]
```
            if (player_mutation_level(MUT_BEAK)
```
Insertion in crawl-ref/source/enum.h at line 2175 [5.3287960]
[5.3348634]
[5.3348634]
```
    MUT_BEAK,
```
Replacement in crawl-ref/source/enum.h at line 2177 [5.3287960]
B:BD[5.3348656] → [5.3348656:3348679]
B:BD[5.3348679] → [21.3191:3238]
```
    MUT_FLEXIBLE_WEAK,
    MUT_SCREAM,                        //   35
```
[5.3348656]
[5.3348726]
```
    MUT_FLEXIBLE_WEAK,                 //   35
    MUT_SCREAM,
```

Replacement in crawl-ref/source/enum.h at line 2182 [5.3287960]

B:BD[5.3348783] → [5.3348783:3348853]

    MUT_BLURRY_VISION,
    MUT_MUTATION_RESISTANCE,           //   40

[5.3348783]

[5.3348853]

    MUT_BLURRY_VISION,                 //   40
    MUT_MUTATION_RESISTANCE,

Replacement in crawl-ref/source/enum.h at line 2187 [5.3287960]

B:BD[5.3348912] → [5.3348912:3348995]

    MUT_NEGATIVE_ENERGY_RESISTANCE,
    MUT_SUMMON_MINOR_DEMONS,           //   45

[5.3348912]

[5.3348995]

    MUT_NEGATIVE_ENERGY_RESISTANCE,    //   45
    MUT_SUMMON_MINOR_DEMONS,

Replacement in crawl-ref/source/enum.h at line 2192 [5.3287960]

B:BD[5.3349063] → [5.3349063:3349130]

    MUT_RAISE_DEAD,
    MUT_CONTROL_DEMONS,                //   50

[5.3349063]

[5.3349130]

    MUT_RAISE_DEAD,                    //   50
    MUT_CONTROL_DEMONS,

Replacement in crawl-ref/source/enum.h at line 2197 [5.3287960]

B:BD[5.3349197] → [5.3349197:3349264]

    MUT_DRAIN_LIFE,
    MUT_THROW_FLAMES,                  //   55

[5.3349197]

[5.3349264]

    MUT_DRAIN_LIFE,                    //   55
    MUT_THROW_FLAMES,

Replacement in crawl-ref/source/enum.h at line 2202 [5.3287960]
∅:D[33.10786] → [7.4586:4620]
B:BD[7.4586] → [7.4586:4620]
```
    MUT_FANGS,      // new in 0.3
```
[33.10786]
[18.3254]
```
    MUT_FANGS,      // new in 0.3      --   60
```
Replacement in crawl-ref/source/enum.h at line 2204 [5.3287960]
∅:D[18.3296] → [7.4665:4712]
B:BD[7.4665] → [7.4665:4712]
```
    MUT_HOOVES,                        //   60
```
[18.3296]
[7.4712]
```
    MUT_HOOVES,
```

Replacement in crawl-ref/source/enum.h at line 2208 [5.3287960]

B:BD[5.3349499] → [18.3297:3381]

    MUT_BIG_WINGS,
    MUT_BLUE_MARKS, // 65, decorative, as in "mark of the devil"

[5.3349499]

[7.4889]

    MUT_BIG_WINGS,                     //   65
    MUT_BLUE_MARKS, // decorative, as in "mark of the devil"

Replacement in crawl-ref/source/enum.h at line 2213 [5.3287960]

B:BD[34.428] → [18.3382:3463]

    MUT_HIGH_MAGIC, // new in 0.4
    MUT_LOW_MAGIC,  // new in 0.4      --   70

[34.428]

[33.10787]

    MUT_HIGH_MAGIC, // new in 0.4      --   70
    MUT_LOW_MAGIC,  // new in 0.4

Replacement in crawl-ref/source/describe.cc at line 3235 [5.3736416]
B:BD[32.6402] → [32.6402:6440]
```
        if (you.species == SP_KENKU)
```
[32.6402]
[32.6440]
```
        else if (player_mutation_level(MUT_BEAK))
```

Turn kenkus' hardcoded pecking attack and inability to wear helmets into

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.cc at line 884 [5.143977]

Replacement in crawl-ref/source/transfor.cc at line 888 [5.143977]

Deletion in crawl-ref/source/transfor.cc at line 891 [5.143977]

Deletion in crawl-ref/source/player.cc at line 571 [5.962854]

Insertion in crawl-ref/source/player.cc at line 574 [5.962854]

Deletion in crawl-ref/source/output.cc at line 2348 [5.1088282]

Insertion in crawl-ref/source/output.cc at line 2559 [5.1088282]

Insertion in crawl-ref/source/newgame.cc at line 2796 [5.1132300]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/itemprop.cc at line 1239 [28.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1242 [28.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1247 [28.646661]

Replacement in crawl-ref/source/itemprop.cc at line 1250 [28.646661]

Replacement in crawl-ref/source/item_use.cc at line 965 [5.2781507]

Replacement in crawl-ref/source/item_use.cc at line 968 [5.2781507]

Replacement in crawl-ref/source/fight.cc at line 944 [5.3140790]

Replacement in crawl-ref/source/fight.cc at line 960 [5.3140790]

Insertion in crawl-ref/source/enum.h at line 2175 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2177 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2182 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2187 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2192 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2197 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2202 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2204 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2208 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 2213 [5.3287960]

Replacement in crawl-ref/source/describe.cc at line 3235 [5.3736416]