Water units balancing changes

changelog

@@ -55,6 +55,9 @@ CVS HEAD:
    * decreased undeadfoot movement cost on mountains from 4 to 3
    * decreased undeadfoot movement cost on hills from 3 to 2
    * Demilich now advances to Dread Lich (previously Ancient Lich)
+   * increased Naga hitpoints from 30 to 33 and experience from 25 to 32
+   * decreased Merman Hunter ranged attack from 6-3 to 5-3
+   * increased Merman Fighter hitpoints from 32 to 36  
  * server
    * no longer rejects :control command with "Side not found"
    * write a summary of commands when a fifo command is not recognized

data/units/Merman_Fighter.cfg

@@ -4,7 +4,7 @@ name= _ "Merman Fighter"
 race=merman
 image="merman-fighter.png"
 image_defensive="merman-fighter-defend.png"
-hitpoints=32
+hitpoints=36
 movement_type=swimmer
     [defense]
     castle=50

data/units/Merman_Hunter.cfg

@@ -60,7 +60,7 @@ get_hit_sound=mermen-hit.wav
 	name=spear
 	type=pierce
 	range=long
-	damage=6
+	damage=5
 	number=3
 		[frame]
 		begin=-160

data/units/Naga-Fighter.cfg

@@ -5,10 +5,10 @@ race=naga
 gender=male,female
 image="naga-fighter.png"
 image_defensive="naga-fighter-defend.png"
-hitpoints=30
+hitpoints=33
 movement_type=naga
 movement=7
-experience=25
+experience=32
 level=1
 alignment=neutral
 advanceto=Naga Warrior