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

Introduce ICallForTransport + carryall code fixes

Browse Source
This commit is contained in:
penev92
2015-04-28 20:59:20 +03:00
parent 070e5109f5
commit 97e150e757
3 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -85,4 +85,12 @@ namespace OpenRA.Mods.Common.Traits
{ {
IEnumerable<string> PaletteNames { get; } IEnumerable<string> PaletteNames { get; }
} }
public interface ICallForTransport
{
WRange MinimumDistance { get; }
bool WantsTransport { get; set; }
void MovementCancelled(Actor self);
void RequestTransport(CPos destination, Activity afterLandActivity);
}
} }

30
OpenRA.Mods.D2k/Traits/Carryable.cs
View File

@@ -18,13 +18,13 @@ namespace OpenRA.Mods.D2k.Traits
[Desc("Can be carried by units with the trait `Carryall`.")] [Desc("Can be carried by units with the trait `Carryall`.")]
public class CarryableInfo : ITraitInfo public class CarryableInfo : ITraitInfo
{ {
[Desc("Required distance away from destination before requesting a pickup.")] [Desc("Required distance away from destination before requesting a pickup. Default is 6 cells.")]
public int MinDistance = 6; public WRange MinDistance = WRange.FromCells(6);
public object Create(ActorInitializer init) { return new Carryable(init.Self, this); } public object Create(ActorInitializer init) { return new Carryable(init.Self, this); }
} }
public class Carryable : IDisableMove, INotifyHarvesterAction public class Carryable : IDisableMove, INotifyHarvesterAction, ICallForTransport
{ {
readonly CarryableInfo info; readonly CarryableInfo info;
readonly Actor self; readonly Actor self;
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.D2k.Traits
// If we're locked there isn't much we can do. We'll have to wait for the carrier to finish with us. We should not move or get new orders! // If we're locked there isn't much we can do. We'll have to wait for the carrier to finish with us. We should not move or get new orders!
bool locked; bool locked;
public bool WantsTransport { get; private set; } public bool WantsTransport { get; set; }
public CPos Destination; public CPos Destination;
Activity afterLandActivity; Activity afterLandActivity;
@@ -51,9 +51,12 @@ namespace OpenRA.Mods.D2k.Traits
public void MovingToResources(Actor self, CPos targetCell, Activity next) { RequestTransport(targetCell, next); } public void MovingToResources(Actor self, CPos targetCell, Activity next) { RequestTransport(targetCell, next); }
public void MovingToRefinery(Actor self, CPos targetCell, Activity next) { RequestTransport(targetCell, next); } public void MovingToRefinery(Actor self, CPos targetCell, Activity next) { RequestTransport(targetCell, next); }
void RequestTransport(CPos destination, Activity afterLandActivity) public WRange MinimumDistance { get { return info.MinDistance; } }
public void RequestTransport(CPos destination, Activity afterLandActivity)
{ {
if (destination == CPos.Zero || (self.Location - destination).Length < info.MinDistance) var destPos = self.World.Map.CenterOfCell(destination);
if (destination == CPos.Zero || (self.CenterPosition - destPos).LengthSquared < info.MinDistance.Range * info.MinDistance.Range)
{ {
WantsTransport = false; // Be sure to cancel any pending transports WantsTransport = false; // Be sure to cancel any pending transports
return; return;
@@ -71,12 +74,9 @@ namespace OpenRA.Mods.D2k.Traits
.Where(c => !c.Trait.IsBusy && !c.Actor.IsDead && c.Actor.Owner == self.Owner && c.Actor.IsInWorld) .Where(c => !c.Trait.IsBusy && !c.Actor.IsDead && c.Actor.Owner == self.Owner && c.Actor.IsInWorld)
.OrderBy(p => (self.Location - p.Actor.Location).LengthSquared); .OrderBy(p => (self.Location - p.Actor.Location).LengthSquared);
foreach (var carrier in carriers) // Is any carrier able to transport the actor?
{ // Any will return once it finds a carrier that returns true.
// Notify the carrier and see if he's willing to transport us.. carriers.Any(carrier => carrier.Trait.RequestTransportNotify(self));
if (carrier.Trait.RequestTransportNotify(self))
break; // If true then we're done
}
} }
// No longer want to be carried // No longer want to be carried
@@ -119,7 +119,8 @@ namespace OpenRA.Mods.D2k.Traits
if (Reserved) if (Reserved)
return false; return false;
if ((self.Location - Destination).Length < info.MinDistance) var destPos = self.World.Map.CenterOfCell(Destination);
if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.Range * info.MinDistance.Range)
{ {
MovementCancelled(self); MovementCancelled(self);
return false; return false;
@@ -146,7 +147,8 @@ namespace OpenRA.Mods.D2k.Traits
return false; return false;
// Last change to change our mind... // Last change to change our mind...
if ((self.Location - Destination).Length < info.MinDistance) var destPos = self.World.Map.CenterOfCell(Destination);
if ((self.CenterPosition - destPos).LengthSquared < info.MinDistance.Range * info.MinDistance.Range)
{ {
MovementCancelled(self); MovementCancelled(self);
return false; return false;

3
OpenRA.Mods.D2k/Traits/Carryall.cs
View File

@@ -103,6 +103,9 @@ namespace OpenRA.Mods.D2k.Traits
if (!trait.WantsTransport) if (!trait.WantsTransport)
return false; return false;
if (actor.IsIdle)
return false;
return true; return true;
}) })
.OrderBy(p => (self.Location - p.Actor.Location).LengthSquared); .OrderBy(p => (self.Location - p.Actor.Location).LengthSquared);