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

Add strafing to C&C airstrike.

Browse Source
This commit is contained in:
Paul Chote
2013-11-01 17:44:54 +13:00
parent 8d07d14e4d
commit 2f5ff30184
5 changed files with 75 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
OpenRA.Mods.RA/AttackBomber.cs
View File

@@ -19,28 +19,59 @@ namespace OpenRA.Mods.RA
{
class AttackBomberInfo : AttackBaseInfo
{
public override object Create(ActorInitializer init) { return new AttackBomber(init.self); }
[Desc("Armament name")]
public readonly string Bombs = "primary";
[Desc("Armament name")]
public readonly string Guns = "secondary";
public readonly int FacingTolerance = 2;
public override object Create(ActorInitializer init) { return new AttackBomber(init.self, this); }
}
class AttackBomber : AttackBase, ISync
{
AttackBomberInfo info;
[Sync] Target target;
public AttackBomber(Actor self)
: base(self) { }
public AttackBomber(Actor self, AttackBomberInfo info)
: base(self)
{
this.info = info;
}
public override void Tick(Actor self)
{
base.Tick(self);
if (!target.IsInRange(self.CenterPosition, GetMaximumRange()))
return;
var facing = self.TraitOrDefault<IFacing>();
var cp = self.CenterPosition;
var t = Target.FromPos(cp - new WVec(0, 0, cp.Z));
foreach (var a in Armaments)
var bombTarget = Target.FromPos(cp - new WVec(0, 0, cp.Z));
// Bombs drop anywhere in range
foreach (var a in Armaments.Where(a => a.Info.Name == info.Bombs))
{
var range = new WRange((int)(1024 * a.Weapon.Range));
if (!target.IsInRange(self.CenterPosition, range))
continue;
a.CheckFire(self, this, facing, bombTarget);
}
// Guns only fire when approaching the target
var facingToTarget = Util.GetFacing(target.CenterPosition - self.CenterPosition, facing.Facing);
if (Math.Abs(facingToTarget - facing.Facing) % 256 > info.FacingTolerance)
return;
foreach (var a in Armaments.Where(a => a.Info.Name == info.Guns))
{
var range = new WRange((int)(1024 * a.Weapon.Range));
if (!target.IsInRange(self.CenterPosition, range))
continue;
var t = Target.FromPos(cp - new WVec(0, range.Range / 2, cp.Z).Rotate(WRot.FromFacing(facing.Facing)));
a.CheckFire(self, this, facing, t);
}
}
public void SetTarget(WPos pos) { target = Target.FromPos(pos); }

2
OpenRA.Mods.RA/SupportPowers/AirstrikePower.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA
[ActorReference]
public readonly string UnitType = "badr.bomber";
public readonly int SquadSize = 1;
public readonly WVec SquadOffset = new WVec(-1536, 2048, 0);
public readonly WVec SquadOffset = new WVec(-1536, 1536, 0);
public readonly int QuantizedFacings = 32;
public readonly WRange Cordon = new WRange(5120);