[Wesnoth-cvs-commits] wesnoth/data/scenarios Eastern_Invasion/Norther...

[James Spencer]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     James Spencer <address@hidden>  04/10/01 19:23:52

Modified files:
        data/scenarios/Eastern_Invasion: Northern_Outpost.cfg 
                                         The_Outpost.cfg 
        data/scenarios/Heir_To_The_Throne: Ford_of_Abez.cfg 
                                           Gryphon_Mountain.cfg 
                                           Home_North_Elves.cfg 
                                           Princess_of_Wesnoth.cfg 
        data/scenarios/multiplayer: Wesbowl.cfg 
        data/scenarios/Son_Of_The_Black_Eye: Black_Flag.cfg 
        data/scenarios/The_Dark_Hordes: Crelanus_Book.cfg 
                                        Confrontation.cfg 

Log message:
        Remove Cavalry in Favour of Cavalryman

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/Wesbowl.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.15 
wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.16
--- wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg:1.15   Wed Sep 
22 22:02:53 2004
+++ wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg        Fri Oct 
 1 19:23:52 2004
@@ -43,7 +43,7 @@
        description=Gweddry
        side=1
        canrecruit=1
-       recruit=Spearman,Cavalry,Mage,Horseman,Heavy Infantryman
+       recruit=Spearman,Cavalryman,Mage,Horseman,Heavy Infantryman
        controller=human
        team_name=good
        [/side]
Index: wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg
diff -u wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.11 
wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.12
--- wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg:1.11        Mon Sep 
 6 03:51:35 2004
+++ wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg     Fri Oct  1 
19:23:52 2004
@@ -47,7 +47,7 @@
        description=Gweddry
        side=1
        canrecruit=1
-       recruit=Spearman, Cavalry, Mage, Heavy Infantryman
+       recruit=Spearman, Cavalryman, Mage, Heavy Infantryman
        controller=human
                [unit]
                type=White Mage
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.13 
wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.14
--- wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg:1.13     Fri Oct 
 1 18:41:15 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg  Fri Oct  1 
19:23:52 2004
@@ -40,7 +40,7 @@
        description=Li'sar
        side=2
        canrecruit=1
-       recruit=Cavalry,Swordsman,Spearman,Red Mage,Ogre,Duelist
+       recruit=Cavalryman,Swordsman,Spearman,Red Mage,Ogre,Duelist
                [ai]
                recruitment_pattern=scout,fighter,fighter,fighter,mixed fighter
                aggression=1.0
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.12 
wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.13
--- wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg:1.12 Sat Sep 
 4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg      Fri Oct 
 1 19:23:52 2004
@@ -65,7 +65,7 @@
        description=Robert
        side=2
        canrecruit=1
-       recruit=Cavalry,Swordsman,Mage,Ogre,Duelist,Longbowman
+       recruit=Cavalryman,Swordsman,Mage,Ogre,Duelist,Longbowman
                [ai]
                recruitment_pattern=scout,fighter,fighter,fighter,archer,mixed 
fighter
                [/ai]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.10 
wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.11
--- wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg:1.10 Sat Sep 
 4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg      Fri Oct 
 1 19:23:52 2004
@@ -67,7 +67,7 @@
        description=Herbert
        side=3
        canrecruit=1
-       recruit=Cavalry,Swordsman,Pikeman,Ogre,Dragoon,Red Mage
+       recruit=Cavalryman,Swordsman,Pikeman,Ogre,Dragoon,Red Mage
                [ai]
                recruitment_pattern=scout,scout,fighter,fighter,mixed fighter
                villages_per_scout=0
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.16 
wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.17
--- wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg:1.16      
Sat Sep  4 10:20:24 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg   Fri Oct 
 1 19:23:52 2004
@@ -72,13 +72,13 @@
        {INCOME 5 12 20}
 
 #ifdef EASY
-        recruit=Cavalry,Spearman,Swordsman,Mage,Ogre,Bowman
+        recruit=Cavalryman,Spearman,Swordsman,Mage,Ogre,Bowman
 #endif
 #ifdef NORMAL
-        recruit=Cavalry,Swordsman,Spearman,Mage,Ogre,Bowman
+        recruit=Cavalryman,Swordsman,Spearman,Mage,Ogre,Bowman
 #endif
 #ifdef HARD
