fiddlerwoaroof/crawl - Change EEZCC5GUYHETFQV4KSZJSJ6BTTWZHKS7RXQ25XQ6ODGKLDD4XFRAC

Fixed acquirement giving unwearable armour (Iaido).

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

Created by dshaligram on August 4, 2007

EEZCC5GUYHETFQV4KSZJSJ6BTTWZHKS7RXQ25XQ6ODGKLDD4XFRAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/transfor.h at line 35 [6.142596]
B:BD[6.143353] → [7.96398:96440]
```
bool can_equip(equipment_type use_which);
```
[6.143353]
[7.96440]
```
bool can_equip(equipment_type use_which, bool ignore_temporary);
```
Replacement in crawl-ref/source/transfor.cc at line 545 [6.143977]
B:BD[6.158691] → [7.97723:97766]
```
bool can_equip( equipment_type use_which )
```
[6.158691]
[6.158724]
```
bool can_equip( equipment_type use_which, bool ignore_temporary )
```
Replacement in crawl-ref/source/transfor.cc at line 550 [6.143977]
B:BD[6.158822] → [6.158822:158857]
```
    if (!player_is_shapechanged())
```
[6.158822]
[6.158857]
```
    if (ignore_temporary || !player_is_shapechanged())
```
Replacement in crawl-ref/source/transfor.cc at line 586 [6.143977]
B:BD[6.159725] → [6.159725:159773]
```
    switch (you.attribute[ATTR_TRANSFORMATION])
```
[6.159725]
[6.159773]
```
    if (!ignore_temporary)
```

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

B:BD[6.159779] → [6.159779:159842]

    case TRAN_NONE:
    case TRAN_LICH:
        return (true);

[6.159779]

[6.159842]

        switch (you.attribute[ATTR_TRANSFORMATION])
        {
        case TRAN_NONE:
        case TRAN_LICH:
            return (true);

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

B:BD[6.159843] → [6.159843:159995]

    case TRAN_BLADE_HANDS:
        return (use_which != EQ_WEAPON
                && use_which != EQ_GLOVES
                && use_which != EQ_SHIELD);

[6.159843]

[6.159995]

        case TRAN_BLADE_HANDS:
            return (use_which != EQ_WEAPON
                    && use_which != EQ_GLOVES
                    && use_which != EQ_SHIELD);

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

B:BD[6.159996] → [6.159996:160144]

    case TRAN_STATUE:
        return (use_which == EQ_WEAPON 
                || use_which == EQ_CLOAK 
                || use_which == EQ_HELMET);

[6.159996]

[6.160144]

        case TRAN_STATUE:
            return (use_which == EQ_WEAPON 
                    || use_which == EQ_CLOAK 
                    || use_which == EQ_HELMET);

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

B:BD[6.160145] → [6.160145:160210]

    case TRAN_ICE_BEAST:
        return (use_which == EQ_CLOAK);

[6.160145]

[6.160210]

        case TRAN_ICE_BEAST:
            return (use_which == EQ_CLOAK);

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

B:BD[6.160211] → [6.160211:160248]

    default:
        return (false);

[6.160211]

[6.160248]

        default:
            return (false);
        }

Insertion in crawl-ref/source/item_use.h at line 96 [6.2777340]
[6.2780186]
[6.2780186]
```
bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary);
```

Replacement in crawl-ref/source/item_use.cc at line 90 [6.2781507]

B:BD[7.729261] → [5.551:684]

    if (!ignore_temporary_disability
        && you.attribute[ATTR_TRANSFORMATION] != TRAN_NONE 
        && !can_equip( EQ_WEAPON ))

[7.729261]

[7.729262]

    if (!can_equip( EQ_WEAPON, ignore_temporary_disability ))

Replacement in crawl-ref/source/item_use.cc at line 721 [6.2781507]
B:BD[6.2797812] → [6.2797812:2797856]
```
bool do_wear_armour( int item, bool quiet )
```
[6.2797812]
[6.2797856]
```
bool can_wear_armour(const item_def &item, bool verbose, bool ignore_temporary)
```

