heli separation
This commit is contained in:
@@ -19,6 +19,7 @@
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Linq;
|
||||||
using OpenRA.GameRules;
|
using OpenRA.GameRules;
|
||||||
|
|
||||||
namespace OpenRA.Traits.Activities
|
namespace OpenRA.Traits.Activities
|
||||||
@@ -27,6 +28,7 @@ namespace OpenRA.Traits.Activities
|
|||||||
{
|
{
|
||||||
Actor target;
|
Actor target;
|
||||||
const int CruiseAltitude = 20;
|
const int CruiseAltitude = 20;
|
||||||
|
const int AvoidDist = 80;
|
||||||
public HeliAttack( Actor target ) { this.target = target; }
|
public HeliAttack( Actor target ) { this.target = target; }
|
||||||
|
|
||||||
public IActivity NextActivity { get; set; }
|
public IActivity NextActivity { get; set; }
|
||||||
@@ -54,17 +56,37 @@ namespace OpenRA.Traits.Activities
|
|||||||
var desiredFacing = Util.GetFacing(dist, unit.Facing);
|
var desiredFacing = Util.GetFacing(dist, unit.Facing);
|
||||||
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<UnitInfo>().ROT);
|
Util.TickFacing(ref unit.Facing, desiredFacing, self.Info.Traits.Get<UnitInfo>().ROT);
|
||||||
|
|
||||||
if (!float2.WithinEpsilon(float2.Zero, dist, range * Game.CellSize))
|
var rawSpeed = .2f * Util.GetEffectiveSpeed(self, UnitMovementType.Fly);
|
||||||
{
|
|
||||||
var rawSpeed = .2f * Util.GetEffectiveSpeed(self, UnitMovementType.Fly);
|
if (!float2.WithinEpsilon(float2.Zero, dist, range * Game.CellSize))
|
||||||
self.CenterLocation += (rawSpeed / dist.Length) * dist;
|
self.CenterLocation += (rawSpeed / dist.Length) * dist;
|
||||||
self.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
|
|
||||||
}
|
var otherHelis = self.World.FindUnitsInCircle(self.CenterLocation, AvoidDist)
|
||||||
|
.Where(a => a.traits.Contains<Helicopter>());
|
||||||
|
|
||||||
|
var f = otherHelis
|
||||||
|
.Select(h => GetRepulseForce(self, h))
|
||||||
|
.Aggregate(float2.Zero, (a, b) => a + b);
|
||||||
|
|
||||||
|
self.CenterLocation += rawSpeed * f;
|
||||||
|
|
||||||
|
self.Location = ((1 / 24f) * self.CenterLocation).ToInt2();
|
||||||
|
|
||||||
/* todo: maintain seperation wrt other helis */
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const float Epsilon = .5f;
|
||||||
|
float2 GetRepulseForce(Actor self, Actor h)
|
||||||
|
{
|
||||||
|
if (self == h)
|
||||||
|
return float2.Zero;
|
||||||
|
var d = self.CenterLocation - h.CenterLocation;
|
||||||
|
if (d.LengthSquared < Epsilon)
|
||||||
|
return float2.FromAngle((float)self.World.SharedRandom.NextDouble() * 3.14f);
|
||||||
|
|
||||||
|
return (2 / d.LengthSquared) * d;
|
||||||
|
}
|
||||||
|
|
||||||
public void Cancel(Actor self) { target = null; NextActivity = null; }
|
public void Cancel(Actor self) { target = null; NextActivity = null; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user