fiddlerwoaroof/crawl - Change ETJXWTOUQEK2BECTSNQOQN2GQO4U5GMSCEIOVNW4KY7J3CLEUWCAC

Display (very) ugly things' colors in their descriptions.

Created by David Lawrence Ramsey on October 6, 2009

ETJXWTOUQEK2BECTSNQOQN2GQO4U5GMSCEIOVNW4KY7J3CLEUWCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/output.cc at line 1352 [9.1088282]

B:BD[7.3269] → [8.7222:7345]

void monster_pane_info::to_string( int count, std::string& desc,
                                   int& desc_color) const

[7.3269]

[10.4963]

void monster_pane_info::to_string(int count, std::string& desc,
                                  int& desc_color) const

Replacement in crawl-ref/source/output.cc at line 1374 [9.1088282]

B:BD[6.3009] → [6.3009:3086]

∅:D[6.3086] → [11.3138:3169]

∅:D[12.3878] → [11.3138:3169]

B:BD[11.3138] → [11.3138:3169]

        // Don't differentiate between dancing weapons, mimics or draconians
        // of different types.

[6.3009]

[6.3087]

        // Don't differentiate between dancing weapons, mimics, (very)
        // ugly things or draconians of different types.

Insertion in crawl-ref/source/output.cc at line 1379 [9.1088282]

[12.3936]

[13.3086]

            && m_mon->type != MONS_UGLY_THING
            && m_mon->type != MONS_VERY_UGLY_THING

Replacement in crawl-ref/source/output.cc at line 1517 [9.1088282]

B:BD[14.3151] → [14.3151:3210]

                cprintf( stringize_glyph(glyph).c_str() );

[14.3151]

[15.3504]

                cprintf(stringize_glyph(glyph).c_str());

Replacement in crawl-ref/source/output.cc at line 1658 [9.1088282]
∅:D[16.2962] → [10.8310:8374]
B:BD[10.8310] → [10.8310:8374]
```
    std::string blank; blank.resize(crawl_view.mlistsz.x, ' ');
```
[10.8310]
[17.5131]
```
    std::string blank;
    blank.resize(crawl_view.mlistsz.x, ' ');
```
Replacement in crawl-ref/source/output.cc at line 1675 [9.1088282]
B:BD[10.8713] → [15.4011:4047]
```
    if (i_mons < (int) mons.size())
```
[10.8713]
[17.5245]
```
    if (i_mons < (int)mons.size())
```
Replacement in crawl-ref/source/output.cc at line 1685 [9.1088282]
∅:D[2.2607] → [18.3194:3216]
B:BD[19.2701] → [18.3194:3216]
```
    return full_info;
```
[2.2607]
[10.8713]
```
    return (full_info);
```

Insertion in crawl-ref/source/mon-util.cc at line 2006 [9.1699344]

[20.9047]

