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

Reduce some code duplication

Browse Source
This commit is contained in:
Scott_NZ
2012-11-12 00:24:32 +13:00
parent e643f12371
commit 1660c4fe7c
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.RA/Missions/Allies03Script.cs
View File

@@ -141,12 +141,12 @@ namespace OpenRA.Mods.RA.Missions
attackAtFrame += attackAtFrameIncrement; attackAtFrame += attackAtFrameIncrement;
attackAtFrameIncrement = Math.Max(attackAtFrameIncrement - 5, 100); attackAtFrameIncrement = Math.Max(attackAtFrameIncrement - 5, 100);
} }
if (world.FrameNumber % YakSpawnTicks == 0 && SovietAircraft().Count() < MaxNumberYaks && objectives[AirbaseID].Status != ObjectiveStatus.Completed) if (objectives[AirbaseID].Status != ObjectiveStatus.Completed)
{
if (world.FrameNumber % YakSpawnTicks == 0 && SovietAircraft().Count() < MaxNumberYaks)
{ {
SpawnSovietAircraft(); SpawnSovietAircraft();
} }
if (objectives[AirbaseID].Status != ObjectiveStatus.Completed)
{
ManageSovietAircraft(); ManageSovietAircraft();
} }
ManageSovietUnits(); ManageSovietUnits();
@@ -176,8 +176,7 @@ namespace OpenRA.Mods.RA.Missions
var ammo = aircraft.Trait<LimitedAmmo>(); var ammo = aircraft.Trait<LimitedAmmo>();
if ((plane.Altitude == 0 && ammo.FullAmmo()) || (plane.Altitude != 0 && ammo.HasAmmo())) if ((plane.Altitude == 0 && ammo.FullAmmo()) || (plane.Altitude != 0 && ammo.HasAmmo()))
{ {
var enemy = enemies.OrderBy(u => (aircraft.CenterLocation - u.CenterLocation).LengthSquared) var enemy = enemies.OrderBy(u => (aircraft.CenterLocation - u.CenterLocation).LengthSquared).FirstUnshroudedOrDefault(world, 10);
.FirstOrDefault(u => world.FindAliveCombatantActorsInCircle(u.CenterLocation, 10).All(a => !a.HasTrait<CreatesShroud>()));
if (enemy != null) if (enemy != null)
{ {
if (!aircraft.IsIdle && aircraft.GetCurrentActivity().GetType() != typeof(FlyAttack)) if (!aircraft.IsIdle && aircraft.GetCurrentActivity().GetType() != typeof(FlyAttack))
@@ -254,8 +253,7 @@ namespace OpenRA.Mods.RA.Missions
{ {
var enemies = world.Actors.Where(u => u.IsInWorld && !u.IsDead() && (u.Owner == allies1 || u.Owner == allies2) var enemies = world.Actors.Where(u => u.IsInWorld && !u.IsDead() && (u.Owner == allies1 || u.Owner == allies2)
&& ((u.HasTrait<Building>() && !u.HasTrait<Wall>()) || u.HasTrait<Mobile>())); && ((u.HasTrait<Building>() && !u.HasTrait<Wall>()) || u.HasTrait<Mobile>()));
var enemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared) var enemy = enemies.OrderBy(u => (self.CenterLocation - u.CenterLocation).LengthSquared).FirstUnshroudedOrDefault(world, 10);
.FirstOrDefault(u => world.FindAliveCombatantActorsInCircle(u.CenterLocation, 10).All(a => !a.HasTrait<CreatesShroud>()));
if (enemy != null) if (enemy != null)
{ {
self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), 3))); self.QueueActivity(new AttackMove.AttackMoveActivity(self, new Attack(Target.FromActor(enemy), 3)));

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

@@ -100,6 +100,11 @@ namespace OpenRA.Mods.RA.Missions
badger.QueueActivity(new RemoveSelf()); badger.QueueActivity(new RemoveSelf());
} }
public static Actor FirstUnshroudedOrDefault(this IEnumerable<Actor> actors, World world, int shroudRange)
{
return actors.FirstOrDefault(u => world.FindAliveCombatantActorsInCircle(u.CenterLocation, shroudRange).All(a => !a.HasTrait<CreatesShroud>()));
}
public static bool AreaSecuredWithUnits(World world, Player player, PPos location, int range) public static bool AreaSecuredWithUnits(World world, Player player, PPos location, int range)
{ {
var units = world.FindAliveCombatantActorsInCircle(location, range).Where(a => a.HasTrait<IMove>()); var units = world.FindAliveCombatantActorsInCircle(location, range).Where(a => a.HasTrait<IMove>());