[Wesnoth-cvs-commits] wesnoth/data units/Merman_Lord.cfg items.cfg

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/10/31 20:13:43

Modified files:
        data/units     : Merman_Lord.cfg 
        data           : items.cfg 

Log message:
        Fix the trident to use the new Merfolk

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman_Lord.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/items.cfg.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: wesnoth/data/items.cfg
diff -u wesnoth/data/items.cfg:1.23 wesnoth/data/items.cfg:1.24
--- wesnoth/data/items.cfg:1.23 Sun Aug 29 20:33:01 2004
+++ wesnoth/data/items.cfg      Sun Oct 31 20:13:43 2004
@@ -656,7 +656,7 @@
                description= _ "This trident allows a merman to shoot electric 
bolts at his enemies!"
                cannot_use_message= _ "Only the mermen can use this item!"
                        [filter]
-                       type=Merman,Merman Lord,Triton
+                       type=Merman,Merman Lord,Triton,Mermaid Diviner,Mermaid 
Enchantress,Mermaid Initiate,Mermaid Priestess,Siren,Merman Entangler,Merman 
Fighter,Merman Hoplite,Merman Hunter,Merman Javelineer,Merman Netcaster,Merman 
Spearman,Merman Triton,Merman Warrior
                        x,y={X},{Y}
                        [/filter]
                        [then]
Index: wesnoth/data/units/Merman_Lord.cfg
diff -u wesnoth/data/units/Merman_Lord.cfg:1.12 
wesnoth/data/units/Merman_Lord.cfg:1.13
--- wesnoth/data/units/Merman_Lord.cfg:1.12     Sat Sep 25 12:01:40 2004
+++ wesnoth/data/units/Merman_Lord.cfg  Sun Oct 31 20:13:43 2004
@@ -1,4 +1,4 @@
-# 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
+# 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. When this is 
removed please remove it from the Trident Item as well.
 
 [unit]
 id=Merman Lord