fiddlerwoaroof/crawl - Change HFCPPPYI366EDKNBDGVNSAW76OGQA2NYTKLSP4LC3VYKHPLWFJ6QC

Changed requirements for auto-identification of equipped

items, specifically jewellery and randarts. The goal of this change was to clear up the identification rules and apply them consistently. It was inspired by FR 1788698.

Like the ring of teleportation, =lev and "rage now only autoID if you do not wear/wield a randart with the same property.
Stat changes caused by randarts always give a message.
Other "obvious" changes give a message only if the randart has not been identified, to avoid message spam. (Obvious refers to attributes that would cause the item to be autoID'd if it were the appropriate sub type.)
Randarts do NOT autoID anymore just because you recognize the base type.

On the whole, autoidentification becomes much rarer (thus both the scroll and the spell become more valuable). Yes, this might be too harsh. On the upside, the player is told about properties such as stat changes (including AC and EV) and all evokable abilities. We might even include information about items hindering or preventing spellcasting and teleportation, respectively, under the assumption that skilled spellcasters and chars with teleportitis or teleport control would notice.

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

Created by j-p-e-g on September 10, 2007

HFCPPPYI366EDKNBDGVNSAW76OGQA2NYTKLSP4LC3VYKHPLWFJ6QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/player.h at line 236 [3.945993]
[3.955888]
[4.197390]
```
bool items_give_ability(const int slot, char abil);
```

Insertion in crawl-ref/source/player.cc at line 3935 [3.962854]

[3.1049042]


// Checks each equip slot for an evokable item (jewellery or randart).
// Returns true if any of these has the same ability as the one handed in.
bool items_give_ability(const int slot, char abil)
{
    for (int i = EQ_WEAPON; i < NUM_EQUIP; i++)
    {
        const int eq = you.equip[i];
        if (eq == -1)
            continue;
        // skip item to compare with
        if (eq == slot)
            continue;
        // only weapons give their effects when in our hands
        if (i == EQ_WEAPON && you.inv[ eq ].base_type != OBJ_WEAPONS)
            continue;
            
        if (eq == EQ_LEFT_RING || eq == EQ_RIGHT_RING)
        {
            if (abil == RAP_LEVITATE && you.inv[eq].sub_type == RING_LEVITATION)
                return (true);
            if (abil == RAP_CAN_TELEPORT && you.inv[eq].sub_type == RING_TELEPORTATION)
                return (true);
            if (abil == RAP_INVISIBLE && you.inv[eq].sub_type == RING_INVISIBILITY)
                return (true);
        }
        else if (eq == EQ_AMULET)
        {
            if (abil == RAP_BERSERK && you.inv[eq].sub_type == AMU_RAGE)
                return (true);
        }
        // other items are not evokable
        if (!is_random_artefact( you.inv[ eq ] ))
            continue;
        if (randart_wpn_property(you.inv[ eq ], abil))
            return (true);
    }
    // none of the equipped items possesses this ability
    return (false);
}                               // end scan_randarts()

Replacement in crawl-ref/source/player.cc at line 4061 [3.962854]
B:BD[3.1050944] → [3.1050944:1050967]
```
    if (!suppress_msg)
```
[3.1050944]
[5.16940]
```
    if (!suppress_msg && amount != 0)
```

Insertion in crawl-ref/source/item_use.cc at line 2242 [3.2781507]

[3.2833498]

[6.751766]

    // Randart jewellery shouldn't auto-ID just because the 
    // base type is known. Somehow the player should still 
    // be told, preferably by message. (jpeg)
    const bool artefact = is_random_artefact( item );
    const bool identified = fully_identified( item );

Replacement in crawl-ref/source/item_use.cc at line 2270 [3.2781507]

∅:D[6.751855] → [3.2834092:2834127]

B:BD[3.2834092] → [3.2834092:2834127]

            ident = ID_KNOWN_TYPE;

[6.751855]

[3.2834127]

        {
            if (!artefact)
                ident = ID_KNOWN_TYPE;
            else if (!identified)
            {
                mprf("You feel %s.", item.plus > 0?
                     "well-protected" : "more vulnerable");
            }
        }

Replacement in crawl-ref/source/item_use.cc at line 2285 [3.2781507]

B:BD[3.2834262] → [3.2834262:2834297]

            ident = ID_KNOWN_TYPE;

[3.2834262]

[3.2834297]

            if (!artefact)
                ident = ID_KNOWN_TYPE;

Replacement in crawl-ref/source/item_use.cc at line 2293 [3.2781507]

∅:D[6.751884] → [3.2834420:2834455]

B:BD[3.2834420] → [3.2834420:2834455]

            ident = ID_KNOWN_TYPE;

[6.751884]

[3.2834455]

        {
            if (!artefact)
                ident = ID_KNOWN_TYPE;
            else if (!identified)
                mprf("You feel %s.", item.plus > 0? "nimbler" : "more awkward");
        }

Replacement in crawl-ref/source/item_use.cc at line 2302 [3.2781507]

B:BD[3.2834495] → [6.751885:751966]

        modify_stat(STAT_STRENGTH, item.plus, true);
        if (item.plus != 0)

[3.2834495]

[3.2834604]

        modify_stat(STAT_STRENGTH, item.plus, !artefact);
        if (item.plus != 0 && !artefact)

Replacement in crawl-ref/source/item_use.cc at line 2308 [3.2781507]

B:BD[3.2834680] → [6.751967:752049]

        modify_stat(STAT_DEXTERITY, item.plus, true);
        if (item.plus != 0)

[3.2834680]

[3.2834790]

        modify_stat(STAT_DEXTERITY, item.plus, !artefact);
        if (item.plus != 0 && !artefact)

Replacement in crawl-ref/source/item_use.cc at line 2314 [3.2781507]

B:BD[3.2834869] → [6.752050:752135]

        modify_stat(STAT_INTELLIGENCE, item.plus, true);
        if (item.plus != 0)

[3.2834869]

[3.2834982]

        modify_stat(STAT_INTELLIGENCE, item.plus, !artefact);
        if (item.plus != 0 && !artefact)

Replacement in crawl-ref/source/item_use.cc at line 2321 [3.2781507]
B:BD[3.2835081] → [3.2835081:2835112]
```
        ident = ID_KNOWN_TYPE;
```
[3.2835081]
[3.2835112]
```
        if (!artefact)
            ident = ID_KNOWN_TYPE;
```

Replacement in crawl-ref/source/item_use.cc at line 2326 [3.2781507]

B:BD[3.2835154] → [3.2835154:2835219]

        mpr("You feel buoyant.");
        ident = ID_KNOWN_TYPE;

[3.2835154]

[3.2835383]

        if (!scan_randarts( RAP_LEVITATE ))
        {
            mpr("You feel buoyant.");
            if (!artefact)
                ident = ID_KNOWN_TYPE;
        }

Replacement in crawl-ref/source/item_use.cc at line 2338 [3.2781507]

B:BD[2.14810] → [2.14810:14864]

            ident = ID_KNOWN_TYPE;
            break;

[2.14810]

[2.14864]

            if (!artefact)
                ident = ID_KNOWN_TYPE;

Replacement in crawl-ref/source/item_use.cc at line 2344 [3.2781507]

B:BD[3.2835418] → [3.2835418:2835514]

        mpr("You feel a brief urge to hack something to bits.");
        ident = ID_KNOWN_TYPE;

[3.2835418]

[3.2835514]

        if (!scan_randarts( RAP_BERSERK ))
        {
            mpr("You feel a brief urge to hack something to bits.");
            if (!artefact)
                ident = ID_KNOWN_TYPE;
        }

Replacement in crawl-ref/source/item_use.cc at line 2359 [3.2781507]
B:BD[3.2835692] → [6.752220:752256]
```
    if (is_random_artefact( item ))
```
[3.2835692]
[6.752256]
```
    if (artefact)
```
Insertion in crawl-ref/source/item_use.cc at line 3884 [3.2781507]
[7.51161]
[3.2868554]
```
    const bool ident = fully_identified(item);
```
Insertion in crawl-ref/source/item_use.cc at line 3889 [3.2781507]
[3.2868665]
[3.2868665]
```
    // Give messages for stat changes, possibly only if !identified
```
Insertion in crawl-ref/source/item_use.cc at line 3891 [3.2781507]
[3.2868689]
[3.2868689]
```
    {
```

Insertion in crawl-ref/source/item_use.cc at line 3893 [3.2781507]

[3.2868726]

        if (!ident)
        {
            mprf("You feel %s.", proprt[RAP_AC] > 0?
                 "well-protected" : "more vulnerable");
        }
    }

