fiddlerwoaroof/crawl - Change 6RJVKSL7RVZIZIZIC4TWIYJQ24RUSB346ODS3NYGDHUIRTC4Z5FQC

[1731587] Kenku get claw-kick and a small speed boost when flying unladen.

Swiftness speed boost is now given only if flying, not levitating.

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

Created by dshaligram on July 13, 2007

6RJVKSL7RVZIZIZIC4TWIYJQ24RUSB346ODS3NYGDHUIRTC4Z5FQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 977 [5.616635]

B:BD[5.639683] → [5.639683:639805]

    if (!player_is_levitating())
        mpr("You fly up into the air.");
    else
        mpr("You feel more buoyant.");

[5.639683]

[5.639805]

    const bool was_levitating = player_is_levitating();

Insertion in crawl-ref/source/spells1.cc at line 990 [5.616635]

[5.640245]


    if (!was_levitating)
    {
        if (you.light_flight())
            mpr("You swoop lightly up into the air.");
        else
            mpr("You fly up into the air.");
    }
    else
        mpr("You feel more buoyant.");

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

[5.987673]


        // in the air, can fly fast (should be lightly burdened).
        if (you.light_flight())
            mv--;

Replacement in crawl-ref/source/player.cc at line 1414 [5.962854]

B:BD[5.987674] → [5.987674:987799]

        // Swiftness is an Air spell, it doesn't work in water...
        // but levitating players will move faster. -- bwr

[5.987674]

[5.987799]

        // Swiftness is an Air spell, it doesn't work in water, but
        // flying players will move faster.

Replacement in crawl-ref/source/player.cc at line 1417 [5.962854]

B:BD[5.987866] → [5.987866:987918]

            mv -= (player_is_levitating() ? 4 : 2);

[5.987866]

[5.987918]

            mv -= (you.flies() == FL_FLY ? 4 : 2);

Replacement in crawl-ref/source/player.cc at line 1917 [5.962854]
B:BD[4.723] → [4.723:757]
```
        if (you.levitates() == 1)
```
[4.723]
[4.757]
```
        if (you.flies() == FL_FLY)
```

Replacement in crawl-ref/source/player.cc at line 2159 [5.962854]

B:BD[5.1004176] → [5.1004176:1004221]

    char old_burdenstate = you.burden_state;

[5.1004176]

[5.1004221]

    const burden_state_type old_burdenstate = you.burden_state;
    const bool was_flying_light = you.light_flight();

Replacement in crawl-ref/source/player.cc at line 2167 [5.962854]
B:BD[5.1004352] → [5.1004352:1004405]
```
    for (unsigned char bu = 0; bu < ENDOFPACK; bu++)
```
[5.1004352]
[5.1004405]
```
    for (int bu = 0; bu < ENDOFPACK; bu++)
```

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

[6.200382]


    const bool is_flying_light = you.light_flight();
    if (is_flying_light != was_flying_light)
    {
        mpr(is_flying_light? "You feel quicker in the air."
            : "You feel heavier in the air.");
    }

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

[7.5811]

const item_def *player::slot_item(equipment_type eq) const
{
    return const_cast<player*>(this)->slot_item(eq);
}

Replacement in crawl-ref/source/player.cc at line 5138 [5.962854]
B:BD[8.4950] → [9.55:85]
```
int player::levitates() const
```
[8.4950]
[8.4981]
```
flight_type player::flies() const
```
Replacement in crawl-ref/source/player.cc at line 5141 [5.962854]
∅:D[4.933] → [9.121:139]
B:BD[9.121] → [9.121:139]
```
        return 0;
```
[4.933]
[9.139]
```
        return (FL_NONE);
```

Replacement in crawl-ref/source/player.cc at line 5143 [5.962854]

B:BD[9.148] → [9.148:210]

        return (you.duration[DUR_CONTROLLED_FLIGHT] ? 1 : 2);

[9.148]

