fiddlerwoaroof/crawl - Change IXLNOTBJGHKESBCTME6QAR6XVWFNCHYGMS62V62ZJEA7VLQHXO2QC

Slight cleanup of randart autoinscription.

Code cleanup with unrandarts and fixedarts. Bugfix for isomorphic-up-to-colour unrandarts being confused when lost in the Abyss. Trowel will not clobber critical features (stairs, portals, etc.) Nemelex is unhappy about Trowel failing. Breaks savefiles.

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

Created by haranp on December 5, 2007

IXLNOTBJGHKESBCTME6QAR6XVWFNCHYGMS62V62ZJEA7VLQHXO2QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/terrain.h at line 57 [6.24828]
[6.26894]
[6.26894]
```
bool is_critical_feature(dungeon_feature_type feat);
```
Replacement in crawl-ref/source/terrain.cc at line 336 [6.26938]
B:BD[6.35499] → [6.35499:35558]
```
static bool is_critical_feature(dungeon_feature_type feat)
```
[6.35499]
[6.35558]
```
bool is_critical_feature(dungeon_feature_type feat)
```
Replacement in crawl-ref/source/randart.h at line 109 [7.889057]
B:BD[7.893066] → [7.893066:893108]
```
int find_unrandart_index(int item_index);
```
[7.893066]
[7.893108]
```
int find_unrandart_index(const item_def& artefact);
```
Replacement in crawl-ref/source/randart.cc at line 795 [7.893152]
∅:D[8.196445] → [7.906460:906530]
B:BD[7.906460] → [7.906460:906530]
```
static struct unrandart_entry *seekunrandart( const item_def &item );
```
[7.906425]
[7.906808]
```
static unrandart_entry *seekunrandart( const item_def &item );
```

Replacement in crawl-ref/source/randart.cc at line 824 [7.893152]

B:BD[7.907277] → [7.907277:907341]

// returns true if item is one of the origional fixed artefacts

[7.907277]

[7.907341]

// returns true if item is one of the original fixed artefacts

Replacement in crawl-ref/source/randart.cc at line 829 [7.893152]
B:BD[7.907468] → [7.907468:907516]
```
        && item.special >= SPWPN_SINGING_SWORD)
```
[7.907468]
[7.907516]
```
        && item.special >= SPWPN_START_FIXEDARTS)
```

Replacement in crawl-ref/source/randart.cc at line 840 [7.893152]

B:BD[7.907630] → [7.907630:907756]

    // Note: for weapons "art" is in item.special,
    //       for orbs it's the sub_type.
    if (base_type == OBJ_WEAPONS)

[7.907630]

[7.907756]

    if (base_type == OBJ_WEAPONS
        && art >= SPWPN_START_FIXEDARTS && art < SPWPN_START_NOGEN_FIXEDARTS)

Replacement in crawl-ref/source/randart.cc at line 843 [7.893152]

B:BD[7.907762] → [7.907762:908060]

        if (art >= SPWPN_SINGING_SWORD && art <= SPWPN_SWORD_OF_ZONGULDROK)
            return (you.unique_items[ art - SPWPN_SINGING_SWORD ]);
        else if (art >= SPWPN_SWORD_OF_POWER && art <= SPWPN_STAFF_OF_WUCAD_MU)
            return (you.unique_items[ art - SPWPN_SWORD_OF_POWER + 24 ]);

[7.907762]

[7.908060]

        return (you.unique_items[art - SPWPN_START_FIXEDARTS]);

Replacement in crawl-ref/source/randart.cc at line 845 [7.893152]

B:BD[7.908066] → [7.908066:908231]

    else if (base_type == OBJ_ORBS)
    {
        if (art >= 4 && art <= 19)
            return (you.unique_items[ art + 3 ]);
    }
    return (UNIQ_NOT_EXISTS);

[7.908066]

[7.908231]

    else
        return (UNIQ_NOT_EXISTS);

Replacement in crawl-ref/source/randart.cc at line 852 [7.893152]

B:BD[7.908302] → [7.908302:908428]

    // Note: for weapons "art" is in item.special,
    //       for orbs it's the sub_type.
    if (base_type == OBJ_WEAPONS)

