fiddlerwoaroof/crawl - Change Q2LPHU5H37HYN24G42JF4T3MXLEULG2NXKMD2WGDNYE5UBR56SHQC

Implement FR 2489034: Disallow known scrolls of enchant

armour/recharging on armour that cannot be enchanted or items that cannot be recharged, respectively.

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

Created by j-p-e-g on January 8, 2009

Q2LPHU5H37HYN24G42JF4T3MXLEULG2NXKMD2WGDNYE5UBR56SHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/itemprop.h at line 638 [3.641567]

B:BD[3.643810] → [4.3565:3632]

bool item_is_rechargeable(const item_def &it, bool known = false);

[3.643810]

[5.3161]

bool item_is_rechargeable(const item_def &it, bool unknown = false,
                          bool hide_charged = false);

Replacement in crawl-ref/source/itemprop.cc at line 1330 [3.646661]

B:BD[6.3088] → [7.3057:3197]

∅:D[7.3197] → [4.3634:3692]

B:BD[8.8906] → [4.3634:3692]

// If known is true, only returns true for *known* weapons of electrocution,
// and returns false for wands/rods known to be fully charged.
bool item_is_rechargeable(const item_def &it, bool known)

[6.3088]

[6.3145]

// Returns whether a wand or rod can be charged, or a weapon of electrocution
// enchanted.
// If unknown is true, wands with unknown charges and weapons with unknown
// brand will also return true.
// If hide_charged is true, wands known to be full will return false.
// (This distinction is necessary because even full wands/rods give a message.)
bool item_is_rechargeable(const item_def &it, bool unknown, bool hide_charged)

Insertion in crawl-ref/source/itemprop.cc at line 1341 [3.646661]

[7.3239]

[2.4014]

        if (unknown && !hide_charged)
            return (true);

Replacement in crawl-ref/source/itemprop.cc at line 1345 [3.646661]

B:BD[2.4070] → [2.4070:4125]

∅:D[2.4125] → [7.3293:3353]

B:BD[7.3293] → [7.3293:3353]

B:BD[7.3353] → [2.4126:4202]

        if (known && (it.plus2 == ZAPCOUNT_MAX_CHARGED
                      || item_ident(it, ISFLAG_KNOW_PLUSES)
                         && it.plus >= 3 * wand_charge_value(it.sub_type)))

[2.4070]

[7.3428]

        if (it.plus2 == ZAPCOUNT_MAX_CHARGED
            || item_ident(it, ISFLAG_KNOW_PLUSES)
               && it.plus >= 3 * wand_charge_value(it.sub_type))

Replacement in crawl-ref/source/itemprop.cc at line 1355 [3.646661]

B:BD[7.3541] → [7.3541:3598]

        if (known && item_ident(it, ISFLAG_KNOW_PLUSES))

[7.3541]

[7.3598]

        if (unknown && !hide_charged)
            return (true);
        if (item_ident(it, ISFLAG_KNOW_PLUSES))

Insertion in crawl-ref/source/itemprop.cc at line 1365 [3.646661]

[7.3733]

[3.683009]

    else if (it.base_type == OBJ_WEAPONS)
    {
        if (unknown && !item_type_known(it)) // Could be electrocution.
            return (true);

Replacement in crawl-ref/source/itemprop.cc at line 1370 [3.646661]

B:BD[3.683010] → [9.2663:2832]

    // ...but electric weapons can also be charged.
    return (it.base_type == OBJ_WEAPONS
            && !is_random_artefact(it)
            && !is_fixed_artefact(it)

[3.683010]

[9.2832]

        // Weapons of electrocution can get +1 to-dam this way.
        if (!is_artefact(it)

Replacement in crawl-ref/source/itemprop.cc at line 1373 [3.646661]

B:BD[9.2891] → [9.2891:2940]

            && (!known || item_type_known(it)));

[9.2891]

[6.3538]

            && item_type_known(it)
            && (unknown && !item_ident(it, ISFLAG_KNOW_PLUSES )
                || item_ident(it, ISFLAG_KNOW_PLUSES )
                   && it.plus2 < MAX_WPN_ENCHANT))
        {
            return (true);
        }
    }
    return (false);

