diff options
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/mutation.cc | 9 |
2 files changed, 9 insertions, 8 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 8f70f23498..2478e7cf65 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -437,8 +437,6 @@ static int _scan_mon_inv_items(const monsters *mon, static bool _mons_has_undrinkable_potion(const monsters *mon) { - bool ret = false; - if (mons_itemuse(mon) >= MONUSE_STARTING_EQUIPMENT) { const int potion = mon->inv[MSLOT_POTION]; @@ -449,11 +447,11 @@ static bool _mons_has_undrinkable_potion(const monsters *mon) static_cast<potion_type>(mitm[potion].sub_type); if (!mon->can_drink_potion(ptype)) - ret = true; + return (true); } } - return (ret); + return (false); } int mons_unusable_items(const monsters *mon) @@ -8152,7 +8150,7 @@ bool monsters::can_drink_potion(potion_type ptype) const if (mons_itemuse(this) >= MONUSE_STARTING_EQUIPMENT) { if (mons_is_skeletal(type) || mons_is_insubstantial(type) - || mons_species() == MONS_LICH || mons_species() == MONS_MUMMY) + || mons_species() == MONS_LICH || mons_genus(type) == MONS_MUMMY) { return (false); } diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 5c006e94ee..da633db58b 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -2606,8 +2606,7 @@ std::string mutation_name(mutation_type mut, int level, bool colour) return (result); } -// Use an attribute counter for how many demonic mutations a demonspawn -// has. +// Use an attribute counter for how many demonic mutations a demonspawn has. void demonspawn() { mutation_type whichm = NUM_MUTATIONS; @@ -2710,7 +2709,11 @@ void demonspawn() howm = 1; } - if (you.religion != GOD_SIF_MUNA && one_chance_in(11)) + // Theoretically, you could use this with Trog (for rods and + // some misc. items), but in general it's going to be much more + // useful for someone capable of casting spells. + if (you.religion != GOD_TROG + && you.religion != GOD_SIF_MUNA && one_chance_in(11)) { whichm = MUT_CHANNEL_HELL; howm = 1; |