[7.908302]

[7.908428]

    if (base_type == OBJ_WEAPONS
        && art >= SPWPN_START_FIXEDARTS && art < SPWPN_START_NOGEN_FIXEDARTS)

Replacement in crawl-ref/source/randart.cc at line 855 [7.893152]

B:BD[7.908434] → [7.908434:908866]

        if (art >= SPWPN_SINGING_SWORD && art <= SPWPN_SWORD_OF_ZONGULDROK)
            you.unique_items[ art - SPWPN_SINGING_SWORD ] = status;
        else if (art >= SPWPN_SWORD_OF_POWER && art <= SPWPN_STAFF_OF_WUCAD_MU)
            you.unique_items[ art - SPWPN_SWORD_OF_POWER + 24 ] = status;
    }
    else if (base_type == OBJ_ORBS)
    {
        if (art >= 4 && art <= 19)
            you.unique_items[ art + 3 ] = status;

[7.908434]

[7.908866]

        you.unique_items[art - SPWPN_START_FIXEDARTS] = status;

Replacement in crawl-ref/source/randart.cc at line 1042 [7.893152]

B:BD[9.619] → [9.619:693]

    if (cl == OBJ_ARMOUR || cl == OBJ_JEWELLERY && ty == RING_PROTECTION)

[9.619]

[9.693]

    if (cl == OBJ_ARMOUR || (cl == OBJ_JEWELLERY && ty == RING_PROTECTION))

Replacement in crawl-ref/source/randart.cc at line 1690 [7.893152]

B:BD[7.923207] → [10.3965:4035]

        const struct unrandart_entry *unrand = seekunrandart( item );

[7.923207]

[10.4035]

        const unrandart_entry *unrand = seekunrandart( item );

Replacement in crawl-ref/source/randart.cc at line 1740 [7.893152]

B:BD[7.925957] → [10.4480:4550]

        const struct unrandart_entry *unrand = seekunrandart( item );

[7.925957]

[10.4550]

        const unrandart_entry *unrand = seekunrandart( item );

Replacement in crawl-ref/source/randart.cc at line 1790 [7.893152]

B:BD[7.928766] → [7.928766:928831]

B:BD[7.928831] → [11.770:883]

        struct unrandart_entry *unrand = seekunrandart( item );
        return (item_type_known(item) ? unrand->name
                                      : unrand->unid_name);

[7.928766]

[7.928970]

        const unrandart_entry *unrand = seekunrandart( item );
        return (item_type_known(item) ? unrand->name : unrand->unid_name);

Replacement in crawl-ref/source/randart.cc at line 1836 [7.893152]
B:BD[7.931408] → [7.931408:931477]
```
static struct unrandart_entry *seekunrandart( const item_def &item )
```
[7.931408]
[7.931477]
```
int find_unrandart_index(const item_def& artefact)
```
Replacement in crawl-ref/source/randart.cc at line 1838 [7.893152]
B:BD[7.931479] → [7.931479:931525]
```
    int x = 0;
    while (x < NO_UNRANDARTS)
```
[7.931479]
[7.931525]
```
    for (int i=0; i < NO_UNRANDARTS; i++)
```

Replacement in crawl-ref/source/randart.cc at line 1840 [7.893152]

B:BD[7.931531] → [7.931531:931686]

B:BD[7.931686] → [2.205:309]

        if (unranddata[x].ura_cl == item.base_type 
            && unranddata[x].ura_ty == item.sub_type
            && unranddata[x].ura_pl == item.plus 
            && unranddata[x].ura_pl2 == item.plus2
            && unranddata[x].ura_col == item.colour)

[7.931531]

[7.931738]

        const unrandart_entry& candidate = unranddata[i];
        if (candidate.ura_cl == artefact.base_type
            && candidate.ura_ty == artefact.sub_type
            && candidate.ura_pl == artefact.plus
            && candidate.ura_pl2 == artefact.plus2
            && candidate.ura_col == artefact.colour)

Replacement in crawl-ref/source/randart.cc at line 1847 [7.893152]
B:BD[7.931748] → [7.931748:931785]
```
            return (&unranddata[x]);
```
[7.931748]
[7.931785]
```
            return i;
```
Deletion in crawl-ref/source/randart.cc at line 1849 [7.893152]
B:BD[7.931795] → [7.931795:931809]
```
        x++;
```

Replacement in crawl-ref/source/randart.cc at line 1851 [7.893152]

B:BD[7.931816] → [7.931816:931917]

    return (&unranddata[0]);  // Dummy object
}                               // end seekunrandart()

