summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-14 08:42:31 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-14 08:42:31 +0530
commit11aaef4f436e8049649d48ac99d8f5ed7be64cc9 (patch)
tree1b5019727c987a42aa49b4d3e988cabcd019edfd /crawl-ref/source
parent3568100f8f0a937d027b17cc54be18ee75f7b957 (diff)
downloadcrawl-ref-11aaef4f436e8049649d48ac99d8f5ed7be64cc9.tar.gz
crawl-ref-11aaef4f436e8049649d48ac99d8f5ed7be64cc9.zip
Shoals monster changes: more harpies, weaken impalers, alligator snapping turtles, sea snakes.
Merfolk impalers: 28->26 dam, 23->18 EV. Alligator snapping turtles: 8->10 action cost. Sea snakes: 14->12 speed. Harpies are now more common.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/mon-data.h12
-rw-r--r--crawl-ref/source/mon-pick.cc4
2 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index af633ae2bc..0897c42df0 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1123,10 +1123,10 @@ static monsterentry mondata[] = {
M_WARM_BLOOD,
MR_NO_FLAGS,
500, 8, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3,
- { {AT_HIT, AF_PLAIN, 28}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { {AT_HIT, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 12, 5, 4, 0 },
// Impalers prefer light armour, and are dodging experts.
- 0, 23, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
+ 0, 18, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, ATTACK_ENERGY(6),
MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM
},
@@ -1138,7 +1138,7 @@ static monsterentry mondata[] = {
500, 8, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4,
{ {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,
+ 0, 14, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY,
MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM
},
@@ -1548,8 +1548,8 @@ static monsterentry mondata[] = {
MH_NATURAL, -3,
{ {AT_BITE, AF_REACH, 50}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 16, 7, 4, 0 },
- 19, 2, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS,
- I_ANIMAL, HT_AMPHIBIOUS_LAND, FL_NONE, 8, ACTION_ENERGY(8),
+ 19, 1, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS,
+ I_ANIMAL, HT_AMPHIBIOUS_LAND, FL_NONE, 8, DEFAULT_ENERGY,
MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE
},
@@ -2970,7 +2970,7 @@ static monsterentry mondata[] = {
{ {AT_BITE, AF_POISON_STRONG, 24}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 10, 4, 5, 0 },
2, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS,
- I_INSECT, HT_AMPHIBIOUS_WATER, FL_NONE, 14, DEFAULT_ENERGY,
+ I_INSECT, HT_AMPHIBIOUS_WATER, FL_NONE, 12, DEFAULT_ENERGY,
MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM
},
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index 41ae0e5e58..4b3192570f 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -1712,12 +1712,12 @@ int mons_shoals_level(int mcls)
case MONS_MANTICORE:
case MONS_SNAPPING_TURTLE:
+ case MONS_HARPY:
mlev += 2;
break;
case MONS_CYCLOPS: // will have a sheep band
case MONS_SIREN:
- case MONS_HARPY:
case MONS_MERFOLK_IMPALER:
case MONS_MERFOLK_AQUAMANCER:
case MONS_MERFOLK_JAVELINEER:
@@ -1755,10 +1755,10 @@ int mons_shoals_rare(int mcls)
return 35;
case MONS_SIREN:
+ case MONS_HARPY:
return 24;
case MONS_CYCLOPS:
- case MONS_HARPY:
case MONS_CENTAUR:
case MONS_MERFOLK_AQUAMANCER:
case MONS_MERFOLK_IMPALER: