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

Convert Missile to world coordinates. Fixes #3347. Closes #3434.

Browse Source
This commit is contained in:
Paul Chote
2013-07-22 19:42:43 +12:00
parent 285ecb8c03
commit b374816fa1
2 changed files with 109 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -23,11 +23,10 @@ namespace OpenRA.Mods.RA.Effects
class MissileInfo : IProjectileInfo class MissileInfo : IProjectileInfo
{ {
public readonly int Speed = 1; public readonly int Speed = 1;
public readonly WAngle MaximumPitch = WAngle.FromDegrees(30);
public readonly int Arm = 0; public readonly int Arm = 0;
[Desc("Check for whether an actor with Wall: trait blocks fire")] [Desc("Check for whether an actor with Wall: trait blocks fire")]
public readonly bool High = false; public readonly bool High = false;
public readonly bool Shadow = true;
public readonly bool Proximity = false;
public readonly string Trail = null; public readonly string Trail = null;
public readonly float Inaccuracy = 0; public readonly float Inaccuracy = 0;
public readonly string Image = null; public readonly string Image = null;
@@ -48,145 +47,155 @@ namespace OpenRA.Mods.RA.Effects
class Missile : IEffect class Missile : IEffect
{ {
readonly MissileInfo Info; readonly MissileInfo info;
readonly ProjectileArgs Args; readonly ProjectileArgs args;
PVecInt offset;
public PSubPos SubPxPosition;
public PPos PxPosition { get { return SubPxPosition.ToPPos(); } }
PPos target;
int targetAltitude;
readonly Animation anim; readonly Animation anim;
int Facing;
int t; ContrailRenderable trail;
int Altitude; WPos pos;
ContrailRenderable Trail; int facing;
WPos target;
WVec offset;
int ticks;
bool exploded;
readonly int speed;
public Missile(MissileInfo info, ProjectileArgs args) public Missile(MissileInfo info, ProjectileArgs args)
{ {
Info = info; this.info = info;
Args = args; this.args = args;
SubPxPosition = PPos.FromWPos(Args.source).ToPSubPos(); pos = args.source;
Altitude = args.source.Z * Game.CellSize / 1024; facing = args.facing;
Facing = Args.facing;
target = PPos.FromWPos(Args.passiveTarget); target = args.passiveTarget;
targetAltitude = args.passiveTarget.Z * Game.CellSize / 1024;
// Convert ProjectileArg definitions to world coordinates
// TODO: Change the yaml definitions so we don't need this
var inaccuracy = (int)(info.Inaccuracy * 1024 / Game.CellSize);
speed = info.Speed * 1024 / (5 * Game.CellSize);
if (info.Inaccuracy > 0) if (info.Inaccuracy > 0)
offset = (PVecInt)(info.Inaccuracy * args.sourceActor.World.SharedRandom.Gauss2D(2)).ToInt2(); offset = WVec.FromPDF(args.sourceActor.World.SharedRandom, 2) * inaccuracy / 1024;
if (Info.Image != null) if (info.Image != null)
{ {
anim = new Animation(Info.Image, () => Facing); anim = new Animation(info.Image, () => facing);
anim.PlayRepeating("idle"); anim.PlayRepeating("idle");
} }
if (Info.ContrailLength > 0) if (info.ContrailLength > 0)
{ {
var color = Info.ContrailUsePlayerColor ? ContrailRenderable.ChooseColor(args.sourceActor) : Info.ContrailColor; var color = info.ContrailUsePlayerColor ? ContrailRenderable.ChooseColor(args.sourceActor) : info.ContrailColor;
Trail = new ContrailRenderable(args.sourceActor.World, color, Info.ContrailLength, Info.ContrailDelay, 0); trail = new ContrailRenderable(args.sourceActor.World, color, info.ContrailLength, info.ContrailDelay, 0);
} }
} }
// In pixels static readonly WRange MissileCloseEnough = new WRange(7 * 1024 / Game.CellSize);
const int MissileCloseEnough = 7;
int ticksToNextSmoke; int ticksToNextSmoke;
bool JammedBy(TraitPair<JamsMissiles> tp)
{
if ((tp.Actor.CenterPosition - pos).HorizontalLengthSquared > tp.Trait.Range * tp.Trait.Range)
return false;
if (tp.Actor.Owner.Stances[args.sourceActor.Owner] == Stance.Ally && !tp.Trait.AlliedMissiles)
return false;
return tp.Actor.World.SharedRandom.Next(100 / tp.Trait.Chance) == 0;
}
public void Tick(World world) public void Tick(World world)
{ {
t += 40; // Fade the trail out gradually
if (exploded && info.ContrailLength > 0)
// Missile tracks target
if (Args.guidedTarget.IsValid)
{ {
target = PPos.FromWPos(Args.guidedTarget.CenterPosition); trail.Update(pos);
targetAltitude = Args.guidedTarget.CenterPosition.Z * Game.CellSize / 1024; return;
}
// In pixels
var dist = target + offset - PxPosition;
var jammed = Info.Jammable && world.ActorsWithTrait<JamsMissiles>().Any(tp =>
(tp.Actor.CenterLocation - PxPosition).ToCVec().Length <= tp.Trait.Range
&& (tp.Actor.Owner.Stances[Args.sourceActor.Owner] != Stance.Ally
|| (tp.Actor.Owner.Stances[Args.sourceActor.Owner] == Stance.Ally && tp.Trait.AlliedMissiles))
&& world.SharedRandom.Next(100 / tp.Trait.Chance) == 0);
if (!jammed)
{
Altitude += Math.Sign(targetAltitude - Altitude);
if (Args.guidedTarget.IsValid)
Facing = Traits.Util.TickFacing(Facing,
Traits.Util.GetFacing(dist, Facing),
Info.ROT);
}
else
{
Altitude += world.SharedRandom.Next(-1, 2);
Facing = Traits.Util.TickFacing(Facing,
Facing + world.SharedRandom.Next(-20, 21),
Info.ROT);
} }
ticks++;
anim.Tick(); anim.Tick();
if (dist.LengthSquared < MissileCloseEnough * MissileCloseEnough) // Missile tracks target
Explode(world); if (args.guidedTarget.IsValid)
target = args.guidedTarget.CenterPosition;
// TODO: Replace this with a lookup table var dist = target + offset - pos;
var dir = (-float2.FromAngle((float)(Facing / 128f * Math.PI))).ToPSubVec(); var desiredFacing = Traits.Util.GetFacing(dist, facing);
var desiredAltitude = target.Z;
var jammed = info.Jammable && world.ActorsWithTrait<JamsMissiles>().Any(j => JammedBy(j));
var move = Info.Speed * dir; if (jammed)
if (targetAltitude > 0 && Info.TurboBoost) {
desiredFacing = facing + world.SharedRandom.Next(-20, 21);
desiredAltitude = world.SharedRandom.Next(-43, 86);
}
else if (!args.guidedTarget.IsValid)
desiredFacing = facing;
facing = Traits.Util.TickFacing(facing, desiredFacing, info.ROT);
var move = new WVec(0, -1024, 0).Rotate(WRot.FromFacing(facing)) * speed / 1024;
if (target.Z > 0 && info.TurboBoost)
move = (move * 3) / 2; move = (move * 3) / 2;
move = move / 5;
SubPxPosition += move; if (pos.Z != desiredAltitude)
if (Info.Trail != null)
{ {
var sp = ((SubPxPosition - (move * 3) / 2)).ToPPos() - new PVecInt(0, Altitude); var delta = move.HorizontalLength * info.MaximumPitch.Tan() / 1024;
var dz = (target.Z - pos.Z).Clamp(-delta, delta);
if (--ticksToNextSmoke < 0) move += new WVec(0, 0, dz);
{
world.AddFrameEndTask(w => w.Add(new Smoke(w, sp.ToWPos(0), Info.Trail)));
ticksToNextSmoke = Info.TrailInterval;
}
} }
if (Info.RangeLimit != 0 && t > Info.RangeLimit * 40) pos += move;
if (info.Trail != null && --ticksToNextSmoke < 0)
{
world.AddFrameEndTask(w => w.Add(new Smoke(w, pos - 3 * move / 2, info.Trail)));
ticksToNextSmoke = info.TrailInterval;
}
if (info.ContrailLength > 0)
trail.Update(pos);
var shouldExplode = pos.Z < 0 // Hit the ground
|| dist.LengthSquared < MissileCloseEnough.Range * MissileCloseEnough.Range // Within range
|| info.RangeLimit != 0 && ticks > info.RangeLimit // Ran out of fuel
|| (!info.High && world.ActorMap.GetUnitsAt(pos.ToCPos())
.Any(a => a.HasTrait<IBlocksBullets>())); // Hit a wall
if (shouldExplode)
Explode(world); Explode(world);
if (!Info.High) // check for hitting a wall
{
var cell = PxPosition.ToCPos();
if (world.ActorMap.GetUnitsAt(cell).Any(a => a.HasTrait<IBlocksBullets>()))
Explode(world);
}
if (Info.ContrailLength > 0)
Trail.Update(PxPosition.ToWPos(Altitude));
} }
void Explode(World world) void Explode(World world)
{ {
world.AddFrameEndTask(w => w.Remove(this)); exploded = true;
if (t > Info.Arm * 40) /* don't blow up in our launcher's face! */
Combat.DoImpacts(PxPosition.ToWPos(Altitude), Args.sourceActor, Args.weapon, Args.firepowerModifier); if (info.ContrailLength > 0)
world.AddFrameEndTask(w => w.Add(new DelayedAction(info.ContrailLength, () => w.Remove(this))));
else
world.AddFrameEndTask(w => w.Remove(this));
// Don't blow up in our launcher's face!
if (ticks <= info.Arm)
return;
Combat.DoImpacts(pos, args.sourceActor, args.weapon, args.firepowerModifier);
} }
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
if (Info.ContrailLength > 0) if (info.ContrailLength > 0)
yield return Trail; yield return trail;
if (!Args.sourceActor.World.FogObscures(PxPosition.ToCPos())) if (!args.sourceActor.World.FogObscures(pos.ToCPos()))
yield return new SpriteRenderable(anim.Image, PxPosition.ToFloat2() - new float2(0, Altitude), {
wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y); var palette = wr.Palette(args.weapon.Underwater ? "shadow" : "effect");
foreach (var r in anim.Render(pos, palette))
yield return r;
}
} }
} }
} }

3
OpenRA.Mods.RA/JamsMissiles.cs
View File

@@ -26,7 +26,8 @@ namespace OpenRA.Mods.RA
{ {
readonly JamsMissilesInfo info; readonly JamsMissilesInfo info;
public int Range { get { return info.Range; } } // Convert cells to world units
public int Range { get { return 1024 * info.Range; } }
public bool AlliedMissiles { get { return info.AlliedMissiles; } } public bool AlliedMissiles { get { return info.AlliedMissiles; } }
public int Chance { get { return info.Chance; } } public int Chance { get { return info.Chance; } }