From e2d1ba01835188a9874f900cf584572610323352 Mon Sep 17 00:00:00 2001
From: Naruni <kram321@gmail.com>
Date: Thu, 5 May 2016 01:16:08 -0700
Subject: [PATCH] Signed-off-by: Naruni <kram321@gmail.com>

---
 crawl-ref/source/enum.h          |  1 +
 crawl-ref/source/mutation-data.h | 16 ++++++++++++++++
 crawl-ref/source/mutation.cc     |  1 +
 crawl-ref/source/player.cc       |  1 +
 crawl-ref/source/species-data.h  |  2 +-
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index d563c97..eedabb7 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -3680,6 +3680,7 @@ enum mutation_type
     MUT_POISON_RESISTANCE,
     MUT_POWERED_BY_DEATH,
     MUT_POWERED_BY_PAIN,
+    MUT_PURP_DR_MAGIC_RESIST,
     MUT_REGENERATION,
     MUT_ROBUST,
 #if TAG_MAJOR_VERSION == 34
diff --git a/crawl-ref/source/mutation-data.h b/crawl-ref/source/mutation-data.h
index 2d9c7f9..6956aed 100644
--- a/crawl-ref/source/mutation-data.h
+++ b/crawl-ref/source/mutation-data.h
@@ -16,6 +16,22 @@ struct mutation_def
 static const mutation_def mut_data[] =
 {
 
+{ MUT_PURP_DR_MAGIC_RESIST, 0, 1, mutflag::SPECIES, false,
+  "magic resistance",
+
+  {"You are naturally resistant to hostile enchantments.",
+   "",
+   ""},
+
+  {"You feel more resistant to hostile enchantments.",
+   "",
+   ""},
+
+  {"",
+   "",
+   ""},
+},
+
 { MUT_TOUGH_SKIN, 0, 3, mutflag::GOOD, true,
   "tough skin",
 
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 51bd1b5..10179a6 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -76,6 +76,7 @@ enum class mutflag
     JIYVA   = 1 << 2, // jiyva-only muts
     QAZLAL  = 1 << 3, // qazlal wrath
     XOM     = 1 << 4, // xom being xom
+    SPECIES = 1 << 5, // native species mutation
 
     LAST    = XOM
 };
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 1846ad1..aead48c 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -6439,6 +6439,7 @@ int player_res_magic(bool calc_unid, bool temp)
 
     // Mutations
     rm += MR_PIP * player_mutation_level(MUT_MAGIC_RESISTANCE);
+    rm += MR_PIP * player_mutation_level(MUT_PURP_DR_MAGIC_RESIST);
     rm -= MR_PIP * player_mutation_level(MUT_MAGICAL_VULNERABILITY);
 
     // transformations
diff --git a/crawl-ref/source/species-data.h b/crawl-ref/source/species-data.h
index 73ee721..a3d245e 100644
--- a/crawl-ref/source/species-data.h
+++ b/crawl-ref/source/species-data.h
@@ -259,7 +259,7 @@ static const map<species_type, species_def> species_data =
     HT_LAND, US_ALIVE, SIZE_MEDIUM,
     10, 8, 6, // 24
     { STAT_STR, STAT_INT, STAT_DEX }, 4,
-    { { MUT_COLD_BLOODED, 1, 1 }, },
+    { { MUT_COLD_BLOODED, 1, 1 }, { MUT_PURP_DR_MAGIC_RESIST, 1, 7 } },
     { "You can breathe bolts of dispelling energy." },
     { "breathe power" },
     {}, // not a starting race
-- 
2.8.0

From 3615d9fd027bd1139f077ba6d2ca56d888c7cace Mon Sep 17 00:00:00 2001
From: Naruni <kram321@gmail.com>
Date: Thu, 5 May 2016 12:56:18 -0700
Subject: [PATCH] Add a line in abilities menu to indicate species' natural MR
 higher than 4.

Signed-off-by: Naruni <kram321@gmail.com>
---
 crawl-ref/source/species-data.h | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/crawl-ref/source/species-data.h b/crawl-ref/source/species-data.h
index 73ee721..435846e 100644
--- a/crawl-ref/source/species-data.h
+++ b/crawl-ref/source/species-data.h
@@ -79,7 +79,8 @@ static const map<species_type, species_def> species_data =
       { MUT_PASSIVE_MAPPING, 1, 9 }, { MUT_PASSIVE_MAPPING, 1, 18 },
       { MUT_NEGATIVE_ENERGY_RESISTANCE, 1, 14 }, },
     { "You are resistant to damage.",
-      "You can recharge devices by infusing magical energy." },
+      "You can recharge devices by infusing magical energy.",
+      "You are naturally more resistant to hostile enchantments." },
     { "damage resistance", "recharge devices" },
     { JOB_FIGHTER, JOB_HUNTER, JOB_BERSERKER, JOB_NECROMANCER,
       JOB_EARTH_ELEMENTALIST },
@@ -260,7 +261,8 @@ static const map<species_type, species_def> species_data =
     10, 8, 6, // 24
     { STAT_STR, STAT_INT, STAT_DEX }, 4,
     { { MUT_COLD_BLOODED, 1, 1 }, },
