[Wesnoth-cvs-commits] wesnoth/data scenarios/multiplayer/Wesbowl.cfg ...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  05/02/16 01:02:04

Modified files:
        data/scenarios/multiplayer: Wesbowl.cfg 
        data/scenarios/Son_Of_The_Black_Eye: Clash_Of_Armies.cfg 
                                             utils.cfg 
        data/scenarios/The_Dark_Hordes: A_New_Chance.cfg 
        data/units     : Merman.cfg Naga.cfg Sea_Hag.cfg Triton.cfg 

Log message:
        Obsolete the old Nagas & Merfolk & update scenarios to reflect the 
change

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Wesbowl.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Merman.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Naga.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Sea_Hag.cfg.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Triton.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.20 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.21
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:1.20        
Wed Dec 22 12:04:20 2004
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg     Wed Feb 
16 01:02:04 2005
@@ -118,7 +118,7 @@
 
     [side]
       race=Merman
-      type=Triton
+      type=Merman Warrior
       description=Plouf
       side=5
       canrecruit=0
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg:1.8 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg:1.9
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg:1.8   Thu Nov 25 
05:10:21 2004
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/utils.cfg       Wed Feb 16 
01:02:04 2005
@@ -234,7 +234,7 @@
 #define MERMAN X Y NAME
 [unit]
   side=5
-  type=Merman
+  type=Merman Fighter
   description={NAME}
   x={X}
   y={Y}
Index: wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg:1.14 
wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg:1.15
--- wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg:1.14        Sat Sep 
 4 10:20:24 2004
+++ wesnoth/data/scenarios/The_Dark_Hordes/A_New_Chance.cfg     Wed Feb 16 
01:02:04 2005
@@ -79,7 +79,7 @@
                ai_special=guardian
                [/unit] 
                [unit] 
-               type=Naga
+               type=Naga Fighter
                x,y=34,6
                ai_special=guardian
                [/unit] 
Index: wesnoth/data/scenarios/multiplayer/Wesbowl.cfg
diff -u wesnoth/data/scenarios/multiplayer/Wesbowl.cfg:1.10 
wesnoth/data/scenarios/multiplayer/Wesbowl.cfg:1.11
--- wesnoth/data/scenarios/multiplayer/Wesbowl.cfg:1.10 Thu Nov 25 05:10:21 2004
+++ wesnoth/data/scenarios/multiplayer/Wesbowl.cfg      Wed Feb 16 01:02:03 2005
@@ -63,11 +63,11 @@
 #enddef
 
 #define WESBOWL_SIDE_DEFS SIDE FACING X
