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

Merge Rearm and Repair into Resupply activity

Browse Source 
Allows parallel rearming and repairing.
This commit is contained in:
reaperrr
2019-03-24 16:26:14 +01:00
committed by Paul Chote
parent 123b3f054f
commit ba4b5738d7
9 changed files with 109 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs
View File

@@ -28,12 +28,8 @@ namespace OpenRA.Mods.Common.Activities
if (host == null)
return;
var resupplyActivities = aircraft.GetResupplyActivities(host).ToArray();
if (resupplyActivities.Any())
QueueChild(self, ActivityUtils.SequenceActivities(self, resupplyActivities));
QueueChild(self, new Resupply(self, host, WDist.Zero));
QueueChild(self, new AllowYieldingReservation(self));
if (aircraft.Info.TakeOffOnResupply)
QueueChild(self, new TakeOff(self, (a, b, c) => NextActivity == null && b.NextActivity == null));
}

101
OpenRA.Mods.Common/Activities/Rearm.cs
View File

@@ -1,101 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2019 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using OpenRA.Activities;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities
{
public class Rearm : Activity
{
readonly Target host;
readonly WDist closeEnough;
readonly Rearmable rearmable;
public Rearm(Actor self, Actor host, WDist closeEnough)
{
this.host = Target.FromActor(host);
this.closeEnough = closeEnough;
rearmable = self.Trait<Rearmable>();
}
protected override void OnFirstRun(Actor self)
{
// Reset the ReloadDelay to avoid any issues with early cancellation
// from previous reload attempts (explicit order, host building died, etc).
// HACK: this really shouldn't be managed from here
foreach (var pool in rearmable.RearmableAmmoPools)
pool.RemainingTicks = pool.Info.ReloadDelay;
if (host.Type == TargetType.Invalid)
return;
foreach (var notify in host.Actor.TraitsImplementing<INotifyRearm>())
notify.RearmingStarted(host.Actor, self);
}
protected override void OnLastRun(Actor self)
{
if (host.Type == TargetType.Invalid)
return;
foreach (var notify in host.Actor.TraitsImplementing<INotifyRearm>())
notify.RearmingFinished(host.Actor, self);
}
protected override void OnActorDispose(Actor self)
{
// If the actor died (or will be disposed directly) this tick, Activity.TickOuter won't be ticked again,
// so we need to run OnLastRun directly (otherwise it would be skipped completely).
OnLastRun(self);
}
public override Activity Tick(Actor self)
{
if (IsCanceling)
return NextActivity;
if (host.Type == TargetType.Invalid)
return NextActivity;
if (closeEnough.LengthSquared > 0 && !host.IsInRange(self.CenterPosition, closeEnough))
return NextActivity;
var complete = true;
foreach (var pool in rearmable.RearmableAmmoPools)
{
if (!pool.FullAmmo())
{
Reload(self, host.Actor, pool);
complete = false;
}
}
return complete ? NextActivity : this;
}
void Reload(Actor self, Actor host, AmmoPool ammoPool)
{
if (--ammoPool.RemainingTicks <= 0)
{
foreach (var notify in host.TraitsImplementing<INotifyRearm>())
notify.Rearming(host, self);
ammoPool.RemainingTicks = ammoPool.Info.ReloadDelay;
if (!string.IsNullOrEmpty(ammoPool.Info.RearmSound))
Game.Sound.PlayToPlayer(SoundType.World, self.Owner, ammoPool.Info.RearmSound, self.CenterPosition);
ammoPool.GiveAmmo(self, ammoPool.Info.ReloadCount);
}
}
}
}

121
OpenRA.Mods.Common/Activities/Repair.cs → OpenRA.Mods.Common/Activities/Resupply.cs
View File

