fiddlerwoaroof/crawl - Change MG2J6HQGH4DWFH3PC2SZB45NGKK5ISPBADQD24GWAZCZTDLOA33AC

Allow for the creation of named zombies and spectral things from named

non-unique monsters (including polymorphed uniques, so you can get things like "A rat shaped Royal Jelly zombie").

Include the name of unique and named monsters in their corpse names, for things like "The corpse of the Lernaean hydra" or "The human corpse of Sigmund".

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

Created by zelgadis on January 10, 2009

MG2J6HQGH4DWFH3PC2SZB45NGKK5ISPBADQD24GWAZCZTDLOA33AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 868 [7.531613]

B:BD[5.7586] → [6.274:386]

        name_zombified_unique(&menv[monster], monnum,
                              origin_monster_name(item));

[5.7586]

[5.7693]

        if (is_named_corpse(item))
            name_zombie(&menv[monster], monnum, get_corpse_name(item));

Deletion in crawl-ref/source/religion.cc at line 5556 [7.804403]
B:BD[8.2743] → [3.4105:4157]
```
    const std::string name = mon->name(DESC_PLAIN);
```
Insertion in crawl-ref/source/religion.cc at line 5587 [7.804403]
[9.5628]
[9.5628]
```
    const monsters orig = *mon;
```
Replacement in crawl-ref/source/religion.cc at line 5607 [7.804403]
B:BD[9.5839] → [3.5009:5053]
```
    name_zombified_unique(mon, type, name);
```
[9.5839]
[9.5908]
```
    name_zombie(mon, &orig);
```

Insertion in crawl-ref/source/monstuff.cc at line 363 [7.1396662]

[10.11688]

    if (!monster->mname.empty())
        corpse.props[CORPSE_NAME_KEY] = monster->mname;
    else if (mons_is_unique(monster->type))
        corpse.props[CORPSE_NAME_KEY] = mons_type_name(monster->type,
                                                       DESC_PLAIN);

Replacement in crawl-ref/source/monstuff.cc at line 1336 [7.1396662]

B:BD[11.3663] → [6.2797:2948]

                        name_zombified_unique(&menv[spectre], monster->type,
                                              monster->name(DESC_PLAIN));

[11.3663]

[11.4020]

                        name_zombie(&menv[spectre], monster);

Replacement in crawl-ref/source/mon-util.h at line 647 [7.1682293]

B:BD[9.7773] → [12.2638:2717]

bool name_zombified_unique(monsters *mon, int mc, const std::string mon_name);

[9.7773]

[7.1694947]

bool name_zombie(monsters *mon, int mc, const std::string mon_name);
bool name_zombie(monsters *mon, const monsters* orig);

Insertion in crawl-ref/source/mon-util.cc at line 979 [7.1699344]

[13.8829]

[7.1707746]


bool name_zombie(monsters *mon, int mc, const std::string mon_name)
{
    mon->mname = mon_name;

Replacement in crawl-ref/source/mon-util.cc at line 984 [7.1699344]

B:BD[7.1707747] → [12.2719:2797]

bool name_zombified_unique(monsters *mon, int mc, const std::string mon_name)

[7.1707747]

[6.3113]

    // Special case for Blork the orc: shorten his name to "Blork"
    // to avoid mentions of e.g "Blork the orc the orc zombie".
    if (mc == MONS_BLORK_THE_ORC)
        mon->mname = "Blork";
    // Also for the Lernaean hydra.
    else if (mc == MONS_LERNAEAN_HYDRA)
        mon->mname = "Lernaean hydra";
    if (starts_with(mon->mname, "shaped "))
        mon->flags |= MF_NAME_SUFFIX;
    return (true);
}
bool name_zombie(monsters *mon, const monsters* orig)

Replacement in crawl-ref/source/mon-util.cc at line 1000 [7.1699344]

