2p Dark Forceast cleanups

wesnoth · Feb 18, 2016 · 561e30b · 561e30b
1 parent 7bbb184
commit 561e30b
Showing 1 changed file with 3 additions and 27 deletions.
diff --git a/data/multiplayer/scenarios/2p_Dark_Forecast.cfg b/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
@@ -39,11 +39,7 @@ Note: You need to use the default map settings for the scenario to work right."
                     y=$spawn_place[$random].y
                     radius=1
                 [/and]
-                # Avoid border hexes; we cannot spawn there.
-                [and]
-                    x=1-16
-                    y=8-22
-                [/and]
+                include_borders=no
             [/store_locations]
             {RANDOMIZE_INDEX $locs.length}
             {VARIABLE spawn_x $locs[$random].x}
@@ -238,8 +234,7 @@ Note: You need to use the default map settings for the scenario to work right."
     {FOREACH new_spawn unit_id}
         {VARIABLE spawn_id $new_spawn[$unit_id].variables.spawn_id}
         {VARIABLE previous_cost $new_spawn.cost}
-        {VARIABLE upgrade_var main_spawns[$group_id].spawn_type[$spawn_id].up{TIER_NUMBER}}
-        {VARIABLE_OP advanceto to_variable $upgrade_var}
+        {VARIABLE advanceto $main_spawns[$group_id].spawn_type[$spawn_id].up{TIER_NUMBER}}
         [if]
             [variable]
                 name=advanceto
@@ -1014,26 +1009,7 @@ Note: You need to use the default map settings for the scenario to work right."
         no_leader=yes
         controller="ai"
         village_gold=1
-#ifdef MULTIPLAYER_2P_DARK_FORECAST_LOAD
-        [unit]
-            type=Ancient Lich
-            canrecruit=yes
-            x=8
-            y=6
-            ai_special=guardian
-            [modifications]
-                [object]
-                    [effect]
-                        apply_to=movement_costs
-                        replace=true
-                        [movement_costs]
-                            frozen={UNREACHABLE}
-                        [/movement_costs]
-                    [/effect]
-                [/object]
-            [/modifications]
-        [/unit]
-#endif
+		defeat_condition=never
     [/side]
 
     [side]