fiddlerwoaroof/crawl - Change SZBMBNW34N2SM7Y6QBKBSA7OMLEMLFGCE4NSMHCBH6ORU2MYY2MQC

For jewellery with pluses and wands, only make an ident note when the

first item of the type is identified, not when the charges/pluses of any item of the type is identified.

Make sure that artefacts have nothing to do with the identification level of jewellery by making versions of set_ident_type() and get_ident_type() which accept a full item_def as a parameter.

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

Created by zelgadis on June 19, 2008

SZBMBNW34N2SM7Y6QBKBSA7OMLEMLFGCE4NSMHCBH6ORU2MYY2MQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/stash.cc at line 134 [5.147324]

B:BD[5.150145] → [6.519:593]

        set_ident_type( item->base_type, item->sub_type, ID_KNOWN_TYPE );

[5.150145]

[5.150609]

        set_ident_type( *item, ID_KNOWN_TYPE );

Deletion in crawl-ref/source/spells1.cc at line 453 [8.616635]
∅:D[7.315] → [8.622958:622959]
B:BD[8.622958] → [8.622958:622959]
B:BD[8.622959] → [9.4960:4992]
∅:D[9.4992] → [10.295:371]
B:BD[10.295] → [10.295:371]
```
        if (!is_artefact(item))
            set_ident_type( item.base_type, item.sub_type, ID_KNOWN_TYPE );
```
Insertion in crawl-ref/source/spells1.cc at line 454 [8.616635]
[8.623085]
[10.372]
```
        set_ident_type( item, ID_KNOWN_TYPE );
```

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

B:BD[11.5862] → [11.5862:5932]

        set_ident_type(item.base_type, item.sub_type, ID_KNOWN_TYPE);

[11.5862]

[11.5932]

        set_ident_type(item, ID_KNOWN_TYPE);

Replacement in crawl-ref/source/player.cc at line 5125 [8.962854]

B:BD[8.1066334] → [2.188:247]

        const item_def *amulet = you.slot_item(EQ_AMULET);

[8.1066334]

[2.247]

        item_def *amulet = you.slot_item(EQ_AMULET);

Replacement in crawl-ref/source/player.cc at line 5127 [8.962854]

B:BD[2.296] → [2.296:406]

            set_ident_type( amulet->base_type, amulet->sub_type,
                            ID_KNOWN_TYPE );

[2.296]

[2.406]

            set_ident_type( *amulet, ID_KNOWN_TYPE );

Replacement in crawl-ref/source/ouch.cc at line 988 [8.1104358]

B:BD[3.2728] → [3.2728:2844]

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

[3.2728]

[3.2844]

            set_ident_type( you.inv[i], ID_KNOWN_TYPE );

Replacement in crawl-ref/source/newgame.cc at line 1273 [8.1132300]
∅:D[12.4483] → [13.9060:9110]
B:BD[14.145] → [13.9060:9110]
∅:D[13.9110] → [8.1152125:1152191]
B:BD[8.1152125] → [8.1152125:1152191]
```
            set_ident_type( you.inv[i].base_type,
                            you.inv[i].sub_type, ID_KNOWN_TYPE );
```
[12.4483]
[15.10362]
```
            set_ident_type( you.inv[i], ID_KNOWN_TYPE );
```
Insertion in crawl-ref/source/itemprop.cc at line 585 [17.646661]
[16.6801]
[16.6801]
```
        && get_ident_type(item) != ID_KNOWN_TYPE
```
Insertion in crawl-ref/source/itemname.h at line 130 [8.2661173]
[18.4186]
[19.2813]
```
item_type_id_state_type get_ident_type(const item_def &item);
```

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

[19.2933]

void set_ident_type( item_def &item, item_type_id_state_type setting,
                     bool force = false);

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

B:BD[20.3019] → [20.3019:3084]

                get_ident_type(this->base_type, this->sub_type);

[20.3019]

[20.3084]

                get_ident_type(*this);

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

[18.7569]

[8.2746021]


void set_ident_type( item_def &item, item_type_id_state_type setting,
                     bool force )
{
    if (is_artefact(item))
        return;
    item_type_id_state_type old_setting = get_ident_type(item);
    set_ident_type(item.base_type, item.sub_type, setting, force);

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

[8.2746022]

[19.3107]

    if (setting == ID_KNOWN_TYPE && old_setting != ID_KNOWN_TYPE
        && notes_are_active() && is_interesting_item(item)
        && !(item.flags & (ISFLAG_NOTED_ID | ISFLAG_NOTED_GET)))
    {
        // Make a note of it.
        take_note(Note(NOTE_ID_ITEM, 0, 0, item.name(DESC_NOCAP_A).c_str(),
                       origin_desc(item).c_str()));
        // Sometimes (e.g. shops) you can ID an item before you get it;
        // don't note twice in those cases.
        item.flags |= (ISFLAG_NOTED_ID | ISFLAG_NOTED_GET);
    }
}

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

