fiddlerwoaroof/crawl - Change PQYLCUBDA6P4UY7X3NLIUUKMJ5GTQTB5X64VNSQVMCFS6ONMXXOQC

Apply patch #2838024 by bookofjude: new Elven twins uniques, Duvessa and Dowan. I'll do the tiles later.

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

Created by evktalo on August 19, 2009

PQYLCUBDA6P4UY7X3NLIUUKMJ5GTQTB5X64VNSQVMCFS6ONMXXOQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/monplace.h at line 69 [7.1638277]
[5.6596]
[6.64807]
```
    BAND_DUVESSA,               // 50
```

Insertion in crawl-ref/source/monplace.cc at line 1802 [7.1641732]

[5.6865]

[7.1664298]


    case MONS_DUVESSA:
        band = BAND_DUVESSA;
        band_size = 1;
        break;

Insertion in crawl-ref/source/monplace.cc at line 2105 [7.1641732]

[5.7072]

[8.2828]

    case BAND_DUVESSA:
        mon_type = MONS_DOWAN;
        break;

Insertion in crawl-ref/source/mon-spll.h at line 1068 [7.1750895]

[9.6464]

[5.8743]

    {  MST_DOWAN,
      {
       SPELL_THROW_FROST, 
       SPELL_BACKLIGHT, 
       SPELL_HASTE, 
       SPELL_THROW_FLAME, 
       SPELL_BLINK, 
       SPELL_MINOR_HEALING, 
      }
    },

Insertion in crawl-ref/source/mon-data.h at line 4178 [7.1826214]

[5.16423]

},
{
    MONS_DUVESSA, 'e', BLUE, "Duvessa",
    M_UNIQUE | M_FIGHTER | M_WARM_BLOOD | M_SPEAKS,
    MR_NO_FLAGS,
    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
    { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 6, 3, 3, 0 },
    0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH,
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM

Insertion in crawl-ref/source/mon-data.h at line 4191 [7.1826214]

[5.16427]

[10.122188]

{
    MONS_DOWAN, 'e', RED, "Dowan",
    M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD 
        | M_SPEAKS,
    MR_NO_FLAGS,
    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
    { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
    { 4, 3, 3, 0 },
    0, 13, MST_DOWAN, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH,
    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
},

Insertion in crawl-ref/source/makeitem.cc at line 3338 [11.927]
[11.109202]
[11.109202]
```
    case MONS_DUVESSA:
```

Replacement in crawl-ref/source/makeitem.cc at line 3718 [11.927]

B:BD[11.121019] → [11.121019:121069]

        // deliberate fall-through, I guess {dlb}

[11.121019]

[2.2747]

        item.base_type = OBJ_WEAPONS;
        item.sub_type  = WPN_DAGGER;
        break;
    case MONS_DOWAN:
        item_race = MAKE_ITEM_ELVEN;
        item.base_type = OBJ_WEAPONS;
        item.sub_type  = WPN_DAGGER;
        break;

Insertion in crawl-ref/source/makeitem.cc at line 4093 [11.927]
[12.6067]
[13.2830]
```
    case MONS_DUVESSA:
```
Insertion in crawl-ref/source/makeitem.cc at line 4165 [11.927]
[14.6599]
[11.125621]
```
    case MONS_DUVESSA:
```
Insertion in crawl-ref/source/makeitem.cc at line 4319 [11.927]
[15.1134]
[15.1134]
```
    case MONS_DOWAN:
        item_race = MAKE_ITEM_ELVEN;
```

Replacement in crawl-ref/source/makeitem.cc at line 4344 [11.927]

∅:D[5.22018] → [16.665:704]

B:BD[16.665] → [16.665:704]

        item_race = MAKE_ITEM_NO_RACE;

[5.22018]

[17.4484]

        if (item_race == MAKE_ITEM_RANDOM_RACE)
            item_race = MAKE_ITEM_NO_RACE;

Insertion in crawl-ref/source/enum.h at line 2079 [7.3287960]
[4.4062]
[18.3693]
```
    MONS_DUVESSA,
    MONS_DOWAN,
```
Replacement in crawl-ref/source/enum.h at line 2288 [7.3287960]
B:BD[9.7351] → [19.3672:3718]
```
    MST_MENKAURE,                      // 148
```
[9.7351]
[5.24169]
```
    MST_MENKAURE,
    MST_DOWAN,
```

Replacement in crawl-ref/source/dungeon.cc at line 3291 [7.3429798]

B:BD[20.3006] → [20.3006:3053]

                            MONS_SIGMUND, -1);

[20.3006]

[20.3053]

                            MONS_SIGMUND, MONS_DUVESSA, -1);

