diff options
| author | Neil Moore <neil@s-z.org> | 2013-05-29 22:06:06 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2013-05-29 22:06:06 -0400 |
| commit | 3259975a78f2e202c4f348a76db3fecec76a19ae (patch) | |
| tree | 4cb9fb5c9677b95a943c4050fd9048593c5fa246 /crawl-ref/source/spl-miscast.cc | |
| parent | fad644818c9b5118a796b3e3ec486dc38c53cd52 (diff) | |
| parent | bad48d64c2a38978bf4ccf19931ea0483f60c843 (diff) | |
| download | crawl-ref-3259975a78f2e202c4f348a76db3fecec76a19ae.tar.gz crawl-ref-3259975a78f2e202c4f348a76db3fecec76a19ae.zip | |
Merge branch 'lava_djinn' into master
Conflicts:
crawl-ref/source/enum.h
Diffstat (limited to 'crawl-ref/source/spl-miscast.cc')
| -rw-r--r-- | crawl-ref/source/spl-miscast.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/spl-miscast.cc b/crawl-ref/source/spl-miscast.cc index 7289e2c0e4..7e7a0dad6c 100644 --- a/crawl-ref/source/spl-miscast.cc +++ b/crawl-ref/source/spl-miscast.cc @@ -1519,9 +1519,9 @@ void MiscastEffect::_divination_you(int severity) break; case 1: mpr("You lose your focus."); - if (you.magic_points > 0) + if (you.magic_points > 0 || you.species == SP_DJINNI) { - dec_mp(3 + random2(10)); + drain_mp(3 + random2(10)); mpr("You suddenly feel drained of magical energy!", MSGCH_WARN); } break; @@ -1535,9 +1535,9 @@ void MiscastEffect::_divination_you(int severity) { case 0: mpr("You lose concentration completely!"); - if (you.magic_points > 0) + if (you.magic_points > 0 || you.species == SP_DJINNI) { - dec_mp(5 + random2(20)); + drain_mp(5 + random2(20)); mpr("You suddenly feel drained of magical energy!", MSGCH_WARN); } break; @@ -2030,12 +2030,12 @@ void MiscastEffect::_transmutation(int severity) // We don't need messages when the mutation fails, // because we give our own (which is justified anyway as // you take damage). - give_bad_mutation(cause, false, false); + mutate(RANDOM_BAD_MUTATION, cause, false, false); if (coinflip()) - give_bad_mutation(cause, false, false); + mutate(RANDOM_BAD_MUTATION, cause, false, false); } else - target->mutate(cause); + target->malmutate(cause); _ouch(5 + random2avg(23, 2)); break; } @@ -3024,9 +3024,9 @@ void MiscastEffect::_zot() else { you_msg = "Your body is distorted in a weirdly horrible way!"; - give_bad_mutation(cause, false, false); + mutate(RANDOM_BAD_MUTATION, cause, false, false); if (coinflip()) - give_bad_mutation(cause, false, false); + mutate(RANDOM_BAD_MUTATION, cause, false, false); do_msg(); } break; |