fiddlerwoaroof/crawl - Change CL7GSN76SHFJA7SAHJMLN4K5ALWGSF6UFI2QTM4Y5W7WKBAZQP2AC

Fix [1994684]: Weapon enchantments were always failing if only one of

the two stats was 9 or greater, instead of both.

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

Created by dolorous on June 16, 2008

CL7GSN76SHFJA7SAHJMLN4K5ALWGSF6UFI2QTM4Y5W7WKBAZQP2AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/itemprop.cc at line 1330 [4.646661]
B:BD[3.3147] → [3.3147:3172]
```
    // These are obvious
```
[3.3147]
[3.3172]
```
    // These are obvious...
```

Replacement in crawl-ref/source/itemprop.cc at line 1334 [4.646661]

B:BD[4.683010] → [3.3250:3342]

B:BD[3.3342] → [5.8907:9046]

∅:D[5.9046] → [3.3487:3538]

B:BD[3.3487] → [3.3487:3538]

    // ... but electro-weapons can also be charged
    return ( it.base_type == OBJ_WEAPONS
             && !is_random_artefact(it)
             && !is_fixed_artefact(it)
             && get_weapon_brand(it) == SPWPN_ELECTROCUTION
             && (!known || item_type_known(it)) );

[4.683010]

[3.3538]

    // ...but electric weapons can also be charged.
    return (it.base_type == OBJ_WEAPONS
            && !is_random_artefact(it)
            && !is_fixed_artefact(it)
            && get_weapon_brand(it) == SPWPN_ELECTROCUTION
            && (!known || item_type_known(it)));

Replacement in crawl-ref/source/itemprop.cc at line 1347 [4.646661]

B:BD[6.4622] → [5.9047:9115]

∅:D[5.9115] → [6.4689:4726]

B:BD[6.4689] → [6.4689:4726]

B:BD[6.4726] → [5.9116:9192]

∅:D[5.9192] → [6.4806:4812]

B:BD[6.4806] → [6.4806:4812]

B:BD[6.4812] → [2.2634:2712]

∅:D[2.2712] → [6.4889:4896]

B:BD[6.4889] → [6.4889:4896]

B:BD[6.4896] → [2.2713:2782]

∅:D[2.2782] → [5.9193:9274]

B:BD[6.4964] → [5.9193:9274]

    // Artefacts cannot be enchanted (missiles can't be artefacts).
    if (wpn.base_type == OBJ_WEAPONS
        && (is_fixed_artefact(wpn)
            || is_random_artefact(wpn)))
    {
        return (uncurse && item_cursed( wpn )); // ?EW may uncurse artefacts.
    }
    // Nor can highly enchanted items (missiles only have one stat).
    if (wpn.plus >= 9
        || wpn.base_type == OBJ_WEAPONS && wpn.plus2 >= 9)

[3.3541]

[6.5049]

    // Artefacts or highly enchanted weapons cannot be enchanted, only
    // uncursed.
    if (wpn.base_type == OBJ_WEAPONS)

Replacement in crawl-ref/source/itemprop.cc at line 1351 [4.646661]

B:BD[6.5055] → [5.9275:9349]

        return (uncurse && item_cursed( wpn )); // ?EW may uncurse items.

[6.5055]

[6.5128]

        if (is_artefact(wpn) || wpn.plus >= 9 && wpn.plus2 >= 9)
            return (uncurse && item_cursed(wpn));

Insertion in crawl-ref/source/itemprop.cc at line 1354 [4.646661]

[6.5134]

    // Highly enchanted missiles, which have only one stat, cannot be
    // enchanted or uncursed, since missiles cannot be artefacts or
    // cursed.
    else if (wpn.plus >= 9)
        return (false);

Deletion in crawl-ref/source/itemprop.cc at line 1367 [4.646661]
B:BD[3.3773] → [3.3773:3774]
B:BD[3.3774] → [5.9350:9455]
∅:D[5.9455] → [3.3882:3888]
B:BD[3.3882] → [3.3882:3888]
B:BD[3.3888] → [5.9456:9532]
∅:D[5.9532] → [3.3965:3971]
B:BD[3.3965] → [3.3965:3971]
```
    // Artefacts cannot be enchanted.
    if (is_fixed_artefact(arm)
        || is_random_artefact(arm))
    {
        return (uncurse && item_cursed(arm)); // ?EA may uncurse artefacts.
    }
```

Replacement in crawl-ref/source/itemprop.cc at line 1368 [4.646661]

B:BD[3.3972] → [5.9533:9594]

    // Nor can highly enchanted items.
    if (arm.plus >= 2

[3.3972]

[5.9594]

    // Artefacts or highly enchanted armour cannot be enchanted, only
    // uncursed.
    if (is_artefact(arm) || (arm.plus >= 2

Replacement in crawl-ref/source/itemprop.cc at line 1372 [4.646661]
B:BD[5.9661] → [5.9661:9693]
```
            || is_shield(arm)))
```
[5.9661]
[3.4135]
```
            || is_shield(arm))))
```

Replacement in crawl-ref/source/itemprop.cc at line 1374 [4.646661]

B:BD[3.4141] → [5.9694:9766]

        return (uncurse && item_cursed(arm)); // ?EA may uncurse items.

[3.4141]

[3.4213]

        return (uncurse && item_cursed(arm));