fiddlerwoaroof/crawl - Change FU663V7RFZNSMG5P2E7TZJZWSGXWLCCFXSVGH4Z222FIJTH4R3KAC

Just for kicks, reuse monster property mname to name zombies/skeletons

raised from unique monster's corpses. The unique number is stored in orig_monnum, so this doesn't apply to orcish followers. I thought it would be cool to have Sigmund the human zombie in your ranks, or to fight againt Blork the orc skeleton. The corpses are currently not differentiated (just "human corpse", "orc skeleton"), just the resulting undead.

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

Created by j-p-e-g on May 30, 2008

FU663V7RFZNSMG5P2E7TZJZWSGXWLCCFXSVGH4Z222FIJTH4R3KAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells2.cc at line 468 [6.569242]

[5.395]

[6.578888]


        int monster = create_monster(
                        mgen_data(
                            type, corps_beh, 0,
                            coord_def(corx, cory), corps_hit,
                            0, zombie_type, number));

Replacement in crawl-ref/source/spells2.cc at line 475 [6.569242]

B:BD[6.578889] → [7.6530:6663]

B:BD[7.6663] → [5.396:438]

        create_monster(
            mgen_data(
                type, corps_beh, 0,
                coord_def(corx, cory), corps_hit,
                0, zombie_type, number));

[6.578889]

[6.579000]

        if (monster != -1)
        {
            const int monnum = mitm[corps].orig_monnum - 1;
            if (mons_is_unique(monnum))
            {
                menv[monster].mname = origin_monster_name(mitm[corps]);
                // Special case for Blork the orc: shorten his name to "Blork"
                // to avoid mentions of "Blork the orc the orc skeleton".
                if (monnum == MONS_BLORK_THE_ORC)
                    menv[monster].mname = "Blork";
            }
        }

Insertion in crawl-ref/source/monstuff.cc at line 354 [6.1396662]
[8.2928]
[8.2928]
```
    origin_set_monster(mitm[o], monster);
```
Replacement in crawl-ref/source/mon-util.cc at line 1639 [6.1699344]
B:BD[9.6824] → [9.6824:6852]
```
    if (!mon.mname.empty())
```
[9.6824]
[9.6852]
```
    if (desc != DESC_BASENAME && !mon.mname.empty())
```

Replacement in crawl-ref/source/mon-util.cc at line 1776 [6.1699344]

B:BD[10.9477] → [11.5144:5288]

    if ( result.length() >= 3
         && (result[0] == 'a' || result[0] == 'A')
         && result[1] == ' '
         && is_vowel(result[2]) )

[10.9477]

[12.11162]

    if (result.length() >= 3
        && (result[0] == 'a' || result[0] == 'A')
        && result[1] == ' '
        && is_vowel(result[2]) )

Insertion in crawl-ref/source/items.h at line 135 [6.2580284]
[13.342698]
[13.342698]
```
std::string origin_monster_name(const item_def &item);
```
Replacement in crawl-ref/source/items.cc at line 1015 [6.2584728]
B:BD[13.346824] → [14.7257:7319]
```
static std::string _origin_monster_name(const item_def &item)
```
[13.346824]
[13.346885]
```
std::string origin_monster_name(const item_def &item)
```
Deletion in crawl-ref/source/items.cc at line 1025 [6.2584728]
B:BD[13.347211] → [14.7320:7382]
∅:D[14.7382] → [13.347272:347274]
B:BD[13.347272] → [13.347272:347274]
B:BD[13.347274] → [14.7383:7424]
∅:D[14.7424] → [13.347314:347317]
B:BD[13.347314] → [13.347314:347317]
```
static std::string _origin_monster_desc(const item_def &item)
{
    return (_origin_monster_name(item));
}
```

Replacement in crawl-ref/source/items.cc at line 1112 [6.2584728]

B:BD[14.8080] → [14.8080:8136]

                    + _origin_monster_desc(item) + " ";

[14.8080]

[2.9843]

                    + origin_monster_name(item) + " ";

Replacement in crawl-ref/source/externs.h at line 396 [6.3270163]

∅:D[15.3751] → [6.3274836:3275145]

B:BD[6.3274836] → [6.3274836:3275145]

B:BD[6.3275145] → [16.895955:896007]

∅:D[16.896007] → [6.3275197:3275247]

B:BD[6.3275197] → [6.3275197:3275247]

    unsigned char  sub_type;   // type within that class (ie WPN_DAGGER)
    short          plus;       // +to hit, charges, corpse mon id
    short          plus2;      // +to dam, sub-sub type for boots and helms
    long           special;    // special stuff
    unsigned char  colour;     // item colour
    unsigned long  flags;      // item status flags
    short          quantity;   // number of items

[15.3751]

[6.3275247]

    unsigned char  sub_type;       // type within that class (ie WPN_DAGGER)
    short          plus;           // +to hit, charges, corpse mon id
    short          plus2;          // +to dam, sub-sub type for boots/helms
    long           special;        // special stuff
    unsigned char  colour;         // item colour
    unsigned long  flags;          // item status flags
    short          quantity;       // number of items

Replacement in crawl-ref/source/enum.h at line 2732 [6.3287960]

B:BD[4.3936] → [4.3936:4013]

}; // for numbers higher than 70 change size of tutorial_events in externs.h

[4.3936]

[17.2657]

};
// NOTE: For numbers higher than 70 change size of tutorial_events in externs.h.

Replacement in crawl-ref/source/directn.cc at line 2183 [6.3697945]

B:BD[3.12220] → [3.12220:12258]

        // "Morbeogh the orc priest".

[3.12220]

[18.2992]

        // "Morbeogh the orc priest", "Sigmund the human zombie".
        // Note that the only difference between DESC_BASENAME and DESC_PLAIN
        // is that basename will ignore mname, so the monster _must_ be named
        // for this to make any sense.

Replacement in crawl-ref/source/directn.cc at line 2188 [6.3697945]

B:BD[18.3027] → [3.12259:12328]

            desc += " " + mons_type_name(mon->type, DESC_NOCAP_THE);

[18.3027]

[18.3095]

            desc += " the " + mon->name(DESC_BASENAME);

Replacement in crawl-ref/source/delay.cc at line 1592 [6.3963459]

B:BD[18.3361] → [3.12335:12408]

                text += " " + mons_type_name(mon->type, DESC_NOCAP_THE);

[18.3361]

[19.1535]

                text += " the " + mon->name(DESC_BASENAME);