Weaken merfolk impalers and javelineers, give sirens and mermaids extra hp, and sirens extra HD, remove ettin and sheep from Shoals.

2 files changed, 6 insertions, 10 deletions

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 6ce2103a22..0db6c4e927 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1123,8 +1123,8 @@ static monsterentry mondata[] = {
     M_WARM_BLOOD,
     MR_NO_FLAGS,
     500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -3,
-    { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
-    { 16, 5, 3, 0 },
+    { {AT_HIT, AF_PLAIN, 34}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+    { 16, 4, 3, 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),
@@ -1136,8 +1136,8 @@ static monsterentry mondata[] = {
     M_WARM_BLOOD | M_ARCHER,
     MR_NO_FLAGS,
     500, 10, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4,
-    { {AT_SHOOT, AF_PLAIN, 18}, {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
-    { 16, 4, 2, 0 },
+    { {AT_SHOOT, AF_PLAIN, 16}, {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK },
+    { 15, 4, 2, 0 },
     0, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
     I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, MISSILE_ENERGY(8),
     MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM
@@ -1161,7 +1161,7 @@ static monsterentry mondata[] = {
     MR_NO_FLAGS,
     500, 10, MONS_MERMAID, MONS_MERMAID, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
-    { 8, 2, 3, 0 },
+    { 8, 3, 3, 0 },
     4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
     I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY,
     MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
@@ -1173,7 +1173,7 @@ static monsterentry mondata[] = {
     MR_NO_FLAGS,
     500, 12, MONS_MERMAID, MONS_SIREN, MH_NATURAL, -7,
     { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
-    { 8, 2, 3, 0 },
+    { 13, 5, 3, 0 },
     4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT,
     I_NORMAL, HT_AMPHIBIOUS_WATER, FL_NONE, 10, DEFAULT_ENERGY,
     MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM
diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc
index edcb9a5ec7..091650e0a0 100644
--- a/crawl-ref/source/mon-pick.cc
+++ b/crawl-ref/source/mon-pick.cc
@@ -1706,8 +1706,6 @@ int mons_shoals_level(int mcls)
     case MONS_MERFOLK:
     case MONS_MERMAID:
     case MONS_CENTAUR:
-    case MONS_ETTIN:
-    case MONS_SHEEP:
     case MONS_HIPPOGRIFF:
         mlev++;
         break;
@@ -1751,8 +1749,6 @@ int mons_shoals_rare(int mcls)
     case MONS_PLANT:
         return 150;
 
-    case MONS_ETTIN:
-    case MONS_SHEEP:
     case MONS_MERFOLK:
         return 50;