fiddlerwoaroof/crawl - Change OQ4KB7QCJSK7GSW3DYBARH4DCB75HFKLUSOSOZZZ4IUFKNGFRUDQC

Describing items now works better in shops (fixes 1749246.)

More consistency in type-ID vs. artefacts: knowing the type-ID of a specific ring won't property-ID or type-ID an artefact ring of the same type, and vice versa.

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

Created by haranp on July 7, 2007

OQ4KB7QCJSK7GSW3DYBARH4DCB75HFKLUSOSOZZZ4IUFKNGFRUDQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells1.cc at line 42 [8.616635]
[8.617597]
[8.617597]
```
#include "randart.h"
```

Replacement in crawl-ref/source/spells1.cc at line 378 [8.616635]

B:BD[8.622958] → [2.155:207]

        if ( fully_identified(you.inv[item_slot]) )

[8.622958]

[2.207]


        item_def& item(you.inv[item_slot]);
        if ( fully_identified(item) )

Replacement in crawl-ref/source/spells1.cc at line 389 [8.616635]

B:BD[8.622959] → [8.622959:623084]

        set_ident_type( you.inv[item_slot].base_type, 
                        you.inv[item_slot].sub_type, ID_KNOWN_TYPE );

[8.622959]

[8.623084]

        if ( !is_artefact(item) )
            set_ident_type( item.base_type, item.sub_type, ID_KNOWN_TYPE );

Replacement in crawl-ref/source/spells1.cc at line 392 [8.616635]

B:BD[8.623085] → [8.623085:623151]

        set_ident_flags( you.inv[item_slot], ISFLAG_IDENT_MASK );

[8.623085]

[9.113]

        set_ident_flags( item, ISFLAG_IDENT_MASK );

Replacement in crawl-ref/source/spells1.cc at line 395 [8.616635]

B:BD[8.623186] → [10.1646:1714]

        mpr(you.inv[item_slot].name(DESC_INVENTORY_EQUIP).c_str());

[8.623186]

[8.623274]

        mpr(item.name(DESC_INVENTORY_EQUIP).c_str());

Replacement in crawl-ref/source/shopping.cc at line 262 [8.759950]

B:BD[8.764222] → [8.764222:764269]

        describe_item( mitm[shop_items[ft]] );

[8.764222]

[8.764269]

        // A hack to make the description more useful.
        // In theory, the user could kill the process at this
        // point and end up with valid ID for the item.
        // That's not very useful, though, because it doesn't set
        // type-ID and once you can access the item (by buying it)
        // you have its full ID anyway. Worst case, it won't get
        // noted when you buy it.
        item_def& item = mitm[shop_items[ft]];
        const unsigned long old_flags = item.flags;
        if ( id_stock )
            item.flags |= ISFLAG_IDENT_MASK;
        describe_item(item);
        if ( id_stock )
            item.flags = old_flags;

Insertion in crawl-ref/source/itemname.h at line 37 [8.2661173]
[11.359873]
[8.2665643]
```
bool item_type_tried( const item_def &item );
```
Deletion in crawl-ref/source/itemname.cc at line 49 [8.2667494]
B:BD[12.709902] → [13.161:162]
B:BD[13.162] → [3.253:322]
∅:D[3.322] → [13.217:219]
B:BD[13.217] → [13.217:219]
B:BD[13.219] → [6.253:300]
```
static bool is_tried_type( object_class_type basetype, int subtype )
{
    if ( subtype >= 50 )
        return false;
```
Deletion in crawl-ref/source/itemname.cc at line 50 [8.2667494]
∅:D[6.301] → [13.219:271]
B:BD[13.219] → [13.219:271]
B:BD[13.271] → [14.4443:4510]
∅:D[14.4510] → [13.332:354]
B:BD[13.332] → [13.332:354]
B:BD[13.354] → [14.4511:4578]
∅:D[14.4578] → [13.415:435]
B:BD[13.415] → [13.415:435]
B:BD[13.435] → [14.4579:4644]
∅:D[14.4644] → [13.494:537]
B:BD[13.494] → [13.494:537]
B:BD[8.2668557] → [13.538:539]
```
    switch ( basetype )
    {
    case OBJ_SCROLLS:
        return type_ids[IDTYPE_SCROLLS][subtype] == ID_TRIED_TYPE;
    case OBJ_POTIONS:
        return type_ids[IDTYPE_POTIONS][subtype] == ID_TRIED_TYPE;
    case OBJ_WANDS:
        return type_ids[IDTYPE_WANDS][subtype] == ID_TRIED_TYPE;
    default:
        return false;
    }
}
```