Replacement in crawl-ref/source/item_use.cc at line 723 [6.2781507]

B:BD[6.2797882] → [6.2797882:2798032]

B:BD[6.2798032] → [4.3102:3167]

    if (!is_valid_item( you.inv[item] ))
    {
        if (!quiet)
           mpr("You don't have any such object.");
        return (false);
    }
    const object_class_type base_type = you.inv[item].base_type;

[6.2797858]

[7.734768]

    const object_class_type base_type = item.base_type;

Replacement in crawl-ref/source/item_use.cc at line 726 [6.2781507]
B:BD[6.2798085] → [6.2798085:2798105]
```
        if (!quiet)
```
[6.2798085]
[6.2798105]
```
        if (verbose)
```

Replacement in crawl-ref/source/item_use.cc at line 731 [6.2781507]

B:BD[6.2798176] → [6.2798176:2798177]

B:BD[6.2798177] → [7.734802:734956]

∅:D[7.734956] → [6.2798177:2798322]

B:BD[6.2798177] → [6.2798177:2798322]

B:BD[6.2798322] → [3.290:320]

∅:D[3.320] → [6.2798387:2798393]

B:BD[6.2798387] → [6.2798387:2798393]

B:BD[6.2798393] → [3.321:391]

∅:D[3.391] → [6.2798518:2798519]

B:BD[6.2798518] → [6.2798518:2798519]

B:BD[6.2798519] → [3.392:416]

∅:D[3.416] → [6.2798557:2798676]

B:BD[6.2798557] → [6.2798557:2798676]

B:BD[6.2798676] → [7.734957:735116]

∅:D[7.735116] → [6.2799026:2799137]

B:BD[6.2799026] → [6.2799026:2799137]

B:BD[6.2799137] → [7.735117:735118]


    const int sub_type  = you.inv[item].sub_type;
    const item_def &invitem = you.inv[item];
    const equipment_type slot = get_armour_slot(invitem);
    if (item == you.equip[EQ_WEAPON])
    {
        if (!quiet)
           mpr("You are wielding that object!");
        return (false);
    }
    if ( wearing_slot(item) )
    {
        if (!quiet)
            mpr("You are already wearing that!");
        return (false);
    }
    // if you're wielding something,
    if (you.equip[EQ_WEAPON] != -1
        // attempting to wear a shield,
        && is_shield(you.inv[item])
        && is_shield_incompatible(
                    you.inv[you.equip[EQ_WEAPON]],
                    &you.inv[item]))
    {
        if (!quiet)
           mpr("You'd need three hands to do that!");
        return (false);
    }

[6.2798176]

[7.735118]

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

[7.735144]

    const int sub_type = item.sub_type;
    const equipment_type slot = get_armour_slot(item);

Replacement in crawl-ref/source/item_use.cc at line 744 [6.2781507]
B:BD[7.735343] → [7.735343:735363]
```
        if (!quiet)
```
[7.735343]
[7.735363]
```
        if (verbose)
```
Replacement in crawl-ref/source/item_use.cc at line 749 [6.2781507]
∅:D[7.735435] → [6.2799138:2799183]
B:BD[6.2799138] → [6.2799138:2799183]
```
    if (you.inv[item].sub_type == ARM_BOOTS)
```
[7.735435]
[6.2799183]
```
    if (sub_type == ARM_BOOTS)
```
Replacement in crawl-ref/source/item_use.cc at line 753 [6.2781507]
B:BD[6.2799280] → [6.2799280:2799304]
```
            if (!quiet)
```
[6.2799280]
[7.735502]
```
            if (verbose)
```

Replacement in crawl-ref/source/item_use.cc at line 758 [6.2781507]

B:BD[6.2799593] → [6.2799593:2799656]

        if (player_is_swimming() && you.species == SP_MERFOLK)

[6.2799388]

