fiddlerwoaroof/crawl - Change V5SYTPXSEUOCYVBE3KRNZSOJMDIVOOLSOGJKQNHGZO26SHICPNCQC

* Add the diagonal movement logic for monsters moving aside for other

monsters of the same type.

Allow vampires of xp > 9 to meld with cursed gear in their bat form. (As always, exempting weapons, of course.)

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

Created by j-p-e-g on November 22, 2008

V5SYTPXSEUOCYVBE3KRNZSOJMDIVOOLSOGJKQNHGZO26SHICPNCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/transfor.cc at line 210 [5.143977]

[4.325]

    case TRAN_BAT:
        // Vampires of certain Xp may transform into bats even
        // with cursed gear.
        if (you.species == SP_VAMPIRE && you.experience_level >= 10)
            return (true);
        // intentional fall-through

Deletion in crawl-ref/source/transfor.cc at line 217 [5.143977]
B:BD[4.347] → [4.347:401]
```
    case TRAN_BAT: // Maybe this should depend on xp?
```
Deletion in crawl-ref/source/transfor.cc at line 218 [5.143977]
B:BD[4.420] → [4.420:445]
```
    case TRAN_ICE_BEAST:
```

Replacement in crawl-ref/source/monstuff.cc at line 3676 [5.1396662]

B:BD[3.2494] → [3.2494:2673]

        // Hostile monsters of animal-like intelligence only move aside
        // for monsters of the same type.
        if (mons_intel(mon) < I_NORMAL && !mons_wont_attack(mon)

[3.2494]

[3.2673]

        // Hostile monsters of normal intelligence only move aside for
        // monsters of the same type.
        if (mons_intel(mon) <= I_NORMAL && !mons_wont_attack(mon)

Replacement in crawl-ref/source/monstuff.cc at line 3871 [5.1396662]

B:BD[6.5695] → [6.5695:5817]

                                      coord_def(0, -mmov.y),
                                      coord_def(1, -mmov.y))

[6.5695]

[6.5817]

                                       coord_def(0, -mmov.y),
                                       coord_def(1, -mmov.y))

Insertion in crawl-ref/source/monstuff.cc at line 3882 [5.1396662]

[6.6269]

            }
        }
        else // We're moving diagonally.
        {
            if (good_move[mmov.x+1][1])
            {
                if (!good_move[1][mmov.y+1]
                    && (_allied_monster_at(monster, coord_def(-mmov.x, -1),
                                           coord_def(-mmov.x, 0),
                                           coord_def(-mmov.x, 1))
                        || mons_intel(monster) >= I_NORMAL
                           && !mons_wont_attack(monster)
                           && _ranged_allied_monster_in_dir(monster,
                                                coord_def(-mmov.x, -mmov.y))))
                {
                    mmov.y = 0;
                }

Insertion in crawl-ref/source/monstuff.cc at line 3900 [5.1396662]

[6.6283]

            else if (good_move[1][mmov.y+1]
                     && (_allied_monster_at(monster, coord_def(-1, -mmov.y),
                                           coord_def(0, -mmov.x),
                                           coord_def(1, -mmov.x))
                         || mons_intel(monster) >= I_NORMAL
                            && !mons_wont_attack(monster)
                            && _ranged_allied_monster_in_dir(monster,
                                                coord_def(-mmov.x, -mmov.y))))
            {
                mmov.x = 0;
            }

Replacement in crawl-ref/source/dat/descript/spells.txt at line 568 [7.2853]

B:BD[7.23867] → [7.23867:24093]

This spell temporarily transforms the caster into a venomous, spider-like creature. Spellcasting is slightly more difficult in this form. This spell is not powerful enough to allow the caster to slip out of cursed equipment.

[7.23867]

[8.2838]

This spell temporarily transforms the caster into a venomous, spider-like creature. Spellcasting is slightly more difficult in this form. This spell is not powerful enough to allow the caster to meld with their cursed equipment.

Insertion in crawl-ref/source/dat/descript/ability.txt at line 53 [9.3323]

[2.3123]

[9.4272]

Vampires below experience level 10 will be unable to transform if wearing cursed equipment.