Add more habitat cleanups: rename HT_NORMAL to HT_LAND, remove

HT_SHALLOW_WATER, and rename HT_DEEP_WATER to HT_WATER. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3183 c06c8d41-db1a-0410-9941-cceddc491573
author: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> 2008-01-04 05:26:00 +0000
committer: dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> 2008-01-04 05:26:00 +0000
commit: 0a2eef4f7c8d6cab369dee37adef2aba41cdf557 (patch)
tree: 7e1ec00e15db5ecc912038500c1fd64bfc38cefb /crawl-ref/source
parent: ba61c9ea0ff447e24a9ad3f7f1b45160640c913b (diff)
download: crawl-ref-0a2eef4f7c8d6cab369dee37adef2aba41cdf557.tar.gz
crawl-ref-0a2eef4f7c8d6cab369dee37adef2aba41cdf557.zip
8 files changed, 384 insertions, 389 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc
index 5dc324443e..09f95ac804 100644
--- a/crawl-ref/source/debug.cc
+++ b/crawl-ref/source/debug.cc
@@ -1409,11 +1409,10 @@ void stethoscope(int mwh)
 
     mprf(MSGCH_DIAGNOSTICS,
          "hab=%s beh=%s(%d) foe=%s(%d) mem=%d target=(%d,%d)",
-         ((hab == HT_DEEP_WATER)              ? "deep water" :
-          (hab == HT_SHALLOW_WATER)           ? "shallow water" :
+         ((hab == HT_WATER)                   ? "water" :
           (hab == HT_LAVA)                    ? "lava" :
           (hab == HT_ROCK_WALL)               ? "rock wall" :
-          (hab == HT_FLOOR)                   ? "floor" :
+          (hab == HT_LAND)                    ? "floor" :
                                               : "unknown"),
          ((menv[i].behaviour == BEH_SLEEP)    ? "sleep" :
           (menv[i].behaviour == BEH_WANDER)   ? "wander" :
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index e7c4e87cc4..d2b0331ca1 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4323,21 +4323,21 @@ bool dgn_place_monster(mons_spec &mspec,
             else if (mlev == -9)
                 monster_level += 5;
         }
-        
+
         if (mid != RANDOM_MONSTER && mid < NUM_MONSTERS)
         {
             if (mons_is_unique(mid) && you.unique_creatures[mid])
                 return (false);
-            
+
             const habitat_type habitat = mons_habitat(mid);
-            if (habitat != HT_NORMAL)
+            if (habitat != HT_LAND)
                 grd[vx][vy] = habitat2grid(habitat);
         }
 
         int mindex = NON_MONSTER;
         const bool placed =
             place_monster( mindex, mid, monster_level,
-                           m_generate_awake? BEH_WANDER : BEH_SLEEP,
+                           m_generate_awake ? BEH_WANDER : BEH_SLEEP,
                            MHITNOT, true, vx, vy, false,
                            PROX_ANYWHERE, mspec.monnum);
         if (placed && mindex != -1 && mindex != NON_MONSTER)
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 1c54574d90..875110c604 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2449,8 +2449,8 @@ void update_level( double elapsedTime )
         if (turns >= 10)
             mon->timeout_enchantments( turns / 10 );
 
-        // Don't move water, lava, or stationary monsters around
-        if (mons_habitat( mon->type ) != HT_NORMAL
+        // Don't move non-land or stationary monsters around
+        if (mons_habitat( mon->type ) != HT_LAND
             || mons_is_stationary( mon ))
         {
             continue;
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 465301305d..0c88fc49bd 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -112,7 +112,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 0, 0, 0, 0 },
     0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_HUGE
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_HUGE
 },
 
 // real monsters begin here {dlb}:
@@ -124,7 +124,7 @@
     { {AT_BITE, AF_POISON, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     4, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -135,7 +135,7 @@
     { {AT_HIT, AF_PLAIN, 1}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 2, 3, 0 },
     1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 30, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 30, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -146,7 +146,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     3, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -157,7 +157,7 @@
     { {AT_HIT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     10, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -168,7 +168,7 @@
     { {AT_HIT, AF_PLAIN, 18}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     3, 4, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT2, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
 },
 
 {
@@ -179,7 +179,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     1, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -190,7 +190,7 @@
     { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 2, 4, 0 },
     0, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
 },
 
 {
@@ -201,7 +201,7 @@
     { {AT_BITE, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     2, 13, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BARK, I_ANIMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 // note: these things regenerate
@@ -213,7 +213,7 @@
     { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 3, 0 },
     3, 14, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LITTLE,
 },
 
 {
@@ -224,7 +224,7 @@
     { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, I_ANIMAL, 
-    HT_NORMAL, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -235,7 +235,7 @@
     { {AT_STING, AF_POISON, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     2, 18, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_BUZZ, I_INSECT, 
-    HT_NORMAL, 20, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 20, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -246,7 +246,7 @@
     { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     1, 5, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -257,7 +257,7 @@
     { {AT_BITE, AF_PLAIN, 14}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8}, AT_NO_ATK },
     { 9, 3, 5, 0 },
     5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 // this thing doesn't have nr. 13 for nothing, has it? ($pellbinder)
@@ -269,7 +269,7 @@
     { {AT_HIT, AF_ROT, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     2, 10, MST_NO_SPELLS, CE_HCL, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -280,7 +280,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 4, 6, 0 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 // XP modifier is 5 for these, because they really aren't all that
@@ -293,7 +293,7 @@
     { {AT_HIT, AF_BLINK, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     3, 13, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -304,7 +304,7 @@
     { {AT_BITE, AF_DRAIN_DEX, 3}, {AT_CLAW, AF_DRAIN_DEX, 2}, {AT_CLAW, AF_DRAIN_DEX, 2}, AT_NO_ATK },
     { 3, 2, 6, 0 },
     5, 17, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_INSECT, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -315,7 +315,7 @@
     { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 1, 3, 0 },
     1, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -326,7 +326,7 @@
     { {AT_STING, AF_POISON_MEDIUM, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     5, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 /* ******************************************************************
@@ -340,7 +340,7 @@
     { 50, 0, 0, 0 },
     { 10, 5, 5, 0 },
     3, 3, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_HUGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_HUGE
 },
 
 ****************************************************************** */
@@ -353,7 +353,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -364,7 +364,7 @@
     { {AT_HIT, AF_FIRE, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     0, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -375,7 +375,7 @@
     { {AT_BITE, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     1, 5, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 // random
@@ -387,7 +387,7 @@
     { {AT_HIT, AF_PLAIN, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 2, 5, 0 },
     0, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -398,7 +398,7 @@
     { {AT_STING, AF_PARALYSE, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     5, 14, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_INSECT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 // small zombie
@@ -410,7 +410,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 5, 5, 0 },
     0, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -421,7 +421,7 @@
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 6, 5, 0 },
     10, 20, MST_ANGEL, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -432,7 +432,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 7, 6, 0 },
     10, 3, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
-    HT_NORMAL, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -443,7 +443,7 @@
     { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 3, 5, 0 },
     5, 3, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
 },
 
 {
@@ -454,7 +454,7 @@
     { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 13}, {AT_CLAW, AF_PLAIN, 13}, AT_NO_ATK },
     { 12, 5, 5, 0 },
     10, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 // These guys get understated because the experience code can't see
@@ -467,7 +467,7 @@
     { {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     1, 4, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT2, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_LARGE
 },
 
 {
@@ -478,7 +478,7 @@
     { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK },
     { 18, 3, 5, 0 },
       15, 6, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -489,7 +489,7 @@
     { {AT_HIT, AF_PLAIN, 1}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 0, 0, 1 },
     0, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -500,7 +500,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 4, 3, 0 },
     2, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -511,7 +511,7 @@
     { {AT_HIT, AF_COLD, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     5, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -522,7 +522,7 @@
     { {AT_HIT, AF_ACID, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 5, 5, 0 },
     0, 2, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_MEDIUM
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_MEDIUM
 },
 
 {
@@ -533,7 +533,7 @@
     { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 2, 3, 0 },
     2, 12, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
 },
 
 {
@@ -544,7 +544,7 @@
     { {AT_TOUCH, AF_DRAIN_XP, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 20, 2, 4, 0 },
     10, 10, MST_LICH_I, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -555,7 +555,7 @@
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 5, 3, 0 },
     3, 6, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -566,7 +566,7 @@
     { {AT_HIT, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     6, 14, MST_GUARDIAN_NAGA, CE_MUTAGEN_RANDOM, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -577,7 +577,7 @@
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     1, 6, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_LARGE
 },
 
 {
@@ -588,7 +588,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     10, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -599,7 +599,7 @@
     { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     10, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -610,7 +610,7 @@
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     10, 14, MST_RAKSHASA, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -621,7 +621,7 @@
     { {AT_BITE, AF_POISON, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     1, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -632,7 +632,7 @@
     { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK },
     { 7, 3, 5, 0 },
     3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -643,7 +643,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     5, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 30, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 30, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -654,7 +654,7 @@
     { {AT_BITE, AF_VAMPIRIC, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     10, 10, MST_VAMPIRE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -665,7 +665,7 @@
     { {AT_HIT, AF_DRAIN_XP, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     10, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 // Large abom: (the previous one was small)
@@ -677,7 +677,7 @@
     { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 2, 5, 0 },
     0, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 {
@@ -688,7 +688,7 @@
     { {AT_BUTT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     4, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_BELLOW, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 // big zombie
@@ -700,7 +700,7 @@
     { {AT_HIT, AF_PLAIN, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     8, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -711,7 +711,7 @@
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 4, 6, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -722,7 +722,7 @@
     { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     2, 13, MST_KOBOLD_DEMONOLOGIST, CE_POISONOUS, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
 },
 
 {
@@ -733,7 +733,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 4, 0 },
     1, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -744,7 +744,7 @@
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 4, 7, 0 },
     2, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 /* ******************************************************************
@@ -771,7 +771,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     5, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 {
@@ -782,7 +782,7 @@
     { {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     3, 12, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
 },
 
 {
@@ -793,7 +793,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     0, 1, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_PLANT, 
-    HT_NORMAL, 3, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 3, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -804,7 +804,7 @@
     { {AT_HIT, AF_DRAIN_XP, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     4, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -815,7 +815,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     10, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -826,7 +826,7 @@
     { {AT_BITE, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     3, 10, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_HISS, I_INSECT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -837,7 +837,7 @@
     { {AT_HIT, AF_DRAIN_STR, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     12, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
 },
 
 {
@@ -848,7 +848,7 @@
     { {AT_HIT, AF_HUNGER, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     0, 17, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -859,7 +859,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     3, 1, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -870,7 +870,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     0, 25, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 25, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 25, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -881,7 +881,7 @@
     { {AT_SPORE, AF_CONFUSE, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     5, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -892,7 +892,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     10, 5, MST_EFREET, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
 },
 
 {
@@ -903,7 +903,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 3, 0 },
     1, 5, MST_BRAIN_WORM, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -914,7 +914,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     2, 4, MST_GIANT_ORANGE_BRAIN, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
 },
 
 {
@@ -925,7 +925,7 @@
     { {AT_BITE, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 3, 5, 0 },
     20, 2, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
-    HT_NORMAL, 3, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 3, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -936,7 +936,7 @@
     { {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     10, 17, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SCREAM, I_ANIMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -947,7 +947,7 @@
     { {AT_BITE, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     6, 13, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_BARK, I_NORMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -958,7 +958,7 @@
     { {AT_HIT, AF_PLAIN, 35}, {AT_BUTT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
     { 13, 3, 5, 0 },
     5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -969,7 +969,7 @@
     { {AT_BITE, AF_PLAIN, 17}, {AT_CLAW, AF_PLAIN, 17}, {AT_CLAW, AF_PLAIN, 17}, AT_NO_ATK },
     { 12, 5, 5, 0 },
     10, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -980,7 +980,7 @@
     { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     1, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -991,7 +991,7 @@
     { {AT_HIT, AF_COLD, 19}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     12, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 // fake R - conjured by the R's illusion spell.
@@ -1003,7 +1003,7 @@
     { {AT_HIT, AF_PLAIN, 0}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 0, 0, 1 },
     0, 30, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -1014,7 +1014,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 3, 5, 0 },
     10, 3, MST_GREAT_ORB_OF_EYES, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1025,7 +1025,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     5, 10, MST_BURNING_DEVIL, CE_NOCORPSE, Z_NOZOMBIE, S_SCREAM, I_HIGH, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1036,7 +1036,7 @@
     { {AT_HIT, AF_ROT, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     2, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1047,7 +1047,7 @@
     { {AT_HIT, AF_PLAIN, 8}, {AT_HIT, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     12, 12, MST_TORMENTOR, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_HIGH, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1058,7 +1058,7 @@
     { {AT_HIT, AF_PLAIN, 32}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     15, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -1069,7 +1069,7 @@
     { {AT_HIT, AF_DRAIN_XP, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     18, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1080,7 +1080,7 @@
     { {AT_HIT, AF_PLAIN, 9}, {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     7, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
 },
 
 {
@@ -1091,7 +1091,7 @@
     { {AT_HIT, AF_COLD, 16}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     12, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1102,7 +1102,7 @@
     { {AT_HIT, AF_PLAIN, 21}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     14, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 // random
@@ -1114,7 +1114,7 @@
     { {AT_CLAW, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_RANDOM, I_NORMAL, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1125,7 +1125,7 @@
     { {AT_HIT, AF_PLAIN, 14}, {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     16, 8, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREECH, I_HIGH, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1136,7 +1136,7 @@
     { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     0, 10, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1147,7 +1147,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     0, 10, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1158,7 +1158,7 @@
     { {AT_BITE, AF_POISON, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     1, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1169,7 +1169,7 @@
     { {AT_BITE, AF_PLAIN, 12}, {AT_CLAW, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK },
     { 4, 5, 5, 0 },
     5, 10, MST_STEAM_DRAGON, CE_CLEAN, Z_BIG, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -1180,7 +1180,7 @@
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 3, 5, 0 },
     4, 8, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1191,7 +1191,7 @@
     { {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 2, 3, 0 },
     5, 12, MST_ORC_SORCERER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -1202,7 +1202,7 @@
     { {AT_BITE, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8}, AT_NO_ATK },
     { 7, 3, 5, 0 },
     2, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SCREECH, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -1213,7 +1213,7 @@
     { {AT_BITE, AF_PLAIN, 18}, {AT_CLAW, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 10}, AT_NO_ATK },
     { 12, 3, 5, 0 },
     4, 6, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SCREECH, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -1224,7 +1224,7 @@
     { {AT_BITE, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 3, 5, 0 },
     0, 5, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_ROAR, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 // small skeleton
@@ -1236,7 +1236,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 0, 0, 0, 0 },
     0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 // large skeleton
@@ -1248,7 +1248,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 0, 0, 0, 0 },
     0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 0, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -1259,7 +1259,7 @@
     { {AT_HIT, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 6, 0 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -1270,7 +1270,7 @@
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 2, 4, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -1281,7 +1281,7 @@
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 2, 4, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -1292,7 +1292,7 @@
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 4, 0 },
     1, 10, MST_ORC_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -1303,7 +1303,7 @@
     { {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 4, 0 },
     1, 12, MST_ORC_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 // this is a dummy monster, used for corpses
@@ -1319,7 +1319,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -1330,7 +1330,7 @@
     { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 4, 5, 0 },
     2, 9, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -1341,7 +1341,7 @@
     { {AT_HIT, AF_PLAIN, 11}, {AT_HIT, AF_PLAIN, 11}, AT_NO_ATK, AT_NO_ATK },
     { 8, 7, 3, 0 },
     7, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1352,7 +1352,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 6, 3, 0 },
     5, 6, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1363,7 +1363,7 @@
     { {AT_HIT, AF_PLAIN, 28}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 7, 4, 0 },
     12, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1374,7 +1374,7 @@
     { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 7, 4, 0 },
     15, 3, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1385,7 +1385,7 @@
     { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 7, 4, 0 },
     22, 3, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1396,7 +1396,7 @@
     { {AT_HIT, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 5, 3, 0 },
     8, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1407,7 +1407,7 @@
     { {AT_BITE, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     5, 10, MST_MOTTLED_DRAGON, CE_POISONOUS, Z_BIG, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -1418,7 +1418,7 @@
     { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 5, 5, 0 },
     14, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -1429,7 +1429,7 @@
     { {AT_HIT, AF_FIRE, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     4, 12, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -1440,7 +1440,7 @@
     { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     2, 18, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 25, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 25, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 // water elementals are later (with the other water monsters)
@@ -1453,7 +1453,7 @@
     { {AT_CLAW, AF_COLD, 25}, {AT_CLAW, AF_COLD, 25}, AT_NO_ATK, AT_NO_ATK },
     { 18, 3, 5, 0 },
     15, 6, MST_ICE_FIEND, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1464,7 +1464,7 @@
     { {AT_HIT, AF_DRAIN_XP, 25}, {AT_HIT, AF_DRAIN_XP, 15}, {AT_HIT, AF_DRAIN_XP, 15}, AT_NO_ATK },
     { 18, 3, 5, 0 },
     15, 6, MST_SHADOW_FIEND, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1475,7 +1475,7 @@
     { {AT_BITE, AF_POISON_MEDIUM, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     2, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, 
-    HT_NORMAL, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -1486,7 +1486,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     4, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -1497,7 +1497,7 @@
     { {AT_HIT, AF_DRAIN_XP, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 3, 5, 0 },
     12, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1508,7 +1508,7 @@
     { {AT_HIT, AF_MUTATE, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     2, 6, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 5, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -1519,7 +1519,7 @@
     { {AT_BITE, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK },
     { 14, 5, 5, 0 },
     13, 10, MST_STORM_DRAGON, CE_CLEAN, Z_BIG, S_ROAR, I_NORMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -1530,7 +1530,7 @@
     { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     4, 4, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -1541,7 +1541,7 @@
     { {AT_BUTT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 3, 5, 0 },
     9, 5, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_BELLOW, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 {
@@ -1552,7 +1552,7 @@
     { {AT_BITE, AF_PLAIN, 30}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK },
     { 11, 3, 5, 0 },
     13, 6, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1563,7 +1563,7 @@
     { {AT_HIT, AF_PLAIN, 45}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 3, 5, 0 },
     12, 2, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
 },
 
 {
@@ -1574,7 +1574,7 @@
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     0, 14, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1585,7 +1585,7 @@
     { {AT_STING, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     4, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_BUZZ, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1596,7 +1596,7 @@
     { {AT_BITE, AF_POISON_STRONG, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     2, 12, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1607,7 +1607,7 @@
     { {AT_HIT, AF_BLINK, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 1, 2, 0 },
     20, 20, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1618,7 +1618,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 2, 3, 0 },
     0, 12, MST_STORM_DRAGON, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -1629,7 +1629,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     1, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
 },
 
 {
@@ -1640,7 +1640,7 @@
     { {AT_STING, AF_ACID, 32}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 3, 5, 0 },
     10, 6, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_PLANT, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 // These are named more explicitly when they attack, also when you use 'x'
@@ -1653,7 +1653,7 @@
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 0, 0, 15 },
     10, 20, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -1664,7 +1664,7 @@
     { {AT_HIT, AF_PLAIN, 55}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 20, 3, 5, 0 },
     10, 3, MST_TITAN, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -1675,7 +1675,7 @@
     { {AT_BITE, AF_PLAIN, 40}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK },
     { 18, 4, 4, 0 },
     15, 7, MST_GOLDEN_DRAGON, CE_POISONOUS, Z_BIG, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 // 147 - dummy monster, used for corpses etc.
@@ -1688,7 +1688,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 3, 0 },
     0, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_NORMAL,
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 // Used to be "lindworm" and a GREEN 'l'...  I'm hoping that by 
@@ -1702,7 +1702,7 @@
     { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 10}, AT_NO_ATK },
     { 9, 3, 5, 0 },
     8, 6, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_ROAR, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_GIANT,
 },
 
 {
@@ -1713,7 +1713,7 @@
     { {AT_BITE, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 20, 5, 3, 0 },
     2, 1, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
-    HT_NORMAL, 4, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 4, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 {
@@ -1724,7 +1724,7 @@
     { {AT_BITE, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     4, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, I_ANIMAL, 
-    HT_NORMAL, 17, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 17, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -1735,7 +1735,7 @@
     { {AT_BITE, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 6, 0 },
     2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1746,7 +1746,7 @@
     { {AT_BITE, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     5, 11, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1757,7 +1757,7 @@
     { {AT_BITE, AF_DRAIN_XP, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     7, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_ROAR, I_ANIMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -1768,7 +1768,7 @@
     { {AT_BITE, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     4, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, 
-    HT_NORMAL, 18, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 18, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -1779,7 +1779,7 @@
     { {AT_BITE, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     2, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BELLOW, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -1790,7 +1790,7 @@
     { {AT_CLAW, AF_ROT, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     4, 10, MST_NO_SPELLS, CE_HCL, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -1801,7 +1801,7 @@
     { {AT_BITE, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     2, 9, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -1812,7 +1812,7 @@
     { {AT_BITE, AF_DISEASE, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_WHINE, I_PLANT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1823,7 +1823,7 @@
     { {AT_STING, AF_POISON_NASTY, 2}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 3, 0 },
     2, 14, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1834,7 +1834,7 @@
     { {AT_BITE, AF_PLAIN, 35}, {AT_CLAW, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 25}, AT_NO_ATK },
     { 16, 3, 5, 0 },
     20, 4, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_ROAR, I_NORMAL, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -1845,7 +1845,7 @@
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     6, 10, MST_NAGA, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -1856,7 +1856,7 @@
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 3, 6, 0 },
     8, 4, MST_EFREET, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
 },
 
 {
@@ -1867,7 +1867,7 @@
     { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 4, 5, 0 },
     9, 3, MST_FROST_GIANT, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
 },
 
 {
@@ -1878,7 +1878,7 @@
     { {AT_BITE, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     3, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -1889,7 +1889,7 @@
     { {AT_BITE, AF_DRAIN_XP, 20}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK },
     { 17, 5, 5, 0 },
     15, 10, MST_SHADOW_DRAGON, CE_CLEAN, Z_BIG, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -1900,7 +1900,7 @@
     { {AT_BITE, AF_POISON_MEDIUM, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     4, 14, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -1911,7 +1911,7 @@
     { {AT_BITE, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     4, 16, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, I_INSECT, 
-    HT_NORMAL, 18, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 18, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -1922,7 +1922,7 @@
     { {AT_BITE, AF_PLAIN, 27}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK },
     { 10, 3, 5, 0 },
     6, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -1933,7 +1933,7 @@
     { {AT_BITE, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     2, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_BUZZ, I_PLANT, 
-    HT_NORMAL, 19, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 19, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1944,7 +1944,7 @@
     { {AT_STING, AF_PARALYSE, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     7, 14, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_BUZZ, I_PLANT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -1955,7 +1955,7 @@
     { {AT_BITE, AF_PLAIN, 18}, {AT_CLAW, AF_PLAIN, 9}, {AT_CLAW, AF_PLAIN, 9}, AT_NO_ATK },
     { 9, 5, 5, 0 },
     7, 7, MST_SWAMP_DRAGON, CE_CONTAMINATED, Z_BIG, S_ROAR, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -1966,7 +1966,7 @@
     { {AT_BITE, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 5, 5, 0 },
     3, 11, MST_SWAMP_DRAKE, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_ANIMAL, 
-    HT_NORMAL, 11, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 11, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -1977,7 +1977,7 @@
     { {AT_BITE, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 5, 7, 0 },
     6, 14, MST_DEATH_DRAKE, CE_HCL, Z_BIG, S_ROAR, I_ANIMAL,
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -1988,7 +1988,7 @@
     { {AT_STING, AF_POISON_NASTY, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     8, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -1999,7 +1999,7 @@
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     3, 4, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -2010,7 +2010,7 @@
     { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 3, 5, 0 },
     14, 3, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -2021,7 +2021,7 @@
     { {AT_BITE, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     2, 6, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -2032,7 +2032,7 @@
     { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     0, 12, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_CROAK, I_ANIMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -2043,7 +2043,7 @@
     { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     2, 11, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_CROAK, I_ANIMAL, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -2054,7 +2054,7 @@
     { {AT_STING, AF_POISON_MEDIUM, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     6, 9, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_CROAK, I_ANIMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -2065,7 +2065,7 @@
     { {AT_HIT, AF_BLINK, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     3, 12, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_CROAK, I_ANIMAL, 
-    HT_NORMAL, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -2076,7 +2076,7 @@
     { {AT_BITE, AF_PLAIN, 2}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 4, 0 },
     3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -2087,7 +2087,7 @@
     { {AT_BITE, AF_POISON, 2}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 2, 3, 0 },
     0, 11, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -2098,7 +2098,7 @@
     { {AT_HIT, AF_COLD, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     4, 10, MST_WHITE_IMP, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
 },
 
 {
@@ -2109,7 +2109,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     1, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_NORMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
 },
 
 {
@@ -2120,7 +2120,7 @@
     { {AT_HIT, AF_PLAIN, 5}, {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK },
     { 1, 4, 6, 0 },
     2, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -2131,7 +2131,7 @@
     { {AT_HIT, AF_PLAIN, 5}, {AT_HIT, AF_PLAIN, 3}, {AT_HIT, AF_PLAIN, 3}, AT_NO_ATK },
     { 3, 3, 5, 0 },
     2, 8, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
 },
 
 {
@@ -2142,7 +2142,7 @@
     { {AT_HIT, AF_BLINK, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     4, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
 },
 
 {
@@ -2153,7 +2153,7 @@
     { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     4, 12, MST_NEQOXEC, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -2164,7 +2164,7 @@
     { {AT_STING, AF_POISON_STR, 10}, {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK },
     { 8, 4, 5, 0 },
     3, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SCREECH, I_NORMAL, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -2175,7 +2175,7 @@
     { {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK },
     { 7, 4, 5, 0 },
     8, 10, MST_HELLWING, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2186,7 +2186,7 @@
     { {AT_HIT, AF_PLAIN, 8}, {AT_HIT, AF_PLAIN, 5}, {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK },
     { 7, 3, 5, 0 },
     5, 9, MST_SMOKE_DEMON, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_NORMAL, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
 },
 
 {
@@ -2197,7 +2197,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     3, 10, MST_YNOXINUL, CE_CONTAMINATED, Z_NOZOMBIE, S_BELLOW, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -2208,7 +2208,7 @@
     { {AT_HIT, AF_PLAIN, 30}, {AT_HIT, AF_PLAIN, 10}, {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK },
     { 12, 3, 5, 0 },
     10, 15, MST_HELL_KNIGHT_I, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREAM, I_HIGH, 
-    HT_NORMAL, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2219,7 +2219,7 @@
     { {AT_HIT, AF_PLAIN, 32}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 3, 5, 0 },
     5, 7, MST_GREEN_DEATH, CE_POISONOUS, Z_NOZOMBIE, S_ROAR, I_HIGH, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2230,7 +2230,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
     { 12, 3, 5, 0 },
     10, 10, MST_BLUE_DEATH, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2241,7 +2241,7 @@
     { {AT_HIT, AF_FIRE, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 3, 5, 0 },
     5, 12, MST_BALRUG, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -2252,7 +2252,7 @@
     { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 3, 5, 0 },
     11, 10, MST_CACODEMON, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2263,7 +2263,7 @@
     { {AT_HIT, AF_PLAIN, 13}, {AT_HIT, AF_PLAIN, 13}, {AT_HIT, AF_PLAIN, 13} },
     { 9, 3, 5, 0 },
     10, 6, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREAM, I_NORMAL, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -2274,7 +2274,7 @@
     { {AT_HIT, AF_FIRE, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     10, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -2285,7 +2285,7 @@
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     3, 11, MST_SHADOW_IMP, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
 },
 
 {
@@ -2296,7 +2296,7 @@
     { {AT_HIT, AF_PLAIN, 21}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     7, 12, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_CROAK, I_HIGH, 
-    HT_NORMAL, 11, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
+    HT_LAND, 11, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_SMALL
 },
 
 {
@@ -2307,7 +2307,7 @@
     { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK },
     { 12, 3, 5, 0 },
     10, 12, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -2318,7 +2318,7 @@
     { {AT_HIT, AF_DRAIN_XP, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -2329,7 +2329,7 @@
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 3, 5, 0 },
     0, 4, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -2340,7 +2340,7 @@
     { {AT_BITE, AF_PLAIN, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 5, 3, 0 },
     0, 2, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -2351,7 +2351,7 @@
     { {AT_BITE, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 5, 3, 0 },
     7, 2, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
-    HT_NORMAL, 4, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 4, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -2362,7 +2362,7 @@
     { {AT_HIT, AF_DISTORT, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 6, 6, 0 },
     0, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -2373,7 +2373,7 @@
     { {AT_HIT, AF_PLAIN, 28}, {AT_HIT, AF_PLAIN, 21}, {AT_HIT, AF_PLAIN, 21}, AT_NO_ATK },
     { 19, 4, 5, 0 },
     17, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_HIGH, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2384,7 +2384,7 @@
     { {AT_BITE, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     13, 4, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -2395,7 +2395,7 @@
     { {AT_BITE, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 6}, {AT_CLAW, AF_PLAIN, 6}, AT_NO_ATK },
     { 4, 3, 5, 0 },
     18, 6, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 // only appear in Dis castle
@@ -2407,7 +2407,7 @@
     { {AT_BITE, AF_PLAIN, 19}, {AT_CLAW, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 10}, AT_NO_ATK },
     { 8, 3, 5, 0 },
     20, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 // only appear in Gehenna castle & one minivault
@@ -2419,7 +2419,7 @@
     { {AT_BITE, AF_FIRE, 12}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8}, AT_NO_ATK },
     { 5, 3, 5, 0 },
     14, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 // 250 can't exist
@@ -2433,7 +2433,7 @@
     { {AT_HIT, AF_PLAIN, 35}, {AT_HIT, AF_PLAIN, 23}, AT_NO_ATK, AT_NO_ATK },
     { 17, 0, 0, 199 },
     10, 13, MST_MNOLEG, CE_CONTAMINATED, Z_NOZOMBIE, S_BUZZ, I_HIGH, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2444,7 +2444,7 @@
     { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 19, 0, 0, 223 },
     10, 7, MST_LOM_LOBON, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREAM, I_HIGH, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2455,7 +2455,7 @@
     { {AT_HIT, AF_PLAIN, 60}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 21, 0, 0, 253 },
     15, 8, MST_CEREBOV, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
 },
 
 {
@@ -2466,7 +2466,7 @@
     { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 0, 0, 234 },
     10, 10, MST_GLOORX_VLOQ, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 /* ******************************************************************
@@ -2484,7 +2484,7 @@
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     6, 10, MST_NAGA_MAGE, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -2495,7 +2495,7 @@
     { {AT_HIT, AF_PLAIN, 28}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 9, 2, 0 },
     6, 10, MST_NAGA, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -2506,7 +2506,7 @@
     { {AT_HIT, AF_PLAIN, 32}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 4, 7, 0 },
     3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2517,7 +2517,7 @@
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 3, 0 },
     0, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2528,7 +2528,7 @@
     { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 3, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2539,7 +2539,7 @@
     { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 3, 0 },
     0, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 11, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 11, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2550,7 +2550,7 @@
     { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK },
     { 16, 5, 3, 0 },
     0, 25, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2562,7 +2562,7 @@
     { {AT_SHOOT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK },
     { 15, 4, 2, 0 },
     0, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 11, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 11, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
     
@@ -2575,7 +2575,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 3, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2586,7 +2586,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 3, 0 },
     0, 13, MST_DEEP_ELF_SUMMONER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2597,7 +2597,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 3, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2608,7 +2608,7 @@
     { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 3, 0 },
     0, 13, MST_DEEP_ELF_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2619,7 +2619,7 @@
     { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 3, 0 },
     3, 13, MST_DEEP_ELF_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2630,7 +2630,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 3, 3, 0 },
     0, 13, MST_DEEP_ELF_DEMONOLOGIST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2641,7 +2641,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 3, 3, 0 },
     0, 13, MST_DEEP_ELF_ANNIHILATOR, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2653,7 +2653,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 3, 3, 0 },
     0, 13, MST_DEEP_ELF_SORCERER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2664,7 +2664,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 3, 3, 0 },
     0, 13, MST_DEEP_ELF_DEATH_MAGE, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2675,7 +2675,7 @@
     { {AT_HIT, AF_ACID, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     10, 1, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
 },
 
 {
@@ -2687,7 +2687,7 @@
     { {AT_HIT, AF_COLD, 12}, {AT_HIT, AF_COLD, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12} },
     { 15, 3, 5, 0 },
     5, 10, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
 },
 
 {
@@ -2698,7 +2698,7 @@
     { {AT_HIT, AF_ROT, 32}, {AT_HIT, AF_PLAIN, 32}, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 3, 0 },
     2, 4, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
 },
 
 {
@@ -2709,7 +2709,7 @@
     { {AT_HIT, AF_ACID, 42}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 18, 3, 5, 0 },
     1, 3, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 14, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
+    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_LITTLE,
 },
 
 {
@@ -2720,7 +2720,7 @@
     { {AT_HIT, AF_ACID, 50}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 21, 0, 0, 111 },
     8, 4, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_SMALL
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_EATS_ITEMS, SIZE_SMALL
 },
 
 {
@@ -2731,7 +2731,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 0, 0, 20 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2742,7 +2742,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 0, 0, 10 },
     0, 10, MST_ORC_WIZARD_I, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2753,7 +2753,7 @@
     { {AT_HIT, AF_PLAIN, 4}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 0, 0, 28 },
     2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_SMALL
 },
 
 {
@@ -2764,7 +2764,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 0, 0, 30 },
     0, 11, MST_ORC_WIZARD_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2775,7 +2775,7 @@
     { {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 0, 0, 32 },
     0, 9, MST_ORC_WIZARD_III, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2786,7 +2786,7 @@
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 0, 0, 44 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2797,7 +2797,7 @@
     { {AT_HIT, AF_PLAIN, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 0, 0, 39 },
     0, 12, MST_ORC_WIZARD_III, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2809,7 +2809,7 @@
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 0, 0, 54 },
     3, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
 },
 
 {
@@ -2820,7 +2820,7 @@
     { {AT_HIT, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 0, 0, 54 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2831,7 +2831,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 0, 0, 66 },
     0, 11, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2842,7 +2842,7 @@
     { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 0, 0, 50 },
     0, 10, MST_ORC_WIZARD_III, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2853,7 +2853,7 @@
     { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 0, 0, 66 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2864,7 +2864,7 @@
     { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK },
     { 8, 0, 0, 96 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -2875,7 +2875,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 0, 0, 64 },
     0, 11, MST_WIZARD_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 11, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 11, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2886,7 +2886,7 @@
     { {AT_HIT, AF_PLAIN, 11}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 0, 0, 69 },
     0, 10, MST_NECROMANCER_I, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2897,7 +2897,7 @@
     { {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 0, 0, 76 },
     0, 8, MST_HELL_KNIGHT_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2908,7 +2908,7 @@
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 0, 0, 105 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2919,7 +2919,7 @@
     { {AT_HIT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 0, 0, 90 },
     0, 9, MST_GUARDIAN_NAGA, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2930,7 +2930,7 @@
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 0, 0, 140 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2941,7 +2941,7 @@
     { {AT_HIT, AF_PLAIN, 24}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 0, 0, 118 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2952,7 +2952,7 @@
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 0, 0, 106 },
     0, 10, MST_WIZARD_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2964,7 +2964,7 @@
     { {AT_HIT, AF_PLAIN, 19}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 0, 0, 110 },
     0, 10, MST_ORC_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2976,7 +2976,7 @@
     { {AT_HIT, AF_PLAIN, 29}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 0, 0, 121 },
     0, 10, MST_ORC_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -2988,7 +2988,7 @@
     { {AT_HIT, AF_PLAIN, 21}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 0, 0, 123 },
     0, 10, MST_RUPERT, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3000,7 +3000,7 @@
     { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 17, 0, 0, 140 },
     1, 10, MST_ORC_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3012,7 +3012,7 @@
     { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 18, 0, 0, 136 },
     0, 10, MST_ORC_WIZARD_I, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3023,7 +3023,7 @@
     { {AT_BITE, AF_PLAIN, 35}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 17}, AT_NO_ATK },
     { 19, 0, 0, 133 },
     15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -3035,7 +3035,7 @@
     { {AT_HIT, AF_PLAIN, 36}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 20, 0, 0, 214 },
     1, 9, MST_MYSTIC, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3047,7 +3047,7 @@
     { {AT_HIT, AF_PLAIN, 27}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 21, 0, 0, 159 },
     0, 10, MST_LICH_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3059,7 +3059,7 @@
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 22, 0, 0, 164 },
     0, 10, MST_EFREET, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3071,7 +3071,7 @@
     { {AT_HIT, AF_PLAIN, 25}, {AT_TOUCH, AF_DRAIN_XP, 15}, AT_NO_ATK, AT_NO_ATK },
     { 22, 0, 0, 154 },
     12, 10, MST_LICH_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3083,7 +3083,7 @@
     { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 0, 0, 240 },
     15, 6, MST_GERYON, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
 },
 
 {
@@ -3094,7 +3094,7 @@
     { {AT_HIT, AF_PLAIN, 50}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 16, 0, 0, 222 },
     15, 3, MST_DISPATER, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
 },
 
 {
@@ -3105,7 +3105,7 @@
     { {AT_HIT, AF_PLAIN, 50}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 17, 0, 0, 245 },
     12, 7, MST_ASMODEUS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
 },
 
 // Antaeus is now demonic so that he'll resist torment. -- bwr
@@ -3117,7 +3117,7 @@
     { {AT_HIT, AF_COLD, 75}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 22, 0, 0, 250 },
     10, 4, MST_ANTAEUS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_GIANT,
 },
 
 {
@@ -3128,7 +3128,7 @@
     { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 18, 0, 0, 238 },
     15, 6, MST_ERESHKIGAL, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LARGE
 },
 
 {
@@ -3139,7 +3139,7 @@
     { {AT_TOUCH, AF_DRAIN_XP, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 27, 2, 4, 0 },
     20, 10, MST_LICH_I, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 /* number is set in define_monster */
@@ -3152,7 +3152,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     1, 3, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -3163,7 +3163,7 @@
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 3, 5, 0 },
     1, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 /* These nasties are never randomly generated, only sometimes specially
@@ -3176,7 +3176,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 13, 0, 0, 66 },
     40, 3, MST_CURSE_SKULL, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -3187,7 +3187,7 @@
     { {AT_HIT, AF_PLAIN, 33}, {AT_BITE, AF_VAMPIRIC, 15}, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 7, 0 },
     10, 10, MST_VAMPIRE_KNIGHT, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3198,7 +3198,7 @@
     { {AT_BITE, AF_VAMPIRIC, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 4, 0 },
     10, 10, MST_VAMPIRE_MAGE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3209,7 +3209,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     3, 1, MST_SHINING_EYE, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -3220,7 +3220,7 @@
     { {AT_HIT, AF_PLAIN, 45}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 3, 5, 0 },
     13, 13, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 14, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -3231,7 +3231,7 @@
     { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 10}, {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK },
     { 14, 6, 5, 0 },
     10, 13, MST_DAEVA, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 /* spectral thing - similar to zombies/skeletons */
@@ -3243,7 +3243,7 @@
     { {AT_HIT, AF_DRAIN_XP, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     8, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -3254,7 +3254,7 @@
     { {AT_HIT, AF_PLAIN, 27}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 3, 5, 0 },
     6, 10, MST_NAGA_MAGE, CE_POISONOUS, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -3265,7 +3265,7 @@
     { {AT_BITE, AF_PLAIN, 30}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK },
     { 20, 8, 8, 0 },
     20, 4, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -3276,7 +3276,7 @@
     { {AT_HIT, AF_PLAIN, 22}, {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 13} },
     { 25, 3, 5, 0 },
     5, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -3287,7 +3287,7 @@
     { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK },
     { 16, 3, 5, 0 },
     5, 5, MST_SPHINX, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -3298,7 +3298,7 @@
     { {AT_HIT, AF_DISEASE, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     5, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -3309,7 +3309,7 @@
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 5, 3, 0 },
     6, 9, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -3320,7 +3320,7 @@
     { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 15, 5, 3, 100 },
     10, 6, MST_MUMMY, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3331,7 +3331,7 @@
     { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 5, 3, 0 },
     8, 7, MST_MUMMY, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 9, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {
@@ -3342,7 +3342,7 @@
     { {AT_HIT, AF_PLAIN, 16}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 3, 5, 0 },
     4, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_BIG
 },
 
 {
@@ -3353,7 +3353,7 @@
     { {AT_HIT, AF_PLAIN, 23}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 3, 5, 0 },
     5, 5, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 {   // Base draconian -- for use like MONS_HUMAN, MONS_ELF although we 
@@ -3366,7 +3366,7 @@
     { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 3, 6, 4, 0 },
     7, 8, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3377,7 +3377,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     9, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 { 
@@ -3388,7 +3388,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     9, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3399,7 +3399,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     9, 14, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3410,7 +3410,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     9, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3421,7 +3421,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     8, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 { 
@@ -3432,7 +3432,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     9, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 { 
@@ -3443,7 +3443,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     9, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3454,7 +3454,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 14, 5, 4, 0 },
     9, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH,
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3465,7 +3465,7 @@
     { {AT_HIT, AF_PLAIN, 20}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 16, 4, 3, 0 },
     9, 10, MST_DRAC_CALLER, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3477,7 +3477,7 @@
                               {AT_TAIL_SLAP, AF_PLAIN, 15} },
     { 16, 6, 3, 0 },
     6, 20, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 { 
@@ -3488,7 +3488,7 @@
     { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 16, 4, 2, 0 },
     12, 10, MST_DEEP_ELF_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3499,7 +3499,7 @@
     { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 16, 4, 4, 0 },
     8, 16, MST_DRAC_SHIFTER, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3510,7 +3510,7 @@
     { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 16, 4, 2, 0 },
     8, 10, MST_DEEP_ELF_ANNIHILATOR, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3521,7 +3521,7 @@
     { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 16, 6, 4, 0 },
     12, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3532,7 +3532,7 @@
     { {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 0}, {AT_HIT, AF_PLAIN, 0} },
     { 16, 4, 2, 0 },
     8, 12, MST_DRAC_SCORCHER, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -3543,7 +3543,7 @@
     { {AT_HIT, AF_KLOWN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 20, 5, 5, 0 },
     10, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 {
@@ -3554,7 +3554,7 @@
     { {AT_HIT, AF_ELEC, 15}, {AT_HIT, AF_ELEC, 15}, {AT_HIT, AF_PLAIN, 15}, {AT_HIT, AF_PLAIN, 15} },
     { 15, 7, 4, 0 },
     5, 20, MST_ELECTRIC_GOLEM, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 {
@@ -3565,7 +3565,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 0, 0, 1 },
     0, 10, MST_STORM_DRAGON, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_PLANT, 
-    HT_NORMAL, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
+    HT_LAND, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
 },
 
 {
@@ -3576,7 +3576,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 30, 0, 0, 150 },
     20, 20, MST_ORB_OF_FIRE, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
+    HT_LAND, 20, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LITTLE,
 },
 
 {
@@ -3587,7 +3587,7 @@
     { {AT_BITE, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     2, 13, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL,
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -3598,7 +3598,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 3, 5, 0 },
     12, 1, MST_EYE_OF_DEVASTATION, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 {
@@ -3609,7 +3609,7 @@
     { {AT_BITE, AF_RAGE, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 9, 3, 5, 0 },
     0, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SHOUT, I_HIGH,
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -3620,7 +3620,7 @@
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 4, 5, 0 },
     10, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_MOAN, I_NORMAL, 
-    HT_NORMAL, 25, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_TINY
+    HT_LAND, 25, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_TINY
 },
 
 // Curse toes move at half the speed with which they attack.
@@ -3632,7 +3632,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 14, 0, 0, 77 },
     50, 1, MST_CURSE_TOE, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
-    HT_NORMAL, 12, MOVE_ENERGY(20), MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 12, MOVE_ENERGY(20), MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -3644,7 +3644,7 @@
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK },
     { 8, 3, 5, 0 },
     5, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -3655,7 +3655,7 @@
     { {AT_HIT, AF_POISON, 17}, {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK },
     { 8, 3, 5, 0 },
     5, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -3666,7 +3666,7 @@
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK },
     { 8, 3, 5, 0 },
     15, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -3677,7 +3677,7 @@
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK },
     { 8, 3, 5, 0 },
     5, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -3688,7 +3688,7 @@
     { {AT_HIT, AF_POISON, 12}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK },
     { 8, 3, 5, 0 },
     5, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -3699,7 +3699,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 11, 3, 5, 0 },
     2, 9, MST_HELL_HOG, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
-    HT_NORMAL, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -3710,7 +3710,7 @@
     { {AT_BITE, AF_PLAIN, 35}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK },
     { 20, 4, 4, 0 },
     12, 9, MST_SERPENT_OF_HELL, CE_CLEAN, Z_NOZOMBIE, S_ROAR, I_HIGH, 
-    HT_NORMAL, 14, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 14, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -3721,7 +3721,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     0, 12, MST_BOGGART, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LITTLE,
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_LITTLE,
 },
 
 {
@@ -3732,7 +3732,7 @@
     { {AT_BITE, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
     { 16, 3, 5, 0 },
     10, 15, MST_QUICKSILVER_DRAGON, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
+    HT_LAND, 15, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_GIANT,
 },
 
 {
@@ -3743,7 +3743,7 @@
     { {AT_BITE, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 25}, AT_NO_ATK },
     { 18, 5, 3, 0 },
     20, 6, MST_IRON_DRAGON, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_HUGE
 },
 
 {
@@ -3754,7 +3754,7 @@
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 5, 3, 0 },
     15, 10, MST_SKELETAL_WARRIOR, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_NORMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 },
 
 /* player ghost - only one per level. stats are stored in ghost struct */
@@ -3766,7 +3766,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 2, 3, 0 },
     1, 2, MST_GHOST, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH,
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_MEDIUM
 },
 
 /* random demon in pan - only one per level. stats are stored in ghost struct */
@@ -3778,7 +3778,7 @@
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 2, 3, 0 },
     1, 2, MST_GHOST, CE_CONTAMINATED, Z_NOZOMBIE, S_RANDOM, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_LARGE
 },
 
 // begin lava monsters {dlb}
@@ -3837,7 +3837,7 @@
     { {AT_BITE, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     1, 12, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_DEEP_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -3848,7 +3848,7 @@
     { {AT_BITE, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     5, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_DEEP_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -3859,7 +3859,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     1, 15, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL, 
-    HT_DEEP_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -3870,7 +3870,7 @@
     { {AT_STING, AF_POISON_STR, 1}, {AT_HIT, AF_PLAIN, 1}, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     0, 5, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_PLANT, 
-    HT_DEEP_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -3881,7 +3881,7 @@
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 5, 3, 0 },
     0, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_DEEP_WATER, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
+    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, SIZE_BIG
 },
 
 {
@@ -3892,7 +3892,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 5, 5, 0 },
     3, 12, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_PLANT, 
-    HT_DEEP_WATER, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_WATER, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 // end water monsters {dlb}
@@ -3907,7 +3907,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 5, 5, 0 },
     3, 12, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_PLANT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 // end "move through rock" monsters {mpc}
 
@@ -3919,7 +3919,7 @@
     { {AT_BITE, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 2}, {AT_CLAW, AF_PLAIN, 2}, AT_NO_ATK },
     { 4, 3, 5, 0 },
     3, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BARK, I_ANIMAL, 
-    HT_NORMAL, 17, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 17, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 {
@@ -3930,7 +3930,7 @@
     { {AT_BITE, AF_PLAIN, 12}, {AT_CLAW, AF_PLAIN, 3}, {AT_CLAW, AF_PLAIN, 3}, AT_NO_ATK },
     { 4, 4, 5, 0 },
     4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, I_ANIMAL, 
-    HT_NORMAL, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 13, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -3941,7 +3941,7 @@
     { {AT_BITE, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 6}, {AT_CLAW, AF_PLAIN, 6}, AT_NO_ATK },
     { 7, 3, 3, 0 },
     4, 4, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -3952,7 +3952,7 @@
     { {AT_BITE, AF_PLAIN, 12}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8}, AT_NO_ATK },
     { 7, 4, 4, 0 },
     5, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -3963,7 +3963,7 @@
     { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 5}, {AT_CLAW, AF_PLAIN, 5}, AT_NO_ATK },
     { 7, 5, 3, 0 },
     7, 8, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_BIG
 },
 
 {
@@ -3974,7 +3974,7 @@
     { {AT_BITE, AF_PLAIN, 4}, {AT_CLAW, AF_PLAIN, 4}, {AT_CLAW, AF_PLAIN, 4}, AT_NO_ATK },
     { 6, 3, 3, 0 },
     2, 8, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_GROWL, I_ANIMAL, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 // small simulacrum
@@ -3986,7 +3986,7 @@
     { {AT_HIT, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 2, 3, 5, 0 },
     10, 4, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_SMALL
 },
 
 // large simulacrum
@@ -3998,7 +3998,7 @@
     { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     10, 5, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
-    HT_NORMAL, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 7, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -4009,7 +4009,7 @@
     { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 2, 4, 0 },
     4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,
-    HT_DEEP_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 }
 ,
 
@@ -4021,7 +4021,7 @@
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 2, 4, 0 },
     4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,
-    HT_DEEP_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
+    HT_WATER, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
 }
 ,
 
@@ -4033,7 +4033,7 @@
     { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 1, 2, 0 },
     0, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -4044,7 +4044,7 @@
     { {AT_BITE, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
-    HT_NORMAL, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 12, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -4055,7 +4055,7 @@
     { {AT_BITE, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     5, 9, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -4067,7 +4067,7 @@
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 4, 4, 0 },
     3, 12, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_HISS, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LITTLE,
 },
 
 {
@@ -4078,7 +4078,7 @@
     { {AT_BITE, AF_DISEASE, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     7, 8, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_HISS, I_INSECT, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_MEDIUM
 },
 
 {
@@ -4089,7 +4089,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 0, 0, 160 },
     20, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 6, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -4100,7 +4100,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 0, 0, 150 },
     15, 1, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -4111,7 +4111,7 @@
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 0, 0, 70 },
     12, 1, MST_ICE_STATUE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
-    HT_NORMAL, 16, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
+    HT_LAND, 16, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_LARGE
 },
 
 {
@@ -4122,7 +4122,7 @@
     { {AT_BITE, AF_PLAIN, 20}, {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
     { 14, 0, 0, 180 },
     30, 10, MST_CURSE_SKULL, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
 {
@@ -4134,7 +4134,7 @@
       AT_NO_ATK, AT_NO_ATK },
     { 22, 0, 0, 200 },
     8, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_ROAR, I_HIGH, 
-    HT_NORMAL, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_MEDIUM
 },
 
 {
@@ -4145,6 +4145,6 @@
     { {AT_HIT, AF_PLAIN, 35}, {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK },
     { 12, 0, 0, 105 },
     7, 3, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, 
-    HT_NORMAL, 8, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
+    HT_LAND, 8, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, SIZE_GIANT,
 },
 #endif
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index be991571a9..e4e85eb834 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -86,21 +86,20 @@ static int mons_exp_mod(int mclass);
 
 /* ******************** BEGIN PUBLIC FUNCTIONS ******************** */
 
-habitat_type grid2habitat(int grid)
+habitat_type grid2habitat(dungeon_feature_type grid)
 {
+    if (grid_is_watery(grid))
+        return (HT_WATER);
+
     switch (grid)
     {
-    case DNGN_DEEP_WATER:
-        return (HT_DEEP_WATER);
-    case DNGN_SHALLOW_WATER:
-        return (HT_SHALLOW_WATER);
     case DNGN_LAVA:
         return (HT_LAVA);
     case DNGN_ROCK_WALL:
         return (HT_ROCK_WALL);
     case DNGN_FLOOR:
     default:
-        return (HT_NORMAL);
+        return (HT_LAND);
     }
 }
 
@@ -108,15 +107,13 @@ dungeon_feature_type habitat2grid(habitat_type ht)
 {
     switch (ht)
     {
-    case HT_DEEP_WATER:
+    case HT_WATER:
         return (DNGN_DEEP_WATER);
-    case HT_SHALLOW_WATER:
-        return (DNGN_SHALLOW_WATER);
     case HT_LAVA:
         return (DNGN_LAVA);
     case HT_ROCK_WALL:
         return (DNGN_ROCK_WALL);
-    case HT_NORMAL:
+    case HT_LAND:
     default:
         return (DNGN_FLOOR);
     }
@@ -144,7 +141,7 @@ monster_type random_monster_at_grid(int x, int y)
     return (random_monster_at_grid(grd[x][y]));
 }
 
-monster_type random_monster_at_grid(int grid)
+monster_type random_monster_at_grid(dungeon_feature_type grid)
 {
     if (!initialized_randmons)
         initialize_randmons();
@@ -2417,7 +2414,7 @@ coord_def monsters::target_pos() const
 bool monsters::swimming() const
 {
     const dungeon_feature_type grid = grd[x][y];
-    return (grid_is_watery(grid) && mons_habitat(type) == HT_DEEP_WATER);
+    return (grid_is_watery(grid) && mons_habitat(type) == HT_WATER);
 }
 
 bool monsters::submerged() const
@@ -2431,7 +2428,7 @@ bool monsters::floundering() const
     return (grid_is_water(grid)
             // Can't use monster_habitable_grid because that'll return true
             // for non-water monsters in shallow water.
-            && mons_habitat(type) != HT_DEEP_WATER
+            && mons_habitat(type) != HT_WATER
             && !mons_amphibious(type)
             && !mons_flies(this));
 }
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h
index 0d9244aed6..8928397978 100644
--- a/crawl-ref/source/mon-util.h
+++ b/crawl-ref/source/mon-util.h
@@ -150,9 +150,8 @@ enum mon_intel_type             // Must be in increasing intelligence order
 enum habitat_type
 {
     // Flying monsters will appear in all categories except rock walls
-    HT_NORMAL,          // Normal critters
-    HT_SHALLOW_WATER,   // Union of normal + water
-    HT_DEEP_WATER,      // Water critters
+    HT_LAND = 0,        // Normal critters
+    HT_WATER,           // Water critters
     HT_LAVA,            // Lava critters
     HT_ROCK_WALL,       // Rock wall critters
 
@@ -326,7 +325,7 @@ struct monsterentry
     size_type size;
 };
 
-habitat_type grid2habitat(int grid);
+habitat_type grid2habitat(dungeon_feature_type grid);
 dungeon_feature_type habitat2grid(habitat_type ht);
 
 monsterentry *get_monster_data(int p_monsterid);
@@ -636,7 +635,7 @@ bool monster_senior(const monsters *first, const monsters *second);
 monster_type draco_subspecies( const monsters *mon );
 
 monster_type random_monster_at_grid(int x, int y);
-monster_type random_monster_at_grid(int grid);
+monster_type random_monster_at_grid(dungeon_feature_type grid);
 
 void         init_mon_name_cache();
 monster_type get_monster_by_name(std::string name, bool exact = false);
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc
index 4eed6926a6..c2485d3824 100644
--- a/crawl-ref/source/monplace.cc
+++ b/crawl-ref/source/monplace.cc
@@ -128,7 +128,7 @@ bool monster_can_submerge(int monster_class, int grid)
 {
     const habitat_type habitat = mons_habitat(monster_class);
 
-    if (habitat == HT_DEEP_WATER &&
+    if (habitat == HT_WATER &&
            (grid == DNGN_DEEP_WATER || grid == DNGN_BLUE_FOUNTAIN))
     {
         return true;
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index ec001837f4..f41112ecae 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -4088,8 +4088,8 @@ static void monster_regenerate(monsters *monster)
     if (monster->has_ench(ENCH_SICK))
         return;
 
-    // Water/lava creatures out of their element cannot regenerate.
-    if (mons_habitat(monster->type) != HT_NORMAL
+    // Non-land creatures out of their element cannot regenerate.
+    if (mons_habitat(monster->type) != HT_LAND
         && !monster_habitable_grid(monster, grd(monster->pos())))
     {
         return;
@@ -5300,7 +5300,7 @@ bool mon_can_move_to_pos(const monsters *monster, const int count_x,
     // [dshaligram] Monsters now prefer to head for deep water only if
     // they're low on hitpoints. No point in hiding if they want a
     // fight.
-    if (habitat == HT_DEEP_WATER
+    if (habitat == HT_WATER
         && (targ_x != you.x_pos || targ_y != you.y_pos)
         && target_grid != DNGN_DEEP_WATER
         && grd[monster->x][monster->y] == DNGN_DEEP_WATER
@@ -5308,7 +5308,7 @@ bool mon_can_move_to_pos(const monsters *monster, const int count_x,
     {
         return false;
     }
-    
+
     // smacking the player is always a good move if we're
     // hostile (even if we're heading somewhere else)
     // also friendlies want to keep close to the player
@@ -5457,7 +5457,7 @@ static bool monster_move(monsters *monster)
         {
             coord_def newpos = monster->pos() + coord_def(mmov_x, mmov_y);
             if (in_bounds(newpos)
-                && (habitat == HT_NORMAL
+                && (habitat == HT_LAND
                     || monster_habitable_grid(monster, grd(newpos))))
             {
                 return do_move_monster(monster, mmov_x, mmov_y);
@@ -5471,7 +5471,7 @@ static bool monster_move(monsters *monster)
         return false;
 
     if (mons_flies(monster) != FL_NONE
-        || habitat != HT_NORMAL
+        || habitat != HT_LAND
         || mons_amphibious(monster->type))
     {
         okmove = DNGN_MINMOVE;
@@ -5557,7 +5557,7 @@ static bool monster_move(monsters *monster)
     // water creatures have a preference for water they can hide in -- bwr
     // [ds] Weakened the powerful attraction to deep water if the monster
     // is in good health.
-    if (habitat == HT_DEEP_WATER
+    if (habitat == HT_WATER
         && deep_water_available
         && grd[monster->x][monster->y] != DNGN_DEEP_WATER
         && grd[monster->x + mmov_x][monster->y + mmov_y] != DNGN_DEEP_WATER
author	dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>	2008-01-04 05:26:00 +0000
committer	dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>	2008-01-04 05:26:00 +0000
commit	0a2eef4f7c8d6cab369dee37adef2aba41cdf557 (patch)
tree	7e1ec00e15db5ecc912038500c1fd64bfc38cefb /crawl-ref/source
parent	ba61c9ea0ff447e24a9ad3f7f1b45160640c913b (diff)
download	crawl-ref-0a2eef4f7c8d6cab369dee37adef2aba41cdf557.tar.gz crawl-ref-0a2eef4f7c8d6cab369dee37adef2aba41cdf557.zip