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

Convert Attack*.FacingTolerance to WAngle.

Browse Source
This commit is contained in:
Paul Chote
2020-11-28 14:42:16 +00:00
committed by abcdefg30
parent d75fed3a00
commit 77ffc20a5f
14 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
View File

@@ -52,14 +52,14 @@ namespace OpenRA.Mods.Common.Traits
public readonly string Voice = "Action";
[Desc("Tolerance for attack angle. Range [0, 128], 128 covers 360 degrees.")]
public readonly int FacingTolerance = 128;
public readonly WAngle FacingTolerance = new WAngle(512);
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.");
if (FacingTolerance.Angle > 512)
throw new YamlException("Facing tolerance must be in range of [0, 512], 512 covers 360 degrees.");
}
public override abstract object Create(ActorInitializer init);
@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Common.Traits
return () => armaments;
}
public bool TargetInFiringArc(Actor self, in Target target, int facingTolerance)
public bool TargetInFiringArc(Actor self, in Target target, WAngle facingTolerance)
{
if (facing == null)
return true;