Since the M_THICK_SKIN flag has no effect, replace it with the

M_STATIONARY flag, and mark stationary monsters with it.


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

1 files changed, 14 insertions, 13 deletions

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index a2fb120c69..cf654f13d9 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -612,7 +612,7 @@
 // fungi ('f')
 {
     MONS_FUNGUS, 'f', LIGHTGREY, "fungus",
-    M_NO_EXP_GAIN,
+    M_NO_EXP_GAIN | M_STATIONARY,
     MR_RES_POISON,
     0, 10, MONS_PLANT, MONS_FUNGUS, MH_PLANT, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -759,7 +759,7 @@
 
 {
     MONS_HELL_HOG, 'h', LIGHTRED, "hell-hog",
-    M_SPELLCASTER | M_THICK_SKIN | M_EVIL,
+    M_SPELLCASTER | M_EVIL,
     MR_NO_FLAGS,
     0, 10, MONS_HELL_HOG, MONS_HELL_HOG, MH_DEMONIC, -3,
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -1565,7 +1565,8 @@
 // placed in the Crypt.
 {
     MONS_CURSE_SKULL, 'z', LIGHTCYAN, "curse skull",
-    M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS | M_EVIL | M_SPEAKS,
+    M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS | M_STATIONARY | M_EVIL
+        | M_SPEAKS,
     MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | mrd(MR_RES_COLD, 2),
     0, 50, MONS_LICH, MONS_CURSE_SKULL, MH_UNDEAD, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -2400,7 +2401,7 @@
 // plants ('P')
 {
     MONS_PLANT, 'P', GREEN, "plant",
-    M_NO_EXP_GAIN,
+    M_NO_EXP_GAIN | M_STATIONARY,
     MR_RES_POISON,
     0, 10, MONS_PLANT, MONS_PLANT, MH_PLANT, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -2411,7 +2412,7 @@
 
 {
     MONS_OKLOB_PLANT, 'P', LIGHTGREEN, "oklob plant",
-    M_SPECIAL_ABILITY,
+    M_SPECIAL_ABILITY | M_STATIONARY,
     MR_RES_POISON,
     0, 10, MONS_PLANT, MONS_OKLOB_PLANT, MH_PLANT, -3,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -3051,7 +3052,7 @@
 {
     // gold mimics are the only mimics that actually use their name -- bwr
     MONS_GOLD_MIMIC, '$', YELLOW, "pile of gold coins",
-    M_NO_SKELETON,
+    M_NO_SKELETON | M_STATIONARY,
     MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
     0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12},
@@ -3063,7 +3064,7 @@
 
 {
     MONS_WEAPON_MIMIC, ')', BLACK, "mimic",
-    M_NO_SKELETON,
+    M_NO_SKELETON | M_STATIONARY,
     MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
     0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { {AT_HIT, AF_POISON, 17}, {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 17},
@@ -3075,7 +3076,7 @@
 
 {
     MONS_ARMOUR_MIMIC, '[', BLACK, "mimic",
-    M_NO_SKELETON,
+    M_NO_SKELETON | M_STATIONARY,
     MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
     0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12},
@@ -3087,7 +3088,7 @@
 
 {
     MONS_SCROLL_MIMIC, '?', LIGHTGREY, "mimic",
-    M_NO_SKELETON,
+    M_NO_SKELETON | M_STATIONARY,
     MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
     0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12},
@@ -3099,7 +3100,7 @@
 
 {
     MONS_POTION_MIMIC, '!', BLACK, "mimic",
-    M_NO_SKELETON,
+    M_NO_SKELETON | M_STATIONARY,
     MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
     0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12},
@@ -3628,7 +3629,7 @@
 // statues (also '8')
 {
     MONS_ICE_STATUE, '8', LIGHTBLUE, "ice statue",
-    M_SPELLCASTER | M_SPEAKS,
+    M_SPELLCASTER | M_STATIONARY | M_SPEAKS,
     MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 3) | MR_RES_ELEC,
     0, 10, MONS_CLAY_GOLEM, MONS_ICE_STATUE, MH_NONLIVING, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -3639,7 +3640,7 @@
 
 {
     MONS_SILVER_STATUE, '8', WHITE, "silver statue",
-    M_SPECIAL_ABILITY | M_SPEAKS,
+    M_SPECIAL_ABILITY | M_STATIONARY | M_SPEAKS,
     mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 2),
     0, 10, MONS_CLAY_GOLEM, MONS_SILVER_STATUE, MH_NONLIVING, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
@@ -3650,7 +3651,7 @@
 
 {
     MONS_ORANGE_STATUE, '8', LIGHTRED, "orange crystal statue",
-    M_SPECIAL_ABILITY | M_SPEAKS,
+    M_SPECIAL_ABILITY | M_STATIONARY | M_SPEAKS,
     mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 2),
     0, 10, MONS_CLAY_GOLEM, MONS_ORANGE_STATUE, MH_NONLIVING, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },