summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 1426d83ad6..2f3d899835 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -858,6 +858,17 @@ bool melee_attack::player_attack()
player_calc_hit_damage();
}
+ if (you.duration[DUR_SLIMIFY]
+ && mon_can_be_slimified(defender_as_monster()))
+ {
+ // Bail out after sliming so we don't get aux unarmed and
+ // attack a fellow slime.
+ damage_done = 0;
+ slimify_monster(defender_as_monster());
+ you.duration[DUR_SLIMIFY] = 0;
+ return (true);
+ }
+
bool hit_woke_orc = false;
if (you.religion == GOD_BEOGH
&& defender->mons_species() == MONS_ORC