From 847d18dc0c092ff23aa03cfc23b7bc1c32f2dabe Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 8 Dec 2008 22:46:17 +0000 Subject: Some more recent trunk commits -> 0.4. 7429, 7672, 7716, 7729, 6646, 7760 * Descriptions, messages, help screen. Also: * Don't allow monsters to polymorph into uniques. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@7790 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/monstuff.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'crawl-ref/source/monstuff.cc') diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 5e10ddbf67..c23d93098f 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -1431,6 +1431,7 @@ static bool _valid_morph( monsters *monster, int new_mclass ) // Various inappropriate polymorph targets. if (mons_class_holiness( new_mclass ) != mons_holiness( monster ) + || mons_class_flag( new_mclass, M_UNIQUE) // no uniques || mons_class_flag( new_mclass, M_NO_EXP_GAIN ) // not helpless || new_mclass == mons_species( monster->type ) // must be different || new_mclass == MONS_PROGRAM_BUG -- cgit v1.2.3-54-g00ecf