fiddlerwoaroof/crawl - Change JZSJAFHPIC5L6BVNOE3CWEI3IMUOUE7IVEPIKVSLS5KVGJLQBDLQC

[1952025] Fix bad text wrapping of randart base item descriptions in chardumps.

No longer show the long description of a randart's base item in the dump, instead show the base item name in brackets (such as "[amulet of warding]"). Turfed out things like item weight descriptions that shouldn't infest chardumps anyway.

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

Created by dshaligram on May 4, 2008

JZSJAFHPIC5L6BVNOE3CWEI3IMUOUE7IVEPIKVSLS5KVGJLQBDLQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/describe.cc at line 994 [4.3736416]
B:BD[4.3773731] → [2.6705:6746]
∅:D[2.6746] → [5.4717:4781]
B:BD[5.4717] → [5.4717:4781]
B:BD[5.4781] → [2.6747:6800]
```
    if ( is_demonic(item) && !launcher )
         description += "$Demonspawn are more deadly with it.";
    else if (get_equip_race(item) != ISFLAG_NO_RACE)
```
[4.3773731]
[4.3773768]
```
    if (verbose)
```

Replacement in crawl-ref/source/describe.cc at line 996 [4.3736416]

B:BD[4.3773774] → [4.3773774:3773814]

        switch (get_equip_race( item ))

[4.3773774]

[4.3773814]

        if ( is_demonic(item) && !launcher )
            description += "$Demonspawn are more deadly with it.";
        else if (get_equip_race(item) != ISFLAG_NO_RACE)

Replacement in crawl-ref/source/describe.cc at line 1000 [4.3736416]

B:BD[4.3773824] → [4.3773824:3773921]

B:BD[4.3773921] → [5.4879:4942]

∅:D[5.4942] → [6.1030:1076]

B:BD[6.1030] → [6.1030:1076]

B:BD[6.1076] → [5.4943:5006]

∅:D[6.1140] → [4.3773921:3773940]

∅:D[5.5006] → [4.3773921:3773940]

B:BD[4.3773921] → [4.3773921:3773940]

B:BD[4.3773940] → [6.1141:1169]

B:BD[6.1169] → [5.5007:5067]

∅:D[5.5067] → [6.1230:1249]

B:BD[6.1230] → [6.1230:1249]

∅:D[6.1249] → [4.3773940:3773950]

B:BD[4.3773940] → [4.3773940:3773950]

        case ISFLAG_DWARVEN:
            description += "$It is well-crafted and very durable.";
            description += "$Dwarves are more deadly with it";
            break;
        case ISFLAG_ELVEN:
            description += "$Elves are more accurate with it";
            break;
        case ISFLAG_ORCISH:
            description += "$Orcs are more deadly with it";
            break;
        }

[4.3773824]

[4.3773950]

            switch (get_equip_race( item ))
            {
            case ISFLAG_DWARVEN:
                description += "$It is well-crafted and very durable.";
                description += "$Dwarves are more deadly with it";
                break;
            case ISFLAG_ELVEN:
                description += "$Elves are more accurate with it";
                break;
            case ISFLAG_ORCISH:
                description += "$Orcs are more deadly with it";
                break;
            }

Replacement in crawl-ref/source/describe.cc at line 1014 [4.3736416]

B:BD[4.3773951] → [2.6801:6823]

∅:D[2.6823] → [4.3773997:3774007]

∅:D[7.985272] → [4.3773997:3774007]

B:BD[4.3773997] → [4.3773997:3774007]