[6.2799656]

        if (!ignore_temporary && player_is_swimming()
            && you.species == SP_MERFOLK)

Replacement in crawl-ref/source/item_use.cc at line 761 [6.2781507]
B:BD[6.2799666] → [6.2799666:2799690]
```
            if (!quiet)
```
[6.2799666]
[6.2799690]
```
            if (verbose)
```
Replacement in crawl-ref/source/item_use.cc at line 769 [6.2781507]
∅:D[7.735611] → [6.2800369:2800407]
B:BD[6.2800369] → [6.2800369:2800407]
```
        && !player_is_shapechanged())
```
[7.735611]
[6.2800407]
```
        && (ignore_temporary || !player_is_shapechanged()))
```
Insertion in crawl-ref/source/item_use.cc at line 772 [6.2781507]
[6.2800432]
[6.2800432]
```
        return (true);
```
Replacement in crawl-ref/source/item_use.cc at line 776 [6.2781507]
∅:D[7.735660] → [6.2800590:2800633]
B:BD[6.2800590] → [6.2800590:2800633]
```
             && !player_is_shapechanged())
```
[7.735660]
[6.2800633]
```
             && (ignore_temporary || !player_is_shapechanged()))
```
Insertion in crawl-ref/source/item_use.cc at line 779 [6.2781507]
[6.2800658]
[6.2800658]
```
        return (true);
```

Replacement in crawl-ref/source/item_use.cc at line 782 [6.2781507]

B:BD[7.735697] → [7.735697:735819]

             && (get_helmet_type(invitem) == THELM_CAP
                 || get_helmet_type(invitem) == THELM_WIZARD_HAT))

[7.735697]

[6.2800848]

             && (get_helmet_type(item) == THELM_CAP
                 || get_helmet_type(item) == THELM_WIZARD_HAT))

Insertion in crawl-ref/source/item_use.cc at line 786 [6.2781507]
[2.1585]
[6.2800931]
```
        return (true);
```
Replacement in crawl-ref/source/item_use.cc at line 788 [6.2781507]
B:BD[6.2800937] → [7.735820:735853]
```
    else if (!can_equip( slot ))
```
[6.2800937]
[6.2800974]
```
    else if (!can_equip( slot, ignore_temporary ))
```
Replacement in crawl-ref/source/item_use.cc at line 790 [6.2781507]
B:BD[6.2800980] → [6.2800980:2801000]
```
        if (!quiet)
```
[6.2800980]
[6.2801000]
```
        if (verbose)
```
Replacement in crawl-ref/source/item_use.cc at line 797 [6.2781507]
B:BD[6.2801128] → [6.2801128:2801157]
```
    if (player_is_swimming()
```
[6.2801128]
[7.735854]
```
    if (!ignore_temporary
        && player_is_swimming()
```
Replacement in crawl-ref/source/item_use.cc at line 800 [6.2781507]
B:BD[7.735888] → [7.735888:735928]
```
        && !is_light_armour( invitem ))
```
[7.735888]
[6.2801241]
```
        && !is_light_armour( item ))
```
Replacement in crawl-ref/source/item_use.cc at line 802 [6.2781507]
B:BD[6.2801247] → [6.2801247:2801267]
```
        if (!quiet)
```
[6.2801247]
[6.2801267]
```
        if (verbose)
```

Replacement in crawl-ref/source/item_use.cc at line 818 [6.2781507]

B:BD[7.736192] → [7.736192:736318]

                && (get_helmet_type(invitem) == THELM_HELM
                    || get_helmet_type(invitem) == THELM_HELMET)))

[7.736192]

[6.2801958]

                && (get_helmet_type(item) == THELM_HELM
                    || get_helmet_type(item) == THELM_HELMET)))

Replacement in crawl-ref/source/item_use.cc at line 821 [6.2781507]
B:BD[6.2801968] → [6.2801968:2801992]
```
            if (!quiet)
```
[6.2801968]
[6.2801992]
```
            if (verbose)
```