Replacement in crawl-ref/source/item_use.cc at line 4170 [11.2781507]
B:BD[10.4722] → [10.4722:4747]
```
    if (item_slot == -1)
```
[10.4722]
[12.3674]
```
    do
```

Replacement in crawl-ref/source/item_use.cc at line 4172 [11.2781507]

B:BD[12.3680] → [13.7561:7709]

∅:D[13.7709] → [12.3681:3687]

B:BD[10.4898] → [12.3681:3687]

        item_slot = prompt_invent_item("Enchant which item?", MT_INVLIST,
                                       OSEL_ENCH_ARM, true, true, false);
    }

[12.3680]

[10.4898]

        if (item_slot == -1)
        {
            item_slot = prompt_invent_item("Enchant which item?", MT_INVLIST,
                                           OSEL_ENCH_ARM, true, true, false);
        }
        if (prompt_failed(item_slot))
            return (false);

Replacement in crawl-ref/source/item_use.cc at line 4180 [11.2781507]
B:BD[10.4899] → [14.3686:3720]
∅:D[15.2960] → [10.4970:4994]
∅:D[14.3720] → [10.4970:4994]
B:BD[10.4970] → [10.4970:4994]
```
    if (prompt_failed(item_slot))
        return (false);
```
[10.4899]
[10.5000]
```
        item_def& arm(you.inv[item_slot]);
```

Replacement in crawl-ref/source/item_use.cc at line 4182 [11.2781507]

B:BD[10.5001] → [10.5001:5040]

    item_def& arm(you.inv[item_slot]);

[10.5001]

[10.5040]

        if (!is_enchantable_armour(arm, true, true))
        {
            mpr("Choose some type of armour to enchant, or Esc to abort.");
            if (Options.auto_list)
                more();
            item_slot = -1;
            continue;
        }

Replacement in crawl-ref/source/item_use.cc at line 4192 [11.2781507]

B:BD[10.5041] → [10.5041:5117]

    int ac_change;
    bool result = enchant_armour(ac_change, false, arm);

[10.5041]

[10.5117]

        // Okay, we may actually (attempt to) enchant something.
        int ac_change;
        bool result = enchant_armour(ac_change, false, arm);
        if (ac_change)
            you.redraw_armour_class = true;

Replacement in crawl-ref/source/item_use.cc at line 4199 [11.2781507]
B:BD[10.5118] → [16.2745:2764]
∅:D[16.2764] → [10.5202:5242]
B:BD[10.5202] → [10.5202:5242]
```
    if (ac_change)
        you.redraw_armour_class = true;
```
[10.5118]
[10.5242]
```
        return (result);
    }
    while (true);
```
Replacement in crawl-ref/source/item_use.cc at line 4203 [11.2781507]
B:BD[10.5243] → [17.6022:6043]
```
    return (result);
```
[10.5243]
[11.2857290]
```
    return (false);
```
Replacement in crawl-ref/source/item_use.cc at line 4281 [11.2781507]
B:BD[18.4247] → [4.3697:3737]
```
        if (item_is_rechargeable(item))
```
[18.4247]
[6.7218]
```
        if (item_is_rechargeable(item, true))
```

Replacement in crawl-ref/source/invent.cc at line 878 [11.2920632]

B:BD[6.8893] → [4.3808:3856]

        return (item_is_rechargeable(i, true));

[6.8893]

[19.7291]

        return (item_is_rechargeable(i, true, true));

Replacement in crawl-ref/source/effects.cc at line 1878 [11.3382105]
B:BD[11.3425265] → [6.9139:9164]
```
    if (item_slot == -1)
```
[11.3425265]
[20.11905]
```
    do
```

Replacement in crawl-ref/source/effects.cc at line 1880 [11.3382105]

