diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-13 03:24:45 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-13 03:24:45 -0800 |
| commit | 30c0986c2795663356a148bd3a0f0e2c981ee9e8 (patch) | |
| tree | 0c2240a6ae26db91587bd8a01ca983aae0b94422 /crawl-ref/source/mon-stuff.cc | |
| parent | df750a0139a6fb3bd89aa87066f29236211cd9f1 (diff) | |
| download | crawl-ref-30c0986c2795663356a148bd3a0f0e2c981ee9e8.tar.gz crawl-ref-30c0986c2795663356a148bd3a0f0e2c981ee9e8.zip | |
Jiyva won't slimify god-gift monsters.
Diffstat (limited to 'crawl-ref/source/mon-stuff.cc')
| -rw-r--r-- | crawl-ref/source/mon-stuff.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index bdd286c9c3..e51a64cb62 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -2646,13 +2646,15 @@ bool mon_can_be_slimified(monsters *monster) { const mon_holy_type holi = monster->holiness(); - return (holi == MH_UNDEAD - || holi == MH_NATURAL - && !mons_is_slime(monster)); + return (!(monster->flags & MF_GOD_GIFT) + && (holi == MH_UNDEAD + || holi == MH_NATURAL && !mons_is_slime(monster)) + ); } void slimify_monster(monsters *mon, bool hostile) { + if (mon->holiness() == MH_UNDEAD) monster_polymorph(mon, MONS_DEATH_OOZE); else @@ -2689,6 +2691,7 @@ 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); } |