-        recruit=Cavalry,Swordsman,Red Mage,Ogre,Lieutenant,Pikeman,Longbowman
+        recruit=Cavalryman,Swordsman,Red 
Mage,Ogre,Lieutenant,Pikeman,Longbowman
 #endif
 
                [ai]
Index: wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg
diff -u wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.14 
wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.15
--- wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg:1.14     Fri Oct 
 1 19:15:10 2004
+++ wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg  Fri Oct  1 
19:23:52 2004
@@ -237,19 +237,19 @@
                  side=3
          [/unit]
          [unit]
-                 type=Cavalry
+                 type=Cavalryman
                  x=28
                  y=25
                  side=3
          [/unit]
          [unit]
-                 type=Cavalry
+                 type=Cavalryman
                  x=28
                  y=25
                  side=3
          [/unit]
          [unit]
-                 type=Cavalry
+                 type=Cavalryman
                  x=28
                  y=25
                  side=3
Index: wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.7 
wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.8
--- wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg:1.7        Mon Sep 
 6 16:02:44 2004
+++ wesnoth/data/scenarios/The_Dark_Hordes/Confrontation.cfg    Fri Oct  1 
19:23:52 2004
@@ -42,7 +42,7 @@
        description=Leonard
        side=2
        canrecruit=1
-       recruit=Mage,Cavalry,Fencer,Bowman,Spearman
+       recruit=Mage,Cavalryman,Fencer,Bowman,Spearman
 
        {GOLD 100 200 300}
        {INCOME 5 10 20}
Index: wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg
diff -u wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:1.12 
wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:1.13
--- wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:1.12       Fri Oct 
 1 18:41:15 2004
+++ wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg    Fri Oct  1 
19:23:52 2004
@@ -222,7 +222,7 @@
                type=Vampire Bat,Ghost,Dark Adept,Skeleton,Skeleton Archer
                [/allow_recruit] 
                [unit]
-               type=Cavalry
+               type=Cavalryman
                description=Advance Scout
                x=36
                y=3
Index: wesnoth/data/scenarios/multiplayer/Wesbowl.cfg
diff -u wesnoth/data/scenarios/multiplayer/Wesbowl.cfg:1.6 
wesnoth/data/scenarios/multiplayer/Wesbowl.cfg:1.7
--- wesnoth/data/scenarios/multiplayer/Wesbowl.cfg:1.6  Fri Oct  1 19:15:10 2004
+++ wesnoth/data/scenarios/multiplayer/Wesbowl.cfg      Fri Oct  1 19:23:52 2004
@@ -67,7 +67,7 @@
        {WESBOWL_SIDE (Orcish Warlord) {SIDE} {FACING} {X} Naga (Orcish Grunt) 
(Orcish Grunt) (Orcish Archer) (Orcish Archer) Saurian Saurian (Troll Whelp) 
(Troll Whelp) (Wolf Rider) (Wolf Rider)}
        {WESBOWL_SIDE Lich {SIDE} {FACING} {X} (Vampire Bat) Skeleton Skeleton 
(Skeleton Archer) (Skeleton Archer) Skeleton Skeleton (Dark Adept) (Dark Adept) 
Ghost Ghost}
        {WESBOWL_SIDE (Dwarvish Lord) {SIDE} {FACING} {X} Poacher (Dwarvish 
Fighter) (Dwarvish Fighter) (Dwarvish Thunderer) (Dwarvish Thunderer) Footpad 
Footpad Thief Thief (Gryphon Rider) (Gryphon Rider)}
-       {WESBOWL_SIDE General {SIDE} {FACING} {X} Naga Spearman Spearman Fencer 
Fencer Horseman Horseman (Heavy Infantryman) (Heavy Infantryman) Cavalry 
Cavalry}
+       {WESBOWL_SIDE General {SIDE} {FACING} {X} Naga Spearman Spearman Fencer 
Fencer Horseman Horseman (Heavy Infantryman) (Heavy Infantryman) Cavalryman 
Cavalryman}
        {WESBOWL_SIDE (Drake Flameheart) {SIDE} {FACING} {X} (Drake Slave) 
(Drake Fighter) (Drake Fighter) (Drake Burner) (Drake Burner) (Drake Mage) 
(Drake Mage) (Drake Clasher) (Drake Clasher) (Drake Petit) (Drake Petit)}
 #enddef