summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/mutation.cc3
-rw-r--r--crawl-ref/source/newgame.cc3
-rw-r--r--crawl-ref/source/player.cc9
3 files changed, 4 insertions, 11 deletions
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 1bddfda019..ba37d8a52d 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1943,7 +1943,7 @@ bool mutate(mutation_type which_mutation, bool failMsg,
return (false);
// These can be forced by demonspawn or god gifts.
- if ((mutat == MUT_TOUGH_SKIN || mutat == MUT_SHAGGY_FUR
+ if ((mutat == MUT_SHAGGY_FUR
|| mutat >= MUT_GREEN_SCALES && mutat <= MUT_BONEY_PLATES
|| mutat >= MUT_RED_SCALES && mutat <= MUT_PATTERNED_SCALES)
&& body_covered() >= 3 && !god_gift && !force_mutation)
@@ -2532,7 +2532,6 @@ static int body_covered()
if (player_genus(GENPC_DRACONIAN))
covered += 3;
- covered += you.mutation[MUT_TOUGH_SKIN];
covered += you.mutation[MUT_GREEN_SCALES];
covered += you.mutation[MUT_BLACK_SCALES];
covered += you.mutation[MUT_GREY_SCALES];
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc
index b9c0e38228..4a37f2dd9e 100644
--- a/crawl-ref/source/newgame.cc
+++ b/crawl-ref/source/newgame.cc
@@ -2873,6 +2873,7 @@ void give_basic_mutations(species_type speci)
you.mutation[MUT_SAPROVOROUS] = 1;
break;
case SP_OGRE:
+ you.mutation[MUT_TOUGH_SKIN] = 1;
you.mutation[MUT_FAST_METABOLISM] = 1;
you.mutation[MUT_SAPROVOROUS] = 1;
break;
@@ -2889,6 +2890,7 @@ void give_basic_mutations(species_type speci)
you.mutation[MUT_SLOW_METABOLISM] = 3;
break;
case SP_CENTAUR:
+ you.mutation[MUT_TOUGH_SKIN] = 3;
you.mutation[MUT_FAST] = 2;
you.mutation[MUT_DEFORMED] = 1;
you.mutation[MUT_FAST_METABOLISM] = 2;
@@ -2926,6 +2928,7 @@ void give_basic_mutations(species_type speci)
you.mutation[MUT_TALONS] = 1;
break;
case SP_TROLL:
+ you.mutation[MUT_TOUGH_SKIN] = 2;
you.mutation[MUT_REGENERATION] = 2;
you.mutation[MUT_FAST_METABOLISM] = 3;
you.mutation[MUT_SAPROVOROUS] = 2;
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index d315c3cffd..20984429d1 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -2152,15 +2152,6 @@ int player_AC(void)
AC += 100 * you.experience_level / 3; // max 9
break;
- case SP_OGRE:
- AC += 100;
- break;
-
- case SP_TROLL:
- case SP_CENTAUR:
- AC += 300;
- break;
-
default:
break;
}