fiddlerwoaroof/crawl - Change DTMAROHP75MUCSQHYEAL3K6OUZCXDUJK7SKCFY4JSKJRENHDPTIQC

make player::has_claws() return an int indicating the level of claws

available; this removes the need for some special cases dealing with trolls' and ghouls' built-in claws

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

Created by dolorous on November 21, 2007

DTMAROHP75MUCSQHYEAL3K6OUZCXDUJK7SKCFY4JSKJRENHDPTIQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 647 [5.5308]

B:BD[4.318] → [3.171:307]

        if (you.species == SP_TROLL || you.species == SP_GHOUL)
            damage += 2;
        else if (you.mutation[MUT_CLAWS] == 1)

[4.318]

[4.360]

        int level = you.has_claws();
        if (level == 1)

Replacement in crawl-ref/source/traps.cc at line 651 [5.5308]

B:BD[4.407] → [4.407:458]

            damage += you.mutation[MUT_CLAWS] - 1;

[4.407]

[4.458]

            damage += level - 1;

Replacement in crawl-ref/source/player.cc at line 6118 [7.962854]
B:BD[6.1544] → [2.961:992]
```
bool player::has_claws() const
```
[6.1544]
[2.992]
```
int player::has_claws() const
```

Replacement in crawl-ref/source/player.cc at line 6124 [7.962854]

B:BD[2.1172] → [2.1172:1193]

        return true;

[2.1172]

[2.1193]

        return 3;
    }
    // transformations other than these will override claws
    if (attribute[ATTR_TRANSFORMATION] != TRAN_NONE
        && attribute[ATTR_TRANSFORMATION] != TRAN_STATUE
        && attribute[ATTR_TRANSFORMATION] != TRAN_LICH)
    {
        return 0;

Replacement in crawl-ref/source/player.cc at line 6136 [7.962854]

B:BD[2.1250] → [2.1250:1591]

    if (species != SP_TROLL && species != SP_GHOUL && !mutation[MUT_CLAWS])
        return false;
    // transformations other than these will override claws
    return ( attribute[ATTR_TRANSFORMATION] == TRAN_NONE
             || attribute[ATTR_TRANSFORMATION] == TRAN_STATUE
             || attribute[ATTR_TRANSFORMATION] == TRAN_LICH );

[2.1250]

[2.1591]

    if (species == SP_TROLL || species == SP_GHOUL)
        return 3;
    else
        return mutation[MUT_CLAWS];

Replacement in crawl-ref/source/item_use.cc at line 780 [7.2781507]

B:BD[2.2150] → [2.2150:2258]

        if (you.species == SP_TROLL || you.species == SP_GHOUL
            || you.mutation[MUT_CLAWS] >= 3)

[2.2150]

[2.2258]

        if (you.has_claws() >= 3)

Replacement in crawl-ref/source/externs.h at line 769 [7.3270163]
B:BD[8.83074] → [2.3470:3503]
```
    bool      has_claws() const;
```
[8.83074]
[6.24982]
```
    int       has_claws() const;
```