-       {WESBOWL_SIDE (Elvish Captain,Elvish Hero,Elvish Ranger,Elvish 
Marksman,Elvish Druid,Elvish Sorceress,Elvish Marshal,Elvish Champion,Elvish 
Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress) {SIDE} {FACING} 
{X} Merman (Elvish Fighter) (Elvish Fighter) (Elvish Archer) (Elvish Archer) 
Mage Mage (Elvish Shaman) (Elvish Shaman) (Elvish Scout) (Elvish Scout)}
-       {WESBOWL_SIDE (Orcish Warrior,Troll,Troll Rocklobber,Orcish 
Crossbowman,Orcish Slayer,Orcish Warlord,Troll Warrior) {SIDE} {FACING} {X} 
Naga (Orcish Grunt) (Orcish Grunt) (Orcish Archer) (Orcish Archer) (Goblin 
Spearman) (Goblin Spearman) (Troll Whelp) (Troll Whelp) (Wolf Rider) (Wolf 
Rider)}
+       {WESBOWL_SIDE (Elvish Captain,Elvish Hero,Elvish Ranger,Elvish 
Marksman,Elvish Druid,Elvish Sorceress,Elvish Marshal,Elvish Champion,Elvish 
Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress) {SIDE} {FACING} 
{X} (Merman Fighter) (Elvish Fighter) (Elvish Fighter) (Elvish Archer) (Elvish 
Archer) Mage Mage (Elvish Shaman) (Elvish Shaman) (Elvish Scout) (Elvish Scout)}
+       {WESBOWL_SIDE (Orcish Warrior,Troll,Troll Rocklobber,Orcish 
Crossbowman,Orcish Slayer,Orcish Warlord,Troll Warrior) {SIDE} {FACING} {X} 
(Naga Fighter) (Orcish Grunt) (Orcish Grunt) (Orcish Archer) (Orcish Archer) 
(Goblin Spearman) (Goblin Spearman) (Troll Whelp) (Troll Whelp) (Wolf Rider) 
(Wolf Rider)}
        {WESBOWL_SIDE (Necromancer,Revenant,Bone Shooter,Lich,Soul Shooter) 
{SIDE} {FACING} {X} (Vampire Bat) Skeleton Skeleton (Skeleton Archer) (Skeleton 
Archer) Skeleton Skeleton (Dark Adept) (Dark Adept) Ghost Ghost}
        {WESBOWL_SIDE (Dwarvish Steelclad,Dwarvish Stalwart,Dwarvish 
Thunderguard,Rogue,Trapper,Bandit,Dwarvish Lord,Dwarvish Sentinel,Dwarvish 
Dragonguard,Assassin) {SIDE} {FACING} {X} Poacher (Dwarvish Fighter) (Dwarvish 
Fighter) (Dwarvish Thunderer) (Dwarvish Thunderer) Footpad Footpad Thief Thief 
(Gryphon Rider) (Gryphon Rider)}
-       {WESBOWL_SIDE (Lieutenant,Swordsman,Pikeman,Shock 
Trooper,Longbowman,White Mage,Red Mage,General,Royal Guard,Halbardier,Iron 
Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage) {SIDE} {FACING} {X} 
Naga Spearman Spearman Fencer Fencer Horseman Horseman (Heavy Infantryman) 
(Heavy Infantryman) Cavalryman Cavalryman}
+       {WESBOWL_SIDE (Lieutenant,Swordsman,Pikeman,Shock 
Trooper,Longbowman,White Mage,Red Mage,General,Royal Guard,Halbardier,Iron 
Mauler,Master Bowman,Mage of Light,Arch Mage,Silver Mage) {SIDE} {FACING} {X} 
(Naga Fighter) Spearman Spearman Fencer Fencer Horseman Horseman (Heavy 
Infantryman) (Heavy Infantryman) Cavalryman Cavalryman}
        {WESBOWL_SIDE (Drake Flare,Fire Drake,Drake Slasher,Drake 
Gladiator,Drake Warrior,Saurian Soothsayer,Saurian Icecaster,Drake 
Flameheart,Inferno Drake) {SIDE} {FACING} {X} (Saurian Tribalist) (Drake 
Fighter) (Drake Fighter) (Drake Burner) (Drake Burner) (Saurian Skirmisher) 
(Saurian Skirmisher) (Drake Clasher) (Drake Clasher) (Drake Glider) (Drake 
Glider)}
 #enddef
 
Index: wesnoth/data/units/Merman.cfg
diff -u wesnoth/data/units/Merman.cfg:1.13 wesnoth/data/units/Merman.cfg:1.14
--- wesnoth/data/units/Merman.cfg:1.13  Thu Jan 20 22:43:31 2005
+++ wesnoth/data/units/Merman.cfg       Wed Feb 16 01:02:04 2005
@@ -2,7 +2,7 @@
 
 [unit]
 id=Merman
-obsolete=yes
+obsolete=1
 name= _ "Merman"
 race=merman
 image=merman.png
Index: wesnoth/data/units/Naga.cfg
diff -u wesnoth/data/units/Naga.cfg:1.13 wesnoth/data/units/Naga.cfg:1.14
--- wesnoth/data/units/Naga.cfg:1.13    Wed Oct 20 13:26:32 2004
+++ wesnoth/data/units/Naga.cfg Wed Feb 16 01:02:04 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=Naga
+obsolete=1
 name= _ "female^Naga"
 race=naga
 gender=female
Index: wesnoth/data/units/Sea_Hag.cfg
diff -u wesnoth/data/units/Sea_Hag.cfg:1.17 wesnoth/data/units/Sea_Hag.cfg:1.18
--- wesnoth/data/units/Sea_Hag.cfg:1.17 Tue Feb 15 21:40:38 2005
+++ wesnoth/data/units/Sea_Hag.cfg      Wed Feb 16 01:02:04 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=Sea Hag
+obsolete=1
 name= _ "female^Sea Hag"
 race=naga
 gender=female
Index: wesnoth/data/units/Triton.cfg
diff -u wesnoth/data/units/Triton.cfg:1.7 wesnoth/data/units/Triton.cfg:1.8
--- wesnoth/data/units/Triton.cfg:1.7   Thu Jan 20 22:43:31 2005
+++ wesnoth/data/units/Triton.cfg       Wed Feb 16 01:02:04 2005
@@ -2,7 +2,7 @@
 
 [unit]
 id=Triton
-obsolete=yes
+obsolete=1
 name= _ "Triton"
 race=merman
 image=merman-king.png