From 29b8231d094fc97a59736a2c5c38377a052e9d47 Mon Sep 17 00:00:00 2001
From: j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Thu, 20 Mar 2008 18:28:17 +0000
Subject: FR 1913320: remove shock resistance from a number of (humanoid)
 monsters Fix 1916532: rename db entry "simulacrum" -> "large simulacrum"

Move tutorial help into the complete hotkey-triggerable help menu.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3758 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/mon-data.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'crawl-ref/source/mon-data.h')

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 5a84ccbebe..73e55e6ddf 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -504,7 +504,7 @@
 {
     MONS_DEEP_ELF_MAGE, 'e', MAGENTA, "deep elf mage",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 3, 0 },
@@ -526,7 +526,7 @@
 {
     MONS_DEEP_ELF_CONJURER, 'e', BLUE, "deep elf conjurer",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 3, 0 },
@@ -572,7 +572,7 @@
     MONS_DEEP_ELF_ANNIHILATOR, 'e', LIGHTBLUE, "deep elf annihilator",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL
         | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 3, 3, 0 },
@@ -2358,7 +2358,7 @@
 {
     MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 16, MONS_OGRE, MONS_OGRE, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
@@ -2954,7 +2954,7 @@
 {
     MONS_WIZARD, '@', MAGENTA, "wizard",
     M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4,
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 2, 4, 0 },
@@ -3748,7 +3748,7 @@
     MONS_EROLCHA, 'O', LIGHTBLUE, "Erolcha",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD
         | M_SPEAKS | M_EVIL | M_UNIQUE,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 20, MONS_OGRE, MONS_OGRE, MH_NATURAL, -7,
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 0, 0, 54 },
@@ -4007,7 +4007,7 @@
 {
     MONS_LOUISE, '@', BLUE, "Louise",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 15, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 0, 0, 106 },
@@ -4043,7 +4043,7 @@
     MONS_RUPERT, '@', RED, "Rupert",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD
         | M_SEE_INVIS | M_UNIQUE,
-    MR_RES_ELEC,
+    MR_NO_FLAGS,
     0, 12, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 21}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 0, 0, 123 },
-- 
cgit v1.2.3-54-g00ecf