From 9cc9c1350516b56581c8bf86aafa695677d819f9 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Mon, 12 Oct 2009 20:14:49 -0500 Subject: Apply n78291's patch in [2877049], with a few tweaks, to expand Jiyva's wrath, allow uncancelable transformations as part of it, and adjust his Slimify power. --- crawl-ref/source/fight.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'crawl-ref/source/fight.cc') 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 -- cgit v1.2.3-54-g00ecf