From 9ea7fa89e915b52411383937e9c0f9903ac5b794 Mon Sep 17 00:00:00 2001
From: Lari Nieminen <lari.nieminen@iki.fi>
Date: Sun, 14 Mar 2010 21:25:42 +0000
Subject: [PATCH] Likely fix for the Dark Forecast OoS.

---
 .../scenarios/2p_Dark_Forecast.cfg            | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
index e1ddd9dcb6e..93bbca92888 100644
--- a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
+++ b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
@@ -213,15 +213,8 @@ Note: You need to use map settings for the scenario to work right."
         role=new_unit{TIER_NUMBER}
         random_traits=no
         name="none"
+        to_variable=new_unit
     [/unit]
-    [store_unit]
-        kill=no
-        variable=new_unit
-        [filter]
-            side={SIDE}
-            role=new_unit{TIER_NUMBER}
-        [/filter]
-    [/store_unit]
     {VARIABLE_OP gold add -$new_unit.cost}
     ### DEBUG
     {VARIABLE_OP total_cost add $new_unit.cost}
@@ -305,16 +298,8 @@ Note: You need to use map settings for the scenario to work right."
                             name="none"
                             x=20
                             y=22
+                            to_variable=advancement
                         [/unit]
-                        [store_unit]
-                            variable=advancement
-                            kill=yes
-                            [filter]
-                                x=20
-                                y=22
-                                side={SIDE}
-                            [/filter]
-                        [/store_unit]
                         {VARIABLE upgrade_cost $advancement.cost}
                         {VARIABLE_OP upgrade_cost add -$previous_cost}
                         # 25% surcharge
@@ -340,11 +325,6 @@ Note: You need to use map settings for the scenario to work right."
             [/then]
         [/if]
 
-        [unstore_unit]
-            variable=new_spawn[$unit_id]
-            find_vacant=yes
-        [/unstore_unit]
-
         [if]
             [variable]
                 name=use_somehack
@@ -352,10 +332,25 @@ Note: You need to use map settings for the scenario to work right."
             [/variable]
 
             [then]
-                {TRANSFORM_UNIT x,y=$new_spawn[$unit_id].x,$new_spawn[$unit_id].y $somehack_type}
+                [unit]
+                    type=$somehack_type
+                    side={SIDE}
+                    x=$new_spawn[$unit_id].x
+                    y=$new_spawn[$unit_id].y
+                    role=new_unit{TIER_NUMBER}
+                    random_traits=no
+                    name="none"
+                [/unit]
 
                 {VARIABLE use_somehack no}
             [/then]
+
+            [else]
+                [unstore_unit]
+                    variable=new_spawn[$unit_id]
+                    find_vacant=yes
+                [/unstore_unit]
+            [/else]
         [/if]
     {NEXT unit_id}
     {CLEAR_VARIABLE new_spawn}