From f424787fb00d9c9797dc66a18ac27fda38e3c366 Mon Sep 17 00:00:00 2001 From: Matthew Cline Date: Fri, 13 Nov 2009 03:30:54 -0800 Subject: mon-stuff.cc: Jiyva slimify-monster stuff * Don't slimify insubstantial monsters. * Remove shapeshifting-ness when slimifying a monster, so that it won't later shape-shift to a non-slime. --- crawl-ref/source/mon-stuff.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'crawl-ref/source/mon-stuff.cc') diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index e51a64cb62..f3beee2fc5 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -2647,6 +2647,7 @@ bool mon_can_be_slimified(monsters *monster) const mon_holy_type holi = monster->holiness(); return (!(monster->flags & MF_GOD_GIFT) + && !mons_is_insubstantial(monster->type) && (holi == MH_UNDEAD || holi == MH_NATURAL && !mons_is_slime(monster)) ); @@ -2691,8 +2692,11 @@ void slimify_monster(monsters *mon, bool hostile) else mon->attitude = ATT_HOSTILE; - //mon->god = GOD_NO_GOD; // Prevent assertion. mons_make_god_gift(mon, GOD_JIYVA); + + // Don't want shape-shifters to shift into non-slimes. + mon->del_ench(ENCH_GLOWING_SHAPESHIFTER); + mon->del_ench(ENCH_SHAPESHIFTER); } static bool _habitat_okay( const monsters *monster, dungeon_feature_type targ ) -- cgit v1.2.3-54-g00ecf