B:BD[4.3774007] → [2.6824:6995]

        if (launcher)
        {
            description += ", and it is most deadly when used with ";
            description += racial_description_string(item);
            description += "ammunition";

[4.3773951]

[4.3774574]

            if (launcher)
            {
                description += ", and it is most deadly when used with ";
                description += racial_description_string(item);
                description += "ammunition";
            }
            description += ".";

Deletion in crawl-ref/source/describe.cc at line 1022 [4.3736416]
B:BD[4.3774584] → [5.5413:5441]
```
        description += ".";
```

Replacement in crawl-ref/source/describe.cc at line 1557 [4.3736416]

B:BD[8.12571] → [8.12571:12634]

    else if (is_fixed_artefact(item) && item_type_known(item))

[8.12571]

[8.12634]


    if (is_fixed_artefact(item) && item_type_known(item))

Deletion in crawl-ref/source/describe.cc at line 1573 [4.3736416]

∅:D[2.10472] → [8.13039:13113]

B:BD[8.13039] → [8.13039:13113]

B:BD[8.13113] → [3.2680:2758]

        std::string db_name = item.name(DESC_DBNAME, true, false, false);
        std::string db_desc = getLongDescription(db_name, is_artefact(item));

Replacement in crawl-ref/source/describe.cc at line 1574 [4.3736416]
∅:D[9.362] → [8.13181:13208]
B:BD[8.13181] → [8.13181:13208]
```
        if (db_desc == "")
```
[9.362]
[8.13208]
```
        if (dump)
```

Replacement in crawl-ref/source/describe.cc at line 1576 [4.3736416]

B:BD[8.13218] → [8.13218:13257]

            if (item_type_known(item))

[8.13218]

[8.13257]

            description << "["
                        << item.name(DESC_DBNAME, true, false, false)
                        << "]";
        }
        else
        {
            std::string db_name = item.name(DESC_DBNAME, true, false, false);
            std::string db_desc =
                getLongDescription(db_name, is_artefact(item));
            if (db_desc == "")

Replacement in crawl-ref/source/describe.cc at line 1588 [4.3736416]

B:BD[8.13271] → [8.13271:13347]

B:BD[8.13347] → [2.10473:10511]

                description << "[ERROR: no desc for item name '" << db_name
                            << "']$";

[8.13271]

[8.13384]

                if (item_type_known(item))
                {
                    description << "[ERROR: no desc for item name '" << db_name
                                << "']$";
                }
                else
                {
                    description << article_a(item.name(DESC_CAP_A, true,
                                                       false, false), false);
                    description << ".$";
                }

Insertion in crawl-ref/source/describe.cc at line 1601 [4.3736416]

[8.13415]

                description << db_desc;
            if (item.base_type == OBJ_WANDS
                || item.base_type == OBJ_MISSILES
                || item.base_type == OBJ_FOOD && item.sub_type == FOOD_CHUNK)

Replacement in crawl-ref/source/describe.cc at line 1607 [4.3736416]

B:BD[8.13429] → [8.13429:13572]

B:BD[8.13572] → [2.10512:10549]

                description << article_a(item.name(DESC_CAP_A, true,
                                                   false, false), false);
                description << ".$";

[8.13429]

[8.13608]

                // Get rid of newline at end of description, so that
                // either the wand "no charges left" or the meat chunk
                // "unpleasant" description can follow on the same line.
                // Same for missiles' descriptions.
                description.seekp(description.tellp() - (std::streamoff)1);
                description << " ";

Deletion in crawl-ref/source/describe.cc at line 1614 [4.3736416]

B:BD[8.13622] → [8.13622:13722]

B:BD[8.13722] → [2.10550:10670]

∅:D[10.383] → [8.13897:13972]

∅:D[2.10670] → [8.13897:13972]

B:BD[8.13897] → [8.13897:13972]

B:BD[8.13972] → [10.384:451]

B:BD[10.451] → [11.583:652]

B:BD[11.652] → [2.10671:10719]

∅:D[10.520] → [8.14155:14259]

∅:D[11.652] → [8.14155:14259]

∅:D[2.10719] → [8.14155:14259]

B:BD[8.14155] → [8.14155:14259]

        }
        else
            description << db_desc;
        if (item.base_type == OBJ_WANDS
            || item.base_type == OBJ_MISSILES
            || item.base_type == OBJ_FOOD && item.sub_type == FOOD_CHUNK)
        {
            // Get rid of newline at end of description, so that
            // either the wand "no charges left" or the meat chunk
            // "unpleasant" description can follow on the same line.
            // Same for missiles' descriptions.
            description.seekp(description.tellp() - (std::streamoff)1);
            description << " ";

Replacement in crawl-ref/source/describe.cc at line 1733 [4.3736416]

B:BD[2.11219] → [2.11219:11276]

        description << "It has a curse placed upon it.";

[2.11219]

[5.7881]

        description << "$It has a curse placed upon it.";

Replacement in crawl-ref/source/describe.cc at line 1736 [4.3736416]

∅:D[2.11283] → [5.7890:7921]

B:BD[5.7890] → [5.7890:7921]

B:BD[5.7921] → [2.11284:11389]

        description << "$$It";
        if (item_known_cursed( item ))
            description << " has a curse placed upon it, and it";

[2.11283]

[5.7921]

        if (verbose)
        {
            description << "$$It";
            if (item_known_cursed( item ))
                description << " has a curse placed upon it, and it";

Replacement in crawl-ref/source/describe.cc at line 1742 [4.3736416]

B:BD[4.3843492] → [7.987657:987701]

B:BD[7.987701] → [5.7923:7979]

∅:D[5.7979] → [12.11553:11654]

B:BD[12.11553] → [12.11553:11654]

        const int mass = item_mass( item );
        description << " weighs around " << (mass / 10)
                    << "." << (mass % 10)
                    << " aum. "; // arbitrary unit of mass

[5.7922]

[4.3843536]

            const int mass = item_mass( item );
            description << " weighs around " << (mass / 10)
                        << "." << (mass % 10)
                        << " aum. "; // arbitrary unit of mass

Replacement in crawl-ref/source/describe.cc at line 1747 [4.3736416]

B:BD[4.3843537] → [13.1585:1634]

∅:D[13.1634] → [14.162:251]

B:BD[15.272] → [14.162:251]

B:BD[14.251] → [13.1635:1711]

∅:D[13.1711] → [14.327:394]

∅:D[12.11731] → [14.327:394]

B:BD[14.327] → [14.327:394]

B:BD[14.394] → [13.1712:1775]

        if ( is_dumpable_artefact(item, false) )
        {
            if (item.base_type == OBJ_ARMOUR || item.base_type == OBJ_WEAPONS)
                description << "$$This ancient artefact cannot be changed "
                    "by magic or mundane means.";
            else
                description << "$$It is an ancient artefact.";

[4.3843537]

[14.457]

            if ( is_dumpable_artefact(item, false) )
            {
                if (item.base_type == OBJ_ARMOUR
                    || item.base_type == OBJ_WEAPONS)
                {
                    description << "$$This ancient artefact cannot be changed "
                        "by magic or mundane means.";
                }
                else
                {
                    description << "$$It is an ancient artefact.";
                }
            }

Replacement in crawl-ref/source/chardump.cc at line 710 [4.4100336]
B:BD[4.4112180] → [4.4112180:4112212]
B:BD[4.4112212] → [7.1215603:1215625]
```
        text += "  Inventory:";
        text += "\n";
```
[4.4112180]
[4.4112233]
```
        text += "Inventory:\n\n";
```