summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-08 12:52:24 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-08 12:56:39 -0600
commitae03dd1f95c850329c80fc541cbd1b9286bae7d4 (patch)
tree3d3b03b3b96baa101d467d582481f7fc438de352
parent8b360b634738ea8a953d92660b452e92862d9cda (diff)
downloadcrawl-ref-ae03dd1f95c850329c80fc541cbd1b9286bae7d4.tar.gz
crawl-ref-ae03dd1f95c850329c80fc541cbd1b9286bae7d4.zip
After some thought, don't allow Prince Ribbit to be polymorphed into a
human. It could go the other way, with an appropriate message for when you do so, but, in order to avoid duplicate messages if he gets polymorphed multiple times, whether he's been turned into a human once will have to be saved in-game, and breaking savegame compatibility for this little bit of flavor seems like overkill to me.
-rw-r--r--crawl-ref/source/monstuff.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index d77608c93d..5b31c7f406 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -2190,7 +2190,10 @@ static bool _valid_morph(monsters *monster, monster_type new_mclass)
// Other poly-unsuitable things.
|| new_mclass == MONS_ORB_GUARDIAN
- || mons_is_statue(new_mclass))
+ || mons_is_statue(new_mclass)
+
+ // The spell on Prince Ribbit can't be broken so easily.
+ || (new_mclass == MONS_HUMAN && monster->type == MONS_PRINCE_RIBBIT))
{
return (false);
}