[8.2746740]

[19.3170]

item_type_id_state_type get_ident_type(const item_def &item)
{
    if (is_artefact(item))
        return ID_UNKNOWN_TYPE;
    return get_ident_type(item.base_type, item.sub_type);
}

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

B:BD[4.14594] → [4.14594:14670]

        if (get_ident_type(item.base_type, item.sub_type) == ID_KNOWN_TYPE)

[4.14594]

[4.14670]

        if (get_ident_type(item) == ID_KNOWN_TYPE)

Replacement in crawl-ref/source/item_use.cc at line 2814 [8.2781507]
∅:D[21.3062] → [17.752284:752348]
B:BD[8.2835783] → [17.752284:752348]
```
        set_ident_type( item.base_type, item.sub_type, ident );
```
[21.3062]
[17.752348]
```
        set_ident_type( item, ident );
```

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

B:BD[8.2843587] → [10.2524:2596]

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

[8.2843587]

[10.2596]

        set_ident_type( wand, ID_KNOWN_TYPE );

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

B:BD[8.2844117] → [10.2651:2723]

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

[8.2844111]

[8.2844248]

        set_ident_type( wand, ID_TRIED_TYPE );

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

B:BD[8.2846061] → [22.5263:5317]

∅:D[22.5317] → [8.2846116:2846186]

B:BD[8.2846116] → [8.2846116:2846186]

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

[8.2846061]

[8.2846186]

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

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

B:BD[8.2846207] → [22.5318:5372]

∅:D[22.5372] → [8.2846262:2846332]

B:BD[8.2846262] → [8.2846262:2846332]

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

[8.2846207]

[8.2846332]

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

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

B:BD[23.7064] → [24.3688:3760]

            set_ident_type( OBJ_SCROLLS, SCR_IDENTIFY, ID_KNOWN_TYPE );

[23.7064]

            set_ident_type( item, ID_KNOWN_TYPE );

Insertion in crawl-ref/source/item_use.cc at line 4545 [8.2781507]

[8.2867823]


    set_ident_type( scroll,
                    (id_the_scroll) ? ID_KNOWN_TYPE : ID_TRIED_TYPE );

Deletion in crawl-ref/source/item_use.cc at line 4559 [8.2781507]
B:BD[8.2867966] → [23.8743:8790]
∅:D[23.8790] → [8.2868013:2868084]
B:BD[8.2868013] → [8.2868013:2868084]
B:BD[8.2868084] → [25.50855:50856]
```
    set_ident_type( OBJ_SCROLLS, which_scroll,
                    (id_the_scroll) ? ID_KNOWN_TYPE : ID_TRIED_TYPE );
```

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

B:BD[26.5914] → [27.5194:5265]

B:BD[27.5265] → [28.10281:10353]

                    << static_cast<int>(get_ident_type(item.base_type,
                                                       item.sub_type));

[26.5914]

[8.3841313]

                    << static_cast<int>(get_ident_type(item));

Replacement in crawl-ref/source/debug.cc at line 1818 [8.4016436]
B:BD[29.24407] → [29.24407:24467]
```
         get_ident_type( item.base_type, item.sub_type ) );
```
[29.24407]
[8.4051116]
```
         get_ident_type( item ) );
```

Replacement in crawl-ref/source/acr.cc at line 874 [8.4397395]

B:BD[8.4413936] → [30.17167:17242]

∅:D[30.17242] → [8.4414012:4414061]

B:BD[8.4414012] → [8.4414012:4414061]

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

[8.4413936]

[8.4414061]

                set_ident_type( you.inv[i], ID_KNOWN_TYPE );

Replacement in crawl-ref/source/acr.cc at line 891 [8.4397395]

B:BD[8.4414376] → [30.17243:17318]

∅:D[30.17318] → [8.4414452:4414503]

B:BD[8.4414452] → [8.4414452:4414503]

                set_ident_type( you.inv[i].base_type, you.inv[i].sub_type,
                                ID_UNKNOWN_TYPE );

[8.4414376]

[8.4414503]

                set_ident_type( you.inv[i], ID_UNKNOWN_TYPE );

Replacement in crawl-ref/source/acr.cc at line 918 [8.4397395]

B:BD[31.17272] → [30.17319:17386]

∅:D[30.17386] → [31.17340:17391]

B:BD[31.17340] → [31.17340:17391]

                    set_ident_type( item.base_type, item.sub_type,
                                ID_UNKNOWN_TYPE );

[31.17272]

[31.17391]

                    set_ident_type( item, ID_UNKNOWN_TYPE );