[4.2678]

}
static std::string _ugly_thing_colour_name(const monsters *mon)
{
    if (mons_genus(mon->type) != MONS_UGLY_THING)
        return ("buggy");
    switch (make_low_colour(mon->colour))
    {
        case CYAN:
            return ("turquoise");
        case GREEN:
            return ("green");
        case RED:
            return ("red");
        case LIGHTGREY:
            return ("white");
        case BROWN:
            return ("brown");
        case MAGENTA:
            return ("purple");
        default:
            return ("buggy");
    }

Replacement in crawl-ref/source/mon-util.cc at line 2076 [9.1699344]
B:BD[21.5919] → [21.5919:5944]
```
            return "It";
```
[21.5919]
[21.5944]
```
            return ("It");
```
Replacement in crawl-ref/source/mon-util.cc at line 2078 [9.1699344]
B:BD[21.6009] → [21.6009:6034]
```
            return "it";
```
[21.6009]
[21.6034]
```
            return ("it");
```
Replacement in crawl-ref/source/mon-util.cc at line 2080 [9.1699344]
B:BD[21.6100] → [21.6100:6133]
```
            return "it (buggy)";
```
[21.6051]
[21.6133]
```
            return ("it (buggy)");
```

Replacement in crawl-ref/source/mon-util.cc at line 2091 [9.1699344]

B:BD[22.391] → [21.6343:6413]

        get_mimic_item( &mon, item );
        return item.name(desc);

[22.391]

[21.6413]

        get_mimic_item(&mon, item);
        return (item.name(desc));

Replacement in crawl-ref/source/mon-util.cc at line 2107 [9.1699344]

∅:D[5.3167] → [23.2846:2926]

B:BD[21.6557] → [23.2846:2926]

        return item.name(desc, false, false, use_inscrip, false, ignore_flags);

[5.3167]

[9.1727643]

        return (item.name(desc, false, false, use_inscrip, false,
                          ignore_flags));

Replacement in crawl-ref/source/mon-util.cc at line 2112 [9.1699344]
B:BD[24.2609] → [24.2609:2658]
```
        return get_monster_data(mon.type)->name;
```
[24.2609]
[24.2658]
```
        return (get_monster_data(mon.type)->name);
```

Replacement in crawl-ref/source/mon-util.cc at line 2115 [9.1699344]

B:BD[21.6704] → [25.2574:2625]

        return apostrophise(mon.mname) + " ghost";

[21.6704]

[3.3065]

        return (apostrophise(mon.mname) + " ghost");

Replacement in crawl-ref/source/mon-util.cc at line 2139 [9.1699344]
∅:D[26.3411] → [27.6852:6878]
∅:D[3.3678] → [27.6852:6878]
B:BD[27.6852] → [27.6852:6878]
```
        return mon.mname;
```
[3.3678]
[3.3679]
```
        return (mon.mname);
```

Insertion in crawl-ref/source/mon-util.cc at line 2184 [9.1699344]

[9.1728757]

[28.11264]

    case MONS_UGLY_THING:
    case MONS_VERY_UGLY_THING:
        result += _ugly_thing_colour_name(&mon) + " ";
        break;

Replacement in crawl-ref/source/mon-util.cc at line 2294 [9.1699344]
B:BD[21.8949] → [21.8949:8968]
```
    return result;
```
[21.8949]
[21.8968]
```
    return (result);
```

Replacement in crawl-ref/source/mon-util.cc at line 2297 [9.1699344]

B:BD[9.1731203] → [21.8971:9038]

std::string mons_type_name(int type, description_level_type desc )

[9.1731203]

[21.9038]

std::string mons_type_name(int type, description_level_type desc)

Replacement in crawl-ref/source/mon-util.cc at line 2353 [9.1699344]
∅:D[15.4703] → [21.9656:9675]
B:BD[29.11347] → [21.9656:9675]
```
    return result;
```
[15.4703]
[27.6880]
```
    return (result);
```
Replacement in crawl-ref/source/mon-util.cc at line 2364 [9.1699344]
B:BD[27.7208] → [27.7208:7229]
```
        return name;
```
[27.7208]
[27.7229]
```
        return (name);
```
Replacement in crawl-ref/source/mon-util.cc at line 2370 [9.1699344]
B:BD[27.7369] → [27.7369:7390]
```
        return name;
```
[27.7369]
[27.7390]
```
        return (name);
```
Replacement in crawl-ref/source/mon-util.cc at line 2373 [9.1699344]
B:BD[27.7445] → [27.7445:7462]
```
    return name;
```
[27.7445]
[30.5289]
```
    return (name);
```

Display (very) ugly things' colors in their descriptions.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/output.cc at line 1352 [9.1088282]

Replacement in crawl-ref/source/output.cc at line 1374 [9.1088282]

Insertion in crawl-ref/source/output.cc at line 1379 [9.1088282]

Replacement in crawl-ref/source/output.cc at line 1517 [9.1088282]

Replacement in crawl-ref/source/output.cc at line 1658 [9.1088282]

Replacement in crawl-ref/source/output.cc at line 1675 [9.1088282]

Replacement in crawl-ref/source/output.cc at line 1685 [9.1088282]

Insertion in crawl-ref/source/mon-util.cc at line 2006 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2076 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2078 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2080 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2091 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2107 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2112 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2115 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2139 [9.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2184 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2294 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2297 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2353 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2364 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2370 [9.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2373 [9.1699344]