-    { "You can breathe bolts of dispelling energy." },
+    { "You can breathe bolts of dispelling energy.",
+      "You are naturally more resistant to hostile enchantments." },
     { "breathe power" },
     {}, // not a starting race
     {}, // not a starting race
@@ -336,7 +338,8 @@ static const map<species_type, species_def> species_data =
       { MUT_SLOW_METABOLISM, 1, 1 }, { MUT_CLAWS, 1, 1 },
       { MUT_SHAGGY_FUR, 1, 6 }, { MUT_SHAGGY_FUR, 1, 12 }, },
     { "You cannot wear armour.",
-      "You are incapable of wielding weapons or throwing items." },
+      "You are incapable of wielding weapons or throwing items.",
+      "You are naturally more resistant to hostile enchantments." },
     { "no armour", "no weapons or thrown items" },
     { JOB_BERSERKER, JOB_ENCHANTER, JOB_TRANSMUTER, JOB_ICE_ELEMENTALIST,
       JOB_CONJURER, JOB_SUMMONER, JOB_AIR_ELEMENTALIST, JOB_VENOM_MAGE },
@@ -356,7 +359,7 @@ static const map<species_type, species_def> species_data =
     { { MUT_ANTENNAE, 3, 1 }, },
     { "You are under a permanent stasis effect.",
       "You can dig through walls and to a lower floor.",
-      "Your four strong arms can wield two-handed weapons with a shield." },
+      "Your four strong arms can wield two-handed weapons with a shield.", },
     { "permanent stasis", "dig shafts and tunnels", "four strong arms" },
     { JOB_FIGHTER, JOB_HUNTER, JOB_ABYSSAL_KNIGHT, JOB_ARCANE_MARKSMAN,
       JOB_EARTH_ELEMENTALIST, JOB_VENOM_MAGE },
@@ -551,7 +554,8 @@ static const map<species_type, species_def> species_data =
       { MUT_NECRO_ENHANCER, 1, 13 }, { MUT_NECRO_ENHANCER, 1, 26 },
       { MUT_MUMMY_RESTORATION, 1, 13}, },
     { "You do not eat or drink.",
-      "Your flesh is vulnerable to fire." },
+      "Your flesh is vulnerable to fire.",
+      "You are naturally more resistant to hostile enchantments." },
     { "no food or potions", "fire vulnerability" },
     { JOB_WIZARD, JOB_CONJURER, JOB_NECROMANCER, JOB_ICE_ELEMENTALIST,
       JOB_FIRE_ELEMENTALIST, JOB_SUMMONER },
@@ -572,7 +576,8 @@ static const map<species_type, species_def> species_data =
     { { MUT_ACUTE_VISION, 1, 1 }, { MUT_SLOW, 2, 1 },  { MUT_DEFORMED, 1, 1 },
       { MUT_SPIT_POISON, 2, 1 },  { MUT_POISON_RESISTANCE, 1, 1 },
       { MUT_SLOW_METABOLISM, 1, 1 }, { MUT_CONSTRICTING_TAIL, 1, 13 } },
-    { "You cannot wear boots." },
+    { "You cannot wear boots.",
+      "You are naturally more resistant to hostile enchantments." },
     {},
     { JOB_BERSERKER, JOB_TRANSMUTER, JOB_ENCHANTER, JOB_FIRE_ELEMENTALIST,
       JOB_ICE_ELEMENTALIST, JOB_WARPER, JOB_WIZARD, JOB_VENOM_MAGE },
@@ -630,7 +635,7 @@ static const map<species_type, species_def> species_data =
     { STAT_INT, STAT_DEX }, 5,
     { { MUT_FAST, 3, 1 }, { MUT_HERBIVOROUS, 3, 1 },
       { MUT_ACUTE_VISION, 1, 1 }, { MUT_SLOW_METABOLISM, 2, 1 }, },
-    {},
+    { "You are naturally more resistant to hostile enchantments." },
     {},
     { JOB_ASSASSIN, JOB_ARTIFICER, JOB_ABYSSAL_KNIGHT, JOB_WARPER,
       JOB_ENCHANTER, JOB_CONJURER, JOB_EARTH_ELEMENTALIST, JOB_VENOM_MAGE },
@@ -712,7 +717,7 @@ static const map<species_type, species_def> species_data =
       { MUT_NO_DEVICE_HEAL, 3, 1 }, { MUT_ROT_IMMUNITY, 1, 1 },
       { MUT_REGENERATION, 1, 1 }, { MUT_REGENERATION, 1, 6 },
       { MUT_REGENERATION, 1, 12 }, },
-    {},
+    { "You are naturally more resistant to hostile enchantments." },
     {},
     { JOB_MONK, JOB_ASSASSIN, JOB_ENCHANTER, JOB_CONJURER, JOB_NECROMANCER,
       JOB_AIR_ELEMENTALIST, JOB_ICE_ELEMENTALIST },
-- 
2.8.0