Replacement in crawl-ref/source/itemname.cc at line 216 [8.2667494]

B:BD[13.541] → [5.253:333]

    const bool tried = !ident && is_tried_type(this->base_type,this->sub_type);

[13.541]

[15.427]

    const bool tried = !ident && item_type_tried(*this);

Replacement in crawl-ref/source/itemname.cc at line 219 [8.2667494]
B:BD[12.710780] → [16.2079:2109]
```
        buff << " {";        
```
[12.710780]
[5.334]
```
        buff << " {";
```
Replacement in crawl-ref/source/itemname.cc at line 1490 [8.2667494]
B:BD[8.2745787] → [14.7205:7250]
```
bool item_type_known( const item_def &item )
```
[8.2745787]
[8.2745808]
```
bool item_type_known( const item_def& item )
```

Insertion in crawl-ref/source/itemname.cc at line 1494 [8.2667494]

[14.7318]

[8.2745810]


    // Artefacts have different descriptions from other items,
    // so we can't use general item knowledge for them.
    if ( is_artefact(item) )
        return false;

Insertion in crawl-ref/source/itemname.cc at line 1506 [8.2667494]

[14.7516]

[8.2745834]


bool item_type_tried( const item_def& item )
{
    if ( item_type_known(item) )
        return false;

Insertion in crawl-ref/source/itemname.cc at line 1512 [8.2667494]

[8.2745835]

[14.7517]

    // Well, if we ever put in scroll or potion artefacts, this
    // might be necessary...
    if ( is_artefact(item) )
        return false;
    const item_type_id_type idt = objtype_to_idtype(item.base_type);
    if (idt != NUM_IDTYPE && item.sub_type < 50)
        return ( type_ids[idt][item.sub_type] == ID_TRIED_TYPE );
    else
        return false;
}

Replacement in crawl-ref/source/item_use.cc at line 2618 [8.2781507]

B:BD[8.2841625] → [12.759733:759784]

    if (you.inv[item_slot].base_type != OBJ_WANDS)

[8.2841625]

[8.2841715]

    item_def& wand = you.inv[item_slot];
    if (wand.base_type != OBJ_WANDS)

Replacement in crawl-ref/source/item_use.cc at line 2629 [8.2781507]
B:BD[12.759967] → [17.80939:80978]
```
    if ( you.inv[item_slot].plus < 1 )
```
[12.759967]
[17.80978]
```
    if ( wand.plus < 1 )
```
Replacement in crawl-ref/source/item_use.cc at line 2633 [8.2781507]
B:BD[12.760094] → [4.807:858]
```
        you.inv[item_slot].plus2 = ZAPCOUNT_EMPTY;
```
[12.760094]
[12.760094]
```
        wand.plus2 = ZAPCOUNT_EMPTY;
```

Replacement in crawl-ref/source/item_use.cc at line 2638 [8.2781507]

B:BD[12.760444] → [18.49501:49568]

    const bool alreadyknown = item_type_known(you.inv[item_slot]);

[12.760444]

[18.49568]

    const bool alreadyknown = item_type_known(wand);

Replacement in crawl-ref/source/item_use.cc at line 2642 [8.2781507]

B:BD[8.2841881] → [8.2841881:2842061]

        if (you.inv[item_slot].sub_type == WAND_HASTING
            || you.inv[item_slot].sub_type == WAND_HEALING
            || you.inv[item_slot].sub_type == WAND_INVISIBILITY)

[8.2841881]

[8.2842061]

        if (wand.sub_type == WAND_HASTING
            || wand.sub_type == WAND_HEALING
            || wand.sub_type == WAND_INVISIBILITY)

Replacement in crawl-ref/source/item_use.cc at line 2673 [8.2781507]
B:BD[8.2842743] → [8.2842743:2842795]
```
    char type_zapped = you.inv[item_slot].sub_type;
```
[8.2842743]
[8.2842795]
```
    char type_zapped = wand.sub_type;
```