∅:D[20.11911] → [6.9164:9314]

B:BD[6.9164] → [6.9164:9314]

B:BD[6.9314] → [20.11912:11918]

        item_slot = prompt_invent_item( "Charge which item?", MT_INVLIST,
                                        OSEL_RECHARGE, true, true, false );
    }

[20.11911]

[6.9314]

        if (item_slot == -1)
        {
            item_slot = prompt_invent_item( "Charge which item?", MT_INVLIST,
                                            OSEL_RECHARGE, true, true, false );
        }
        if (prompt_failed(item_slot))
            return (false);

Replacement in crawl-ref/source/effects.cc at line 1888 [11.3382105]
B:BD[6.9315] → [21.5592:5626]
∅:D[21.5626] → [11.3425375:3425399]
∅:D[6.9386] → [11.3425375:3425399]
∅:D[3.945476] → [11.3425375:3425399]
B:BD[11.3425375] → [11.3425375:3425399]
```
    if (prompt_failed(item_slot))
        return (false);
```
[6.9315]
[3.945477]
```
        item_def &wand = you.inv[ item_slot ];
```

Replacement in crawl-ref/source/effects.cc at line 1890 [11.3382105]

B:BD[3.945478] → [6.9394:9437]

    item_def &wand = you.inv[ item_slot ];

[3.945478]

[6.9437]

        if (!item_is_rechargeable(wand, true, true))
        {
            mpr("Choose an item to recharge, or Esc to abort.");
            if (Options.auto_list)
                more();
            // Try again.
            item_slot = -1;
            continue;
        }

Replacement in crawl-ref/source/effects.cc at line 1901 [11.3382105]

B:BD[6.9438] → [20.11919:11990]

∅:D[20.11990] → [6.9438:9476]

B:BD[6.9438] → [6.9438:9476]

B:BD[6.9476] → [22.6632:6690]

∅:D[22.6690] → [6.9613:9619]

B:BD[6.9613] → [6.9613:9619]

B:BD[6.9619] → [20.11991:12050]

∅:D[20.12050] → [22.6691:6750]

