fiddlerwoaroof/crawl - Change UVJBHQ5KGUIEFRHKTYQPKSXYDUDKTRAXINUXGJJJ6QGNCR6JO7ZAC

Applying patches by dolorous:

1794789: Move "Xom is BORED" message into god channel 1795785: remove redundant check for potions of blood 1795673: claw-related clean-ups and enforcing consistency in transformations and claws (Lich and Statue retain claws, Ice Beast doesn't).

I also added a check for hooves and claws mutation for the % and [ you_can_wear output.

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

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

UVJBHQ5KGUIEFRHKTYQPKSXYDUDKTRAXINUXGJJJ6QGNCR6JO7ZAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.cc at line 437 [6.143977]

B:BD[5.280] → [5.280:338]

    return (tt == TRAN_BLADE_HANDS || tt == TRAN_DRAGON);

[5.280]

[5.338]

    return (tt == TRAN_BLADE_HANDS || tt == TRAN_DRAGON
            || tt == TRAN_SERPENT_OF_HELL);

Replacement in crawl-ref/source/spells4.cc at line 89 [6.436250]

B:BD[6.438398] → [6.438398:438462]

        if (you.species == SP_TROLL || you.species == SP_GHOUL)

[6.438398]

[6.438462]

    case TRAN_LICH:
        if (you.has_usable_claws())

Deletion in crawl-ref/source/spells4.cc at line 97 [6.436250]
B:BD[6.438592] → [6.438592:438612]
```
    case TRAN_LICH:
```

Replacement in crawl-ref/source/religion.cc at line 3071 [6.804403]

B:BD[7.31912] → [7.31912:31958]

                mpr("Xom is getting BORED.");

[7.31912]

[7.31958]

                god_speaks(you.religion, "Xom is getting BORED.");

Replacement in crawl-ref/source/player.h at line 317 [6.945993]
∅:D[4.421] → [8.1059:1093]
B:BD[9.198] → [8.1059:1093]
```
bool you_tran_can_wear( int eq );
```
[4.421]
[6.958773]
```
bool you_tran_can_wear( int eq, bool check_mutation = false );
```
Deletion in crawl-ref/source/player.cc at line 476 [6.962854]
B:BD[9.1053] → [9.1053:1073]
∅:D[9.1073] → [10.343086:343087]
B:BD[6.966926] → [10.343086:343087]
B:BD[10.343087] → [9.1074:1096]
```
       return true;
   if (you.is_undead)
```
Deletion in crawl-ref/source/player.cc at line 496 [6.962854]
B:BD[9.1518] → [9.1518:1523]
```
   {
```
Deletion in crawl-ref/source/player.cc at line 497 [6.962854]
B:BD[9.1544] → [9.1544:1549]
```
   }
```

Insertion in crawl-ref/source/player.cc at line 501 [6.962854]

[9.1550]

   if (you.species == SP_GHOUL && eq == EQ_GLOVES)
       return false;

Replacement in crawl-ref/source/player.cc at line 508 [6.962854]
B:BD[8.1096] → [8.1096:1127]
```
bool you_tran_can_wear(int eq)
```
[8.1096]
[8.1127]
```
bool you_tran_can_wear(int eq, bool check_mutation)
```

Insertion in crawl-ref/source/player.cc at line 510 [6.962854]

[8.1129]

   // not a transformation, but also temporary -> check first
   if (check_mutation)
   {
       if (you.mutation[MUT_CLAWS] >= 3 && eq == EQ_GLOVES)
           return false;
       if (eq == EQ_BOOTS
           && (player_is_swimming() && you.species == SP_MERFOLK
               || you.mutation[MUT_HOOVES] >= 2))
       {
           return false;
       }
   }

Insertion in crawl-ref/source/player.cc at line 5744 [6.962854]

[11.1544]

bool player::has_claws() const
{
    // these transformations bring claws with them
    if (attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
        || attribute[ATTR_TRANSFORMATION] == TRAN_SERPENT_OF_HELL)
    {
        return true;
    }
    // these are the only other sources for claws
    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 );
}

Replacement in crawl-ref/source/player.cc at line 5765 [6.962854]

B:BD[11.1584] → [11.1584:1793]

    return (equip[EQ_GLOVES] == -1 &&
            (attribute[ATTR_TRANSFORMATION] == TRAN_DRAGON
             || mutation[MUT_CLAWS] 
             || species == SP_TROLL
             || species == SP_GHOUL));

[11.1584]

[11.1793]

    return (equip[EQ_GLOVES] == -1 && has_claws());

Replacement in crawl-ref/source/output.cc at line 1285 [6.1088282]

B:BD[9.2150] → [8.2598:2655]

                else if (!you_tran_can_wear(e_order[i]))

[9.2150]

[8.2655]

                else if (!you_tran_can_wear(e_order[i], true))

Replacement in crawl-ref/source/mutation.cc at line 71 [6.1263003]
B:BD[12.331] → [12.331:372]
```
    "Your claws are sharper than steel."
```
[12.331]
[12.372]
```
    "You have claws sharper than steel for hands."
```
Replacement in crawl-ref/source/mutation.cc at line 263 [6.1263003]
B:BD[6.1271649] → [6.1271649:1271700]
```
    //     will never accept a 'marked' worhsipper
```
[6.1271649]
[6.1271700]
```
    //     will never accept a 'marked' worshipper
```
Deletion in crawl-ref/source/mutation.cc at line 1611 [6.1263003]
B:BD[6.1310405] → [10.395469:395470]

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

B:BD[6.1310484] → [6.1310484:1310537]

B:BD[6.1310537] → [13.2795:2835]

        // gloves aren't prevented until level three
        if (you.mutation[ mutat ] >= 3)

[6.1310484]

[13.2835]

        // gloves aren't prevented until level 3; we don't have the
        // mutation yet, so we have to check for level 2 or higher claws
        // here
        if (you.mutation[mutat] >= 2)

Insertion in crawl-ref/source/mutation.cc at line 1620 [6.1263003]
[13.2876]
[6.1310875]

Insertion in crawl-ref/source/item_use.cc at line 755 [6.2781507]

[10.735428]

    }
    if (sub_type == ARM_GLOVES)
    {
        if (you.species == SP_TROLL || you.species == SP_GHOUL
            || you.mutation[MUT_CLAWS] >= 3)
        {
            if (verbose)
                mpr( "You can't wear gloves with your huge claws!" );
            return (false);
        }

Replacement in crawl-ref/source/it_use2.cc at line 326 [6.2904329]

B:BD[14.14483] → [14.14483:14540]

B:BD[14.14540] → [15.4720:4778]

            bool likes_blood = (you.species == SP_KOBOLD
                                || you.species == SP_OGRE

[14.14483]

[14.14596]

            bool likes_blood = (you.species == SP_OGRE

Insertion in crawl-ref/source/food.cc at line 198 [6.3043806]
[6.3048228]
[6.3048228]
```
    int old_gloves = you.equip[EQ_GLOVES];
```

Deletion in crawl-ref/source/food.cc at line 205 [6.3043806]

B:BD[14.15552] → [14.15552:15556]

∅:D[14.15556] → [5.875:1184]

B:BD[5.875] → [5.875:1184]

   
    bool barehand_butcher =
        (you.equip[ EQ_GLOVES ] == -1
         && (transform_can_butcher_barehanded(transform)
             || (transform == TRAN_NONE
                 && (you.species == SP_TROLL
                     || you.species == SP_GHOUL
                     || you.mutation[MUT_CLAWS]))));

Replacement in crawl-ref/source/food.cc at line 206 [6.3043806]

B:BD[6.3048582] → [16.671:971]

    bool gloved_butcher = (you.species == SP_TROLL ||
                           you.species == SP_GHOUL ||
                           you.mutation[MUT_CLAWS]) &&
        (you.equip[EQ_GLOVES] != -1 &&
         !item_cursed(you.inv[you.equip[EQ_GLOVES]]));
    int old_gloves = you.equip[EQ_GLOVES];

[6.3048582]

[16.971]

    bool barehand_butcher = (transform_can_butcher_barehanded(transform)
                             || you.has_claws()) && you.equip[EQ_GLOVES] == -1;
    bool gloved_butcher = you.has_claws() && (you.equip[EQ_GLOVES] != -1
                          && !item_cursed(you.inv[you.equip[EQ_GLOVES]]));

Replacement in crawl-ref/source/food.cc at line 212 [6.3043806]

B:BD[16.972] → [14.15557:15617]

∅:D[16.1015] → [10.850732:850826]

∅:D[14.15617] → [10.850732:850826]

B:BD[10.850732] → [10.850732:850826]

    bool can_butcher = teeth_butcher || barehand_butcher ||
        (you.equip[EQ_WEAPON] != -1 &&
         can_cut_meat(you.inv[you.equip[EQ_WEAPON]]));

[16.972]

[10.850826]

    bool can_butcher = teeth_butcher || barehand_butcher
                       || you.equip[EQ_WEAPON] != -1
                          && can_cut_meat(you.inv[you.equip[EQ_WEAPON]]);

Deletion in crawl-ref/source/fight.cc at line 1302 [6.3140790]
B:BD[17.51505] → [17.51505:51534]
```
        case TRAN_ICE_BEAST:
```

Insertion in crawl-ref/source/fight.cc at line 1304 [6.3140790]

[17.51584]

            if (you.has_usable_claws())
            {
                if (damage < HIT_MED)
                    attack_verb = "claw";
                else if (damage < HIT_STRONG)
                    attack_verb = "mangle";
                else
                    attack_verb = "eviscerate";
                break;
            }
            // or fall-through
        case TRAN_ICE_BEAST:

Replacement in crawl-ref/source/fight.cc at line 2282 [6.3140790]
∅:D[18.2435] → [17.70058:70122]
B:BD[19.5357] → [17.70058:70122]
```
    // if you can't see yourself, you're a little less acurate.
```
[18.2435]
[2.2140]
```
    // if you can't see yourself, you're a little less accurate.
```
Insertion in crawl-ref/source/externs.h at line 727 [6.3270163]
[17.83074]
[11.24982]
```
    bool      has_claws() const;
```

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

B:BD[20.1556] → [3.509:578]

∅:D[3.578] → [14.25118:25181]

B:BD[14.25118] → [14.25118:25181]

∅:D[14.25181] → [20.1636:1668]

B:BD[20.1636] → [20.1636:1668]

                 (you.species == SP_TROLL || you.species == SP_GHOUL
                  || you.mutation[MUT_FANGS] == 3) ? "ripping"
                 : "chopping");

[20.1556]

[10.1005789]

                 (you.has_usable_claws() || you.mutation[MUT_FANGS] == 3) ?
                 "ripping" : "chopping");

Replacement in crawl-ref/source/command.cc at line 382 [6.4082507]
∅:D[4.3125] → [21.1095:1135]
B:BD[21.1095] → [21.1095:1135]
```
        else if (!you_tran_can_wear(i))
```
[4.3125]
[21.1135]
```
        else if (!you_tran_can_wear(i, true))
```

Applying patches by dolorous:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.cc at line 437 [6.143977]

Replacement in crawl-ref/source/spells4.cc at line 89 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 97 [6.436250]

Replacement in crawl-ref/source/religion.cc at line 3071 [6.804403]

Replacement in crawl-ref/source/player.h at line 317 [6.945993]

Deletion in crawl-ref/source/player.cc at line 476 [6.962854]

Deletion in crawl-ref/source/player.cc at line 496 [6.962854]

Deletion in crawl-ref/source/player.cc at line 497 [6.962854]

Insertion in crawl-ref/source/player.cc at line 501 [6.962854]

Replacement in crawl-ref/source/player.cc at line 508 [6.962854]

Insertion in crawl-ref/source/player.cc at line 510 [6.962854]

Insertion in crawl-ref/source/player.cc at line 5744 [6.962854]

Replacement in crawl-ref/source/player.cc at line 5765 [6.962854]

Replacement in crawl-ref/source/output.cc at line 1285 [6.1088282]

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

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

Deletion in crawl-ref/source/mutation.cc at line 1611 [6.1263003]

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

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

Insertion in crawl-ref/source/item_use.cc at line 755 [6.2781507]

Replacement in crawl-ref/source/it_use2.cc at line 326 [6.2904329]

Insertion in crawl-ref/source/food.cc at line 198 [6.3043806]

Deletion in crawl-ref/source/food.cc at line 205 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 206 [6.3043806]

Replacement in crawl-ref/source/food.cc at line 212 [6.3043806]

Deletion in crawl-ref/source/fight.cc at line 1302 [6.3140790]

Insertion in crawl-ref/source/fight.cc at line 1304 [6.3140790]

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

Insertion in crawl-ref/source/externs.h at line 727 [6.3270163]

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

Replacement in crawl-ref/source/command.cc at line 382 [6.4082507]