[7.931816]

[7.931917]

    return (-1);
}

Replacement in crawl-ref/source/randart.cc at line 1854 [7.893152]
B:BD[7.931918] → [7.931918:931960]
```
int find_unrandart_index(int item_number)
```
[7.931918]
[7.931960]
```
static unrandart_entry *seekunrandart( const item_def &item )
```

Replacement in crawl-ref/source/randart.cc at line 1856 [7.893152]

B:BD[7.931962] → [7.931962:932342]

    int x;
    for(x=0; x < NO_UNRANDARTS; x++)
    {
        if (unranddata[x].ura_cl == mitm[item_number].base_type
            && unranddata[x].ura_ty == mitm[item_number].sub_type
            && unranddata[x].ura_pl == mitm[item_number].plus
            && unranddata[x].ura_pl2 == mitm[item_number].plus2)
        {
            return (x);
        }
    }
    return (-1);

[7.931962]

[7.932342]

    const int idx = find_unrandart_index(item);
    if ( idx == -1 )
        return &unranddata[0];  // dummy unrandart
    else
        return &unranddata[idx];

Deletion in crawl-ref/source/randart.cc at line 1865 [7.893152]
B:BD[7.932414] → [7.932414:932432]
```
    int x, count;
```

Replacement in crawl-ref/source/randart.cc at line 1867 [7.893152]

B:BD[7.932451] → [7.932451:932502]

    for (x = 0, count = 0; x < NO_UNRANDARTS; x++)

[7.932451]

[7.932502]

    // Pick randomly among not-yet-existing unrandarts with the proper
    // base_type and sub_type.
    for (int i = 0, count = 0; i < NO_UNRANDARTS; i++)

Replacement in crawl-ref/source/randart.cc at line 1871 [7.893152]

B:BD[7.932508] → [7.932508:932552]

B:BD[7.932552] → [10.5034:5074]

∅:D[10.5074] → [7.932596:932667]

B:BD[7.932596] → [7.932596:932667]

        if (unranddata[x].ura_cl == aclass 
            && !does_unrandart_exist(x)
            && (atype == OBJ_RANDOM || unranddata[x].ura_ty == atype))

[7.932508]

[7.932667]

        if (unranddata[i].ura_cl == aclass 
            && !does_unrandart_exist(i)
            && (atype == OBJ_RANDOM || unranddata[i].ura_ty == atype))

Replacement in crawl-ref/source/randart.cc at line 1878 [7.893152]
∅:D[10.5113] → [7.932736:932761]
B:BD[7.932736] → [7.932736:932761]
```
                ret = x;
```
[10.5113]
[7.932761]
```
                ret = i;
```
Replacement in crawl-ref/source/randart.cc at line 1883 [7.893152]
B:BD[7.932796] → [7.932796:932857]
```
}                               // end find_okay_unrandart()
```
[7.932796]
[7.932857]
```
}
```
Replacement in crawl-ref/source/randart.cc at line 1889 [7.893152]
B:BD[7.933018] → [4.305:372]
```
    bool force = true;  // we force any one asked for specifically
```
[7.933018]
[7.933086]
```
    const bool force = (which != 0);
```
Replacement in crawl-ref/source/randart.cc at line 1891 [7.893152]
B:BD[7.933087] → [7.933087:933103]
```
    if (!which)
```
[7.933087]
[7.933103]
```
    if (!force)
```

Replacement in crawl-ref/source/randart.cc at line 1893 [7.893152]

B:BD[7.933109] → [7.933109:933191]

