Author: zookeeper
Date: Sun Jun 29 14:34:07 2008
New Revision: 27589

URL: http://svn.gna.org/viewcvs/wesnoth?rev=27589&view=rev
Log:
Little cleanups.

Modified:
    trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
    trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
    
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
    trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
    trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg?rev=27589&r1=27588&r2=27589&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg 
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/01_End_Of_Peace.cfg Sun 
Jun 29 14:34:07 2008
@@ -55,7 +55,8 @@
         canrecruit=yes
         controller=human
         recruit= Wolf Rider, Orcish Grunt, Orcish Archer
-        enemy=2
+        team_name=Kapoue
+        user_team_name=_ "Kapou'e"
         gold=100
         {BLACK_FLAG}
     [/side]
@@ -67,6 +68,8 @@
         side=2
         canrecruit=yes
         recruit=Cavalryman, Fencer, Spearman
+        team_name=Humans
+        user_team_name=_ "Humans"
         [ai]
             recruitment_pattern=scout,fighter
         [/ai]
@@ -81,8 +84,6 @@
 #ifdef HARD
         gold=210
 #endif
-
-        enemy=1
     [/side]
 
     # Albert starts with all villages south of the river.

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg?rev=27589&r1=27588&r2=27589&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg 
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/02_The_Human_Army.cfg 
Sun Jun 29 14:34:07 2008
@@ -36,7 +36,8 @@
         canrecruit=yes
         controller=human
         recruit= Wolf Rider, Orcish Grunt, Orcish Archer
-        enemy=2
+        team_name=Kapoue
+        user_team_name=_ "Kapou'e"
         gold=100
         {BLACK_FLAG}
     [/side]
@@ -53,9 +54,9 @@
         side=2
         canrecruit=yes
         recruit=Dragoon, Swordsman, Pikeman, Longbowman
+        team_name=Humans
+        user_team_name=_ "Humans"
         gold=10000
-
-        enemy=1
     [/side]
 
     # Lanbec'h starts with all villages south of the river.

Modified: 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg?rev=27589&r1=27588&r2=27589&view=diff
==============================================================================
--- 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
 (original)
+++ 
trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/05_To_The_Harbour_Of_Tirigaz.cfg
 Sun Jun 29 14:34:07 2008
@@ -177,8 +177,9 @@
         recruit=Blood Bat, Skeleton Archer, Revenant, Dark Adept
 #endif
         {GOLD 100 150 180}
-        {INCOME 10 12 15}
     [/side]
+
+    {STARTING_VILLAGES 2 10}
 
     [side]
         type=Lich
@@ -194,8 +195,9 @@
             aggression=-1.0
         [/ai]
         {GOLD 100 150 190}
-        {INCOME 8 10 12}
     [/side]
+
+    {STARTING_VILLAGES 3 10}
 
     [story]
         [part]

Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg?rev=27589&r1=27588&r2=27589&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg 
(original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg Sun 
Jun 29 14:34:07 2008
@@ -85,21 +85,15 @@
             leader_value=50.0
         [/ai]
         {GOLD 110 130 150}
-        {INCOME 5 8 12}
     [/side]
+
+    {STARTING_VILLAGES 2 6}
 
     [side]
         side=3
         no_leader=yes
         team_name=Humans
         user_team_name=_"Humans"
-        colour=blue
-        [unit]
-            x,y=1,30
-            side=3
-            id="Transport Galleon"
-            type=Transport Galleon
-        [/unit]
     [/side]
 
     [side]
@@ -107,7 +101,6 @@
         id=Harman
         name= _ "Harman"
         side=4
-        colour=green
         team_name=Humans
         user_team_name=_"Humans"
         canrecruit=yes
@@ -119,12 +112,12 @@
             leader_value=50.0
         [/ai]
         {GOLD 80 100 150}
-        {INCOME 5 8 12}
     [/side]
+
+    {STARTING_VILLAGES 4 4}
 
     [side]
         side=5
-        colour=purple
         team_name=Kapoue
         user_team_name=_ "Kapou'e"
         no_leader=yes
@@ -167,19 +160,27 @@
         {WATCH_TOWER 21 14 Northern_Tower}
         {WATCH_TOWER 12 19 Western_Tower}
         {WATCH_TOWER 20 21 Eastern_Tower}
+
+        [unit]
+            x,y=1,30
+            side=3
+            id="Transport Galleon"
+            type=Transport Galleon
+        [/unit]
+
         {PIRATE_GALLEON 12 28}
         {PIRATE_GALLEON 3 22}
         {PIRATE_GALLEON 10 26}
         {PIRATE_GALLEON 6 25}
 
         [unit]
-            side=2
+            side=3
             id=Lander
             id="Landing Galleon"
             name= _ "Landing Galleon"
             type=Transport Galleon
             ai_special=guardian
-            x=7
+            x=6
             y=9
         [/unit]
     [/event]

Modified: trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg?rev=27589&r1=27588&r2=27589&view=diff
==============================================================================
--- trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg (original)
+++ trunk/data/campaigns/Son_Of_The_Black_Eye/utils/utils.cfg Sun Jun 29 
14:34:07 2008
@@ -170,14 +170,14 @@
         side=1
         x={X}
         y={Y}
+        upkeep=free
     [/unit]
 #enddef
 
 #define PIRATE_GALLEON X Y
     [unit]
-        side=2
+        side=3
         id= "Pirate Galleon"
-        name= _ "Pirate Galleon"
         type=Pirate Galleon
         x={X}
         y={Y}


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to