diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-26 15:29:47 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-26 15:29:47 +0000 |
| commit | d230622af89d8fd4de219103eb051a227467a94d (patch) | |
| tree | fd36104ea7b84020b788c5c8866f794121c67af8 | |
| parent | 222800e5c98933623d7386bba71834d44bf56174 (diff) | |
| download | crawl-ref-d230622af89d8fd4de219103eb051a227467a94d.tar.gz crawl-ref-d230622af89d8fd4de219103eb051a227467a94d.zip | |
After some thought on the Zin/Xom dynamic, make god gift mutations only
override amulets of resist mutation. This fits because Xom can drain
your stats regardless of a ring of sustain abilities, and because Zin's
mutation protection is also a god gift.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4669 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/mutation.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 90b4bbb1be..c7a2d30cf6 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1694,7 +1694,7 @@ bool mutate(mutation_type which_mutation, bool failMsg, // except for demonspawn (or other permamutations) in lichform -- haranp if (rotting && !demonspawn) { - // Less-than-perfect resistance can be overridden by a god gift. + // A god gift overrides an amulet of resist mutation. if ((wearing_amulet(AMU_RESIST_MUTATION) ? !one_chance_in(10) : one_chance_in(3)) && !god_gift) @@ -1723,10 +1723,10 @@ bool mutate(mutation_type which_mutation, bool failMsg, if (!force_mutation) { - // Less-than-perfect resistance can be overridden by a god gift. - if (((wearing_amulet(AMU_RESIST_MUTATION) && !one_chance_in(10)) - || (you.religion == GOD_ZIN && you.piety > random2(MAX_PIETY)) + // A god gift overrides an amulet of resist mutation. + if ((wearing_amulet(AMU_RESIST_MUTATION) && !one_chance_in(10) && !god_gift) + || you.religion == GOD_ZIN && you.piety > random2(MAX_PIETY) || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 || player_mutation_level(MUT_MUTATION_RESISTANCE) && !one_chance_in(3)) |