B:BD[6.3115] → [6.3115:3180]

    if (mons_is_unique(mc))
    {
        mon->mname = mon_name;

[6.3115]

[6.3180]

    if (!mons_is_unique(orig->type) && orig->mname.empty())
        return (false);

Replacement in crawl-ref/source/mon-util.cc at line 1003 [7.1699344]

B:BD[6.3181] → [6.3181:3392]

B:BD[6.3392] → [4.2937:3064]

        // Special case for Blork the orc: shorten his name to "Blork"
        // to avoid mentions of e.g "Blork the orc the orc zombie".
        if (mc == MONS_BLORK_THE_ORC)
            mon->mname = "Blork";
        // Also for the Lernaean hydra.
        else if (mc == MONS_LERNAEAN_HYDRA)
            mon->mname = "Lernaean hydra";

[6.3181]

[12.2798]

    std::string name;

Replacement in crawl-ref/source/mon-util.cc at line 1005 [7.1699344]

B:BD[12.2799] → [12.2799:2822]

∅:D[12.2822] → [6.3392:3398]

B:BD[6.3392] → [6.3392:3398]

        return (true);
    }

[12.2799]

[12.2823]

    if (!orig->mname.empty())
        name = orig->mname;
    else
        name = mons_type_name(orig->type, DESC_PLAIN);

Replacement in crawl-ref/source/mon-util.cc at line 1010 [7.1699344]
B:BD[12.2824] → [12.2824:2844]
```
    return (false);
```
[12.2824]
[6.3398]
```
    return name_zombie(mon, orig->type, name);
```
Insertion in crawl-ref/source/itemname.h at line 14 [7.2661173]
[7.2661444]
[14.2694]
```
#define CORPSE_NAME_KEY "corpse_name_key"
```

Insertion in crawl-ref/source/itemname.h at line 151 [7.2661173]

[2.6985]

[7.2667450]

bool        is_named_corpse(const item_def &corpse);
std::string get_corpse_name(const item_def &corpse);

Insertion in crawl-ref/source/itemname.cc at line 126 [7.2667494]

[7.2677495]


    if (base_type == OBJ_CORPSES && is_named_corpse(*this)
        && !starts_with(get_corpse_name(*this), "shaped "))
    {
        switch (descrip)
        {
        case DESC_CAP_A:
        case DESC_CAP_YOUR:
            descrip = DESC_CAP_THE;
            break;
        case DESC_NOCAP_A:
        case DESC_NOCAP_YOUR:
        case DESC_NOCAP_ITS:
        case DESC_INVENTORY_EQUIP:
        case DESC_INVENTORY:
            descrip = DESC_NOCAP_THE;
            break;
        default:
            break;
        }
    }

Insertion in crawl-ref/source/itemname.cc at line 1592 [7.2667494]
[7.2743655]
[15.3690]
```
    {
```

Replacement in crawl-ref/source/itemname.cc at line 1596 [7.2667494]

B:BD[15.3738] → [15.3738:3759]

        if (!dbname)

[15.3738]

[15.3759]

        const std::string _name  = get_corpse_name(*this);
        const bool        shaped = starts_with(_name, "shaped ");
        if (!dbname && !starts_with(_name, "the "))
        {

Insertion in crawl-ref/source/itemname.cc at line 1603 [7.2667494]

[15.3824]

            if (!_name.empty() && shaped)
                buff << _name << ' ';
        }

Insertion in crawl-ref/source/itemname.cc at line 1613 [7.2667494]

[15.4016]

[7.2744087]


        if (!_name.empty() && !shaped)
            buff << " of " << _name;

Insertion in crawl-ref/source/itemname.cc at line 1617 [7.2667494]
[7.2744102]
[7.2744102]
```
    }
```

Insertion in crawl-ref/source/itemname.cc at line 2906 [7.2667494]

[14.10726]


bool is_named_corpse(const item_def &corpse)
{
    ASSERT(corpse.base_type == OBJ_CORPSES);
    return (corpse.props.exists(CORPSE_NAME_KEY));
}
std::string get_corpse_name(const item_def &corpse)
{
    ASSERT(corpse.base_type == OBJ_CORPSES);
    if (!corpse.props.exists(CORPSE_NAME_KEY))
        return ("");
    return (corpse.props[CORPSE_NAME_KEY].get_string());
}