summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mutation.cc
diff options
context:
space:
mode:
authorgammafunk <gammafunk@gmail.com>2014-05-28 03:45:14 -0500
committergammafunk <gammafunk@gmail.com>2014-05-28 12:50:50 -0500
commit474ca70ed42f27c2b1982d7c7637e5815c89be55 (patch)
tree066ee8d171d2026ac0396b1dabd6f5ded72f4a67 /crawl-ref/source/mutation.cc
parentafd1d1232c60c598fa064e3417b928de33d77a49 (diff)
downloadcrawl-ref-474ca70ed42f27c2b1982d7c7637e5815c89be55.tar.gz
crawl-ref-474ca70ed42f27c2b1982d7c7637e5815c89be55.zip
Rework demonspawn mutation tiers involving conservation
Since scroll/potion conservation is no longer relevant, I've split the flame/freezing cloud immunities that were part of icemail/fire blood into their own mutations. We now give these as the second mutation in both the tier-2 and tier-3 fire/ice mutation sets.
Diffstat (limited to 'crawl-ref/source/mutation.cc')
-rw-r--r--crawl-ref/source/mutation.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 71c4aae063..09609e4b2d 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -2171,9 +2171,9 @@ static const facet_def _demon_facets[] =
{ 1, { MUT_YELLOW_SCALES, MUT_YELLOW_SCALES, MUT_YELLOW_SCALES },
{ -33, -33, 0 } },
// Tier 2 facets
- { 2, { MUT_CONSERVE_SCROLLS, MUT_HEAT_RESISTANCE, MUT_IGNITE_BLOOD },
+ { 2, { MUT_HEAT_RESISTANCE, MUT_FLAME_CLOUD_IMMUNITY, MUT_IGNITE_BLOOD },
{ -33, 0, 0 } },
- { 2, { MUT_COLD_RESISTANCE, MUT_CONSERVE_POTIONS, MUT_ICEMAIL },
+ { 2, { MUT_COLD_RESISTANCE, MUT_FREEZING_CLOUD_IMMUNITY, MUT_ICEMAIL },
{ -33, 0, 0 } },
{ 2, { MUT_POWERED_BY_DEATH, MUT_POWERED_BY_DEATH, MUT_POWERED_BY_DEATH },
{ -33, 0, 0 } },
@@ -2190,9 +2190,9 @@ static const facet_def _demon_facets[] =
{ 2, { MUT_MANA_SHIELD, MUT_MANA_REGENERATION, MUT_MANA_LINK },
{ -33, 0, 0 } },
// Tier 3 facets
- { 3, { MUT_CONSERVE_SCROLLS, MUT_HEAT_RESISTANCE, MUT_HURL_HELLFIRE },
+ { 3, { MUT_HEAT_RESISTANCE, MUT_FLAME_CLOUD_IMMUNITY, MUT_HURL_HELLFIRE },
{ 50, 50, 50 } },
- { 3, { MUT_COLD_RESISTANCE, MUT_CONSERVE_POTIONS, MUT_PASSIVE_FREEZE },
+ { 3, { MUT_COLD_RESISTANCE, MUT_FREEZING_CLOUD_IMMUNITY, MUT_PASSIVE_FREEZE },
{ 50, 50, 50 } },
{ 3, { MUT_ROBUST, MUT_ROBUST, MUT_ROBUST },
{ 50, 50, 50 } },
@@ -2296,7 +2296,7 @@ try_again:
if (m == MUT_COLD_RESISTANCE)
ice_elemental++;
- if (m == MUT_CONSERVE_SCROLLS)
+ if (m == MUT_HEAT_RESISTANCE)
fire_elemental++;
if (m == MUT_ROT_IMMUNITY || m == MUT_IGNITE_BLOOD)