fiddlerwoaroof/crawl - Change JI33MPZAQQV55WDCZE4IHGMZYRYWIYU5MSYKYZB7RX2AWWY2SMCQC

FR 1927675: Change message for jellies corroding items

        from &quot;Your Foo is eaten away!&quot; (misleading to newbies)
      to &quot;The acid corrodes your Foo!&quot;

FR 1926880: Auto-id "Gourmand when eating chunks while not hungry (unless already a chunklover otherwise). Should there be any case where can_ingest is called as a check, without actual eating (suppress_msg == true, I'd guess) the identification should be restricted to actual eating. I haven't found any, though.

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

Created by j-p-e-g on March 28, 2008

JI33MPZAQQV55WDCZE4IHGMZYRYWIYU5MSYKYZB7RX2AWWY2SMCQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 4148 [4.962854]

B:BD[3.200491] → [3.200491:200586]

            && (calc_unid || 
                item_type_known(you.inv[you.equip[EQ_AMULET]])))

[3.200491]

[4.1043725]

        && ( calc_unid || item_type_known(you.inv[you.equip[EQ_AMULET]]) ))
    {

Insertion in crawl-ref/source/player.cc at line 4151 [4.962854]
[4.1043746]
[4.1043746]
```
    }
```

Replacement in crawl-ref/source/ouch.cc at line 410 [4.1104358]

B:BD[4.1113803] → [5.4414:4470]

B:BD[5.4470] → [2.178:238]

        mprf("%s %s", item.name(DESC_CAP_YOUR).c_str(),
             (it_resists) ? "resists." : "is eaten away!");

[4.1113803]

[4.1114012]

        if (it_resists)
            mprf("%s resists.", item.name(DESC_CAP_YOUR).c_str());
        else
            mprf("The acid corrodes %s!", item.name(DESC_NOCAP_YOUR).c_str());

Replacement in crawl-ref/source/food.cc at line 546 [4.3043806]

B:BD[4.3059310] → [4.3059310:3059383]

                        you.inv[which_inventory_slot].sub_type, false ))

[4.3059310]

[4.3059383]

                     you.inv[which_inventory_slot].sub_type, false ))

Deletion in crawl-ref/source/food.cc at line 1358 [4.3043806]

B:BD[3.431794] → [3.431794:431865]

                           || wearing_amulet(AMU_THE_GOURMAND, !reqid)

Insertion in crawl-ref/source/food.cc at line 1408 [4.3043806]

[4.3077830]

                if (wearing_amulet(AMU_THE_GOURMAND, !reqid))
                {
                    const int amulet = you.equip[EQ_AMULET];
                    ASSERT(amulet != -1);
                    if (!item_type_known(you.inv[amulet]))
                    {
                        set_ident_flags( you.inv[ amulet], ISFLAG_KNOW_TYPE);
                        set_ident_type( OBJ_JEWELLERY, AMU_THE_GOURMAND,
                                        ID_KNOWN_TYPE );
                        mpr(you.inv[amulet].name(DESC_INVENTORY, false).c_str());
                    }
                    return true;
                }