Some more work towards integrating race abilities and mutations:

- Draconian resistances are now mutations. As a side effect, this
means that red draconians can't become resistant to cold, for
example. I think this is a feature.
- Troll metabolism and regeneration is now (partially) a mutation.
So now trolls can't get the slow metabolism mutation.
It might be better to go with a size system here.
- Nagas and centaurs now have deformation as an initial mutation.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@691 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 10 insertions, 11 deletions

diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index 516899dc95..8cd0dddab4 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -1761,43 +1761,42 @@ static void give_basic_mutations(unsigned char speci)
     {
     case SP_MINOTAUR:
         you.mutation[MUT_HORNS] = 2;
-        you.demon_pow[MUT_HORNS] = 2;
         break;
     case SP_SPRIGGAN:
         you.mutation[MUT_ACUTE_VISION] = 1;
-        you.demon_pow[MUT_ACUTE_VISION] = 1;
         you.mutation[MUT_FAST] = 3;
-        you.demon_pow[MUT_FAST] = 3;
         break;
     case SP_CENTAUR:
         you.mutation[MUT_FAST] = 1;
-        you.demon_pow[MUT_FAST] = 1;
+        you.mutation[MUT_DEFORMED] = 1;
         break;
     case SP_NAGA:
         you.mutation[MUT_ACUTE_VISION] = 1;
-        you.demon_pow[MUT_ACUTE_VISION] = 1;
         you.mutation[MUT_POISON_RESISTANCE] = 1;
-        you.demon_pow[MUT_POISON_RESISTANCE] = 1;
+        you.mutation[MUT_DEFORMED] = 1;
         break;
     case SP_MUMMY:
         you.mutation[MUT_POISON_RESISTANCE] = 1;
-        you.demon_pow[MUT_POISON_RESISTANCE] = 1;
         you.mutation[MUT_COLD_RESISTANCE] = 1;
-        you.demon_pow[MUT_COLD_RESISTANCE] = 1;
         break;
     case SP_GNOME:
         you.mutation[MUT_MAPPING] = 2;
-        you.demon_pow[MUT_MAPPING] = 2;
         break;
     case SP_GHOUL:
         you.mutation[MUT_POISON_RESISTANCE] = 1;
-        you.demon_pow[MUT_POISON_RESISTANCE] = 1;
         you.mutation[MUT_COLD_RESISTANCE] = 1;
-        you.demon_pow[MUT_COLD_RESISTANCE] = 1;
+        break;
+    case SP_TROLL:
+        you.mutation[MUT_REGENERATION] = 2;
+        you.mutation[MUT_FAST_METABOLISM] = 3;
         break;
     default:
         break;
     }
+
+    // starting mutations are unremoveable
+    for ( int i = 0; i < NUM_MUTATIONS; ++i )
+        you.demon_pow[i] = you.mutation[i];
 }
 
 static void give_basic_knowledge(int which_job)