From 4d1284eeda576a2c3b183c3e42b49c35617b5584 Mon Sep 17 00:00:00 2001
From: Lari Nieminen <lari.nieminen@iki.fi>
Date: Tue, 1 Jul 2008 17:31:35 +0000
Subject: [PATCH] Made the transport galleons arrive one by one,

...instead of placing all in the beginning.
---
 .../scenarios/06_Black_Flag.cfg               | 132 ++++++++++--------
 1 file changed, 76 insertions(+), 56 deletions(-)

diff --git a/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg b/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
index d509c20cdd2..375f03e7ded 100644
--- a/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
+++ b/data/campaigns/Son_Of_The_Black_Eye/scenarios/06_Black_Flag.cfg
@@ -112,6 +112,7 @@
         team_name=Humans
         user_team_name=_"Humans"
         canrecruit=yes
+        facing=sw
         recruit=Swordsman,Fencer,Mage,Heavy Infantryman,Bowman
         [ai]
             recruitment_pattern=fighter,fighter,archer,mixed fighter
@@ -165,62 +166,6 @@
         {GRUNT_DEFENDER 32 23}
         {ARCHER_DEFENDER 31 25}
 
-        {TRANSPORT_GALLEON 2 26}
-        {TRANSPORT_GALLEON 3 28}
-        {TRANSPORT_GALLEON 5 29}
-        {TRANSPORT_GALLEON 7 29}
-
-        [store_unit]
-            [filter]
-                type=Transport Galleon
-            [/filter]
-
-            kill=yes
-            variable=stored_transports
-        [/store_unit]
-
-        {FOREACH stored_transports i}
-            [store_locations]
-                x=14-28
-                y=14-29
-                terrain=Ww
-
-                [filter_adjacent_location]
-                    terrain=Ds,*^Bw*
-                [/filter_adjacent_location]
-
-                [not]
-                    find_in=already_picked_transport_destination_surroundings
-                [/not]
-
-                variable=possible_transport_destinations
-            [/store_locations]
-
-            {VARIABLE_OP transport_destination_index random "1..$possible_transport_destinations.length"}
-            {VARIABLE_OP transport_destination_index add -1}
-
-            {VARIABLE stored_transports[$i].variables.destination_x $possible_transport_destinations[$transport_destination_index].x}
-            {VARIABLE stored_transports[$i].variables.destination_y $possible_transport_destinations[$transport_destination_index].y}
-
-            [store_locations]
-                x=$stored_transports[$i].variables.destination_x
-                y=$stored_transports[$i].variables.destination_y
-                radius=2
-
-                [or]
-                    find_in=already_picked_transport_destination_surroundings
-                [/or]
-
-                variable=already_picked_transport_destination_surroundings
-            [/store_locations]
-
-            #{VARIABLE stored_transports[$i].name "$stored_transports[$i].variables.destination_x|,$stored_transports[$i].variables.destination_y"}
-
-            [unstore_unit]
-                variable=stored_transports[$i]
-            [/unstore_unit]
-        {NEXT i}
-
         [unit]
             side=2
             id="Landing Galleon"
@@ -298,6 +243,22 @@
         [/store_unit]
     [/event]
 
+    [event]
+        name=new turn
+        first_time_only=no
+
+        [if]
+            [variable]
+                name=turn_number
+                less_than=5
+            [/variable]
+
+            [then]
+                {TRANSPORT_GALLEON 1 30}
+            [/then]
+        [/if]
+    [/event]
+
     [event]
         name=turn 2
 
@@ -368,6 +329,65 @@
             [/variable]
 
             [then]
+                [store_unit]
+                    [filter]
+                        type=Transport Galleon
+                        side=3
+
+                        [not]
+                            [filter_wml]
+                                [variables]
+                                    destination_set=yes
+                                [/variables]
+                            [/filter_wml]
+                        [/not]
+                    [/filter]
+
+                    kill=yes
+                    variable=stored_transports
+                [/store_unit]
+
+                {FOREACH stored_transports i}
+                    [store_locations]
+                        x=14-28
+                        y=14-29
+                        terrain=Ww
+
+                        [filter_adjacent_location]
+                            terrain=Ds,*^Bw*
+                        [/filter_adjacent_location]
+
+                        [not]
+                            find_in=already_picked_transport_destination_surroundings
+                        [/not]
+
+                        variable=possible_transport_destinations
+                    [/store_locations]
+
+                    {VARIABLE_OP transport_destination_index random "1..$possible_transport_destinations.length"}
+                    {VARIABLE_OP transport_destination_index add -1}
+
+                    {VARIABLE stored_transports[$i].variables.destination_x $possible_transport_destinations[$transport_destination_index].x}
+                    {VARIABLE stored_transports[$i].variables.destination_y $possible_transport_destinations[$transport_destination_index].y}
+                    {VARIABLE stored_transports[$i].variables.destination_set yes}
+
+                    [store_locations]
+                        x=$stored_transports[$i].variables.destination_x
+                        y=$stored_transports[$i].variables.destination_y
+                        radius=2
+
+                        [or]
+                            find_in=already_picked_transport_destination_surroundings
+                        [/or]
+
+                        variable=already_picked_transport_destination_surroundings
+                    [/store_locations]
+
+                    [unstore_unit]
+                        variable=stored_transports[$i]
+                    [/unstore_unit]
+                {NEXT i}
+
                 [store_unit]
                     [filter]
                         type=Transport Galleon