diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-28 15:40:04 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-28 15:40:04 +0000 |
commit | 9863b15de70d531b327cbd410806fc42d470d1a7 (patch) | |
tree | 901d1414cc9d0c7ceab45e82786ea04db20b254c | |
parent | 32525cca511f64ddc4ef4921f887e64038cdd428 (diff) | |
download | crawl-ref-9863b15de70d531b327cbd410806fc42d470d1a7.tar.gz crawl-ref-9863b15de70d531b327cbd410806fc42d470d1a7.zip |
After some thought, revert previous change. If the mutation resistance
mutation is hard to remove, it should be hard to get, god gift or not.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4746 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r-- | crawl-ref/source/debug.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/mutation.cc | 21 | ||||
-rw-r--r-- | crawl-ref/source/mutation.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/religion.cc | 2 |
4 files changed, 12 insertions, 15 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 6746479c37..98337ae775 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -2454,7 +2454,7 @@ bool debug_add_mutation(void) { for (int i = 0; i < -levels; i++) { - if (delete_mutation(mutat, force, god_gift)) + if (delete_mutation(mutat, force)) success = true; } } diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index d299d3088d..7dbdfa46b5 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1662,13 +1662,12 @@ bool mutate(mutation_type which_mutation, bool failMsg, if (!force_mutation) { - // God gifts override amulets of resist mutation and less than 3 - // levels of the mutation resistance mutation. - if (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 - || ((wearing_amulet(AMU_RESIST_MUTATION) - && !one_chance_in(10) + // God gifts override amulets of resist mutation. + if ((wearing_amulet(AMU_RESIST_MUTATION) + && !one_chance_in(10) && !god_gift) + || player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 || player_mutation_level(MUT_MUTATION_RESISTANCE) - && !one_chance_in(3)) && !god_gift)) + && !one_chance_in(3)) { mpr("You feel odd for a moment.", MSGCH_MUTATION); return false; @@ -2186,17 +2185,15 @@ int how_mutated(bool all, bool levels) } // end how_mutated() bool delete_mutation(mutation_type which_mutation, - bool force_mutation, bool god_gift) + bool force_mutation) { mutation_type mutat = which_mutation; if (!force_mutation) { - // God gifts override less than 3 levels of the mutation - // resistance mutation. - if (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 - || ((player_mutation_level(MUT_MUTATION_RESISTANCE) > 1 - && coinflip()) && !god_gift)) + if (player_mutation_level(MUT_MUTATION_RESISTANCE) > 1 + && (player_mutation_level(MUT_MUTATION_RESISTANCE) == 3 + || coinflip())) { mpr("You feel rather odd for a moment.", MSGCH_MUTATION); return false; diff --git a/crawl-ref/source/mutation.h b/crawl-ref/source/mutation.h index 09ad80772b..3b39b95996 100644 --- a/crawl-ref/source/mutation.h +++ b/crawl-ref/source/mutation.h @@ -56,7 +56,7 @@ formatted_string describe_mutations(); * called from: decks - it_use2 - mutation - spells * *********************************************************************** */ bool delete_mutation(mutation_type which_mutation, - bool force_mutation = false, bool god_gift = false); + bool force_mutation = false); // last updated 12may2000 {dlb} /* *********************************************************************** diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index b19eb18a6d..88b37366ab 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2955,7 +2955,7 @@ static bool _zin_retribution() bool success = false; for (int i = 0; i < 7; i++) if (random2(10) > i - && delete_mutation(RANDOM_GOOD_MUTATION, false, true)) + && delete_mutation(RANDOM_GOOD_MUTATION)) { success = true; } |