fiddlerwoaroof/crawl - Change VMMUZXOQDXW5ZHA7623F744LS7U4BVLBKW5TNZMG5L2Z44UZGZRAC

Fix the name of Lernaean hydra zombies by adding special handling for named

hydras; kind of hackish.

During arena mode don't give "You see a puff of smoke" message if the arena vetoed the placement of a monster, don't brand item stacks, and always use full names for zombified uniques.

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

Created by zelgadis on January 8, 2009

VMMUZXOQDXW5ZHA7623F744LS7U4BVLBKW5TNZMG5L2Z44UZGZRAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 858 [8.16817]

B:BD[7.282] → [7.282:333]

                 && igrd(mons->pos()) != NON_ITEM)

[7.282]

[7.333]

                 && igrd(mons->pos()) != NON_ITEM
                 && !crawl_state.arena)

Replacement in crawl-ref/source/view.cc at line 1470 [8.16817]
∅:D[3.172] → [9.1689:1725]
∅:D[10.462] → [9.1689:1725]
B:BD[9.1689] → [9.1689:1725]
```
        if (eitem.link != NON_ITEM)
```
[3.172]
[9.1725]
```
        if (eitem.link != NON_ITEM && !crawl_state.arena)
```
Insertion in crawl-ref/source/monplace.cc at line 2433 [8.1641732]
[11.40952]
[2.4229]
```
    {
```

Insertion in crawl-ref/source/monplace.cc at line 2435 [8.1641732]

[2.4261]

[8.1675648]

        // If the arena vetoed the placement then give no fail message.
        if (crawl_state.arena)
            fail_msg = false;
    }

Insertion in crawl-ref/source/mon-util.cc at line 990 [8.1699344]

[12.3392]

[5.2798]

        // Also for the Lernaean hydra.
        else if (mc == MONS_LERNAEAN_HYDRA)
            mon->mname = "Lernaean hydra";

Insertion in crawl-ref/source/mon-util.cc at line 1989 [8.1699344]

[13.2625]

[8.1727779]


    // Some monsters might want the name of a different creature.
    int nametype = mon.type;
    // Tack on other prefixes.
    switch (mon.type)
    {
    case MONS_ZOMBIE_SMALL:     case MONS_ZOMBIE_LARGE:
    case MONS_SKELETON_SMALL:   case MONS_SKELETON_LARGE:
    case MONS_SIMULACRUM_SMALL: case MONS_SIMULACRUM_LARGE:
    case MONS_SPECTRAL_THING:
        nametype = mon.base_monster;
        break;
    default:
        break;
    }

Replacement in crawl-ref/source/mon-util.cc at line 2008 [8.1699344]

B:BD[14.6800] → [14.6800:6824]

B:BD[14.6824] → [15.3358:3411]

    // a unique's name.
    if (desc != DESC_BASENAME && !mon.mname.empty())

[14.6800]

[14.6852]

    // a unique's name.  Special handling for named hydras.
    if (desc != DESC_BASENAME && !mon.mname.empty()
        && mons_genus(nametype) != MONS_HYDRA)
    {

Insertion in crawl-ref/source/mon-util.cc at line 2013 [8.1699344]
[14.6878]
[14.6878]
```
    }
```

Replacement in crawl-ref/source/mon-util.cc at line 2021 [8.1699344]

B:BD[16.6993] → [17.7678:7713]

    if (!mons_is_unique(mon.type))

[16.6993]

[8.1728241]

    if (!mons_is_unique(nametype)
        && (mon.mname.empty() || mons_genus(nametype) == MONS_HYDRA))

Replacement in crawl-ref/source/mon-util.cc at line 2034 [8.1699344]

B:BD[18.10363] → [18.10363:10390]

            result = "A ";

[18.10363]

[18.10390]

            if (mon.mname.empty())
                result = "A ";
            else
                result = "The ";

Replacement in crawl-ref/source/mon-util.cc at line 2040 [8.1699344]

B:BD[18.10436] → [18.10436:10463]

            result = "a ";

[18.10436]

[18.10463]

            if (mon.mname.empty())
                result = "a ";
            else
                result = "the ";

Deletion in crawl-ref/source/mon-util.cc at line 2049 [8.1699344]
B:BD[8.1728726] → [8.1728726:1728732]
B:BD[8.1728732] → [19.2532:2547]
```
    }
    else
    {
```
Deletion in crawl-ref/source/mon-util.cc at line 2054 [8.1699344]
∅:D[4.3086] → [16.7297:7393]
B:BD[8.1728733] → [16.7297:7393]
```
    // Some monsters might want the name of a different creature.
    int nametype = mon.type;
```

Deletion in crawl-ref/source/mon-util.cc at line 2059 [8.1699344]

B:BD[20.5143] → [11.41752:41789]

∅:D[16.7540] → [8.1728892:1728908]

∅:D[11.41789] → [8.1728892:1728908]

B:BD[8.1728892] → [8.1728892:1728908]

B:BD[8.1728908] → [16.7541:7715]

B:BD[16.7715] → [11.41790:41827]

        nametype = mon.base_monster;
        break;
    case MONS_ZOMBIE_SMALL:     case MONS_ZOMBIE_LARGE:
    case MONS_SKELETON_SMALL:   case MONS_SKELETON_LARGE:
    case MONS_SIMULACRUM_SMALL: case MONS_SIMULACRUM_LARGE:
        nametype = mon.base_monster;

Replacement in crawl-ref/source/mon-util.cc at line 2105 [8.1699344]

B:BD[8.1730071] → [6.4273:4314]

    if (nametype == MONS_LERNAEAN_HYDRA)

[8.1730071]

[6.4314]

    if (!mon.mname.empty())
        result += mon.mname;
    else if (nametype == MONS_LERNAEAN_HYDRA)

Deletion in crawl-ref/source/mon-util.cc at line 2110 [8.1699344]
B:BD[6.4359] → [6.4359:4365]
```
    {
```
Deletion in crawl-ref/source/mon-util.cc at line 2112 [8.1699344]
B:BD[6.4447] → [6.4447:4453]
```
    }
```

Replacement in crawl-ref/source/mon-util.cc at line 5131 [8.1699344]

B:BD[21.6547] → [21.6547:6615]

    if ((flags & MF_NAME_MASK) && (force_vis || you.can_see(this)))

[21.6547]

[21.6615]

    if ((flags & MF_NAME_MASK) && (force_vis || you.can_see(this))
        || crawl_state.arena && mons_class_is_zombified(type))
    {

Insertion in crawl-ref/source/mon-util.cc at line 5135 [8.1699344]
[21.6649]
[21.6649]
```
    }
```

Insertion in crawl-ref/source/mon-util.cc at line 5159 [8.1699344]

[21.6885]

[13.3144]


    const int _type = mons_is_zombified(this) ? base_monster : type;
    if (mons_genus(_type) == MONS_HYDRA)
        return (title);

Fix the name of Lernaean hydra zombies by adding special handling for named

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 858 [8.16817]

Replacement in crawl-ref/source/view.cc at line 1470 [8.16817]

Insertion in crawl-ref/source/monplace.cc at line 2433 [8.1641732]

Insertion in crawl-ref/source/monplace.cc at line 2435 [8.1641732]

Insertion in crawl-ref/source/mon-util.cc at line 990 [8.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 1989 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2008 [8.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2013 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2021 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2034 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2040 [8.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2049 [8.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2054 [8.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2059 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2105 [8.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2110 [8.1699344]

Deletion in crawl-ref/source/mon-util.cc at line 2112 [8.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 5131 [8.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5135 [8.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 5159 [8.1699344]