Replacement in crawl-ref/source/item_use.cc at line 2706 [8.2781507]

B:BD[8.2843500] → [12.760477:760559]

    if (beam.obvious_effect == 1 || you.inv[item_slot].sub_type == WAND_FIREBALL)

[8.2843500]

[8.2843581]

    if ((beam.obvious_effect || wand.sub_type == WAND_FIREBALL) &&
        !alreadyknown)

Replacement in crawl-ref/source/item_use.cc at line 2709 [8.2781507]

B:BD[8.2843587] → [8.2843587:2843866]

B:BD[8.2843866] → [10.23135:23207]

∅:D[10.23207] → [8.2843959:2844096]

B:BD[8.2843959] → [8.2843959:2844096]

        if (get_ident_type( you.inv[item_slot].base_type, 
                            you.inv[item_slot].sub_type ) != ID_KNOWN_TYPE)
        {
            set_ident_type( you.inv[item_slot].base_type, 
                            you.inv[item_slot].sub_type, ID_KNOWN_TYPE );
            mpr(you.inv[item_slot].name(DESC_INVENTORY_EQUIP).c_str());
            // update if wielding
            if (you.equip[EQ_WEAPON] == item_slot)
                you.wield_change = true;
        }

[8.2843587]

[8.2844096]

        set_ident_type( wand.base_type, wand.sub_type, ID_KNOWN_TYPE );
        mpr(wand.name(DESC_INVENTORY_EQUIP).c_str());

Replacement in crawl-ref/source/item_use.cc at line 2714 [8.2781507]

B:BD[8.2844117] → [8.2844117:2844242]

        set_ident_type( you.inv[item_slot].base_type, 
                        you.inv[item_slot].sub_type, ID_TRIED_TYPE );

[8.2844117]

[8.2844242]

        set_ident_type( wand.base_type, wand.sub_type, ID_TRIED_TYPE );

Replacement in crawl-ref/source/item_use.cc at line 2718 [8.2781507]
∅:D[4.884] → [8.2844249:2844280]
B:BD[8.2844249] → [8.2844249:2844280]
```
    you.inv[item_slot].plus--;
```
[4.884]
[4.885]
```
    wand.plus--;
```

Replacement in crawl-ref/source/item_use.cc at line 2721 [8.2781507]

B:BD[4.913] → [4.913:990]

    if ( you.inv[item_slot].plus2 >= 0 )
        you.inv[item_slot].plus2++;

[4.913]

[8.2844280]

    if ( wand.plus2 >= 0 )
        wand.plus2++;

Replacement in crawl-ref/source/item_use.cc at line 2724 [8.2781507]