B:BD[7.933191] → [4.373:667]

        // using old behaviour... try only once. -- bwr
        force = false;  
        do {
            which = SPWPN_SINGING_SWORD +
                random2(SPWPN_STAFF_OF_WUCAD_MU - SPWPN_SINGING_SWORD + 1);
        } while ( which == SPWPN_SWORD_OF_CEREBOV ||
                  which == SPWPN_STAFF_OF_DISPATER ||
                  which == SPWPN_SCEPTRE_OF_ASMODEUS );

[7.933109]

[7.933369]

        which = SPWPN_START_FIXEDARTS +
            random2(SPWPN_START_NOGEN_FIXEDARTS - SPWPN_START_FIXEDARTS);

Replacement in crawl-ref/source/items.cc at line 195 [7.2584728]

B:BD[7.2589146] → [7.2589146:2589203]

                    if (is_fixed_artefact( mitm[item] ))

[7.2589146]

[7.2589203]

                    const item_def& obj(mitm[item]);
                    if (is_fixed_artefact(obj))

Replacement in crawl-ref/source/items.cc at line 199 [7.2584728]

B:BD[7.2589277] → [7.2589277:2589358]

                        set_unique_item_status( OBJ_WEAPONS, mitm[item].special,

[7.2589277]

[7.2589358]

                        set_unique_item_status( OBJ_WEAPONS, obj.special,

Replacement in crawl-ref/source/items.cc at line 202 [7.2584728]

B:BD[7.2589450] → [7.2589450:2589515]

                    else if (is_unrandom_artefact( mitm[item] ))

[7.2589450]

[7.2589515]

                    else if (is_unrandom_artefact(obj))

Replacement in crawl-ref/source/items.cc at line 205 [7.2584728]

B:BD[7.2589584] → [12.631917:632013]

                        int z = find_unrandart_index(item);
                        if (z >= 0)

[7.2589584]

[3.452]

                        const int z = find_unrandart_index(obj);
                        if (z != -1)

Insertion in crawl-ref/source/items.cc at line 513 [7.2584728]
[7.2597413]
[3.563]
```
    item_def& item(mitm[dest]);
```

Replacement in crawl-ref/source/items.cc at line 517 [7.2584728]

B:BD[3.592] → [3.592:819]

        if (is_fixed_artefact(mitm[dest]))
            set_unique_item_status( mitm[dest].base_type, mitm[dest].special,
                                    UNIQ_NOT_EXISTS );
        else if (is_unrandom_artefact(mitm[dest]))

[3.592]

[3.819]

        if (is_fixed_artefact(item))
        {
            set_unique_item_status(item.base_type, item.special,
                                   UNIQ_NOT_EXISTS);
        }
        else if (is_unrandom_artefact(item))

Replacement in crawl-ref/source/items.cc at line 524 [7.2584728]

B:BD[3.829] → [3.829:888]

            const int unrand = find_unrandart_index(dest);

[3.829]

[3.888]

            const int unrand = find_unrandart_index(item);

Replacement in crawl-ref/source/items.cc at line 531 [7.2584728]
B:BD[12.632131] → [12.632131:632155]
```
    mitm[dest].clear();
```
[12.632131]
[7.2597485]
```
    item.clear();
```

Replacement in crawl-ref/source/itemprop.h at line 105 [12.641567]

B:BD[6.76474] → [6.76474:76522]

    SPWPN_SINGING_SWORD = 181,          //  181

[6.76474]

[6.76522]

    SPWPN_START_FIXEDARTS = 181,
    SPWPN_SINGING_SWORD = SPWPN_START_FIXEDARTS,

Replacement in crawl-ref/source/itemprop.h at line 111 [12.641567]
B:BD[6.76606] → [6.76606:76654]
```
    SPWPN_GLAIVE_OF_PRUNE,              //  185
```
[6.76606]
[6.76654]
```
    SPWPN_GLAIVE_OF_PRUNE,
```

Insertion in crawl-ref/source/itemprop.h at line 114 [12.641567]

[6.76715]

    SPWPN_SWORD_OF_POWER,
    SPWPN_KNIFE_OF_ACCURACY,
    SPWPN_STAFF_OF_OLGREB,
    SPWPN_VAMPIRES_TOOTH,
    SPWPN_STAFF_OF_WUCAD_MU,

Replacement in crawl-ref/source/itemprop.h at line 121 [12.641567]

B:BD[6.76768] → [6.76768:76796]

    SPWPN_SWORD_OF_CEREBOV,

[6.76768]

[6.76796]

    SPWPN_START_NOGEN_FIXEDARTS,
    SPWPN_SWORD_OF_CEREBOV = SPWPN_START_NOGEN_FIXEDARTS,

Replacement in crawl-ref/source/itemprop.h at line 125 [12.641567]
B:BD[6.76825] → [6.76825:76873]
```
    SPWPN_SCEPTRE_OF_ASMODEUS,          //  190
```
[6.76825]
[6.76873]
```
    SPWPN_SCEPTRE_OF_ASMODEUS,
```

Replacement in crawl-ref/source/itemprop.h at line 127 [12.641567]

B:BD[6.76874] → [6.76874:76982]

B:BD[6.76982] → [4.57600:57678]

    SPWPN_SWORD_OF_POWER,
    SPWPN_KNIFE_OF_ACCURACY,
    SPWPN_STAFF_OF_OLGREB,
    SPWPN_VAMPIRES_TOOTH,
    SPWPN_STAFF_OF_WUCAD_MU            //  195, must be last (see randart.cc)

[6.76874]

[6.77030]

    SPWPN_END_FIXEDARTS = SPWPN_SCEPTRE_OF_ASMODEUS

Insertion in crawl-ref/source/describe.cc at line 152 [7.3736416]

[7.3740505]

[13.4259]

    }
}
const char* jewellery_base_ability_string(int subtype)
{
    switch(subtype)
    {
    case RING_REGENERATION:      return "Regen";
    case RING_SUSTAIN_ABILITIES: return "SustAbil";
    case RING_SUSTENANCE:        return "-Hun";
    case RING_WIZARDRY:          return "Wiz";
    case RING_FIRE:              return "F-Mag";
    case RING_ICE:               return "I-Mag";
    case RING_TELEPORT_CONTROL:  return "TC";
    case AMU_RESIST_SLOW:        return "RSlow";
    case AMU_CLARITY:            return "Clar";
    case AMU_WARDING:            return "Ward";
    case AMU_RESIST_CORROSION:   return "RA";
    case AMU_THE_GOURMAND:       return "Gourm";
    case AMU_CONSERVATION:       return "Csrv";
    case AMU_CONTROLLED_FLIGHT:  return "CFly";
    case AMU_RESIST_MUTATION:    return "RMut";

Insertion in crawl-ref/source/describe.cc at line 175 [7.3736416]
[13.4265]
[13.4265]
```
    return "";
```
Insertion in crawl-ref/source/describe.cc at line 178 [7.3736416]
[13.4268]
[13.4268]

Deletion in crawl-ref/source/describe.cc at line 197 [7.3736416]

B:BD[13.4774] → [13.4774:5202]

B:BD[13.5202] → [5.3677:3718]

∅:D[5.3718] → [13.5243:5835]

B:BD[13.5243] → [13.5243:5835]

B:BD[13.5835] → [5.3719:4632]

        { "AC",  RAP_AC, 0 },
        { "EV",  RAP_EVASION, 0 },
        { "Str", RAP_STRENGTH, 0 },
        { "Dex", RAP_DEXTERITY, 0 },
        { "Int", RAP_INTELLIGENCE, 0 },
        { "Acc", RAP_ACCURACY, 0 },
        { "Dam", RAP_DAMAGE, 0 },
        { "RF",  RAP_FIRE, 1 },
        { "RC",  RAP_COLD, 1 },
        { "RE",  RAP_ELECTRICITY, 1 },
        { "RP",  RAP_POISON, 1 },
        { "RN",  RAP_NEGATIVE_ENERGY, 1 },
        { "MP",  RAP_MAGICAL_POWER, 0 },
        { "MR",  RAP_MAGIC, 2 },
        { "SInv", RAP_EYESIGHT, 2 },
        { "Stl", RAP_STEALTH, 2 },
        { "Ang", RAP_BERSERK, 2 },
        { "Noi", RAP_NOISES, 2 },
        { "-Spl", RAP_PREVENT_SPELLCASTING, 2 },
        { "-Tp", RAP_PREVENT_TELEPORTATION, 2 },
        { "+Tp", RAP_CAUSE_TELEPORTATION, 2 },
        { "Hun", RAP_METABOLISM, 1 },
        { "Mut", RAP_MUTAGENIC, 2 },
        { "Inv", RAP_INVISIBLE, 2 },
        { "Lev", RAP_LEVITATE, 2 },
        { "Blk", RAP_BLINK, 2 },
        { "?Tp", RAP_CAN_TELEPORT, 2 },
        { "Map", RAP_MAPPING, 2 },        
    };
    // For randart jewellry, note the base jewelery type if it's not
    // covered by randart_desc_properties()
    if (item.base_type == OBJ_JEWELLERY
        && item_ident( item, ISFLAG_KNOW_PROPERTIES ))
    {
        std::string type = "";
        switch(item.sub_type)
        {
        case RING_REGENERATION:
            type = "Regen";
            break;
        case RING_SUSTAIN_ABILITIES:
            type = "SustAbil";
            break;
        case RING_SUSTENANCE:
            type = "Susten";
            break;
        case RING_WIZARDRY:
            type = "Wiz";
            break;
        case RING_FIRE:
            type = "F-Mag";
            break;
        case RING_ICE:
            type = "I-Mag";
            break;
        case RING_TELEPORT_CONTROL:
            type = "T-Cont";
            break;
        case AMU_RESIST_SLOW:
            type = "RSlow";
            break;

Replacement in crawl-ref/source/describe.cc at line 198 [7.3736416]

B:BD[5.4633] → [5.4633:4705]

        case AMU_CLARITY:
            type = "Clar";
            break;

[5.4633]

[5.4705]

        // Positive, quantative attributes
        { "AC",   RAP_AC,                    0 },
        { "EV",   RAP_EVASION,               0 },
        { "Str",  RAP_STRENGTH,              0 },
        { "Dex",  RAP_DEXTERITY,             0 },
        { "Int",  RAP_INTELLIGENCE,          0 },
        { "Acc",  RAP_ACCURACY,              0 },
        { "Dam",  RAP_DAMAGE,                0 },

Replacement in crawl-ref/source/describe.cc at line 207 [7.3736416]

B:BD[5.4706] → [5.4706:4778]

        case AMU_WARDING:
            type = "Ward";
            break;

[5.4706]

[5.4778]

        // Resists
        { "RF",   RAP_FIRE,                  1 },
        { "RC",   RAP_COLD,                  1 },
        { "RE",   RAP_ELECTRICITY,           1 },
        { "RP",   RAP_POISON,                1 },
        { "RN",   RAP_NEGATIVE_ENERGY,       1 },
        { "MR",   RAP_MAGIC,                 2 },

Replacement in crawl-ref/source/describe.cc at line 215 [7.3736416]

B:BD[5.4779] → [5.4779:4861]

        case AMU_RESIST_CORROSION:
            type = "RAcid";
            break;

[5.4779]

[5.4861]

        // Positive, qualitative attributes
        { "MP",   RAP_MAGICAL_POWER,         0 },
        { "SInv", RAP_EYESIGHT,              2 },
        { "Stl",  RAP_STEALTH,               2 },

Replacement in crawl-ref/source/describe.cc at line 220 [7.3736416]

B:BD[5.4862] → [5.4862:4940]

        case AMU_THE_GOURMAND:
            type = "Gourm";
            break;

[5.4862]

[5.4940]

        // (Generally) negative attributes
        { "Ang",  RAP_BERSERK,               2 },
        { "Noi",  RAP_NOISES,                2 },
        { "-Spl", RAP_PREVENT_SPELLCASTING,  2 },
        { "-Tp",  RAP_PREVENT_TELEPORTATION, 2 },
        { "+Tp",  RAP_CAUSE_TELEPORTATION,   2 },
        { "Hun",  RAP_METABOLISM,            1 },
        { "Mut",  RAP_MUTAGENIC,             2 },

Replacement in crawl-ref/source/describe.cc at line 229 [7.3736416]

B:BD[5.4941] → [5.4941:5021]

        case AMU_CONSERVATION:
            type = "Conserv";
            break;

[5.4941]

[5.5021]

        // Evokable abilities
        { "Inv",  RAP_INVISIBLE,             2 },
        { "Lev",  RAP_LEVITATE,              2 },
        { "Blk",  RAP_BLINK,                 2 },
        { "?Tp",  RAP_CAN_TELEPORT,          2 },
        { "Map",  RAP_MAPPING,               2 }

Replacement in crawl-ref/source/describe.cc at line 236 [7.3736416]

B:BD[5.5022] → [5.5022:5105]

        case AMU_CONTROLLED_FLIGHT:
            type = "C-Fly";
            break;

[5.5022]

[13.5835]

};

Replacement in crawl-ref/source/describe.cc at line 238 [7.3736416]

B:BD[13.5836] → [5.5106:5220]

        case AMU_RESIST_MUTATION:
            type = "RMut";
            break;
        }
        if (type != "")

[13.5836]

[5.5220]

    // For randart jewellery, note the base jewellery type if it's not
    // covered by randart_desc_properties()
    if (item.base_type == OBJ_JEWELLERY
        && item_ident(item, ISFLAG_KNOW_PROPERTIES))
    {
        const std::string type = jewellery_base_ability_string(item.sub_type);
        if ( !type.empty() )

Deletion in crawl-ref/source/describe.cc at line 248 [7.3736416]
B:BD[5.5266] → [5.5266:5267]

Replacement in crawl-ref/source/describe.cc at line 279 [7.3736416]

B:BD[5.5422] → [5.5422:5488]

    std::vector<std::string> propnames = randart_propnames(item);

[5.5422]

[5.5488]

    const std::vector<std::string> propnames = randart_propnames(item);

Deletion in crawl-ref/source/describe.cc at line 301 [7.3736416]
B:BD[5.6143] → [5.6143:6144]
Deletion in crawl-ref/source/describe.cc at line 304 [7.3736416]
∅:D[5.6181] → [7.3740513:3740514]
B:BD[7.3740513] → [7.3740513:3740514]

Replacement in crawl-ref/source/describe.cc at line 3670 [7.3736416]

B:BD[14.673] → [13.6746:6852]

        // OK, technically inefficient to call randart_auto_inscription
        // when we don't need to.

[14.673]

[13.6852]

        std::string ainscrip;
        if (is_random_artefact(item))
            ainscrip = randart_auto_inscription(item);
        // Only allow autoinscription if we don't have all the text
        // already.

Replacement in crawl-ref/source/describe.cc at line 3678 [7.3736416]

B:BD[13.6892] → [13.6892:6932]

B:BD[13.6932] → [5.6182:6339]

            is_random_artefact(item) &&
            (randart_auto_inscription(item) != "") &&
            (item.inscription.find(randart_auto_inscription(item))
             == std::string::npos);

[13.6892]

[13.7054]

            is_random_artefact(item)
            && !ainscrip.empty()
            && item.inscription.find(ainscrip) == std::string::npos;

Replacement in crawl-ref/source/describe.cc at line 3708 [7.3736416]
B:BD[5.6442] → [5.6442:6482]
```
            if (item.inscription != "")
```
[5.6442]
[5.6482]
```
            if (!item.inscription.empty())
```
Replacement in crawl-ref/source/describe.cc at line 3710 [7.3736416]
∅:D[5.6523] → [13.7591:7655]
B:BD[13.7591] → [13.7591:7655]
```
            item.inscription += randart_auto_inscription(item);
```
[5.6523]
[5.6524]
```
            item.inscription += ainscrip;
```
Replacement in crawl-ref/source/decks.cc at line 2122 [7.3987460]
B:BD[7.4005392] → [15.3209:3269]
```
static void trowel_card(int power, deck_rarity_type rarity)
```
[7.4005392]
[16.26897]
```
static bool trowel_card(int power, deck_rarity_type rarity)
```

Insertion in crawl-ref/source/decks.cc at line 2124 [7.3987460]

[16.26899]

[17.932]

    // Early exit: don't clobber important features
    if (is_critical_feature(grd[you.x_pos][you.y_pos]))
    {
        mpr("The dungeon trembles momentarily.");
        return false;
    }

Replacement in crawl-ref/source/decks.cc at line 2223 [7.3987460]
∅:D[18.1875] → [16.26926:26938]
∅:D[17.2878] → [16.26926:26938]
∅:D[19.3752] → [16.26926:26938]
B:BD[16.26926] → [16.26926:26938]
```
    return;
```
[17.2878]
[16.26938]
```
    return done_stuff;
```

Replacement in crawl-ref/source/decks.cc at line 2550 [7.3987460]

B:BD[20.813] → [17.2879:2946]

    case CARD_TROWEL:           trowel_card(power, rarity); break;

[21.1070]

[17.2946]

    case CARD_TROWEL:      rc = trowel_card(power, rarity); break;

Replacement in crawl-ref/source/acr.cc at line 571 [7.4397395]

B:BD[7.4411140] → [7.4411140:4411220]

        for (tmp = SPWPN_SINGING_SWORD; tmp <= SPWPN_STAFF_OF_WUCAD_MU; tmp++)

[7.4411140]

[7.4411220]

        for (tmp = SPWPN_START_FIXEDARTS;
             tmp < SPWPN_START_NOGEN_FIXEDARTS; tmp++)

Insertion in crawl-ref/source/acr.cc at line 585 [7.4397395]

[7.4411642]


                msg::streams(MSGCH_DIAGNOSTICS) <<
                    "Made " << mitm[islot].name(DESC_NOCAP_A) << std::endl;

Slight cleanup of randart autoinscription.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/terrain.h at line 57 [6.24828]

Replacement in crawl-ref/source/terrain.cc at line 336 [6.26938]

Replacement in crawl-ref/source/randart.h at line 109 [7.889057]

Replacement in crawl-ref/source/randart.cc at line 795 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 824 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 829 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 840 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 843 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 845 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 852 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 855 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1042 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1690 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1740 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1790 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1836 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1838 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1840 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1847 [7.893152]

Deletion in crawl-ref/source/randart.cc at line 1849 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1851 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1854 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1856 [7.893152]

Deletion in crawl-ref/source/randart.cc at line 1865 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1867 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1871 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1878 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1883 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1889 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1891 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1893 [7.893152]

Replacement in crawl-ref/source/items.cc at line 195 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 199 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 202 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 205 [7.2584728]

Insertion in crawl-ref/source/items.cc at line 513 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 517 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 524 [7.2584728]

Replacement in crawl-ref/source/items.cc at line 531 [7.2584728]

Replacement in crawl-ref/source/itemprop.h at line 105 [12.641567]

Replacement in crawl-ref/source/itemprop.h at line 111 [12.641567]

Insertion in crawl-ref/source/itemprop.h at line 114 [12.641567]

Replacement in crawl-ref/source/itemprop.h at line 121 [12.641567]

Replacement in crawl-ref/source/itemprop.h at line 125 [12.641567]

Replacement in crawl-ref/source/itemprop.h at line 127 [12.641567]

Insertion in crawl-ref/source/describe.cc at line 152 [7.3736416]

Insertion in crawl-ref/source/describe.cc at line 175 [7.3736416]

Insertion in crawl-ref/source/describe.cc at line 178 [7.3736416]

Deletion in crawl-ref/source/describe.cc at line 197 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 198 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 207 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 215 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 220 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 229 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 236 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 238 [7.3736416]

Deletion in crawl-ref/source/describe.cc at line 248 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 279 [7.3736416]

Deletion in crawl-ref/source/describe.cc at line 301 [7.3736416]

Deletion in crawl-ref/source/describe.cc at line 304 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 3670 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 3678 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 3708 [7.3736416]

Replacement in crawl-ref/source/describe.cc at line 3710 [7.3736416]

Replacement in crawl-ref/source/decks.cc at line 2122 [7.3987460]

Insertion in crawl-ref/source/decks.cc at line 2124 [7.3987460]

Replacement in crawl-ref/source/decks.cc at line 2223 [7.3987460]

Replacement in crawl-ref/source/decks.cc at line 2550 [7.3987460]

Replacement in crawl-ref/source/acr.cc at line 571 [7.4397395]

Insertion in crawl-ref/source/acr.cc at line 585 [7.4397395]