Insertion in crawl-ref/source/item_use.cc at line 3901 [3.2781507]
[3.2868756]
[3.2868756]
```
    {
```

Insertion in crawl-ref/source/item_use.cc at line 3903 [3.2781507]

[3.2868788]

        if (!ident)
        {
            mprf("You feel somewhat %s.", proprt[RAP_EVASION] > 0?
                 "nimbler" : "more awkward");
        }
    }

Replacement in crawl-ref/source/item_use.cc at line 3911 [3.2781507]

B:BD[3.2868818] → [3.2868818:2869028]

    modify_stat( STAT_STRENGTH,     proprt[RAP_STRENGTH],     true );
    modify_stat( STAT_INTELLIGENCE, proprt[RAP_INTELLIGENCE], true );
    modify_stat( STAT_DEXTERITY,    proprt[RAP_DEXTERITY],    true );

[3.2868818]

[3.2869028]

    // output result even when identified (because of potential fatality)
    modify_stat( STAT_STRENGTH,     proprt[RAP_STRENGTH],     false );
    modify_stat( STAT_INTELLIGENCE, proprt[RAP_INTELLIGENCE], false );
    modify_stat( STAT_DEXTERITY,    proprt[RAP_DEXTERITY],    false );
    // For evokable stuff, check whether other equipped items yield
    // the same ability. If not, give a message.
    // Do NOT give all these messages if the randart is identified.
    if (!ident)
    {
        if (proprt[RAP_LEVITATE] && !items_give_ability(item.link, RAP_LEVITATE))
            mpr("You feel buoyant.");

Insertion in crawl-ref/source/item_use.cc at line 3925 [3.2781507]

[3.2869029]

        if (proprt[RAP_INVISIBLE] && !you.duration[DUR_INVIS])
            mpr("You become transparent for a moment.");
        if (proprt[RAP_CAN_TELEPORT] && !items_give_ability(item.link, RAP_CAN_TELEPORT))
            mpr("You feel slightly jumpy.");
        if (proprt[RAP_BERSERK] && !items_give_ability(item.link, RAP_BERSERK))
            mpr("You feel a brief urge to hack something to bits.");
    }