B:BD[8.2844281] → [8.2844281:2844474]

    if (get_ident_type( you.inv[item_slot].base_type, 
                        you.inv[item_slot].sub_type ) == ID_KNOWN_TYPE  
        && (item_ident( you.inv[item_slot], ISFLAG_KNOW_PLUSES )

[8.2844281]

[8.2844474]

    if (item_type_known(wand)
        && (item_ident( wand, ISFLAG_KNOW_PLUSES )

Replacement in crawl-ref/source/item_use.cc at line 2728 [8.2781507]

B:BD[8.2844541] → [12.760560:760627]

        if (!item_ident( you.inv[item_slot], ISFLAG_KNOW_PLUSES ))

[8.2844541]

[8.2844611]

        if (!item_ident( wand, ISFLAG_KNOW_PLUSES ))

Replacement in crawl-ref/source/item_use.cc at line 2734 [8.2781507]

B:BD[19.17683] → [19.17683:17780]

∅:D[19.17780] → [8.2844924:2844991]

B:BD[8.2844924] → [8.2844924:2844991]

             you.inv[item_slot].plus, 
             (you.inv[item_slot].plus == 1) ? "" : "s" );
        set_ident_flags( you.inv[item_slot], ISFLAG_KNOW_PLUSES );

[19.17683]

[8.2844991]

             wand.plus, (wand.plus == 1) ? "" : "s" );
        set_ident_flags( wand, ISFLAG_KNOW_PLUSES );

Replacement in crawl-ref/source/item_use.cc at line 3314 [8.2781507]

B:BD[8.2858872] → [8.2858872:2858978]

    if (you.inv[item_slot].base_type != OBJ_BOOKS
        && you.inv[item_slot].base_type != OBJ_SCROLLS)

[8.2858872]

[8.2858978]

    item_def& scroll = you.inv[item_slot];
    if (scroll.base_type != OBJ_BOOKS && scroll.base_type != OBJ_SCROLLS)

Replacement in crawl-ref/source/item_use.cc at line 3323 [8.2781507]
B:BD[8.2859085] → [8.2859085:2859136]
```
    if (you.inv[item_slot].base_type == OBJ_BOOKS)
```
[8.2859085]
[8.2859136]
```
    if (scroll.base_type == OBJ_BOOKS)
```

Replacement in crawl-ref/source/item_use.cc at line 3349 [8.2781507]

B:BD[8.2859903] → [8.2859903:2859994]

    const int scroll_type = you.inv[item_slot].sub_type;
    if (scroll_type != SCR_PAPER)

[8.2859903]

[8.2859994]

    const int scroll_type = scroll.sub_type;
    if (scroll_type != SCR_PAPER &&
        (scroll_type != SCR_IMMOLATION || you.duration[DUR_CONF]))

Replacement in crawl-ref/source/item_use.cc at line 3357 [8.2781507]

B:BD[18.50699] → [18.50699:50800]

    bool alreadyknown = get_ident_type( OBJ_SCROLLS, you.inv[item_slot].sub_type ) == ID_KNOWN_TYPE;

[18.50699]

[8.2860127]

    const bool alreadyknown = item_type_known(scroll);
    const bool dangerous = player_in_a_dangerous_place();

Deletion in crawl-ref/source/item_use.cc at line 3360 [8.2781507]
B:BD[8.2860128] → [18.50801:50854]
```
    bool dangerous = player_in_a_dangerous_place();
```

Replacement in crawl-ref/source/item_use.cc at line 3456 [8.2781507]

B:BD[8.2862567] → [8.2862567:2862650]

        if (get_ident_type( OBJ_SCROLLS, SCR_TORMENT ) == ID_KNOWN_TYPE)
        {

[8.2862567]

[12.762390]

        if (!item_type_known(scroll))

Deletion in crawl-ref/source/item_use.cc at line 3458 [8.2781507]
∅:D[12.762435] → [8.2862691:2862701]
B:BD[8.2862691] → [8.2862691:2862701]
```
        }
```

Replacement in crawl-ref/source/item_use.cc at line 3483 [8.2781507]

B:BD[8.2863355] → [17.81787:81862]

        if ( get_ident_type( OBJ_SCROLLS, scroll_type ) != ID_KNOWN_TYPE )

[8.2863355]

[17.81862]

        if ( !item_type_known(scroll) )

Replacement in crawl-ref/source/effects.cc at line 801 [8.3382105]

B:BD[8.3403647] → [8.3403647:3403734]

                    if (get_ident_type(OBJ_JEWELLERY, type_wanted) == ID_UNKNOWN_TYPE)

[8.3403647]

[8.3403734]

                    if (get_ident_type(OBJ_JEWELLERY, type_wanted) ==
                        ID_UNKNOWN_TYPE)

Replacement in crawl-ref/source/describe.cc at line 1820 [8.3736416]
B:BD[8.3792678] → [8.3792678:3792747]
```
    if (get_ident_type( OBJ_WANDS, item.sub_type ) != ID_KNOWN_TYPE)
```
[8.3792678]
[8.3792747]
```
    if ( !item_type_known(item) )
```
Replacement in crawl-ref/source/describe.cc at line 2153 [8.3736416]
B:BD[8.3802132] → [8.3802132:3802203]
```
    if (get_ident_type( OBJ_POTIONS, item.sub_type ) != ID_KNOWN_TYPE)
```
[8.3802072]
[20.2845]
```
    if ( !item_type_known(item) )
```
Replacement in crawl-ref/source/describe.cc at line 2236 [8.3736416]
B:BD[8.3808879] → [8.3808879:3808950]
```
    if (get_ident_type( OBJ_SCROLLS, item.sub_type ) != ID_KNOWN_TYPE)
```
[8.3808879]
[8.3808950]
```
    if ( !item_type_known(item) )
```

Replacement in crawl-ref/source/describe.cc at line 2404 [8.3736416]

B:BD[8.3814949] → [8.3814949:3815112]

B:BD[8.3815112] → [21.3160:3200]

    else if ((!is_random_artefact( item ) 
            && get_ident_type( OBJ_JEWELLERY, item.sub_type ) != ID_KNOWN_TYPE)
        || (is_random_artefact( item ) 
            && !item_type_known(item)))

[8.3814949]

[8.3815170]

    else if ( !item_type_known(item) )

Replacement in crawl-ref/source/describe.cc at line 3124 [8.3736416]
B:BD[8.3839480] → [8.3839480:3839545]
```
    if (is_random_artefact( item ) || is_fixed_artefact( item ))
```
[8.3839480]
[8.3839545]
```
    if (is_artefact( item ) )
```
Replacement in crawl-ref/source/describe.cc at line 3135 [8.3736416]
B:BD[8.3839920] → [12.987534:987555]
∅:D[12.987555] → [8.3839946:3840025]
B:BD[8.3839946] → [8.3839946:3840025]
```
        && (verbose 
            && get_ident_type(OBJ_JEWELLERY, item.sub_type) == ID_KNOWN_TYPE))
```
[8.3839920]
[8.3840025]
```
        && (verbose && item_type_known(item)))
```
Replacement in crawl-ref/source/dat/mini.des at line 1223 [22.75280]
B:BD[7.2397] → [7.2397:2427]
```
PLACE: Shoal:5
TAGS: water_ok
```
[7.2397]
[7.2427]
```
PLACE: Shoal:$
TAGS: water_ok has_rune
```
Replacement in crawl-ref/source/dat/mini.des at line 1240 [22.75280]
B:BD[7.2631] → [7.2631:2646]
```
PLACE: Shoal:5
```
[7.2631]
[7.2646]
```
PLACE: Shoal:$
```

Describing items now works better in shops (fixes 1749246.)

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/spells1.cc at line 42 [8.616635]

Replacement in crawl-ref/source/spells1.cc at line 378 [8.616635]

Replacement in crawl-ref/source/spells1.cc at line 389 [8.616635]

Replacement in crawl-ref/source/spells1.cc at line 392 [8.616635]

Replacement in crawl-ref/source/spells1.cc at line 395 [8.616635]

Replacement in crawl-ref/source/shopping.cc at line 262 [8.759950]

Insertion in crawl-ref/source/itemname.h at line 37 [8.2661173]

Deletion in crawl-ref/source/itemname.cc at line 49 [8.2667494]

Deletion in crawl-ref/source/itemname.cc at line 50 [8.2667494]

Replacement in crawl-ref/source/itemname.cc at line 216 [8.2667494]

Replacement in crawl-ref/source/itemname.cc at line 219 [8.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1490 [8.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1494 [8.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1506 [8.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1512 [8.2667494]

Replacement in crawl-ref/source/item_use.cc at line 2618 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2629 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2633 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2638 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2642 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2673 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2706 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2709 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2714 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2718 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2721 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2724 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2728 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 2734 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3314 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3323 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3349 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3357 [8.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3360 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3456 [8.2781507]

Deletion in crawl-ref/source/item_use.cc at line 3458 [8.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3483 [8.2781507]

Replacement in crawl-ref/source/effects.cc at line 801 [8.3382105]

Replacement in crawl-ref/source/describe.cc at line 1820 [8.3736416]

Replacement in crawl-ref/source/describe.cc at line 2153 [8.3736416]

Replacement in crawl-ref/source/describe.cc at line 2236 [8.3736416]

Replacement in crawl-ref/source/describe.cc at line 2404 [8.3736416]

Replacement in crawl-ref/source/describe.cc at line 3124 [8.3736416]

Replacement in crawl-ref/source/describe.cc at line 3135 [8.3736416]

Replacement in crawl-ref/source/dat/mini.des at line 1223 [22.75280]

Replacement in crawl-ref/source/dat/mini.des at line 1240 [22.75280]