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

Use enum-based objectives for Allies 01

Browse Source
This commit is contained in:
Scott_NZ
2012-09-19 02:05:49 +12:00
parent 68d0201538
commit 67c40f3119
3 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ using OpenRA.Mods.RA.Air;
using OpenRA.Network;
using OpenRA.Scripting;
using OpenRA.Traits;
using System;
namespace OpenRA.Mods.RA.Missions
{
@@ -24,13 +25,53 @@ namespace OpenRA.Mods.RA.Missions
class Allies01Script : IWorldLoaded, ITick
{
static readonly string[] Objectives =
[Flags]
enum Objectives
{
"Find Einstein. Tanya and Einstein must survive.",
"Wait for the helicopter and extract Einstein. Tanya and Einstein must survive."
};
None,
FindEinstein,
WaitForHelicopter
}
int currentObjective;
IEnumerable<string> GetObjectiveText()
{
var objectives = new List<string>();
if (HasObjective(Objectives.FindEinstein))
{
objectives.Add("Find Einstein. Tanya and Einstein must survive.");
}
if (HasObjective(Objectives.WaitForHelicopter))
{
objectives.Add("Wait for the helicopter and extract Einstein. Tanya and Einstein must survive.");
}
return objectives;
}
bool HasObjective(Objectives o)
{
return (currentObjectives & o) == o;
}
void AddObjective(Objectives o)
{
currentObjectives |= o;
}
void RemoveObjective(Objectives o)
{
currentObjectives &= ~o;
}
void DisplayObjectives()
{
foreach (var objective in GetObjectiveText())
{
Game.AddChatLine(Color.LimeGreen, "Objective", objective);
}
Sound.Play("bleep6.aud");
}
Objectives currentObjectives = Objectives.FindEinstein;
Player allies;
Player soviets;
@@ -68,12 +109,6 @@ namespace OpenRA.Mods.RA.Missions
const string ChinookName = "tran";
const string SignalFlareName = "flare";
void DisplayObjective()
{
Game.AddChatLine(Color.LimeGreen, "Objective", Objectives[currentObjective]);
Sound.Play("bleep6.aud");
}
void MissionFailed(string text)
{
if (allies.WinState != WinState.Undefined)
@@ -108,13 +143,13 @@ namespace OpenRA.Mods.RA.Missions
}
if (world.FrameNumber % 1500 == 1)
{
DisplayObjective();
DisplayObjectives();
}
if (world.FrameNumber % 1000 == 0)
{
Sound.Play(Taunts[world.SharedRandom.Next(Taunts.Length)]);
}
if (currentObjective == 0)
if (HasObjective(Objectives.FindEinstein))
{
if (AlliesControlLab())
{
@@ -122,8 +157,8 @@ namespace OpenRA.Mods.RA.Missions
Sound.Play("flaren1.aud");
SpawnEinsteinAtLab();
SendShips();
currentObjective++;
DisplayObjective();
currentObjectives = Objectives.WaitForHelicopter;
DisplayObjectives();
currentAttackWaveFrameNumber = world.FrameNumber;
}
if (lab.Destroyed)
@@ -131,7 +166,7 @@ namespace OpenRA.Mods.RA.Missions
MissionFailed("Einstein was killed.");
}
}
else if (currentObjective == 1)
else if (HasObjective(Objectives.WaitForHelicopter))
{
if (world.FrameNumber >= currentAttackWaveFrameNumber + 600)
{
@@ -302,6 +337,7 @@ namespace OpenRA.Mods.RA.Missions
InsertTanyaAtLZ();
SendPatrol();
PlayMusic();
DisplayObjectives();
});
});
}

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

@@ -182,7 +182,7 @@ namespace OpenRA.Mods.RA.Missions
DisplayObjective();
SpawnSignalFlare();
Sound.Play("flaren1.aud");
SendChinook();
ExtractEinsteinAtLZ();
}
}
else if (currentObjective == 1 && einsteinChinook != null)
@@ -281,16 +281,9 @@ namespace OpenRA.Mods.RA.Missions
sovietWarFactory.Trait<PrimaryBuilding>().SetPrimaryProducer(sovietWarFactory, true);
}
IEnumerable<ProductionQueue> FindQueues(Player player, string category)
{
return world.ActorsWithTrait<ProductionQueue>()
.Where(a => a.Actor.Owner == player && a.Trait.Info.Type == category)
.Select(a => a.Trait);
}
void BuildSovietUnit(string category, string unit)
{
var queue = FindQueues(soviets, category).FirstOrDefault(q => q.CurrentItem() == null);
var queue = MissionUtils.FindQueues(world, soviets, category).FirstOrDefault(q => q.CurrentItem() == null);
if (queue == null)
{
return;
@@ -372,16 +365,15 @@ namespace OpenRA.Mods.RA.Missions
}
}
void SendChinook()
void ExtractEinsteinAtLZ()
{
einsteinChinook = world.CreateActor(ChinookName, new TypeDictionary { new OwnerInit(allies1), new LocationInit(extractionLZEntryPoint.Location) });
einsteinChinook.QueueActivity(new HeliFly(extractionLZ.CenterLocation));
einsteinChinook.QueueActivity(new Turn(0));
einsteinChinook.QueueActivity(new HeliLand(true, 0));
einsteinChinook.QueueActivity(new WaitFor(() => einsteinChinook.Trait<Cargo>().Passengers.Contains(einstein)));
einsteinChinook.QueueActivity(new Wait(150));
einsteinChinook.QueueActivity(new HeliFly(extractionLZEntryPoint.CenterLocation));
einsteinChinook.QueueActivity(new RemoveSelf());
einsteinChinook = MissionUtils.ExtractUnitWithChinook(
world,
allies1,
einstein,
extractionLZEntryPoint.Location,
extractionLZ.Location,
extractionLZEntryPoint.Location);
}
bool EngineerSafe()
@@ -390,8 +382,7 @@ namespace OpenRA.Mods.RA.Missions
{
return false;
}
var units = world.ForcesNearLocation(engineer.CenterLocation, EngineerSafeRange);
return units.Any() && units.All(a => a.Owner == allies1);
return MissionUtils.AreaSecuredByPlayer(world, allies1, engineer.CenterLocation, EngineerSafeRange);
}
void RescueEngineer()

8
OpenRA.Mods.RA/Missions/MissionUtils.cs
View File

@@ -16,6 +16,7 @@ using OpenRA.Mods.RA.Activities;
using OpenRA.Mods.RA.Air;
using OpenRA.Mods.RA.Buildings;
using OpenRA.Traits;
using System.Drawing;
namespace OpenRA.Mods.RA.Missions
{
@@ -79,5 +80,12 @@ namespace OpenRA.Mods.RA.Missions
.OrderBy(a => (location - a.CenterLocation).LengthSquared)
.FirstOrDefault();
}
public static IEnumerable<ProductionQueue> FindQueues(World world, Player player, string category)
{
return world.ActorsWithTrait<ProductionQueue>()
.Where(a => a.Actor.Owner == player && a.Trait.Info.Type == category)
.Select(a => a.Trait);
}
}
}