diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-19 20:42:40 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-10-19 20:42:40 +0000 |
commit | bd3c84a3c74ab0a05809d6a52c5205718a37d59d (patch) | |
tree | 49e5dbda5c0a96d5a6b84648fd263e00a98247b0 | |
parent | 70414943b0b5ee327153e35d6ad1d6a97067da6a (diff) | |
download | crawl-ref-bd3c84a3c74ab0a05809d6a52c5205718a37d59d.tar.gz crawl-ref-bd3c84a3c74ab0a05809d6a52c5205718a37d59d.zip |
Treat colored rat skeletons/simulacra the same way as colored draconian
skeletons/simulacra.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7289 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/misc.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/monplace.cc | 20 |
2 files changed, 20 insertions, 6 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 2bd6b519e4..9ac9cdf9d3 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -150,6 +150,12 @@ void turn_corpse_into_skeleton(item_def &corpse, int time) { corpse.plus = MONS_DRACONIAN; } + // The same goes for rat corpses. + else if (mons_genus(corpse.plus) == MONS_RAT + && corpse.plus != MONS_RAT) + { + corpse.plus = MONS_RAT; + } corpse.sub_type = CORPSE_SKELETON; corpse.special = time; diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index 63b9a6f0be..0c1f05d43b 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -1080,13 +1080,21 @@ static void _define_zombie( int mid, monster_type ztype, if (zombie_size != -1 && mons_zombie_size(cls) != zombie_size) continue; - // Skeletal or icy draconians shouldn't be coloured. - // How could you tell? - if ((cs == MONS_SKELETON_SMALL || cs == MONS_SIMULACRUM_SMALL) - && mons_genus(cls) == MONS_DRACONIAN - && cls != MONS_DRACONIAN) + if (cs == MONS_SKELETON_SMALL || cs == MONS_SIMULACRUM_SMALL) { - cls = MONS_DRACONIAN; + // Skeletal or icy draconians shouldn't be coloured. + // How could you tell? + if (mons_genus(cls) == MONS_DRACONIAN + && cls != MONS_DRACONIAN) + { + cls = MONS_DRACONIAN; + } + // The same goes for rats. + else if (mons_genus(cls) == MONS_RAT + && cls != MONS_RAT) + { + cls = MONS_RAT; + } } // Hack -- non-dungeon zombies are always made out of nastier |