Insertion in crawl-ref/source/it_use2.cc at line 595 [3.2904329]
[6.767594]
[3.2918440]
```
    const bool ident = fully_identified(item);
```
Insertion in crawl-ref/source/it_use2.cc at line 602 [3.2904329]
[3.2918565]
[3.2918565]
```
    {
```

Insertion in crawl-ref/source/it_use2.cc at line 604 [3.2904329]

[3.2918602]

        if (!ident)
        {
            mprf("You feel less %s.",
            proprt[RAP_AC] > 0? "well-protected" : "vulnerable");
        }
    }

Insertion in crawl-ref/source/it_use2.cc at line 612 [3.2904329]
[3.2918632]
[3.2918632]
```
    {
```

Insertion in crawl-ref/source/it_use2.cc at line 614 [3.2904329]

[3.2918664]

        if (!ident)
        {
            mprf("You feel less %s.",
                 proprt[RAP_EVASION] > 0? "nimble" : "awkward");
        }
    }

Replacement in crawl-ref/source/it_use2.cc at line 621 [3.2904329]

B:BD[3.2918665] → [3.2918665:2918907]

    // modify ability scores
    modify_stat( STAT_STRENGTH,     -proprt[RAP_STRENGTH],     true );
    modify_stat( STAT_INTELLIGENCE, -proprt[RAP_INTELLIGENCE], true );
    modify_stat( STAT_DEXTERITY,    -proprt[RAP_DEXTERITY],    true );

[3.2918665]

[3.2918907]

    // modify ability scores, always output messages
    modify_stat( STAT_STRENGTH,     -proprt[RAP_STRENGTH],     false );
    modify_stat( STAT_INTELLIGENCE, -proprt[RAP_INTELLIGENCE], false );
    modify_stat( STAT_DEXTERITY,    -proprt[RAP_DEXTERITY],    false );

Changed requirements for auto-identification of equipped

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/player.h at line 236 [3.945993]

Insertion in crawl-ref/source/player.cc at line 3935 [3.962854]

Replacement in crawl-ref/source/player.cc at line 4061 [3.962854]

Insertion in crawl-ref/source/item_use.cc at line 2242 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2270 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2285 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2293 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2302 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2308 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2314 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2321 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2326 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2338 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2344 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2359 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3884 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3889 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3891 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3893 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3901 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3903 [3.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3911 [3.2781507]

Insertion in crawl-ref/source/item_use.cc at line 3925 [3.2781507]

Insertion in crawl-ref/source/it_use2.cc at line 595 [3.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 602 [3.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 604 [3.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 612 [3.2904329]

Insertion in crawl-ref/source/it_use2.cc at line 614 [3.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 621 [3.2904329]