@@ -17,48 +17,90 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Activities
{
public class Repair : Activity
public class Resupply : Activity
{
readonly IHealth health;
readonly RepairsUnits[] allRepairsUnits;
readonly Target host;
readonly WDist closeEnough;
readonly Repairable repairable;
readonly RepairableNear repairableNear;
readonly Rearmable rearmable;
int remainingTicks;
bool played = false;
bool played;
bool paused;
bool repairComplete;
bool rearmComplete;
public Repair(Actor self, Actor host, WDist closeEnough)
public Resupply(Actor self, Actor host, WDist closeEnough)
{
this.host = Target.FromActor(host);
this.closeEnough = closeEnough;
allRepairsUnits = host.TraitsImplementing<RepairsUnits>().ToArray();
health = self.TraitOrDefault<IHealth>();
repairable = self.TraitOrDefault<Repairable>();
repairableNear = self.TraitOrDefault<RepairableNear>();
rearmable = self.TraitOrDefault<Rearmable>();
repairComplete = health == null || health.DamageState == DamageState.Undamaged
|| !allRepairsUnits.Any()
|| ((repairable == null || !repairable.Info.RepairActors.Contains(host.Info.Name))
&& (repairableNear == null || !repairableNear.Info.RepairActors.Contains(host.Info.Name)));
rearmComplete = rearmable == null || !rearmable.Info.RearmActors.Contains(host.Info.Name) || rearmable.RearmableAmmoPools.All(p => p.FullAmmo());
}
protected override void OnFirstRun(Actor self)
{
if (host.Actor.IsDead)
if (host.Type == TargetType.Invalid)
return;
foreach (var depot in host.Actor.TraitsImplementing<INotifyRepair>())
depot.BeforeRepair(host.Actor, self);
if (!repairComplete)
foreach (var notifyRepair in host.Actor.TraitsImplementing<INotifyRepair>())
notifyRepair.BeforeRepair(host.Actor, self);
if (!rearmComplete)
{
foreach (var notifyRearm in host.Actor.TraitsImplementing<INotifyRearm>())
notifyRearm.RearmingStarted(host.Actor, self);
// Reset the ReloadDelay to avoid any issues with early cancellation
// from previous reload attempts (explicit order, host building died, etc).
// HACK: this really shouldn't be managed from here
foreach (var pool in rearmable.RearmableAmmoPools)
pool.RemainingTicks = pool.Info.ReloadDelay;
}
}
public override Activity Tick(Actor self)
{
if (IsCanceling)
{
if (remainingTicks-- == 0)
return NextActivity;
return NextActivity;
return this;
}
if (host.Type == TargetType.Invalid || health == null)
return NextActivity;
if (closeEnough.LengthSquared > 0 && !host.IsInRange(self.CenterPosition, closeEnough))
return NextActivity;
if (!repairComplete)
RepairTick(self);
if (!rearmComplete)
RearmTick(self);
if (repairComplete && rearmComplete)
return NextActivity;
return this;
}
void RepairTick(Actor self)
{
// First active.
RepairsUnits repairsUnits = null;
var paused = false;
paused = false;
foreach (var r in allRepairsUnits)
{
if (!r.IsTraitDisabled)
@@ -74,13 +116,12 @@ namespace OpenRA.Mods.Common.Activities
}
if (repairsUnits == null)
return paused ? this : NextActivity;
{
if (!paused)
repairComplete = true;
if (host.Type == TargetType.Invalid || health == null)
return NextActivity;
if (closeEnough.LengthSquared > 0 && !host.IsInRange(self.CenterPosition, closeEnough))
return NextActivity;
return;
}
if (health.DamageState == DamageState.Undamaged)
{
@@ -93,7 +134,11 @@ namespace OpenRA.Mods.Common.Activities
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", repairsUnits.Info.FinishRepairingNotification, self.Owner.Faction.InternalName);
return NextActivity;
foreach (var notifyRepair in host.Actor.TraitsImplementing<INotifyRepair>())
notifyRepair.AfterRepair(host.Actor, self);
repairComplete = true;
return;
}
if (remainingTicks == 0)
@@ -114,7 +159,7 @@ namespace OpenRA.Mods.Common.Activities
if (!self.Owner.PlayerActor.Trait<PlayerResources>().TakeCash(cost, true))
{
remainingTicks = 1;
return this;
return;
}
self.InflictDamage(host.Actor, new Damage(-hpToRepair));
@@ -126,24 +171,38 @@ namespace OpenRA.Mods.Common.Activities
}
else
--remainingTicks;
return this;
}
protected override void OnLastRun(Actor self)
void RearmTick(Actor self)
{
if (host.Actor.IsDead)
return;
rearmComplete = true;
foreach (var pool in rearmable.RearmableAmmoPools)
{
if (!pool.FullAmmo())
{
Reload(self, host.Actor, pool);
rearmComplete = false;
}
}
foreach (var depot in host.Actor.TraitsImplementing<INotifyRepair>())
depot.AfterRepair(host.Actor, self);
if (rearmComplete)
foreach (var notifyRearm in host.Actor.TraitsImplementing<INotifyRearm>())
notifyRearm.RearmingFinished(host.Actor, self);
}
protected override void OnActorDispose(Actor self)
void Reload(Actor self, Actor host, AmmoPool ammoPool)
{
// If the actor died (or will be disposed directly) this tick, Activity.TickOuter won't be ticked again,
// so we need to run OnLastRun directly (otherwise it would be skipped completely).
OnLastRun(self);
if (--ammoPool.RemainingTicks <= 0)
{
foreach (var notify in host.TraitsImplementing<INotifyRearm>())
notify.Rearming(host, self);
ammoPool.RemainingTicks = ammoPool.Info.ReloadDelay;
if (!string.IsNullOrEmpty(ammoPool.Info.RearmSound))
Game.Sound.PlayToPlayer(SoundType.World, self.Owner, ammoPool.Info.RearmSound, self.CenterPosition);
ammoPool.GiveAmmo(self, ammoPool.Info.ReloadCount);
}
}
}
}