Move the sam site around to make a new outpost on the top left, add engineer rescue

This commit is contained in:
Scott_NZ
2012-08-11 19:49:57 +12:00
parent 9ccfb2c322
commit 60fb45c909
4 changed files with 105 additions and 158 deletions

View File

@@ -46,8 +46,8 @@ namespace OpenRA.Mods.RA.Missions
Actor einsteinChinook;
Actor tanya;
Actor attackEntryPoint1;
Actor attackEntryPoint2;
Actor attackEntryPoint2;
World world;
static readonly string[] taunts = { "laugh1.aud", "lefty1.aud", "cmon1.aud", "gotit1.aud" };
@@ -124,7 +124,7 @@ namespace OpenRA.Mods.RA.Missions
{
SpawnSignalFlare();
Sound.Play("flaren1.aud");
SpawnEinsteinAtLab(); // spawn Einstein once the area is clear
SpawnEinsteinAtLab();
SendShips();
currentObjective++;
DisplayObjective();
@@ -152,7 +152,7 @@ namespace OpenRA.Mods.RA.Missions
FlyEinsteinFromExtractionLZ();
}
}
if (einsteinChinook != null && !world.Map.IsInMap(einsteinChinook.Location) && einsteinChinook.Trait<Cargo>().Passengers.Contains(einstein))
if (einsteinChinook != null && !einsteinChinook.IsDead() && !world.Map.IsInMap(einsteinChinook.Location) && einsteinChinook.Trait<Cargo>().Passengers.Contains(einstein))
{
MissionAccomplished("Einstein was rescued.");
}
@@ -263,8 +263,8 @@ namespace OpenRA.Mods.RA.Missions
chinook.QueueActivity(new RemoveSelf());
}
public void WorldLoaded(World w)
{
public void WorldLoaded(World w)
{
world = w;
allies = w.Players.Single(p => p.InternalName == "Allies");
soviets = w.Players.Single(p => p.InternalName == "Soviets");