Replacement in crawl-ref/source/dungeon.cc at line 3296 [7.3429798]

B:BD[19.3796] → [19.3796:3844]

                            MONS_MENKAURE, -1);

[19.3796]

[20.3213]

                            MONS_MENKAURE, MONS_DUVESSA, -1);

Replacement in crawl-ref/source/dungeon.cc at line 3300 [7.3429798]

B:BD[20.3328] → [21.5106:5184]

                            MONS_EROLCHA, MONS_PRINCE_RIBBIT, MONS_GRUM, -1);

[20.3328]

[20.3375]

                            MONS_EROLCHA, MONS_PRINCE_RIBBIT, MONS_GRUM,
                            -1);

Replacement in crawl-ref/source/dat/sewer.des at line 242 [23.50909]

B:BD[22.3374] → [3.2811:2882]

# Two fairly waterly vaults with (usually) two giant frogs in the end.

[22.3374]

[3.2882]

# Two fairly watery vaults with (usually) two giant frogs in the end.

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

[24.30654]

[25.37321]

%%%%
Dowan
A beautiful but vain elf with an aptitude for magic and little else. His skills are the perfect complement of his twin sister Duvessa's fighting prowess.

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

[24.30707]

[25.37408]

%%%%
Duvessa
A plain-looking elven fighter who is technically brilliant in many forms of combat, but over-confident because of it. She is complemented by the magical skills of her twin brother, Dowan.

Insertion in crawl-ref/source/dat/database/quotes.txt at line 405 [26.6980]

[26.22190]

%%%%
Dowan
"Skill and grace, the twin brother and sister, 
 are dancing playfully on your finger tips."
    -Rabindranath Tagore, _Chitra, Act I, Scene IV_

Insertion in crawl-ref/source/dat/database/quotes.txt at line 412 [26.6980]

[26.22195]

Duvessa
"Twin children: the Girl, she was plain;
 The Brother was handsome & vain;
 'Let him brag of his looks,'
 Father said; 'mind your books!
 The best beauty is bred in the brain.'"
    -Aesop & Walter Crane, _The Baby's Own Aesop: Brother & Sister_
%%%%

Replacement in crawl-ref/source/dat/database/monspeak.txt at line 1343 [27.307]

B:BD[27.18163] → [27.18163:18198]

# A mercenary guarding the dungeon

[27.18163]

[27.18198]

############ DOWAN ### A vain elf caster, twin brother of Duvessa
Dowan
@_Dowan_common_@
w:2
@_Dowan_rare_@
%%%%
_Dowan_common_
VISUAL:@The_monster@ points a slender finger @at_foe@ and smirks.
@The_monster@ says @to_foe@, "My weaknesses are her strengths!"
@The_monster@ says @to_foe@, "Stay away from my face!"
@The_monster@ says @to_foe@, "Magic and the sword, together, will defeat you." @player_only@
 
%%%%
_Dowan_rare_
VISUAL:@The_monster@ throws and catches a handful of magical flame, then smirks.
VISUAL:@The_monster@ robes are whipped around by a magical breeze.
# Removed VISUAL - makes no sense when silenced
@The_monster@ goes cross-eyed from fumbling a word in a spell.
@The_monster@ whispers @to_foe@, "It won't be long now."
@The_monster@ hisses @to_foe@, "Insulting my beauty only makes me fight harder!"
@The_monster@ says @to_foe@, "Where the sword fails, magic succeeds!"
@The_monster@ says @to_foe@, "There's a certain beauty in death, don't you think?"
@The_monster@ laughs at you. "Don't get delusional, you can't win!"
%%%%
############ DUANE ### A mercenary guarding the dungeon

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

[27.18225]

%%%%
############ DUVESSA ### An over-confident elf fighter, twin sister of Dowan
Duvessa
@_Duvessa_common_@
w:2
@_Duvessa_rare_@
%%%%
_Duvessa_common_
VISUAL:@The_monster@ gestures towards you with her weapon.
@The_monster@ says @to_foe@, "My weaknesses are his strengths!"
@The_monster@ says @to_foe@, "Where magic fails, the sword succeeds!"
@The_monster@ says @to_foe@, "When magic and the sword combine, nothing stands against them."
%%%%
_Duvessa_rare_
@The_monster@ @shouts@ @to_foe@, "You can run, but you cannot escape us forever!" @player_only@
@The_monster@ says @to_foe@, "I don't care about looks, I care about technique!"
@The_monster@ says @to_foe@, "Did you see that move? Perfect!"
@The_monster@ says @to_foe@, "Beauty is only skin deep, and my weapons penetrate much further than that."
@The_monster@ says @to_foe@, "Practice, practice, practice! One day you'll be as good as me." @player_only@