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

Don't hard code 100 into the objectives string

Browse Source
This commit is contained in:
Scott_NZ
2012-10-12 16:06:43 +13:00
parent d9a6cc6b1c
commit 6eb2f2bffe
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.RA/Missions/Allies02Script.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Mods.RA.Missions
const string DestroySamSites = "Destroy the SAM sites. Tanya must survive."; const string DestroySamSites = "Destroy the SAM sites. Tanya must survive.";
const string ExtractEinstein = "Wait for the helicopter and extract Einstein. Tanya and Einstein must survive."; const string ExtractEinstein = "Wait for the helicopter and extract Einstein. Tanya and Einstein must survive.";
const string MaintainPresence = "Maintain an Allied presence in the area. Reinforcements will arrive soon."; const string MaintainPresence = "Maintain an Allied presence in the area. Reinforcements will arrive soon.";
const string FewDeathsTemplate = "Lose fewer than {0}/100 units."; const string FewDeathsTemplate = "Lose fewer than {0}/{1} units.";
const int DeathsThreshold = 100; const int DeathsThreshold = 100;
@@ -237,13 +237,7 @@ namespace OpenRA.Mods.RA.Missions
BuildSovietUnits(); BuildSovietUnits();
ManageSovietUnits(); ManageSovietUnits();
} }
objectives[FewDeathsID].Text = FewDeathsTemplate.F(allies1.Deaths + allies2.Deaths); UpdateDeaths();
OnObjectivesUpdated(false);
if (allies1.Deaths + allies2.Deaths >= DeathsThreshold && objectives[FewDeathsID].Status == ObjectiveStatus.InProgress)
{
objectives[FewDeathsID].Status = ObjectiveStatus.Failed;
OnObjectivesUpdated(true);
}
if (objectives[FindEinsteinID].Status == ObjectiveStatus.InProgress) if (objectives[FindEinsteinID].Status == ObjectiveStatus.InProgress)
{ {
if (AlliesNearTown()) if (AlliesNearTown())
@@ -306,6 +300,18 @@ namespace OpenRA.Mods.RA.Missions
}); });
} }
void UpdateDeaths()
{
var unitDeaths = allies1.Deaths + allies2.Deaths;
objectives[FewDeathsID].Text = FewDeathsTemplate.F(unitDeaths, DeathsThreshold);
OnObjectivesUpdated(false);
if (unitDeaths >= DeathsThreshold && objectives[FewDeathsID].Status == ObjectiveStatus.InProgress)
{
objectives[FewDeathsID].Status = ObjectiveStatus.Failed;
OnObjectivesUpdated(true);
}
}
void YakStrafe(IEnumerable<Actor> candidates) void YakStrafe(IEnumerable<Actor> candidates)
{ {
if (yak == null) if (yak == null)