fiddlerwoaroof/crawl - Change CQKH4FU2BZOMP5VWWOH2CEWDAYOV7FV53VOFQRF7R64DCQMP73LAC

Add two more uniques: Nessos and the Lernaean hydra, also implemented by

castamir.

Nessos still needs to be buffed (he's a normal centaur with fixed equipment) and is also in need of speech. The Lernaean hydra shouldn't be generated randomly but instead be placed via vaults (which will favour spoiled players, but you can't have everything).

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

Created by j-p-e-g on January 7, 2009

CQKH4FU2BZOMP5VWWOH2CEWDAYOV7FV53VOFQRF7R64DCQMP73LAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilepick.cc at line 935 [6.96318]

[3.458]

[5.18858]

    case MONS_NESSOS:
        return TILEP_MONS_NESSOS;
    case MONS_LERNAEAN_HYDRA:
        return TILEP_MONS_LERNAEAN_HYDRA;

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 324 [6.4192854]
[3.7777]
[7.8258]
```
lernaean_hydra MONS_LERNAEAN_HYDRA
```
Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 447 [6.4192854]
[3.10262]
[3.10262]
```
%sdir dc-mon/unique
nessos MONS_NESSOS
%sdir dc-mon
```
File move: centaur_warrior.png → nessos.png
BF:BFD[8.56172] → [8.77833:77883]
BF:BF[8.77883] → [8.76548:76548]
[7.8871]
[8.76548]
File addition: lernaean_hydra.png (----------)
[7.8871]
File deletion: txt4.png, txt4.png
BF:BFD[8.56172] → [8.60663:60702]
BF:BFD[8.60702] → [9.929240:929240]
BFD:BFD[6.4955259] → [9.929453:929492]
BF:BFD[9.929492] → [9.929240:929240]
B:BD[9.929240] → [9.929241:929452]
File deletion: txt3.png, txt3.png
BF:BFD[8.56172] → [8.60704:60743]
BF:BFD[8.60743] → [9.929494:929494]
BFD:BFD[6.4955259] → [9.929721:929760]
BF:BFD[9.929760] → [9.929494:929494]
B:BD[9.929494] → [9.929495:929720]
File deletion: txt2.png, txt2.png
BF:BFD[8.56172] → [8.60745:60784]
BF:BFD[8.60784] → [9.929762:929762]
BFD:BFD[6.4955259] → [9.930116:930155]
BF:BFD[9.930155] → [9.929762:929762]
B:BD[9.929762] → [9.929763:930115]
File deletion: txt1.png, txt1.png
BF:BFD[8.56172] → [8.60786:60825]
BF:BFD[8.60825] → [9.930157:930157]
BFD:BFD[6.4955259] → [9.930523:930562]
BF:BFD[9.930562] → [9.930157:930157]
B:BD[9.930157] → [9.930158:930522]

Insertion in crawl-ref/source/monstuff.cc at line 1949 [11.1396662]

[10.4918]

            flags |= MF_NAME_SUFFIX;
        }
        else if (monster->type == MONS_LERNAEAN_HYDRA)
        {
            name   = "shaped Lernaean hydra";

Insertion in crawl-ref/source/monstuff.cc at line 8472 [11.1396662]
[11.1554644]
[11.1554644]
```
        case MONS_LERNAEAN_HYDRA:
```

Insertion in crawl-ref/source/mon-util.cc at line 1764 [11.1699344]

[12.476551]

        break;
    case MONS_LERNAEAN_HYDRA:
        monnumber = 27;

Replacement in crawl-ref/source/mon-util.cc at line 2065 [11.1699344]
B:BD[13.2671] → [13.2671:2702]
```
    if (nametype == MONS_HYDRA
```
[13.2671]
[14.5866]
```
    if (mons_species(nametype) == MONS_HYDRA
```

Insertion in crawl-ref/source/mon-util.cc at line 2068 [11.1699344]

[13.2780]

[15.10021]

        if (nametype == MONS_LERNAEAN_HYDRA)
            result += "the ";

Replacement in crawl-ref/source/mon-util.cc at line 2093 [11.1699344]

B:BD[11.1730071] → [16.8305:8331]

B:BD[16.8331] → [17.1620:1668]

    // Add the base name.
    result += get_monster_data(nametype)->name;

[11.1730071]

[11.1730138]

    if (nametype == MONS_LERNAEAN_HYDRA)
        result += "Lernaean hydra";
    else
    {
        // Add the base name.
        result += get_monster_data(nametype)->name;
    }

Replacement in crawl-ref/source/mon-util.cc at line 3159 [11.1699344]

B:BD[11.1749562] → [18.5183:5255]

    if (mons_genus(mon_type) == MONS_MERMAID || mon_type == MONS_HARPY)

[11.1749562]

[5.25443]

    if (mons_genus(mon_type) == MONS_MERMAID || mon_type == MONS_HARPY
        || mon_type == MONS_SPHINX)
    {

Insertion in crawl-ref/source/mon-util.cc at line 3163 [11.1699344]
[5.25475]
[5.25475]
```
    }
```
Insertion in crawl-ref/source/mon-util.cc at line 3187 [11.1699344]
[2.2857]
[2.2857]
```
        case MONS_LERNAEAN_HYDRA:
```
Replacement in crawl-ref/source/mon-util.cc at line 6044 [11.1699344]
B:BD[19.42099] → [15.10744:10775]
```
    return (type == MONS_HYDRA
```
[19.42099]
[20.11952]
```
    return (mons_species() == MONS_HYDRA
```

Replacement in crawl-ref/source/mon-data.h at line 3881 [11.1826214]

B:BD[21.3049] → [22.117591:117625]

B:BD[22.117625] → [23.10556:10596]

    MONS_IJYB, 'g', BLUE, "Ijyb",
    M_UNIQUE | M_WARM_BLOOD | M_SPEAKS,

[21.3049]

[21.3150]

    MONS_NESSOS, 'c', DARKGREY, "Nessos",
    M_UNIQUE | M_WARM_BLOOD | M_EVIL | M_SPEAKS,

Replacement in crawl-ref/source/mon-data.h at line 3884 [11.1826214]

B:BD[21.3167] → [4.2696:2750]

∅:D[4.2750] → [22.117718:117803]

B:BD[22.117718] → [22.117718:117803]

B:BD[22.117803] → [24.5897:5971]

∅:D[24.5971] → [22.117874:117941]

B:BD[22.117874] → [22.117874:117941]

    400, 5, MONS_GOBLIN, MONS_GOBLIN, MH_NATURAL, -3,
    { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 3, 0, 0, 28 },
    2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL,
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL

[21.3167]

[25.39126]

    1500, 10, MONS_CENTAUR, MONS_CENTAUR, MH_NATURAL, -3,
    { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 4, 3, 5, 0 },
    3, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL,
    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG

Insertion in crawl-ref/source/mon-data.h at line 3939 [11.1826214]

[11.1895260]

[23.11217]

{
    MONS_LERNAEAN_HYDRA, 'D', YELLOW, "the Lernaean hydra",
    M_UNIQUE | M_COLD_BLOOD,
    MR_RES_POISON,
    1800, 11, MONS_HYDRA, MONS_HYDRA, MH_NATURAL, -3,
    { {AT_BITE, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 30, 3, 2, 0 },
    0, 5, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_ROAR, I_INSECT,
    HT_AMPHIBIOUS_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
},

Insertion in crawl-ref/source/mon-data.h at line 3973 [11.1826214]

[23.12117]

    MONS_IJYB, 'g', BLUE, "Ijyb",
    M_UNIQUE | M_WARM_BLOOD | M_SPEAKS,
    MR_NO_FLAGS,
    400, 5, MONS_GOBLIN, MONS_GOBLIN, MH_NATURAL, -3,
    { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 3, 0, 0, 28 },
    2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL,
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
},
{

Insertion in crawl-ref/source/makeitem.cc at line 3428 [26.927]

[26.116445]

        break;
    case MONS_NESSOS:
        item_race      = MAKE_ITEM_NO_RACE;
        item.base_type = OBJ_WEAPONS;
        item.sub_type  = WPN_LONGBOW;
        item.colour    = DARKGREY;
        force_item     = true;
        item.plus     += 1 + random2(3);
        item.plus2    += 1 + random2(3);

Insertion in crawl-ref/source/makeitem.cc at line 3765 [26.927]

[21.5887]

[27.6019]

        else if (mon->type == MONS_NESSOS)
            mitm[thing_created].special = SPMSL_POISONED;

Insertion in crawl-ref/source/makeitem.cc at line 4202 [26.927]

[23.22213]

[26.129752]

    case MONS_NESSOS:
        item_race = MAKE_ITEM_NO_RACE;
        mitm[bp].base_type = OBJ_ARMOUR;
        mitm[bp].sub_type = ARM_CENTAUR_BARDING;
        force_colour = DARKGRAY;
        break;

Insertion in crawl-ref/source/fight.cc at line 3079 [11.3140790]

[28.6373]

[19.45523]

                unsigned int limit = 20;
                if (def->type == MONS_LERNAEAN_HYDRA)
                    limit = 27;

Replacement in crawl-ref/source/fight.cc at line 3088 [11.3140790]

B:BD[19.45715] → [19.45715:45758]

                else if (def->number < 19)

[19.45715]

[19.45758]

                else if (def->number < limit - 1)

Insertion in crawl-ref/source/enum.h at line 2004 [11.3287960]
[23.23053]
[29.3693]
```
    MONS_NESSOS,
    MONS_LERNAEAN_HYDRA,
```
Replacement in crawl-ref/source/enum.h at line 2008 [11.3287960]
B:BD[29.3718] → [29.3718:3741]
```
    MONS_TEST_SPAWNER,
```
[29.3718]
[11.3340022]
```
    MONS_TEST_SPAWNER,                 // 460
```
Insertion in crawl-ref/source/dungeon.cc at line 3229 [11.3429798]
[23.24510]
[30.2820]
```
// NOTE: The Lernaean hydra should *never* be randomly generated.
```

Replacement in crawl-ref/source/dungeon.cc at line 3245 [11.3429798]

B:BD[30.3328] → [23.24511:24578]

                            MONS_EROLCHA, MONS_PRINCE_RIBBIT, -1);

[30.3328]

[30.3375]

                            MONS_EROLCHA, MONS_PRINCE_RIBBIT, MONS_NESSOS, -1);

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 188 [31.17579]

[31.39497]

Lernaean hydra
An ancient nameless serpent-like water beast that possesses numerous heads. 
The poets mention more heads than vase-painters can paint, poisonous venom
coming out of its eyes, and that this hydra is a guardian of an entrance to
the Underworld.  What of this is true, you do not know.
%%%%

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 219 [31.17579]
[31.39877]
[32.32247]
```
Nessos
A Black Centaur with a malicious look in the eyes.
%%%%
```
Insertion in crawl-ref/source/dat/database/monspeak.txt at line 1985 [33.307]
[23.29009]
[33.27837]
```
# evil centaur, needs speech!
Nessos
__NONE
%%%%
```

Add two more uniques: Nessos and the Lernaean hydra, also implemented by

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilepick.cc at line 935 [6.96318]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 324 [6.4192854]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 447 [6.4192854]

File move: centaur_warrior.png → nessos.png

File addition: lernaean_hydra.png (----------)

File deletion: txt4.png, txt4.png

File deletion: txt3.png, txt3.png

File deletion: txt2.png, txt2.png

File deletion: txt1.png, txt1.png

Insertion in crawl-ref/source/monstuff.cc at line 1949 [11.1396662]

Insertion in crawl-ref/source/monstuff.cc at line 8472 [11.1396662]

Insertion in crawl-ref/source/mon-util.cc at line 1764 [11.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2065 [11.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 2068 [11.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2093 [11.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 3159 [11.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3163 [11.1699344]

Insertion in crawl-ref/source/mon-util.cc at line 3187 [11.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 6044 [11.1699344]

Replacement in crawl-ref/source/mon-data.h at line 3881 [11.1826214]

Replacement in crawl-ref/source/mon-data.h at line 3884 [11.1826214]

Insertion in crawl-ref/source/mon-data.h at line 3939 [11.1826214]

Insertion in crawl-ref/source/mon-data.h at line 3973 [11.1826214]

Insertion in crawl-ref/source/makeitem.cc at line 3428 [26.927]

Insertion in crawl-ref/source/makeitem.cc at line 3765 [26.927]

Insertion in crawl-ref/source/makeitem.cc at line 4202 [26.927]

Insertion in crawl-ref/source/fight.cc at line 3079 [11.3140790]

Replacement in crawl-ref/source/fight.cc at line 3088 [11.3140790]

Insertion in crawl-ref/source/enum.h at line 2004 [11.3287960]

Replacement in crawl-ref/source/enum.h at line 2008 [11.3287960]

Insertion in crawl-ref/source/dungeon.cc at line 3229 [11.3429798]

Replacement in crawl-ref/source/dungeon.cc at line 3245 [11.3429798]

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 188 [31.17579]

Insertion in crawl-ref/source/dat/descript/monsters.txt at line 219 [31.17579]

Insertion in crawl-ref/source/dat/database/monspeak.txt at line 1985 [33.307]