diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2010-01-16 02:47:31 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2010-01-16 02:47:31 +0100 |
| commit | cd1279820c73e2d44d5ca58f1cf62f2ee0bc769d (patch) | |
| tree | f797f813746d28f02ddc505d043f1b26cc38e28e /crawl-ref | |
| parent | 3c9a8035199bcaf485557df84a37a557426ff915 (diff) | |
| download | crawl-ref-cd1279820c73e2d44d5ca58f1cf62f2ee0bc769d.tar.gz crawl-ref-cd1279820c73e2d44d5ca58f1cf62f2ee0bc769d.zip | |
Unlike other dummy monsters, disallow polymorph into dwarves.
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 2 | ||||
| -rw-r--r-- | crawl-ref/source/mon-stuff.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 9d54b5f5e9..1bfe635934 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -3585,7 +3585,7 @@ static monsterentry mondata[] = { MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_MEDIUM }, -{ // another dummy monster +{ // another dummy monster. This one is not a valid polymorph target. MONS_DWARF, '@', BROWN, "dwarf", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index 68c98abb4f..92d9716056 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -2280,7 +2280,9 @@ static bool _valid_morph(monsters *monster, monster_type new_mclass) // Other poly-unsuitable things. || new_mclass == MONS_ORB_GUARDIAN + || new_mclass == MONS_DWARF || mons_is_statue(new_mclass) + || mons_is_projectile(new_mclass) // The spell on Prince Ribbit can't be broken so easily. || (new_mclass == MONS_HUMAN && monster->type == MONS_PRINCE_RIBBIT)) |