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

Some code polish

Browse Source
This commit is contained in:
Scott_NZ
2012-08-12 23:02:55 +12:00
parent 85fa7eb8c4
commit 11f9fa1942
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,8 @@ namespace OpenRA.Mods.RA.Missions
Actor sovietBarracks; Actor sovietBarracks;
Actor sovietWarFactory; Actor sovietWarFactory;
CountdownTimerWidget reinforcementsTimer;
const string InfantryQueueName = "Infantry"; const string InfantryQueueName = "Infantry";
const string VehicleQueueName = "Vehicle"; const string VehicleQueueName = "Vehicle";
static readonly string[] sovietInfantry = { "e1", "e2", "e3", "dog" }; static readonly string[] sovietInfantry = { "e1", "e2", "e3", "dog" };
@@ -86,6 +88,10 @@ namespace OpenRA.Mods.RA.Missions
return; return;
} }
allies1.WinState = allies2.WinState = WinState.Lost; allies1.WinState = allies2.WinState = WinState.Lost;
if (reinforcementsTimer != null)
{
reinforcementsTimer.Visible = false;
}
Game.AddChatLine(Color.Red, "Mission failed", text); Game.AddChatLine(Color.Red, "Mission failed", text);
Sound.Play("misnlst1.aud"); Sound.Play("misnlst1.aud");
} }
@@ -97,12 +103,20 @@ namespace OpenRA.Mods.RA.Missions
return; return;
} }
allies1.WinState = allies2.WinState = WinState.Won; allies1.WinState = allies2.WinState = WinState.Won;
if (reinforcementsTimer != null)
{
reinforcementsTimer.Visible = false;
}
Game.AddChatLine(Color.Blue, "Mission accomplished", text); Game.AddChatLine(Color.Blue, "Mission accomplished", text);
Sound.Play("misnwon1.aud"); Sound.Play("misnwon1.aud");
} }
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (allies1.WinState != WinState.Undefined)
{
return;
}
if (world.FrameNumber % 3500 == 1) if (world.FrameNumber % 3500 == 1)
{ {
DisplayObjective(); DisplayObjective();
@@ -200,8 +214,8 @@ namespace OpenRA.Mods.RA.Missions
void StartReinforcementsTimer() void StartReinforcementsTimer()
{ {
Sound.Play("timergo1.aud"); Sound.Play("timergo1.aud");
var timer = new CountdownTimerWidget("Reinforcements arrive in", ReinforcementsTicks, ReinforcementsTimerExpired, new float2(128, 96)); reinforcementsTimer = new CountdownTimerWidget("Reinforcements arrive in", ReinforcementsTicks, ReinforcementsTimerExpired, new float2(128, 96));
Ui.Root.AddChild(timer); Ui.Root.AddChild(reinforcementsTimer);
} }
void ReinforcementsTimerExpired(CountdownTimerWidget timer) void ReinforcementsTimerExpired(CountdownTimerWidget timer)
@@ -251,7 +265,7 @@ namespace OpenRA.Mods.RA.Missions
void SpawnEngineerAtMiss() void SpawnEngineerAtMiss()
{ {
engineer = world.CreateActor(EngineerName, new TypeDictionary { new OwnerInit(allies1), new LocationInit(engineerMiss.Location) }); engineer = world.CreateActor(EngineerName, new TypeDictionary {new OwnerInit(allies1), new LocationInit(engineerMiss.Location)});
engineer.QueueActivity(new Move.Move(engineerMiss.Location + new CVec(5, 0))); engineer.QueueActivity(new Move.Move(engineerMiss.Location + new CVec(5, 0)));
} }