[Wesnoth-cvs-commits] wesnoth/data/units Merman_Hoplite.cfg Merman.cf...

[Richard Kettering]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Richard Kettering <address@hidden>      05/01/20 22:43:32

Modified files:
        data/units     : Merman_Hoplite.cfg Merman.cfg Triton.cfg 
                         Naga-Fighter.cfg 

Log message:
        Marked Merman and Triton as obsolete, minor stat adjustments to naga 
fighter and Merman Hoplite.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Hoplite.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Triton.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga-Fighter.cfg.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: wesnoth/data/units/Merman.cfg
diff -u wesnoth/data/units/Merman.cfg:1.12 wesnoth/data/units/Merman.cfg:1.13
--- wesnoth/data/units/Merman.cfg:1.12  Sun Aug 15 20:25:07 2004
+++ wesnoth/data/units/Merman.cfg       Thu Jan 20 22:43:31 2005
@@ -1,5 +1,8 @@
+# XXX This unit is obsolete and should not be used anymore. It is here only 
for compatibility purposes and will be removed after few releases
+
 [unit]
 id=Merman
+obsolete=yes
 name= _ "Merman"
 race=merman
 image=merman.png
Index: wesnoth/data/units/Merman_Hoplite.cfg
diff -u wesnoth/data/units/Merman_Hoplite.cfg:1.4 
wesnoth/data/units/Merman_Hoplite.cfg:1.5
--- wesnoth/data/units/Merman_Hoplite.cfg:1.4   Sun Oct 31 08:25:56 2004
+++ wesnoth/data/units/Merman_Hoplite.cfg       Thu Jan 20 22:43:31 2005
@@ -15,11 +15,11 @@
     [/defense]
 # The following resistance adjustments are to slightly downpower steadfast, 
yet keep the effect of it only activating during defense.  There is no 
adjustment for holy because attacking living units with holy should not be 
potent.
     [resistance]
-    blade=120
-    pierce=120
-    cold=60
-    fire=110
-    impact=110
+    blade=110
+    pierce=110
+    cold=70
+    fire=120
+    impact=100
     [/resistance]
 movement=5
 experience=500
@@ -35,7 +35,7 @@
        name=trident
        type=pierce
        range=short
-       damage=9
+       damage=13
        number=2
                [frame]
                begin=-100
Index: wesnoth/data/units/Naga-Fighter.cfg
diff -u wesnoth/data/units/Naga-Fighter.cfg:1.1 
wesnoth/data/units/Naga-Fighter.cfg:1.2
--- wesnoth/data/units/Naga-Fighter.cfg:1.1     Sat Nov 13 23:18:12 2004
+++ wesnoth/data/units/Naga-Fighter.cfg Thu Jan 20 22:43:31 2005
@@ -5,7 +5,7 @@
 gender=male,female
 image=naga-fighter.png
 image_defensive=naga-fighter-defend.png
-hitpoints=27
+hitpoints=30
 movement_type=naga
 movement=7
 experience=25
@@ -36,7 +36,7 @@
         gender=female
         image=naga-fighter+female.png
         image_defensive=naga-fighter+female-defend.png
-        hitpoints=27
+        hitpoints=30
         movement_type=naga
         movement=7
         experience=25
Index: wesnoth/data/units/Triton.cfg
diff -u wesnoth/data/units/Triton.cfg:1.6 wesnoth/data/units/Triton.cfg:1.7
--- wesnoth/data/units/Triton.cfg:1.6   Sun Oct 31 23:34:07 2004
+++ wesnoth/data/units/Triton.cfg       Thu Jan 20 22:43:31 2005
@@ -1,5 +1,8 @@
+# XXX This unit is obsolete and should not be used anymore. It is here only 
for compatibility purposes and will be removed after few releases
+
 [unit]
 id=Triton
+obsolete=yes
 name= _ "Triton"
 race=merman
 image=merman-king.png