summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-data.h
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-01 01:14:49 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-01 01:14:49 +0530
commit1f798f3b7b0b7f840b927a9f53614638d704998f (patch)
tree8a09fa5b9ceb4b7cfeb48eb4030889363ef5d22c /crawl-ref/source/mon-data.h
parent7c6281f089b17ce4adfba97ed29753051ea0c629 (diff)
downloadcrawl-ref-1f798f3b7b0b7f840b927a9f53614638d704998f.tar.gz
crawl-ref-1f798f3b7b0b7f840b927a9f53614638d704998f.zip
Don't allow NPC merfolk to submerge (sirens and mermaids can still submerge).
Diffstat (limited to 'crawl-ref/source/mon-data.h')
-rw-r--r--crawl-ref/source/mon-data.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index b3c35c66f4..9ea80a9835 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1111,10 +1111,10 @@ static monsterentry mondata[] = {
M_WARM_BLOOD | M_SPEAKS,
MR_NO_FLAGS,
500, 4, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3,
- { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { {AT_HIT, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 9, 2, 4, 0 },
4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
- I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY,
+ I_NORMAL, HT_AMPHIBIOUS_LAND, FL_NONE, 10, DEFAULT_ENERGY,
MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
},
@@ -1127,7 +1127,7 @@ static monsterentry mondata[] = {
{ 12, 5, 4, 0 },
// Impalers prefer light armour, and are dodging experts.
0, 23, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
- I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, ATTACK_ENERGY(6),
+ I_NORMAL, HT_AMPHIBIOUS_LAND, FL_NONE, 10, ATTACK_ENERGY(6),
MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM
},
@@ -1139,7 +1139,7 @@ static monsterentry mondata[] = {
{ {AT_SHOOT, AF_PLAIN, 16}, {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK },
{ 13, 5, 2, 0 },
0, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
- I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, MISSILE_ENERGY(8),
+ I_NORMAL, HT_AMPHIBIOUS_LAND, FL_NONE, 10, MISSILE_ENERGY(8),
MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM
},
@@ -1151,7 +1151,7 @@ static monsterentry mondata[] = {
{ {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 15, 3, 3, 0 },
0, 12, MST_MERFOLK_AQUAMANCER, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
- I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY,
+ I_NORMAL, HT_AMPHIBIOUS_LAND, FL_NONE, 10, DEFAULT_ENERGY,
MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM
},