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

Clean up allies01/allies02 code by storing world object

Browse Source
This commit is contained in:
Scott_NZ
2012-08-11 16:49:04 +12:00
parent 7fffb71ac4
commit 0c9f39df78
2 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Missions
Sound.Play("bleep6.aud");
}
void MissionFailed(Actor self, string text)
void MissionFailed(string text)
{
if (allies1.WinState != WinState.Undefined)
{
@@ -72,7 +72,7 @@ namespace OpenRA.Mods.RA.Missions
Sound.Play("misnlst1.aud");
}
void MissionAccomplished(Actor self, string text)
void MissionAccomplished(string text)
{
if (allies1.WinState != WinState.Undefined)
{
@@ -85,10 +85,14 @@ namespace OpenRA.Mods.RA.Missions
public void Tick(Actor self)
{
if (self.World.FrameNumber % 3500 == 1)
if (world.FrameNumber % 3500 == 1)
{
DisplayObjective();
}
if (world.FrameNumber == 1)
{
StartReinforcementsTimer();
}
if (currentObjective == 0)
{
if (sam1.Destroyed && sam2.Destroyed && sam3.Destroyed && sam4.Destroyed)
@@ -105,11 +109,11 @@ namespace OpenRA.Mods.RA.Missions
}
if (tanya.Destroyed)
{
MissionFailed(self, "Tanya was killed.");
MissionFailed("Tanya was killed.");
}
if (einstein.Destroyed)
{
MissionFailed(self, "Einstein was killed.");
MissionFailed("Einstein was killed.");
}
ManageSovietOre();
}
@@ -203,7 +207,6 @@ namespace OpenRA.Mods.RA.Missions
w.WorldActor.Trait<Shroud>().Explore(w, sam3.Location, 2);
w.WorldActor.Trait<Shroud>().Explore(w, sam4.Location, 2);
Game.MoveViewport(((w.LocalPlayer ?? allies1) == allies1 ? chinookHusk.Location : allies2BasePoint.Location).ToFloat2());
StartReinforcementsTimer();
}
}