LoW 01: Unified side setup between SP and MP.

wesnoth · Oct 24, 2014 · 1a5c242 · 1a5c242
1 parent d4fb082
commit 1a5c242
Showing 1 changed file with 50 additions and 38 deletions.
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg
@@ -22,7 +22,7 @@
     {EXTRA_SCENARIO_MUSIC silvan_sanctuary.ogg}
 
     {DEFAULT_SCHEDULE_DUSK}
-    {STARTING_VILLAGES 2 50}
+    {STARTING_VILLAGES_ALL 3}
 
     [story]
         [part]
@@ -75,14 +75,17 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     #### Kalenz's side ####
 #define SINGLEPLAYER_GOLD
     {GOLD 240 200 180}
+    {INCOME -2 -2 -2}
+    village_gold=1
 #enddef
 
 #define MULTIPLAYER_GOLD
     {GOLD 120 100 90}
+    {INCOME -2 -2 -2}
+    village_gold=1
 #enddef
 
     [side]
-        side=1
         fog=no
         shroud=no
         # wmllint: who KALENZ is Kalenz
@@ -144,13 +147,48 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     [/event]
     #### /Kalenz side ####
 
+    #### Landar's side ####
     [side]
         side=2
+#ifdef MULTIPLAYER
+        save_id=Landar
+        {LANDAR}
+        type=Elvish Archer
+        extra_recruit=Elvish Fighter, Elvish Archer
+        x=18
+        y=15
+
+        fog=no
+        shroud=no
+
+        allow_player=yes
+        controller=human
+
+        team_name=player
+        user_team_name= _ "Player"
+        recruit=""
+        {MULTIPLAYER_GOLD}
+
+        [unit]
+            {ARKILDUR}
+            x=19
+            y=16
+        [/unit]
+#else
+        allow_player=no
+        no_leader=yes
+        hidden=yes
+#endif
+    [/side]
+    #### Landar's side ####
+
+    [side]
+        side=3
+        id=Velon
         {ELF_SETUP}
         village_gold=1
         controller=ai
         allow_player=no
-        id=Velon
         name= _ "Velon"
         team_name=player
         user_team_name= _ "Player"
@@ -178,7 +216,7 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     [/side]
 
     [side]
-        side=3
+        side=4
         id=Tbaran
         name= _ "T’baran"
         team_name=orcs
@@ -215,9 +253,9 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     [/side]
 
     [side]
+        side=5
         allow_player=no
         controller=ai
-        side=4
         id=Wrulf
         name= _ "Wrulf"
         team_name=orcs
@@ -254,9 +292,9 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     [/side]
 
     [side]
+        side=6
         allow_player=no
         controller=ai
-        side=5
         team_name=orcs
         user_team_name= _ "Enemies"
         {ORC_SETUP}
@@ -292,9 +330,9 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         [/ai]
     [/side]
     [side]
+        side=7
         allow_player=no
         controller=ai
-        side=6
         team_name=orcs
         user_team_name= _ "Enemies"
         {ORC_SETUP}
@@ -329,30 +367,6 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
         [/ai]
     [/side]
 
-#ifdef MULTIPLAYER
-    [side]
-        side=7
-        fog=no
-        shroud=no
-        {LANDAR}
-        type=Elvish Archer
-        save_id=Landar
-        controller=human
-        team_name=player
-        user_team_name= _ "Player"
-        extra_recruit=Elvish Fighter, Elvish Archer
-        recruit=""
-        {MULTIPLAYER_GOLD}
-        x=18
-        y=15
-        [unit]
-            {ARKILDUR}
-            x=19
-            y=16
-        [/unit]
-    [/side]
-#endif
-
     [event]
         name=start
 
@@ -440,7 +454,11 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
     [event]
         name=attack
         [filter_second]
-            side=2
+            [filter_side]
+                [has_unit]
+                    id=Velon
+                [/has_unit]        
+            [/filter_side]
         [/filter_second]
 
         {INCIDENTAL_MUSIC the_king_is_dead.ogg}
@@ -459,12 +477,6 @@ This is the story of Kalenz, Landar, and of the Elves in the first days of the h
             message= _ "Kalenz was right and I was wrong. Go; join Kalenz while yet you can. I and the remaining elders will cover your retreat as best we may."
         [/message]
 
-#ifndef MULTIPLAYER
-        {MODIFY_UNIT (side=2) side 1 }
-        #TODO think about it
-        #{MODIFY_UNIT (id=Velon) canrecruit no}
-        {TRANSFER_VILLAGE_OWNERSHIP 2 1}
-#endif
     [/event]
 
     [event]