diff options
| author | reaverb <reaverb.Crawl@gmail.com> | 2014-05-08 15:14:54 -0400 |
|---|---|---|
| committer | reaverb <reaverb.Crawl@gmail.com> | 2014-05-08 16:42:33 -0400 |
| commit | e79590dfc16b4fd0446870d658637edcfe7eadf1 (patch) | |
| tree | 5b9b20250d22d4de9705bfebf6a1c275bea5ec0a /crawl-ref/source/mutation.cc | |
| parent | 291ab9b34b0b2cdbf6beedfb9212e71635a51991 (diff) | |
| download | crawl-ref-e79590dfc16b4fd0446870d658637edcfe7eadf1.tar.gz crawl-ref-e79590dfc16b4fd0446870d658637edcfe7eadf1.zip | |
Properly format conflicting mutations
Diffstat (limited to 'crawl-ref/source/mutation.cc')
| -rw-r--r-- | crawl-ref/source/mutation.cc | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index e02346d3f5..d25e132086 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1201,34 +1201,34 @@ static int _handle_conflicting_mutations(mutation_type mutation, { const int conflict[][3] = { - { MUT_REGENERATION, MUT_SLOW_METABOLISM, 0}, - { MUT_REGENERATION, MUT_SLOW_HEALING, 0}, - { MUT_ACUTE_VISION, MUT_BLURRY_VISION, 0}, - { MUT_FAST, MUT_SLOW, 0}, - { MUT_UNBREATHING, MUT_BREATHE_FLAMES, 0}, - { MUT_UNBREATHING, MUT_BREATHE_POISON, 0}, - { MUT_FANGS, MUT_BEAK, -1}, - { MUT_ANTENNAE, MUT_HORNS, -1}, - { MUT_HOOVES, MUT_TALONS, -1}, - { MUT_TRANSLUCENT_SKIN, MUT_CAMOUFLAGE, -1}, - { MUT_STRONG, MUT_WEAK, 1}, - { MUT_CLEVER, MUT_DOPEY, 1}, - { MUT_AGILE, MUT_CLUMSY, 1}, #if TAG_MAJOR_VERSION == 34 - { MUT_STRONG_STIFF, MUT_FLEXIBLE_WEAK, 1}, + { MUT_STRONG_STIFF, MUT_FLEXIBLE_WEAK, 1}, #endif - { MUT_ROBUST, MUT_FRAIL, 1}, - { MUT_HIGH_MAGIC, MUT_LOW_MAGIC, 1}, - { MUT_CARNIVOROUS, MUT_HERBIVOROUS, 1}, - { MUT_SLOW_METABOLISM, MUT_FAST_METABOLISM, 1}, - { MUT_REGENERATION, MUT_SLOW_HEALING, 1}, - { MUT_ACUTE_VISION, MUT_BLURRY_VISION, 1}, - { MUT_FAST, MUT_SLOW, 1}, - { MUT_SLOW_HEALING, MUT_NO_DEVICE_HEAL, 1}, - { MUT_MUTATION_RESISTANCE, MUT_EVOLUTION, -1}, - { MUT_ANTIMAGIC_BITE, MUT_ACIDIC_BITE, -1}, - { MUT_HEAT_RESISTANCE, MUT_HEAT_VULNERABILITY, -1}, - { MUT_COLD_RESISTANCE, MUT_COLD_VULNERABILITY, -1}, + { MUT_STRONG, MUT_WEAK, 1}, + { MUT_CLEVER, MUT_DOPEY, 1}, + { MUT_AGILE, MUT_CLUMSY, 1}, + { MUT_SLOW_HEALING, MUT_NO_DEVICE_HEAL, 1}, + { MUT_ROBUST, MUT_FRAIL, 1}, + { MUT_HIGH_MAGIC, MUT_LOW_MAGIC, 1}, + { MUT_CARNIVOROUS, MUT_HERBIVOROUS, 1}, + { MUT_SLOW_METABOLISM, MUT_FAST_METABOLISM, 1}, + { MUT_REGENERATION, MUT_SLOW_HEALING, 1}, + { MUT_ACUTE_VISION, MUT_BLURRY_VISION, 1}, + { MUT_FAST, MUT_SLOW, 1}, + { MUT_REGENERATION, MUT_SLOW_METABOLISM, 0}, + { MUT_REGENERATION, MUT_SLOW_HEALING, 0}, + { MUT_ACUTE_VISION, MUT_BLURRY_VISION, 0}, + { MUT_FAST, MUT_SLOW, 0}, + { MUT_UNBREATHING, MUT_BREATHE_FLAMES, 0}, + { MUT_UNBREATHING, MUT_BREATHE_POISON, 0}, + { MUT_FANGS, MUT_BEAK, -1}, + { MUT_ANTENNAE, MUT_HORNS, -1}, + { MUT_HOOVES, MUT_TALONS, -1}, + { MUT_TRANSLUCENT_SKIN, MUT_CAMOUFLAGE, -1}, + { MUT_MUTATION_RESISTANCE, MUT_EVOLUTION, -1}, + { MUT_ANTIMAGIC_BITE, MUT_ACIDIC_BITE, -1}, + { MUT_HEAT_RESISTANCE, MUT_HEAT_VULNERABILITY, -1}, + { MUT_COLD_RESISTANCE, MUT_COLD_VULNERABILITY, -1}, { MUT_SHOCK_RESISTANCE, MUT_SHOCK_VULNERABILITY, -1}, }; |