[8.5020]

        return (you.duration[DUR_CONTROLLED_FLIGHT] ? FL_FLY : FL_LEVITATE);
}
bool player::light_flight() const
{
    return (flies() == FL_FLY && travelling_light());
}
bool player::travelling_light() const
{
    const item_def *armour = you.slot_item(EQ_BODY_ARMOUR);
    if (armour && !is_light_armour(*armour))
        return (false);
    return (you.burden < carrying_capacity(BS_UNENCUMBERED) * 60 / 100);

Replacement in crawl-ref/source/output.cc at line 472 [5.1088282]

B:BD[5.1098366] → [3.8367:8453]

                dur_colour( MAGENTA, (you.duration[DUR_LEVITATION] <= 10 && !perm) );

[5.1098366]

[5.1098438]

                dur_colour( you.light_flight()? BLUE : MAGENTA,
                            (you.duration[DUR_LEVITATION] <= 10 && !perm) );

Replacement in crawl-ref/source/monstuff.cc at line 4189 [5.1396662]

B:BD[10.4246] → [10.4246:4334]

    const int lev = mons->levitates();
    if (lev == 2 || (lev && !mons->paralysed()))

[10.4246]

[10.4334]

    const flight_type lev = mons->flies();
    if (lev == FL_LEVITATE || (lev == FL_FLY && !mons->paralysed()))

Replacement in crawl-ref/source/mon-util.h at line 89 [5.1682293]

B:BD[5.1688754] → [11.463321:463392]

int mons_class_flies( int mc );
int mons_flies( const monsters *mon );

[5.1688754]

[5.1688828]

flight_type mons_class_flies( int mc );
flight_type mons_flies( const monsters *mon );

Replacement in crawl-ref/source/mon-util.cc at line 964 [5.1699344]
B:BD[5.1716176] → [11.473515:473544]
```
int mons_class_flies(int mc)
```
[5.1716176]
[5.1716206]
```
flight_type mons_class_flies(int mc)
```
Replacement in crawl-ref/source/mon-util.cc at line 969 [5.1699344]
B:BD[5.1716350] → [5.1716350:1716370]
```
        return (1);
```
[5.1716350]
[5.1716370]
```
        return (FL_FLY);
```
Replacement in crawl-ref/source/mon-util.cc at line 972 [5.1699344]
B:BD[5.1716395] → [5.1716395:1716415]
```
        return (2);
```
[5.1716395]
[5.1716415]
```
        return (FL_LEVITATE);
```
Replacement in crawl-ref/source/mon-util.cc at line 974 [5.1699344]
B:BD[5.1716416] → [5.1716416:1716432]
```
    return (0);
```
[5.1716416]
[5.1716432]
```
    return (FL_NONE);
```
Replacement in crawl-ref/source/mon-util.cc at line 977 [5.1699344]
B:BD[5.1716435] → [11.473545:473583]
```
int mons_flies( const monsters *mon )
```
[5.1716435]
[5.1716475]
```
flight_type mons_flies( const monsters *mon )
```
Replacement in crawl-ref/source/mon-util.cc at line 982 [5.1699344]
B:BD[12.4905] → [12.4905:4925]
```
        return (1);
```
[12.4905]
[12.4925]
```
        return (FL_FLY);
```

Replacement in crawl-ref/source/mon-util.cc at line 985 [5.1699344]

∅:D[12.4936] → [11.473584:473629]

B:BD[5.1716477] → [11.473584:473629]

∅:D[11.473629] → [5.1716524:1716605]

B:BD[5.1716524] → [5.1716524:1716605]

    int ret = mons_class_flies( mon->type );
    return (ret ? ret : (scan_mon_inv_randarts(mon, RAP_LEVITATE) > 0) ? 2 : 0);

[12.4936]

[5.1716605]

    const flight_type ret = mons_class_flies( mon->type );
    return (ret ? ret
            : (scan_mon_inv_randarts(mon, RAP_LEVITATE) > 0) ? FL_LEVITATE
            : FL_NONE);

Replacement in crawl-ref/source/mon-util.cc at line 3025 [5.1699344]
B:BD[8.14630] → [9.237:269]
```
int monsters::levitates() const
```
[8.14630]
[8.14663]
```
flight_type monsters::flies() const
```
Insertion in crawl-ref/source/fight.cc at line 548 [5.3140790]
[2.194]
[5.3150974]
```
    std::string miss_verb;
```
Insertion in crawl-ref/source/fight.cc at line 579 [5.3140790]
[7.35642]
[7.35642]
```
        {
```

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

B:BD[7.35724] → [7.35724:35801]

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

[7.35724]

[7.35801]

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

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

B:BD[5.3153526] → [7.36258:36295]

            unarmed_attack = "kick";

[5.3153526]

[7.36295]

            // Kenku have large taloned feet that do good damage.
            const bool clawed_kick =
                you.species == SP_KENKU && !you.mutation[MUT_HOOVES];
            if (clawed_kick)
            {
                unarmed_attack = "claw";
                miss_verb      = "kick";
            }
            else
                unarmed_attack = "kick";

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

B:BD[7.36347] → [7.36347:36415]

                           || you.species == SP_CENTAUR) ? 10 : 5);

