Merge branch 'master' into wizlab

5 files changed, 60 insertions, 34 deletions

diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 25277aff17..2b1dc4c4ea 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -8,7 +8,8 @@ one is skilled in the appropriate elemental magic.
 %%%%
 amulet of clarity
 
-This amulet protects its wearer from some forms of mental confusion.
+This amulet protects its wearer from some forms of mental confusion,
+including being infuriated against one's will.
 %%%%
 amulet of conservation
 
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index da05efc32f..579bbeb6a3 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -1048,7 +1048,19 @@ This tall and powerful demon is Mara, Lord of Illusions, mighty among dreamers.
 %%%%
 merfolk
 
-Half fish, half man, the merfolk are citizens of both water and land, and they'll fiercely protect their chosen territory.
+Half fish, half man, the merfolk are citizens of both water and land, and fierce protectors of their chosen territory.
+%%%%
+merfolk impaler
+
+A powerfully muscled merfolk warrior, bearing a great trident.
+%%%%
+merfolk aquamancer
+
+A slender merfolk mystic with unusually webby hands. Its form shifts and glistens as if seen through ocean spray.
+%%%%
+merfolk javelineer
+
+A sinewy merfolk fighter with a piercing gaze and a large bundle of javelins.
 %%%%
 mermaid
 
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 493d018b9e..a66a5961dc 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -709,15 +709,23 @@ NAME:    statue_cache
 ORIENT:  north
 TAGS:    no_monster_gen
 DEPTH:   D:12-20, Elf, Vault
-MONS: statue name:archer name_adjective ; crossbow ego:flame . bolt q:30
-MONS: statue name:archer name_adjective ; crossbow ego:frost . bolt q:30
-MONS: statue name:warrior name_adjective ; battleaxe ego:flaming good_item
-MONS: statue name:warrior name_adjective ; battleaxe ego:freezing good_item
-MONS: statue name:warrior name_adjective ; great mace ego:flaming good_item
-MONS: statue name:warrior name_adjective ; great mace ego:freezing good_item
+MONS: statue name:archer name_adjective tile:mons_statue_crossbow ; crossbow \
+      ego:flame . bolt q:30 
+MONS: statue name:archer name_adjective tile:mons_statue_crossbow ; crossbow \
+      ego:frost . bolt q:30
+MONS: statue name:warrior name_adjective tile:mons_statue_axe ; battleaxe \
+      ego:flaming good_item
+MONS: statue name:warrior name_adjective tile:mons_statue_axe ; battleaxe \
+      ego:freezing good_item
+MONS: statue name:warrior name_adjective tile:mons_statue_mace ; great mace \
+      ego:flaming good_item
+MONS: statue name:warrior name_adjective tile:mons_statue_mace ; great mace \
+      ego:freezing good_item
 MONS: silver statue
-KMONS: 8 = statue name:wizard name_adjective spells:lehudib's_crystal_spear;iskenderun's_mystic_blast;slow;stone_arrow
-KMONS: 9 = statue name:wizard name_adjective spells:freezing_cloud;mephitic_cloud;throw_icicle;confuse
+KMONS: 8 = statue name:wizard name_adjective tile:mons_statue_mage \
+           spells:lehudib's_crystal_spear;iskenderun's_mystic_blast;slow;stone_arrow
+KMONS: 9 = statue name:wizard name_adjective tile:mons_statue_mage \
+           spells:freezing_cloud;mephitic_cloud;throw_icicle;confuse
 MAP
   cccccccccccccc
   cccccccc7ccccc
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 2927e8362c..d29eeff639 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -2667,7 +2667,7 @@ ENDMAP
 #
 NAME:   archer_statue
 DEPTH:  D:8-, Vault, Elf
-MONS:   statue tile:mons_archer_statue name:archer name_adjective; longbow . arrow q:30
+MONS:   statue tile:mons_statue_archer name:archer name_adjective; longbow . arrow q:30
 MAP
     ccc
 ccccc1ccccc
diff --git a/crawl-ref/source/dat/shoals.des b/crawl-ref/source/dat/shoals.des
index 2b52eb6ade..c89fea0aad 100644
--- a/crawl-ref/source/dat/shoals.des
+++ b/crawl-ref/source/dat/shoals.des
@@ -234,39 +234,44 @@ wwwwwwwww
 ENDMAP
 
 ################################################################################
-# Shoal hut with rune inside
+# Shoal hut with rune inside.
+#
+# This hut is also used for the decoy huts, with the rune replaced with a good
+# item.
 #
-# Shoal:$ is hand-hacked to force lots of minivaults.
 NAME:      shoalhut_rune
-TAGS:      shoal_rune water_ok no_dump
+TAGS:      shoal_rune water_ok no_dump allow_dup
 SHUFFLE:   ABCD
 SUBST:     A:x, B:x, C:x=, D=+
 LROCKTILE:  wall_vines
 MAP
  xxCxx
-xx...xx
-x.....x
-B..O..D
-x.....x
-xx...xx
+xx.1.xx
+x.1.1.x
+B1.O.1D
+x.1.1.x
+xx.1.xx
  xxAxx
 ENDMAP
 
 ################################################################################
-# Shoal hut with no rune inside
-#
-# Shoal:$ is hand-hacked to force lots of minivaults.
-NAME:    shoalhut_norune
-DEPTH:   Shoal:$
-TAGS:    allow_dup water_ok shoal no_dump
-SHUFFLE: ABCD
-SUBST:   A:x, B:x, C:x=, D=+
+# Shoal hangout of Ilsuiw. Using PLACE: makes this quite likely to turn up.
+# The hut itself may be empty if Ilsuiw had other engagements.
+
+NAME:    shoal_ilsuiw
+PLACE:   Shoal:$
+TAGS:    mini_float
+KMONS:   1 = Ilsuiw band, siren
+KITEM:   1 = |
+KMONS:   2 = merfolk impaler / merfolk javelineer
+KFEAT:   2 = w
+LROCKTILE:  wall_vines
 MAP
- xxCxx
-xx...xx
-x.....x
-B..|..D
-x.....x
-xx...xx
- xxAxx
+ wxwxw
+wxw2wxw
+xwwWwwx
+wwW1Www
+xwwWwwx
+wxw2wxw
+ wxwxw
 ENDMAP