fiddlerwoaroof/crawl - Change QXPGM64FG7OOZ6JNGLEOPEJ4DT556KOASVORXAD3DGGJX5GP5RQQC

* Also describe enchantment limits for weapons (+9, right?), missiles,

and armour (+5 for body armour and bardings, else +2). Tidied up the code a bit.

Prettify waypoint messages as suggested by slinkies in FR 2329972. (I really should reread those tracker items before starting to code them…)

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

Created by j-p-e-g on December 29, 2008

QXPGM64FG7OOZ6JNGLEOPEJ4DT556KOASVORXAD3DGGJX5GP5RQQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/travel.cc at line 3756 [6.39949]
[5.1498]
[5.1498]
```
    {
        canned_msg(MSG_OK);
```
Insertion in crawl-ref/source/travel.cc at line 3759 [6.39949]
[5.1514]
[6.127302]
```
    }
```

Insertion in crawl-ref/source/travel.cc at line 3770 [6.39949]

[4.285]

[6.128100]


    std::string old_dest =
        overwrite ? get_trans_travel_dest(waypoints[waynum], false, true) : "";
    level_id old_lid = (overwrite ? waypoints[waynum].id : lid);

Replacement in crawl-ref/source/travel.cc at line 3778 [6.39949]

B:BD[4.287] → [4.287:391]

    mprf("%s waypoint %d to your current position.",
         overwrite ? "Reset" : "Set new", waynum);

[4.287]

[6.128166]

    std::string new_dest = get_trans_travel_dest(waypoints[waynum],
                                                 false, true);
    mesclr();
    if (overwrite)
    {
        if (lid == old_lid) // same level
            mprf("Waypoint %d re-assigned to your current position.", waynum);
        else
        {
            mprf("Waypoint %d re-assigned from %s to %s.",
                 waynum, old_dest.c_str(), new_dest.c_str());
        }
    }
    else
        mprf("Waypoint %d assigned to %s.", waynum, new_dest.c_str());

Replacement in crawl-ref/source/itemprop.cc at line 1007 [7.646661]

B:BD[7.674425] → [7.674425:674484]

    if (eq_slot == EQ_BODY_ARMOUR || eq_slot == EQ_SHIELD)

[7.674425]

[7.674484]

    if (eq_slot == EQ_BODY_ARMOUR || item.sub_type == ARM_CENTAUR_BARDING
        || item.sub_type == ARM_NAGA_BARDING)
    {

Insertion in crawl-ref/source/itemprop.cc at line 1011 [7.646661]
[7.674520]
[7.674520]
```
    }
```

Replacement in crawl-ref/source/itemprop.cc at line 1372 [7.646661]

B:BD[8.3541] → [2.2941:3029]

    // Artefacts or highly enchanted weapons cannot be enchanted, only
    // uncursed.

[8.3541]

[2.3029]

    // Artefacts or highly enchanted weapons cannot be enchanted,
    // only uncursed.

Replacement in crawl-ref/source/itemprop.cc at line 1399 [7.646661]
B:BD[2.3477] → [2.3477:3520]
∅:D[2.3520] → [9.9594:9661]
B:BD[9.9594] → [9.9594:9661]
B:BD[9.9661] → [2.3521:3554]
∅:D[2.3554] → [8.4135:4141]
∅:D[9.9693] → [8.4135:4141]
B:BD[8.4135] → [8.4135:4141]
```
    if (is_artefact(arm) || (arm.plus >= 2
        && (arm.sub_type >= ARM_CLOAK && arm.sub_type <= ARM_BOOTS
            || is_shield(arm))))
    {
```
[2.3477]
[2.3555]
```
    if (is_artefact(arm) || arm.plus >= armour_max_enchant(arm))
```
Deletion in crawl-ref/source/itemprop.cc at line 1401 [7.646661]
∅:D[2.3601] → [8.4213:4219]
∅:D[10.5231] → [8.4213:4219]
∅:D[9.9766] → [8.4213:4219]
B:BD[8.4213] → [8.4213:4219]
```
    }
```

Insertion in crawl-ref/source/describe.cc at line 1116 [12.3736416]

[11.3649]

[12.3774574]

        }
    }
    if (!is_artefact(item))
    {
        if (item_ident( item, ISFLAG_KNOW_PLUSES )
            && item.plus >= 9 && item.plus2 >= 9)
        {
            description += "$It is maximally enchanted.";

Insertion in crawl-ref/source/describe.cc at line 1126 [12.3736416]

[12.3774584]

[12.3776086]

        else
            description += "$It can be maximally enchanted to +9, +9.";

Insertion in crawl-ref/source/describe.cc at line 1256 [12.3736416]

[13.4859]

[14.3787]


    if (item_ident( item, ISFLAG_KNOW_PLUSES ) && item.plus >= 9)
        description += "$It is maximally enchanted.";
    else
        description += "$It can be maximally enchanted to +9.";

Insertion in crawl-ref/source/describe.cc at line 1430 [12.3736416]

[15.511]

[3.4482]

        }
    }
    if (!is_artefact(item))
    {
        const int max_ench = armour_max_enchant(item);
        if (item.plus < max_ench || !item_ident( item, ISFLAG_KNOW_PLUSES ))
        {
            description += "$It can be maximally enchanted to ";
            _append_value(description, max_ench, false);
            description += ".";

Insertion in crawl-ref/source/describe.cc at line 1442 [12.3736416]

[3.4492]

[12.3795872]

        else
            description += "$It is maximally enchanted.";

Replacement in crawl-ref/source/describe.cc at line 1913 [12.3736416]

B:BD[4.3877] → [4.3877:3918]

            if (item.plus < max_charges)

[4.3877]

[4.3918]

            if (item.plus < max_charges
                || !item_ident(item, ISFLAG_KNOW_PLUSES))