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

Allow opportunity fire for aircraft.

Browse Source
This commit is contained in:
tovl
2019-03-31 22:09:43 +02:00
committed by reaperrr
parent f16ff9eaa0
commit 9abf715fd7
19 changed files with 114 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Traits/Air/AttackAircraft.cs
View File

@@ -20,29 +20,18 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Delay, in game ticks, before non-hovering aircraft turns to attack.")]
public readonly int AttackTurnDelay = 50;
[Desc("Tolerance for attack angle. Range [0, 128], 128 covers 360 degrees.")]
public readonly int FacingTolerance = 0;
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
base.RulesetLoaded(rules, ai);
if (FacingTolerance < 0 || FacingTolerance > 128)
throw new YamlException("Facing tolerance must be in range of [0, 128], 128 covers 360 degrees.");
}
public override object Create(ActorInitializer init) { return new AttackAircraft(init.Self, this); }
}
public class AttackAircraft : AttackFollow
{
public readonly AttackAircraftInfo AttackAircraftInfo;
public new readonly AttackAircraftInfo Info;
readonly AircraftInfo aircraftInfo;
public AttackAircraft(Actor self, AttackAircraftInfo info)
: base(self, info)
{
AttackAircraftInfo = info;
Info = info;
aircraftInfo = self.Info.TraitInfo<AircraftInfo>();
}
@@ -64,14 +53,7 @@ namespace OpenRA.Mods.Common.Traits
if (!base.CanAttack(self, target))
return false;
var pos = self.CenterPosition;
var targetedPosition = GetTargetPosition(pos, target);
var delta = targetedPosition - pos;
if (delta.HorizontalLengthSquared == 0)
return true;
return Util.FacingWithinTolerance(facing.Facing, delta.Yaw.Facing, AttackAircraftInfo.FacingTolerance);
return TargetInFiringArc(self, target, base.Info.FacingTolerance);
}
}
}

8
OpenRA.Mods.Common/Traits/Air/AttackBomber.cs
View File

@@ -18,7 +18,8 @@ namespace OpenRA.Mods.Common.Traits
{
public class AttackBomberInfo : AttackBaseInfo
{
public readonly int FacingTolerance = 2;
[Desc("Tolerance for attack angle. Range [0, 128], 128 covers 360 degrees.")]
public readonly new int FacingTolerance = 2;
public override object Create(ActorInitializer init) { return new AttackBomber(init.Self, this); }
}
@@ -49,10 +50,7 @@ namespace OpenRA.Mods.Common.Traits
inAttackRange = false;
var f = facing.Facing;
var delta = target.CenterPosition - self.CenterPosition;
var facingToTarget = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : f;
facingTarget = Math.Abs(facingToTarget - f) % 256 <= info.FacingTolerance;
facingTarget = TargetInFiringArc(self, target, info.FacingTolerance);
foreach (var a in Armaments)
{