New descriptions for mermaids,

...and a minor tweak to resistances on the diviner line.

data/units/Mermaid_Diviner.cfg

@@ -12,8 +12,6 @@ ability=illuminates,cures
 hitpoints=41
 movement_type=swimmer
 [resistance]
-	blade=110
-	pierce=110
 	holy=70
 [/resistance]
 movement=6
@@ -25,7 +23,9 @@ advanceto=null
 undead_variation=swimmer
 cost=120
 usage=healer
-unit_description= _ "The most devout and pious amongst the mermaids gain the striking power of illumination, which prevents their surroundings from ever seeing true night. Their power is a stalwart counter to the forces of darkness."
+unit_description= _ "Mermaid Priestesses meet their calling with a fervor that leaves their human counterparts somewhat taken aback. This may have its roots in a legend they recite, telling of a nameless, shadowy horror which was once the bane of their people. Though little is told about it, it is clear that it was the power of the light which somehow defeated it, and made their people safe.
+
+Special Notes: the light cast by a diviner is magical in nature, and always has a high chance of hitting an opponent. This light does tremendous damage to the undead, and even does some to living creatures. Diviners are capable of healing units around them, and curing them of poison. They also have the power of Illumination, which increases the lighting level in the area adjacent to the mermaid."
 get_hit_sound=mermen-hit.wav
 	[attack]
 	name=staff

data/units/Mermaid_Enchantress.cfg

@@ -15,7 +15,9 @@ advanceto=Mermaid Siren
 undead_variation=swimmer
 cost=60
 usage=mixed fighter
-unit_description= _ "Skilled creatures of the sea, Mermen are powerful and quick in any watery environment, but struggle greatly to move on land."
+unit_description= _ "Mermaids, like elves, have a powerful and native ability in magic, though theirs is considerably different. Those who master this are held in high regard, and their skill is used in a multitude of crafts, many of which are things that humanity would never dream of. The obvious use in war is forbidden against their own race - this power is the greater part of what protects their people from the monsters that wander out of the abyss.
+
+Special Notes: The blasts of water conjured by mermaids are magical in nature, and always have a high chance of hitting their opponents."
 get_hit_sound=mermen-hit.wav
 	[attack]
 	name=staff

data/units/Mermaid_Initiate.cfg

@@ -15,7 +15,11 @@ advanceto=Mermaid Priestess,Mermaid Enchantress
 undead_variation=swimmer
 cost=19
 usage=mixed fighter
-unit_description= _ "Young Mermaids are often initiated in the water magics of their people. Despite their frailty, this makes them formidable opponents, as they can call upon the very water about them to smite their enemies."
+unit_description= _ "Young Mermaids are often initiated in the water magics native to their people. The wondrous abilities it grants them are something inimitable by any other race, a mark of the faerie side of these creatures.
+
+Despite their frailty, this makes them quite formidable in combat, as they can call upon the very water about them to smite their enemies.
+
+Special Notes: the blasts of water conjured by mermaids are magical in nature, and always have a high chance of hitting their opponents."
 get_hit_sound=mermen-hit.wav
 	[attack]
 	name=staff

data/units/Mermaid_Priestess.cfg

@@ -10,10 +10,6 @@ image_halo_healing="mermaid-priestess-magic1.png:100,mermaid-priestess-magic2.pn
 ability=cures
 hitpoints=31
 movement_type=swimmer
-[resistance]
-	blade=110
-	pierce=110
-[/resistance]
 movement=6
 experience=150
 level=2
@@ -22,7 +18,9 @@ advanceto=Mermaid Diviner
 undead_variation=swimmer
 cost=80
 usage=healer
-unit_description= _ "The more learned among the mermaids often take a path of holy study. This leaves them quite capable of ministering to the wounds of their comrades, as well as being a potent defense against the unworldly."
+unit_description= _ "Mermen share the creed that much of humanity follows, though for cultural reasons, the upholding of this is left to the mermaids, who are more intellectually inclined. It is they who dedicate themselves to the ideal of bringing peace and life to the world, and they who study the arts of battling sickness and injury, maladies which they share in no small part with humanity. Their diligence and piety also grant them certain spiritual powers, allowing them to guard their people against the unworldly.
+
+Special Notes: the light cast by a priestess is magical in nature, and always has a high chance of hitting an opponent. This light does tremendous damage to the undead, and even does some to living creatures. Priestesses are capable of healing units around them, and curing them of poison."
 get_hit_sound=mermen-hit.wav
 	[attack]
 	name=staff

data/units/Mermaid_Siren.cfg

@@ -16,15 +16,15 @@ advanceto=null
 undead_variation=swimmer
 cost=110
 usage=mixed fighter
-unit_description= _ "Skilled creatures of the sea, Mermen are powerful and quick in any watery environment, but struggle greatly to move on land."
+unit_description= _ "The faerie nature of the mermaids is strongest in the Sirens, whose connection to naia often causes them to be mistaken for naiads themselves. Though certainly far from the truth, the mistake is understandable, as true naiads are rarely seen even by mermaids. The manifestation of their magic is certainly very similar; the water about a siren can be commanded at whim, like an extension of herself.
+
+The myriad applications of this rarely occur to land dwellers, who simply regard it with wonder.
+
+Special Notes: the attacks of a siren are magical in nature, and always have a high chance of hitting their opponents."
 get_hit_sound=mermen-hit.wav
 	[attack]
-#note - this "naia" is deliberate, it is not a typo.
-#Mermaids are only partly naiads, but draw their magic from naia.
-#This will be indicated more fully in the description, which was
-#not included yet, to comply with silene's request for a string-freeze.
-#	name=naia touch
-	name=naiad touch
+#note - this "naia" is deliberate, it is not a typo, it is not supposed to be "naiad".
+	name=naia touch
 	type=impact
 	range=short
 	special=magical