epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made Soviet attack waves a bit saner

Browse Source
This commit is contained in:
ScottNZ
2012-06-19 01:04:18 +12:00
parent 20af089fcd
commit 874799c2c3
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
OpenRA.Mods.RA/Missions/Allies01Script.cs
View File

@@ -38,8 +38,6 @@ namespace OpenRA.Mods.RA.Missions
private ISound music; private ISound music;
private bool tanyaLanded; private bool tanyaLanded;
private int frameLastAttackWave;
private int currentAttackWave;
private Actor insertionLZ; private Actor insertionLZ;
private Actor extractionLZ; private Actor extractionLZ;
@@ -55,18 +53,15 @@ namespace OpenRA.Mods.RA.Missions
private Actor attackEntryPoint1; private Actor attackEntryPoint1;
private Actor attackEntryPoint2; private Actor attackEntryPoint2;
private Random random = new Random(); private static readonly Random random = new Random();
private static readonly string[] taunts = { "laugh1.aud", "lefty1.aud", "cmon1.aud", "gotit1.aud" }; private static readonly string[] taunts = { "laugh1.aud", "lefty1.aud", "cmon1.aud", "gotit1.aud" };
private static readonly string[] ships = { "ca", "ca", "ca", "ca" }; private static readonly string[] ships = { "ca", "ca", "ca", "ca" };
private static readonly string[][] attackWaves = new string[][] { private static readonly string[] attackWave = { "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "dog" };
new[] { "e1", "e1", "e1", "e2", "e2", "dog" }, private int currentAttackWaveFrameNumber = -600;
new[] { "e1", "e1", "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "dog" }, private int currentAttackWave;
new[] { "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "e2", "e2", "dog", "dog", "3tnk" }, private const int einsteinChinookArrivesAtAttackWave = 5;
new[] { "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "e2", "e2", "dog", "dog", "e4", "e4", "3tnk", "3tnk" },
};
private static readonly string[] reinforcements = { "e1", "e1", "e1", "e3", "e3" };
private const int labRange = 5; private const int labRange = 5;
private const int lzRange = 3; private const int lzRange = 3;
@@ -74,6 +69,11 @@ namespace OpenRA.Mods.RA.Missions
private const string tanyaName = "e7"; private const string tanyaName = "e7";
private const string chinookName = "tran"; private const string chinookName = "tran";
private void NextObjective(int currentFrameNumber)
{
currentObjective++;
}
private void DisplayObjective(string text) private void DisplayObjective(string text)
{ {
Game.AddChatLine(Color.LimeGreen, "Objective", text); Game.AddChatLine(Color.LimeGreen, "Objective", text);
@@ -139,9 +139,8 @@ namespace OpenRA.Mods.RA.Missions
{ {
SpawnEinsteinAtLab(self); // spawn Einstein once the area is clear SpawnEinsteinAtLab(self); // spawn Einstein once the area is clear
Sound.Play("einok1.aud"); // "Incredible!" - Einstein Sound.Play("einok1.aud"); // "Incredible!" - Einstein
FlyUnitsToInsertionLZ(self, reinforcements);
SendShips(self); SendShips(self);
currentObjective++; NextObjective(self.World.FrameNumber);
DisplayObjective(objectives[currentObjective]); DisplayObjective(objectives[currentObjective]);
} }
if (lab.Destroyed) if (lab.Destroyed)
@@ -151,16 +150,15 @@ namespace OpenRA.Mods.RA.Missions
} }
else if (currentObjective == 1) else if (currentObjective == 1)
{ {
if (self.World.FrameNumber >= frameLastAttackWave + 600) if (self.World.FrameNumber >= currentAttackWaveFrameNumber + 600)
{ {
FlyUnitsToInsertionLZ(self, reinforcements); SendAttackWave(self, attackWave);
SendAttackWave(self, attackWaves[Math.Min(currentAttackWave, attackWaves.Length - 1)]); currentAttackWave++;
if (currentAttackWave == attackWaves.Length - 1) currentAttackWaveFrameNumber = self.World.FrameNumber;
if (currentAttackWave == einsteinChinookArrivesAtAttackWave)
{ {
FlyToExtractionLZ(self); FlyToExtractionLZ(self);
} }
currentAttackWave++;
frameLastAttackWave = self.World.FrameNumber;
} }
if (einsteinChinook != null) if (einsteinChinook != null)
{ {