fiddlerwoaroof/crawl - Change 6T6E2JGOAQCQU56ZR6D6BTCQ6PKWLHQUPYVQZI6GRGX2FDDLILFQC

Don't output inscriptions for DESC_PLAIN and DESC_BASENAME

descriptions. Also remove reference to weapons of disruption.

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

Created by j-p-e-g on February 9, 2008

6T6E2JGOAQCQU56ZR6D6BTCQ6PKWLHQUPYVQZI6GRGX2FDDLILFQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-data.h at line 51 [3.1826214]

B:BD[2.1218] → [2.1218:1363]

                        damage and disruption and repel undead effects
                        are ignored -- *no* automatic hellfire resistance

[2.1218]

[2.1363]

                        damage and repel undead effects are ignored -- *no*
                        automatic hellfire resistance

Replacement in crawl-ref/source/itemname.cc at line 234 [3.2667494]

B:BD[3.2682138] → [4.710639:710645]

[3.2682138]

[5.7851]

   }
   
   if (descrip != DESC_PLAIN && descrip != DESC_BASENAME)
   {
        const bool  tried     = (!ident && !equipped && item_type_tried(*this));
        std::string tried_str = "";

Replacement in crawl-ref/source/itemname.cc at line 241 [3.2667494]

B:BD[5.7852] → [6.1032:1109]

∅:D[6.1109] → [5.7916:7948]

B:BD[5.7916] → [5.7916:7948]

    const bool  tried     = (!ident && !equipped && item_type_tried(*this));
    std::string tried_str = "";

[5.7852]

[7.540]

        if (tried)
        {
            item_type_id_state_type id_type =
                get_ident_type(this->base_type, this->sub_type);
            if (id_type == ID_MON_TRIED_TYPE)
                tried_str = "tried by monster";
            else
                tried_str = "tried";
        }

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

B:BD[7.541] → [5.7949:8212]

∅:D[8.333] → [9.427:487]

∅:D[10.1242] → [9.427:487]

∅:D[11.1346] → [9.427:487]

∅:D[5.8212] → [9.427:487]

B:BD[7.541] → [9.427:487]

∅:D[9.487] → [4.710774:710780]

∅:D[7.578] → [4.710774:710780]

∅:D[12.11185] → [4.710774:710780]

B:BD[4.710774] → [4.710774:710780]

B:BD[4.710780] → [11.1347:1369]

∅:D[11.1369] → [8.334:355]

B:BD[13.2109] → [8.334:355]

B:BD[8.355] → [5.8213:8252]

∅:D[5.8252] → [13.2141:2183]

B:BD[13.2141] → [13.2141:2183]

    if (tried)
    {
        item_type_id_state_type id_type =
            get_ident_type(this->base_type, this->sub_type);
        if (id_type == ID_MON_TRIED_TYPE)
            tried_str = "tried by monster";
        else
            tried_str = "tried";
    }
    if ( with_inscription && !(this->inscription.empty()) )
    {
        buff << " {";
        if ( tried )
            buff << tried_str << ", ";
        buff << this->inscription << "}";

[7.541]