fiddlerwoaroof/crawl - Change JM5VDKPDSBVFW37RJRECYZ7AQUTHTFSGMZDUTU3F66U4QO6ZDMTQC

Fix bug 2398346: don't record note on identify-by-wearing of mundane armour.

Fix some god gift autoinscription problems.

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

Created by zelgadis on December 7, 2008

JM5VDKPDSBVFW37RJRECYZ7AQUTHTFSGMZDUTU3F66U4QO6ZDMTQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/items.cc at line 1589 [5.2584728]

[3.10051]

[4.916]


                const bool floor_god_gift
                    = mitm[obj].inscription.find("god gift")
                      != std::string::npos;
                const bool inv_god_gift
                    = you.inv[m].inscription.find("god gift")
                      != std::string::npos;

Insertion in crawl-ref/source/items.cc at line 1606 [5.2584728]

[5.2615507]

[6.3234]

                // Remove god gift inscription unless both items have it.
                if (floor_god_gift && !inv_god_gift
                    || inv_god_gift && !floor_god_gift)
                {
                    you.inv[m].inscription
                        = replace_all(you.inv[m].inscription,
                                      "god gift, ", "");
                    you.inv[m].inscription
                        = replace_all(you.inv[m].inscription,
                                      "god gift", "");
                }

Replacement in crawl-ref/source/describe.cc at line 442 [5.3736416]

B:BD[7.6621] → [7.6621:6655]

        item.inscription += ", ";

[7.6621]

[7.6655]

    {
        if (ends_with(item.inscription, ","))
            item.inscription += " ";
        else
            item.inscription += ", ";
    }

Deletion in crawl-ref/source/delay.cc at line 1342 [5.3963459]
B:BD[8.3336] → [9.3383:3454]
```
    if (is_random_artefact(arm))
        arm.flags |= ISFLAG_NOTED_ID;
```

Insertion in crawl-ref/source/delay.cc at line 1344 [5.3963459]

[2.8201]

[10.7371]

    if (is_random_artefact(arm))
        arm.flags |= ISFLAG_NOTED_ID;

Deletion in crawl-ref/source/delay.cc at line 1355 [5.3963459]

B:BD[9.3620] → [9.3620:3777]


        // Make a note of it.
        take_note(Note(NOTE_ID_ITEM, 0, 0, arm.name(DESC_NOCAP_A).c_str(),
                       origin_desc(arm).c_str()));