diff options
| author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-12 20:14:49 -0500 |
|---|---|---|
| committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-10-12 20:14:49 -0500 |
| commit | 9cc9c1350516b56581c8bf86aafa695677d819f9 (patch) | |
| tree | 0107beb99991e6e723b270388755d7e0b3033a37 /crawl-ref/source/fight.cc | |
| parent | 533796c8cabcf71b654d45531bb25f0ba3af1506 (diff) | |
| download | crawl-ref-9cc9c1350516b56581c8bf86aafa695677d819f9.tar.gz crawl-ref-9cc9c1350516b56581c8bf86aafa695677d819f9.zip | |
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.
Diffstat (limited to 'crawl-ref/source/fight.cc')
| -rw-r--r-- | crawl-ref/source/fight.cc | 11 |
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 |