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().Explore(w, sam1.Location, 2); w.WorldActor.Trait().Explore(w, sam2.Location, 2); w.WorldActor.Trait().Explore(w, sam3.Location, 2); w.WorldActor.Trait().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 076a245ad3..139cd3c1dc 100644 Binary files a/mods/ra/maps/allies-02/map.bin and b/mods/ra/maps/allies-02/map.bin differ 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: