summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mutation.cc
diff options
context:
space:
mode:
authorreaverb <reaverb.Crawl@gmail.com>2014-06-03 05:52:30 -0400
committerreaverb <reaverb.Crawl@gmail.com>2014-06-03 05:52:30 -0400
commit3bc8b168a1d0ff9b6b6c7192e9e47558968463b7 (patch)
tree07ec321a231e94a0c075fa1ea9498dd82701f8c5 /crawl-ref/source/mutation.cc
parent2d44f70a2ed89f162f4fa627780b45e52004ffdf (diff)
downloadcrawl-ref-3bc8b168a1d0ff9b6b6c7192e9e47558968463b7.tar.gz
crawl-ref-3bc8b168a1d0ff9b6b6c7192e9e47558968463b7.zip
Simplify Xom's amusement at mutations
Before, there was a giant list of which mutations Xom did and didn't like. This list was spoilerly and rarely updated for new mutations, so it has been replaced by just checking if the mutation is good or bad.
Diffstat (limited to 'crawl-ref/source/mutation.cc')
-rw-r--r--crawl-ref/source/mutation.cc59
1 files changed, 4 insertions, 55 deletions
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 3ccf46f7d2..49f24fa329 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -935,61 +935,10 @@ static int _calc_mutation_amusement_value(mutation_type which_mutation)
{
int amusement = 12 * (11 - get_mutation_def(which_mutation).rarity);
- switch (which_mutation)
- {
- case MUT_STRONG:
- case MUT_CLEVER:
- case MUT_AGILE:
- case MUT_POISON_RESISTANCE:
- case MUT_SHOCK_RESISTANCE:
- case MUT_REGENERATION:
- case MUT_SLOW_METABOLISM:
- case MUT_MAGIC_RESISTANCE:
- case MUT_CLARITY:
- case MUT_MUTATION_RESISTANCE:
- case MUT_ROBUST:
- case MUT_HIGH_MAGIC:
- case MUT_MANA_SHIELD:
- case MUT_MANA_REGENERATION:
- case MUT_MANA_LINK:
- amusement /= 2; // not funny
- break;
-
- case MUT_CARNIVOROUS:
- case MUT_HERBIVOROUS:
- case MUT_SLOW_HEALING:
- case MUT_FAST_METABOLISM:
- case MUT_WEAK:
- case MUT_DOPEY:
- case MUT_CLUMSY:
- case MUT_TELEPORT:
- case MUT_DEFORMED:
- case MUT_SPIT_POISON:
- case MUT_BREATHE_FLAMES:
- case MUT_BLINK:
- case MUT_HORNS:
- case MUT_BEAK:
- case MUT_SCREAM:
- case MUT_BERSERK:
- case MUT_DETERIORATION:
- case MUT_BLURRY_VISION:
- case MUT_FRAIL:
- case MUT_CLAWS:
- case MUT_FANGS:
- case MUT_HOOVES:
- case MUT_TALONS:
- case MUT_TENTACLE_SPIKE:
- case MUT_BREATHE_POISON:
- case MUT_STINGER:
- case MUT_BIG_WINGS:
- case MUT_LOW_MAGIC:
- case MUT_EVOLUTION:
- amusement *= 2; // funny!
- break;
-
- default:
- break;
- }
+ if (mut_data[which_mutation].bad == MT_GOOD)
+ amusement /= 2;
+ else if (mut_data[which_mutation].bad == MT_BAD)
+ amusement *= 2;
return amusement;
}