fiddlerwoaroof/crawl - Change 6XSOB55JCEWQK7OANHLEIPOIUGH32ZEB35A7XLBKSFJ5YH5GCZ4AC

Extend the monster list merge handling to dancing weapons and mimics.

Player ghosts should never be merged (rare as that case may be), but I can't test it because in wizard mode all ghosts are named "John Doe", so they always automerge on account of having the same name.

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

Created by j-p-e-g on June 19, 2008

6XSOB55JCEWQK7OANHLEIPOIUGH32ZEB35A7XLBKSFJ5YH5GCZ4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/output.cc at line 1245 [4.1088282]

[3.4493]

    // Force mimics of different types to be treated like the same one.
    if (mons_is_mimic(m1.m_mon->type)
        && mons_is_mimic(m2.m_mon->type))
    {
        return (false);
    }

Insertion in crawl-ref/source/output.cc at line 1255 [4.1088282]

[3.4601]

[2.2828]

        return (false);
    // Never distinguish between dancing weapons.
    // The above checks guarantee that *both* monsters are of this type.
    if (m1.m_mon->type == MONS_DANCING_WEAPON)

Replacement in crawl-ref/source/output.cc at line 1270 [4.1088282]

B:BD[3.4624] → [5.2712:2752]

    if (m1.m_fullname && m2.m_fullname)

[3.4624]

[5.2752]

    if (m1.m_fullname && m2.m_fullname || m1.m_mon->type == MONS_PLAYER_GHOST)

Replacement in crawl-ref/source/output.cc at line 1291 [4.1088282]
B:BD[3.5019] → [5.2828:2852]
```
        if (m_fullname)
```
[3.5019]
[5.2852]
```
        if (m_fullname && !mons_is_mimic(m_mon->type))
```

Replacement in crawl-ref/source/output.cc at line 1298 [4.1088282]

B:BD[3.5096] → [5.2970:2994]

        if (m_fullname)

[3.5096]

[2.3138]

        // Don't differentiate between dancing weapons or mimics
        // of different types.
        if (m_fullname
            && m_mon->type != MONS_DANCING_WEAPON
            && !mons_is_mimic(m_mon->type))