Replacement in crawl-ref/source/item_use.cc at line 839 [6.2781507]

B:BD[7.736656] → [7.736656:736782]

                && (get_helmet_type(invitem) == THELM_HELM
                    || get_helmet_type(invitem) == THELM_HELMET)))

[7.736656]

[6.2802746]

                && (get_helmet_type(item) == THELM_HELM
                    || get_helmet_type(item) == THELM_HELMET)))

Replacement in crawl-ref/source/item_use.cc at line 842 [6.2781507]
B:BD[6.2802756] → [6.2802756:2802780]
```
            if (!quiet)
```
[6.2802756]
[6.2802780]
```
            if (verbose)
```

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

[6.2802887]

    return (true);
}
bool do_wear_armour( int item, bool quiet )
{
    if (!is_valid_item( you.inv[item] ))
    {
        if (!quiet)
           mpr("You don't have any such object.");
        return (false);
    }
    if (!can_wear_armour(you.inv[item], !quiet, false))
        return (false);
    
    const item_def &invitem = you.inv[item];
    const equipment_type slot = get_armour_slot(invitem);
    if (item == you.equip[EQ_WEAPON])
    {
        if (!quiet)
           mpr("You are wielding that object!");
        return (false);
    }
    if ( wearing_slot(item) )
    {
        if (!quiet)
            mpr("You are already wearing that!");
        return (false);
    }
    // if you're wielding something,
    if (you.equip[EQ_WEAPON] != -1
        // attempting to wear a shield,
        && is_shield(you.inv[item])
        && is_shield_incompatible(
                    you.inv[you.equip[EQ_WEAPON]],
                    &you.inv[item]))
    {
        if (!quiet)
           mpr("You'd need three hands to do that!");
        return (false);
    }

Replacement in crawl-ref/source/item_use.cc at line 909 [6.2781507]

B:BD[8.446] → [8.446:532]

                     you.inv[you.equip[EQ_BODY_ARMOUR]].name(DESC_CAP_YOUR).c_str());

[8.446]

[8.532]

                     you.inv[you.equip[EQ_BODY_ARMOUR]].name(DESC_CAP_YOUR)
                                                       .c_str());

Replacement in crawl-ref/source/effects.cc at line 1158 [6.3382105]

B:BD[5.1129] → [5.1129:1230]

            if (doodad.base_type == OBJ_WEAPONS
                && !can_wield(&doodad, false, true))

[5.1129]

[5.1230]

            if ((doodad.base_type == OBJ_WEAPONS
                 && !can_wield(&doodad, false, true))
                || (doodad.base_type == OBJ_ARMOUR
                    && !can_wear_armour(doodad, false, true)))

Replacement in crawl-ref/source/effects.cc at line 1167 [6.3382105]
B:BD[5.1371] → [5.1371:1396]
```
                        
```
[5.1371]
[9.16498]

Fixed acquirement giving unwearable armour (Iaido).

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/transfor.h at line 35 [6.142596]

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

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

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

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

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

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

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

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

Insertion in crawl-ref/source/item_use.h at line 96 [6.2777340]

Replacement in crawl-ref/source/item_use.cc at line 90 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 721 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 723 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 726 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 731 [6.2781507]

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

Replacement in crawl-ref/source/item_use.cc at line 744 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 749 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 753 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 758 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 761 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 769 [6.2781507]

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

Replacement in crawl-ref/source/item_use.cc at line 776 [6.2781507]

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

Replacement in crawl-ref/source/item_use.cc at line 782 [6.2781507]

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

Replacement in crawl-ref/source/item_use.cc at line 788 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 790 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 797 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 800 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 802 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 818 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 821 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 839 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 842 [6.2781507]

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

Replacement in crawl-ref/source/item_use.cc at line 909 [6.2781507]

Replacement in crawl-ref/source/effects.cc at line 1158 [6.3382105]

Replacement in crawl-ref/source/effects.cc at line 1167 [6.3382105]