[7.36347]

[7.36415]

                           || you.species == SP_CENTAUR
                           || clawed_kick) ? 10 : 5);

Insertion in crawl-ref/source/fight.cc at line 614 [5.3140790]
[7.36434]
[7.36434]
```
        }
```

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

B:BD[2.481] → [2.481:526]

                     unarmed_attack.c_str(),

[2.481]

[2.526]

                     miss_verb.empty()? unarmed_attack.c_str()
                     : miss_verb.c_str(),

Replacement in crawl-ref/source/fight.cc at line 1603 [5.3140790]
B:BD[7.58110] → [8.60161:60196]
```
        if (defender->levitates())
```
[7.58110]
[7.58139]
```
        if (defender->flies())
```
Replacement in crawl-ref/source/fight.cc at line 2901 [5.3140790]
∅:D[13.442] → [8.74000:74035]
B:BD[8.74000] → [8.74000:74035]
```
        if (defender->levitates())
```
[13.442]
[8.74035]
```
        if (defender->flies())
```
Replacement in crawl-ref/source/externs.h at line 195 [5.3270163]
B:BD[8.85829] → [9.349:388]
```
    virtual int levitates() const = 0;
```
[8.85829]
[8.85869]
```
    virtual flight_type flies() const = 0;
```
Insertion in crawl-ref/source/externs.h at line 812 [5.3270163]
[14.498]
[15.30270]
```
    bool light_flight() const;
    bool travelling_light() const;
```
Insertion in crawl-ref/source/externs.h at line 824 [5.3270163]
[7.82786]
[7.82786]
```
    const item_def *slot_item(equipment_type eq) const;
```
Replacement in crawl-ref/source/externs.h at line 887 [5.3270163]
B:BD[8.87432] → [9.389:416]
```
    int levitates() const;
```
[8.87432]
[8.87460]
```
    flight_type flies() const;
```
Replacement in crawl-ref/source/externs.h at line 1131 [5.3270163]
B:BD[8.88935] → [9.417:444]
```
    int levitates() const;
```
[8.88935]
[16.3210]
```
    flight_type flies() const;
```
Insertion in crawl-ref/source/enum.h at line 1731 [5.3287960]
[11.917368]
[11.917368]
```
enum flight_type
{
    FL_NONE = 0,
    FL_FLY,
    FL_LEVITATE
};
```

[1731587] Kenku get claw-kick and a small speed boost when flying unladen.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells1.cc at line 977 [5.616635]

Insertion in crawl-ref/source/spells1.cc at line 990 [5.616635]

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

Replacement in crawl-ref/source/player.cc at line 1414 [5.962854]

Replacement in crawl-ref/source/player.cc at line 1417 [5.962854]

Replacement in crawl-ref/source/player.cc at line 1917 [5.962854]

Replacement in crawl-ref/source/player.cc at line 2159 [5.962854]

Replacement in crawl-ref/source/player.cc at line 2167 [5.962854]

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

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

Replacement in crawl-ref/source/player.cc at line 5138 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5141 [5.962854]

Replacement in crawl-ref/source/player.cc at line 5143 [5.962854]

Replacement in crawl-ref/source/output.cc at line 472 [5.1088282]

Replacement in crawl-ref/source/monstuff.cc at line 4189 [5.1396662]

Replacement in crawl-ref/source/mon-util.h at line 89 [5.1682293]

Replacement in crawl-ref/source/mon-util.cc at line 964 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 969 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 972 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 974 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 977 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 982 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 985 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3025 [5.1699344]

Insertion in crawl-ref/source/fight.cc at line 548 [5.3140790]

Insertion in crawl-ref/source/fight.cc at line 579 [5.3140790]

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

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

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

Insertion in crawl-ref/source/fight.cc at line 614 [5.3140790]

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

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

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

Replacement in crawl-ref/source/externs.h at line 195 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 812 [5.3270163]

Insertion in crawl-ref/source/externs.h at line 824 [5.3270163]

Replacement in crawl-ref/source/externs.h at line 887 [5.3270163]

Replacement in crawl-ref/source/externs.h at line 1131 [5.3270163]

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