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

Refactor Allies 01 objectives code

Browse Source
This commit is contained in:
ScottNZ
2013-06-06 01:40:42 +12:00
parent 8c9fb382e3
commit fdfd2eacea
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,19 +26,13 @@ namespace OpenRA.Mods.RA.Missions
{ {
public event Action<bool> OnObjectivesUpdated = notify => { }; public event Action<bool> OnObjectivesUpdated = notify => { };
public IEnumerable<Objective> Objectives { get { return objectives.Values; } } public IEnumerable<Objective> Objectives { get { return new[] { findEinstein, extractEinstein }; } }
Dictionary<int, Objective> objectives = new Dictionary<int, Objective> Objective findEinstein = new Objective(ObjectiveType.Primary, FindEinsteinText, ObjectiveStatus.InProgress);
{ Objective extractEinstein = new Objective(ObjectiveType.Primary, ExtractEinsteinText, ObjectiveStatus.Inactive);
{ FindEinsteinID, new Objective(ObjectiveType.Primary, FindEinstein, ObjectiveStatus.InProgress) },
{ ExtractEinsteinID, new Objective(ObjectiveType.Primary, ExtractEinstein, ObjectiveStatus.Inactive) }
};
const int FindEinsteinID = 0; const string FindEinsteinText = "Find Einstein. Tanya and Einstein must survive.";
const int ExtractEinsteinID = 1; const string ExtractEinsteinText = "Wait for the helicopter and extract Einstein. Tanya and Einstein must survive.";
const string FindEinstein = "Find Einstein. Tanya and Einstein must survive.";
const string ExtractEinstein = "Wait for the helicopter and extract Einstein. Tanya and Einstein must survive.";
Player allies; Player allies;
Player soviets; Player soviets;
@@ -94,19 +88,19 @@ namespace OpenRA.Mods.RA.Missions
if (world.FrameNumber % 1000 == 0) if (world.FrameNumber % 1000 == 0)
Sound.Play(Taunts[world.SharedRandom.Next(Taunts.Length)]); Sound.Play(Taunts[world.SharedRandom.Next(Taunts.Length)]);
if (objectives[FindEinsteinID].Status == ObjectiveStatus.InProgress) if (findEinstein.Status == ObjectiveStatus.InProgress)
{ {
if (AlliesControlLab()) if (AlliesControlLab())
LabSecured(); LabSecured();
if (lab.Destroyed) if (lab.Destroyed)
{ {
objectives[FindEinsteinID].Status = ObjectiveStatus.Failed; findEinstein.Status = ObjectiveStatus.Failed;
OnObjectivesUpdated(true); OnObjectivesUpdated(true);
MissionFailed("Einstein was killed."); MissionFailed("Einstein was killed.");
} }
} }
if (objectives[ExtractEinsteinID].Status == ObjectiveStatus.InProgress) if (extractEinstein.Status == ObjectiveStatus.InProgress)
{ {
if (difficulty != "Easy") if (difficulty != "Easy")
{ {
@@ -128,13 +122,13 @@ namespace OpenRA.Mods.RA.Missions
{ {
if (einsteinChinook.Destroyed) if (einsteinChinook.Destroyed)
{ {
objectives[ExtractEinsteinID].Status = ObjectiveStatus.Failed; extractEinstein.Status = ObjectiveStatus.Failed;
OnObjectivesUpdated(true); OnObjectivesUpdated(true);
MissionFailed("The extraction helicopter was destroyed."); MissionFailed("The extraction helicopter was destroyed.");
} }
else if (!world.Map.IsInMap(einsteinChinook.Location) && einsteinChinook.Trait<Cargo>().Passengers.Contains(einstein)) else if (!world.Map.IsInMap(einsteinChinook.Location) && einsteinChinook.Trait<Cargo>().Passengers.Contains(einstein))
{ {
objectives[ExtractEinsteinID].Status = ObjectiveStatus.Completed; extractEinstein.Status = ObjectiveStatus.Completed;
OnObjectivesUpdated(true); OnObjectivesUpdated(true);
MissionAccomplished("Einstein was rescued"); MissionAccomplished("Einstein was rescued");
} }
@@ -158,9 +152,10 @@ namespace OpenRA.Mods.RA.Missions
SendShips(); SendShips();
lab.QueueActivity(new Transform(lab, "stek") { SkipMakeAnims = true }); lab.QueueActivity(new Transform(lab, "stek") { SkipMakeAnims = true });
objectives[FindEinsteinID].Status = ObjectiveStatus.Completed; findEinstein.Status = ObjectiveStatus.Completed;
objectives[ExtractEinsteinID].Status = ObjectiveStatus.InProgress; extractEinstein.Status = ObjectiveStatus.InProgress;
OnObjectivesUpdated(true); OnObjectivesUpdated(true);
currentAttackWaveFrameNumber = world.FrameNumber; currentAttackWaveFrameNumber = world.FrameNumber;
if (difficulty == "Easy") if (difficulty == "Easy")