B:BD[6.9677] → [22.6691:6750]

    // Weapons of electrocution can be "charged", i.e. gain +1 damage.
    if (wand.base_type == OBJ_WEAPONS
        && get_weapon_brand(wand) == SPWPN_ELECTROCUTION)
    {
        // Might fail because of already high enchantment.
        if (enchant_weapon( ENCHANT_TO_DAM, false, wand ))

[6.9438]

[6.9741]

        // Weapons of electrocution can be "charged", i.e. gain +1 damage.
        if (wand.base_type == OBJ_WEAPONS
            && get_weapon_brand(wand) == SPWPN_ELECTROCUTION)

Replacement in crawl-ref/source/effects.cc at line 1905 [11.3382105]

B:BD[6.9751] → [6.9751:9788]

            you.wield_change = true;

[6.9751]

[6.9788]

            // Might fail because of already high enchantment.
            if (enchant_weapon( ENCHANT_TO_DAM, false, wand ))
            {
                you.wield_change = true;

Replacement in crawl-ref/source/effects.cc at line 1910 [11.3382105]

B:BD[6.9789] → [6.9789:9899]

            if (!item_ident(wand, ISFLAG_KNOW_TYPE))
                set_ident_flags(wand, ISFLAG_KNOW_TYPE);

[6.9789]

[23.7818]

                if (!item_ident(wand, ISFLAG_KNOW_TYPE))
                    set_ident_flags(wand, ISFLAG_KNOW_TYPE);

Replacement in crawl-ref/source/effects.cc at line 1913 [11.3382105]

∅:D[23.7819] → [6.9912:9939]

B:BD[6.9912] → [6.9912:9939]

            return (true);

[23.7819]

[6.9939]

                return (true);
            }
            return (false);

Deletion in crawl-ref/source/effects.cc at line 1917 [11.3382105]
B:BD[6.9949] → [6.9949:9979]
```
        return (false);
    }
```

Replacement in crawl-ref/source/effects.cc at line 1918 [11.3382105]

B:BD[11.3425406] → [3.945533:945616]

    if (wand.base_type != OBJ_WANDS && !item_is_rod(wand))
        return (false);

[11.3425406]

[11.3425441]

        if (wand.base_type != OBJ_WANDS && !item_is_rod(wand))
            return (false);

Replacement in crawl-ref/source/effects.cc at line 1921 [11.3382105]

B:BD[11.3425442] → [3.945617:945679]

∅:D[3.945679] → [11.3425494:3425500]

B:BD[11.3425494] → [11.3425494:3425500]

B:BD[11.3425500] → [5.3636:3692]

    int charge_gain = 0;
    if (wand.base_type == OBJ_WANDS)
    {
        charge_gain = wand_charge_value(wand.sub_type);

[11.3425442]

[11.3425615]

        int charge_gain = 0;
        if (wand.base_type == OBJ_WANDS)
        {
            charge_gain = wand_charge_value(wand.sub_type);

Replacement in crawl-ref/source/effects.cc at line 1926 [11.3382105]

B:BD[3.946737] → [24.2808:2885]

        // Reinitialize zap counts.
        wand.plus2 = ZAPCOUNT_RECHARGED;

[11.3425616]

[3.946877]

            // Reinitialize zap counts.
            wand.plus2 = ZAPCOUNT_RECHARGED;

Replacement in crawl-ref/source/effects.cc at line 1929 [11.3382105]

B:BD[3.946878] → [25.2678:2920]

        const int new_charges =
            std::max<int>(
                wand.plus,
                std::min(charge_gain * 3,
                         wand.plus +
                         1 + random2avg( ((charge_gain - 1) * 3) + 1, 3 )));

[3.946878]

[3.946949]

            const int new_charges =
                std::max<int>(
                    wand.plus,
                    std::min(charge_gain * 3,
                             wand.plus +
                             1 + random2avg( ((charge_gain - 1) * 3) + 1, 3 )));

Replacement in crawl-ref/source/effects.cc at line 1936 [11.3382105]

B:BD[3.946950] → [5.3693:3749]

        const bool charged = (new_charges > wand.plus);

[3.946950]

[26.3379]

            const bool charged = (new_charges > wand.plus);

Replacement in crawl-ref/source/effects.cc at line 1938 [11.3382105]

B:BD[26.3380] → [24.2886:2912]

∅:D[24.2912] → [26.3411:3586]

B:BD[26.3411] → [26.3411:3586]

        std::string desc;
        if (charged && item_ident(wand, ISFLAG_KNOW_PLUSES))
        {
            snprintf(info, INFO_SIZE, " and now has %d charges", new_charges);
            desc = info;

[26.3380]

[26.3586]

            std::string desc;
            if (charged && item_ident(wand, ISFLAG_KNOW_PLUSES))
            {
                snprintf(info, INFO_SIZE, " and now has %d charges", new_charges);
                desc = info;
            }
            mprf("%s %s for a moment%s.",
                 wand.name(DESC_CAP_YOUR).c_str(),
                 charged? "glows" : "flickers",
                 desc.c_str());
            wand.plus = new_charges;
            if (!charged)
                wand.plus2 = ZAPCOUNT_MAX_CHARGED;

Replacement in crawl-ref/source/effects.cc at line 1954 [11.3382105]

B:BD[26.3596] → [26.3596:3634]

∅:D[26.3634] → [25.3011:3058]

B:BD[25.3011] → [25.3011:3058]

B:BD[25.3058] → [26.3635:3707]

        mprf("%s %s for a moment%s.",
             wand.name(DESC_CAP_YOUR).c_str(),
             charged? "glows" : "flickers",
             desc.c_str());

[26.3596]

[26.3707]

        else // It's a rod.
        {
            bool work = false;

Replacement in crawl-ref/source/effects.cc at line 1958 [11.3382105]

∅:D[26.3708] → [25.3103:3136]

B:BD[25.3103] → [25.3103:3136]

        wand.plus = new_charges;

[26.3708]

[7.5287]

            if (wand.plus2 < MAX_ROD_CHARGE * ROD_CHARGE_MULT)
            {
                wand.plus2 += ROD_CHARGE_MULT;

Replacement in crawl-ref/source/effects.cc at line 1962 [11.3382105]
B:BD[7.5288] → [7.5288:5357]
∅:D[25.3136] → [11.3425840:3425846]
∅:D[7.5357] → [11.3425840:3425846]
∅:D[3.947032] → [11.3425840:3425846]
B:BD[11.3425840] → [11.3425840:3425846]
B:BD[11.3425846] → [20.12098:12122]
∅:D[27.2707] → [3.947043:947049]
∅:D[20.12122] → [3.947043:947049]
B:BD[3.947043] → [3.947043:947049]
B:BD[3.947075] → [3.947075:947102]
```
        if (!charged)
            wand.plus2 = ZAPCOUNT_MAX_CHARGED;
    }
    else // It's a rod.
    {
        bool work = false;
```
[7.5288]
[11.3425846]
```
                if (wand.plus2 > MAX_ROD_CHARGE * ROD_CHARGE_MULT)
                    wand.plus2 = MAX_ROD_CHARGE * ROD_CHARGE_MULT;
```

Replacement in crawl-ref/source/effects.cc at line 1965 [11.3382105]

B:BD[11.3425847] → [7.5358:5417]

∅:D[7.5417] → [3.947163:947216]

B:BD[3.947163] → [3.947163:947216]

        if (wand.plus2 < MAX_ROD_CHARGE * ROD_CHARGE_MULT)
        {
            wand.plus2 += ROD_CHARGE_MULT;

[11.3425847]

[11.3426028]

                work = true;
            }

Replacement in crawl-ref/source/effects.cc at line 1968 [11.3382105]

B:BD[11.3426029] → [3.947217:947343]

            if (wand.plus2 > MAX_ROD_CHARGE * ROD_CHARGE_MULT)
                wand.plus2 = MAX_ROD_CHARGE * ROD_CHARGE_MULT;

[11.3426029]

[11.3426149]

            if (wand.plus < wand.plus2)
            {
                wand.plus = wand.plus2;
                work = true;
            }

Replacement in crawl-ref/source/effects.cc at line 1974 [11.3382105]

B:BD[11.3426150] → [3.947344:947379]

            work = true;
        }

[11.3426150]

[3.947379]

            if (!work)
                return (false);

Replacement in crawl-ref/source/effects.cc at line 1977 [11.3382105]

B:BD[3.947380] → [3.947380:947487]

        if (wand.plus < wand.plus2)
        {
            wand.plus = wand.plus2;
            work = true;

[3.947380]

[3.947487]

            mprf("%s glows for a moment.", wand.name(DESC_CAP_YOUR).c_str());

Replacement in crawl-ref/source/effects.cc at line 1980 [11.3382105]
B:BD[3.947498] → [27.2708:2727]
∅:D[27.2727] → [3.947518:947547]
B:BD[3.947518] → [3.947518:947547]
B:BD[3.947547] → [28.27734:27808]
```
        if (!work)
            return (false);
        mprf("%s glows for a moment.", wand.name(DESC_CAP_YOUR).c_str());
```
[3.947498]
[3.947687]
```
        you.wield_change = true;
        return (true);
```
Insertion in crawl-ref/source/effects.cc at line 1983 [11.3382105]
[3.947693]
[11.3426274]
```
    while (true);
```

Replacement in crawl-ref/source/effects.cc at line 1985 [11.3382105]

B:BD[11.3426275] → [11.3426275:3426378]

    you.wield_change = true;
    return (true);
}                               // end recharge_wand()

[11.3426275]

[29.28105]

    return (false);
}