Merge pull request #2296 from ScottNZ/bleed

Allies 01 fixes

OpenRA.Mods.RA/Missions/Allies01Script.cs

@@ -1,6 +1,6 @@
 #region Copyright & License Information
 /*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
+ * Copyright 2007-2012 The OpenRA Developers (see AUTHORS)
  * This file is part of OpenRA, which is free software. It is made
  * available to you under the terms of the GNU General Public License
  * as published by the Free Software Foundation. For more information,
@@ -19,65 +19,59 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Missions
 {
-    public class Allies01ScriptInfo : TraitInfo<Allies01Script>, Requires<SpawnMapActorsInfo> { }
+    class Allies01ScriptInfo : TraitInfo<Allies01Script>, Requires<SpawnMapActorsInfo> { }
 
-    public class Allies01Script : IWorldLoaded, ITick
+    class Allies01Script : IWorldLoaded, ITick
     {
-        private static readonly string[] objectives =
+        static readonly string[] objectives =
         {
             "Find Einstein.",
             "Wait for the helicopter and extract Einstein."
         };
 
-        private int currentObjective;
+        int currentObjective;
 
-        private Player allies;
+        Player allies;
-        private Player soviets;
+        Player soviets;
 
-        private ISound music;
+        Actor insertionLZ;
+        Actor extractionLZ;
+        Actor lab;
+        Actor insertionLZEntryPoint;
+        Actor extractionLZEntryPoint;
+        Actor chinookExitPoint;
+        Actor shipSpawnPoint;
+        Actor shipMovePoint;
+        Actor einstein;
+        Actor einsteinChinook;
+        Actor tanya;
+        Actor attackEntryPoint1;
+        Actor attackEntryPoint2;
 
-        private Actor insertionLZ;
+        static readonly string[] taunts = { "laugh1.aud", "lefty1.aud", "cmon1.aud", "gotit1.aud" };
-        private Actor extractionLZ;
-        private Actor lab;
-        private Actor insertionLZEntryPoint;
-        private Actor extractionLZEntryPoint;
-        private Actor chinookExitPoint;
-        private Actor shipSpawnPoint;
-        private Actor shipMovePoint;
-        private Actor einstein;
-        private Actor einsteinChinook;
-        private Actor tanya;
-        private Actor attackEntryPoint1;
-        private Actor attackEntryPoint2;
 
-        private static readonly string[] taunts = { "laugh1.aud", "lefty1.aud", "cmon1.aud", "gotit1.aud" };
+        static readonly string[] ships = { "ca", "ca", "ca", "ca" };
+        static readonly string[] patrol = { "e1", "dog", "e1" };
 
-        private static readonly string[] ships = { "ca", "ca", "ca", "ca" };
+        static readonly string[] attackWave = { "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "dog" };
+        static readonly string[] lastAttackWaveAddition = { "3tnk", "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2" };
+        int currentAttackWaveFrameNumber;
+        int currentAttackWave;
+        const int einsteinChinookArrivesAtAttackWave = 5;
 
-        private static readonly string[] attackWave = { "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "dog" };
+        const int labRange = 5;
-        private static readonly string[] lastAttackWaveAddition = { "3tnk", "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2" };
+        const string einsteinName = "einstein";
-        private int currentAttackWaveFrameNumber;
+        const string tanyaName = "e7";
-        private int currentAttackWave;
+        const string chinookName = "tran";
-        private const int einsteinChinookArrivesAtAttackWave = 5;
+        const string signalFlareName = "flare";
 
-        private const int labRange = 5;
+        void DisplayObjective()
-        private const string einsteinName = "einstein";
-        private const string tanyaName = "e7";
-        private const string chinookName = "tran";
-        private const string signalFlareName = "flare";
-
-        private void NextObjective()
-        {
-            currentObjective++;
-        }
-
-        private void DisplayObjective()
         {
             Game.AddChatLine(Color.LimeGreen, "Objective", objectives[currentObjective]);
             Sound.Play("bleep6.aud", 5);
         }
 
-        private void MissionFailed(Actor self, string text)
+        void MissionFailed(Actor self, string text)
         {
             if (allies.WinState != WinState.Undefined)
             {
@@ -89,7 +83,7 @@ namespace OpenRA.Mods.RA.Missions
             Sound.Play("misnlst1.aud", 5);
         }
 
-        private void MissionAccomplished(Actor self, string text)
+        void MissionAccomplished(Actor self, string text)
         {
             if (allies.WinState != WinState.Undefined)
             {
@@ -121,6 +115,7 @@ namespace OpenRA.Mods.RA.Missions
             if (self.World.FrameNumber == 1)
             {
                 FlyTanyaToInsertionLZ(self);
+                SendPatrol(self);
             }
             // objectives
             if (currentObjective == 0)
@@ -132,7 +127,7 @@ namespace OpenRA.Mods.RA.Missions
                     SpawnEinsteinAtLab(self); // spawn Einstein once the area is clear
                     Sound.Play("einok1.aud"); // "Incredible!" - Einstein
                     SendShips(self);
-                    NextObjective();
+                    currentObjective++;
                     DisplayObjective();
                     currentAttackWaveFrameNumber = self.World.FrameNumber;
                 }
@@ -158,7 +153,7 @@ namespace OpenRA.Mods.RA.Missions
                         FlyEinsteinFromExtractionLZ(self);
                     }
                 }
-                if (einsteinChinook != null && !self.World.Map.IsInMap(einsteinChinook.Location) && !einstein.IsInWorld)
+                if (einsteinChinook != null && !self.World.Map.IsInMap(einsteinChinook.Location) && einsteinChinook.Trait<Cargo>().Passengers.Contains(einstein))
                 {
                     MissionAccomplished(self, "Einstein was rescued.");
                 }
@@ -171,41 +166,68 @@ namespace OpenRA.Mods.RA.Missions
             {
                 MissionFailed(self, "Tanya was killed.");
             }
+            ManageSovietOre();
         }
 
-        private void SpawnSignalFlare(Actor self)
+        void ManageSovietOre()
+        {
+            var res = soviets.PlayerActor.Trait<PlayerResources>();
+            res.TakeOre(res.Ore);
+            res.TakeCash(res.Cash);
+        }
+
+        void SpawnSignalFlare(Actor self)
         {
             self.World.CreateActor(signalFlareName, new TypeDictionary { new OwnerInit(allies), new LocationInit(extractionLZ.Location) });
         }
 
-        private void SendAttackWave(Actor self, IEnumerable<string> wave)
+        void SendAttackWave(Actor self, IEnumerable<string> wave)
         {
             foreach (var unit in wave)
             {
                 var spawnActor = self.World.SharedRandom.Next(2) == 0 ? attackEntryPoint1 : attackEntryPoint2;
                 var actor = self.World.CreateActor(unit, new TypeDictionary { new OwnerInit(soviets), new LocationInit(spawnActor.Location) });
-                actor.QueueActivity(new AttackMove.AttackMoveActivity(actor, new Attack(Target.FromActor(einstein), 3))); // better way of doing this?
+                Activity innerActivity;
+                if (einstein != null && einstein.IsInWorld)
+                {
+                    innerActivity = new Attack(Target.FromActor(einstein), 3);
+                }
+                else
+                {
+                    innerActivity = new Move.Move(extractionLZ.Location, 3);
+                }
+                actor.QueueActivity(new AttackMove.AttackMoveActivity(actor, innerActivity));
             }
         }
 
-        private IEnumerable<Actor> UnitsNearActor(Actor self, Actor actor, int range)
+        void SendPatrol(Actor self)
+        {
+            for (int i = 0; i < patrol.Length; i++)
+            {
+                var actor = self.World.CreateActor(patrol[i], new TypeDictionary { new OwnerInit(soviets), new LocationInit(insertionLZ.Location + new CVec(-1 + i, 10 + i * 2)) });
+                actor.QueueActivity(new Move.Move(insertionLZ.Location));
+            }
+        }
+
+        IEnumerable<Actor> UnitsNearActor(Actor self, Actor actor, int range)
         {
             return self.World.FindUnitsInCircle(actor.CenterLocation, Game.CellSize * range)
                 .Where(a => a.IsInWorld && a != self.World.WorldActor && !a.Destroyed && a.HasTrait<IMove>() && !a.Owner.NonCombatant);
         }
 
-        private bool AlliesControlLab(Actor self)
+        bool AlliesControlLab(Actor self)
         {
             var units = UnitsNearActor(self, lab, labRange);
             return units.Any() && units.All(a => a.Owner == allies);
         }
 
-        private void SpawnEinsteinAtLab(Actor self)
+        void SpawnEinsteinAtLab(Actor self)
         {
             einstein = self.World.CreateActor(einsteinName, new TypeDictionary { new OwnerInit(allies), new LocationInit(lab.Location) });
+            einstein.QueueActivity(new Move.Move(lab.Location - new CVec(0, 2)));
         }
 
-        private void SendShips(Actor self)
+        void SendShips(Actor self)
         {
             for (int i = 0; i < ships.Length; i++)
             {
@@ -215,7 +237,7 @@ namespace OpenRA.Mods.RA.Missions
             }
         }
 
-        private void FlyEinsteinFromExtractionLZ(Actor self)
+        void FlyEinsteinFromExtractionLZ(Actor self)
         {
             einsteinChinook = self.World.CreateActor(chinookName, new TypeDictionary { new OwnerInit(allies), new LocationInit(extractionLZEntryPoint.Location) });
             einsteinChinook.QueueActivity(new HeliFly(extractionLZ.CenterLocation));
@@ -227,12 +249,11 @@ namespace OpenRA.Mods.RA.Missions
             einsteinChinook.QueueActivity(new RemoveSelf());
         }
 
-        private void FlyTanyaToInsertionLZ(Actor self)
+        void FlyTanyaToInsertionLZ(Actor self)
         {
             tanya = self.World.CreateActor(false, tanyaName, new TypeDictionary { new OwnerInit(allies) });
             var chinook = self.World.CreateActor(chinookName, new TypeDictionary { new OwnerInit(allies), new LocationInit(insertionLZEntryPoint.Location) });
             chinook.Trait<Cargo>().Load(chinook, tanya);
-            // use CenterLocation for HeliFly, Location for Move
             chinook.QueueActivity(new HeliFly(insertionLZ.CenterLocation));
             chinook.QueueActivity(new Turn(0));
             chinook.QueueActivity(new HeliLand(true));
@@ -259,15 +280,15 @@ namespace OpenRA.Mods.RA.Missions
             attackEntryPoint1 = actors["SovietAttackEntryPoint1"];
             attackEntryPoint2 = actors["SovietAttackEntryPoint2"];
             Game.MoveViewport(insertionLZ.Location.ToFloat2());
-            music = Sound.Play("hell226m.aud"); // Hell March
+            Sound.PlayMusic(Rules.Music["hell226m"]); // Hell March
             Game.ConnectionStateChanged += StopMusic;
         }
 
-        private void StopMusic(OrderManager orderManager)
+        void StopMusic(OrderManager orderManager)
         {
             if (!orderManager.GameStarted)
             {
-                Sound.StopSound(music);
+                Sound.StopMusic();
                 Game.ConnectionStateChanged -= StopMusic;
             }
         }