From 1e64a63fa453905e8a6893d1d0160836add913c2 Mon Sep 17 00:00:00 2001
From: Scott_NZ <Scott_NZ>
Date: Thu, 9 Aug 2012 00:28:21 +1200
Subject: [PATCH] Have the starting camera viewport position be determined by
 the local player

---
 OpenRA.Mods.RA/Missions/Allies02Script.cs |   7 +++--
 mods/ra/maps/allies-02/map.bin            | Bin 81925 -> 81925 bytes
 mods/ra/maps/allies-02/map.yaml           |  31 +++++++++++++++++-----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/OpenRA.Mods.RA/Missions/Allies02Script.cs b/OpenRA.Mods.RA/Missions/Allies02Script.cs
index 1773f4c52f..2b90579f92 100644
--- a/OpenRA.Mods.RA/Missions/Allies02Script.cs
+++ b/OpenRA.Mods.RA/Missions/Allies02Script.cs
@@ -34,6 +34,8 @@ namespace OpenRA.Mods.RA.Missions
 		Actor tanya;
 		Actor einstein;
 
+		Actor allies2BasePoint;
+
 		Player allies1;
 		Player allies2;
 		Player soviets;
@@ -83,7 +85,7 @@ namespace OpenRA.Mods.RA.Missions
 			}
 			else if (currentObjective == 1)
 			{
-				
+
 			}
 			if (tanya.Destroyed)
 			{
@@ -108,11 +110,12 @@ namespace OpenRA.Mods.RA.Missions
 			sam4 = actors["SAM4"];
 			tanya = actors["Tanya"];
 			einstein = actors["Einstein"];
+			allies2BasePoint = actors["Allies2BasePoint"];
 			w.WorldActor.Trait<Shroud>().Explore(w, sam1.Location, 2);
 			w.WorldActor.Trait<Shroud>().Explore(w, sam2.Location, 2);
 			w.WorldActor.Trait<Shroud>().Explore(w, sam3.Location, 2);
 			w.WorldActor.Trait<Shroud>().Explore(w, sam4.Location, 2);
-			Game.MoveViewport(chinookHusk.Location.ToFloat2());
+			Game.MoveViewport((w.LocalPlayer == allies1 ? chinookHusk.Location : allies2BasePoint.Location).ToFloat2());
 		}
 	}
 }
diff --git a/mods/ra/maps/allies-02/map.bin b/mods/ra/maps/allies-02/map.bin
index 076a245ad3932cd3732b870d7a931c34955d1cb5..139cd3c1dc1f45526f7ef61d817eeaf2f5e2f341 100644
GIT binary patch
delta 213
zcmZo|U~O$+-Ecs8a=8uvM3J=3rYhWwq8k|)H!`qnWMJROz_pu!VK)QwZU(lAg2|Kr
z%JWRVp(Zq0cM0d@`>GFxH!?8&XJCM!-3*Mo8CZ5terRtxQNeF=nEJQLa%u(>6{03z
z)A%-d=S-f-^A+SKD#T6>*7`ZwPmO<~RK?`W+TSKmPzEdVuVI@U)x$qgmUHsq5~0b>
zy2mEZtm2=%-;ZaaLjGhsZ@J0L`a(dwmu)=*!+HkB$$<et)AA<=8+@LeZ>Kv^A))!Q
L;r7dhj7EF_jFwGC

delta 175
zcmZo|U~O$+-Ecs8vW6-@2v5`x-)ySF%_zK?fpIef%O(bfO$<z%7+65u$pPA_lmE)|
zOx_kKG+B2E=j8jU4}t2KHZ!pP2dQJ;#J~#TPTm+OHBljRa+vzJiLzajuW5XnsL(z+
zSnDT<x~vW4bxroKVVfM)!#_Drn{)Ev5~0b>y2n7mcHVN6ne~N$c<<!%Qj;eK8+@Lq
P(A#|3aQkILMk77|`tLz5

diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml
index ce269d5eee..d6d3067768 100644
--- a/mods/ra/maps/allies-02/map.yaml
+++ b/mods/ra/maps/allies-02/map.yaml
@@ -27,7 +27,6 @@ Players:
 	PlayerReference@Allies1:
 		Name: Allies1
 		Playable: True
-		#AllowBots: False
 		LockRace: True
 		Race: allies
 		LockColor: True
@@ -39,7 +38,6 @@ Players:
 	PlayerReference@Allies2:
 		Name: Allies2
 		Playable: True
-		#AllowBots: False
 		LockRace: True
 		Race: allies
 		LockColor: True
@@ -1438,8 +1436,8 @@ Actors:
 	Actor528: fenc
 		Location: 74,23
 		Owner: Soviets
-	Actor530: ftur
-		Location: 52,61
+	Actor473: tsla
+		Location: 52,60
 		Owner: Soviets
 	Actor167: tsla
 		Location: 58,44
@@ -1516,8 +1514,8 @@ Actors:
 	Actor444: dome
 		Location: 55,68
 		Owner: Soviets
-	Actor445: fact
-		Location: 27,56
+	Actor445: apwr
+		Location: 29,54
 		Owner: Soviets
 	Actor450: silo
 		Location: 47,43
@@ -1576,6 +1574,27 @@ Actors:
 	Actor466: gun
 		Location: 31,89
 		Owner: Allies2
+	Actor83: dome
+		Location: 29,96
+		Owner: Allies2
+	Allies2BasePoint: waypoint
+		Location: 32,97
+		Owner: Neutral
+	Actor468: apwr
+		Location: 25,54
+		Owner: Soviets
+	Actor467: powr
+		Location: 102,46
+		Owner: Soviets
+	Actor469: apwr
+		Location: 25,57
+		Owner: Soviets
+	Actor470: apwr
+		Location: 29,57
+		Owner: Soviets
+	Actor472: fact
+		Location: 29,61
+		Owner: Soviets
 
 Smudges: