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

Prevent turrets from firing until they are aligned with the target.

Browse Source
This commit is contained in:
RoosterDragon
2016-03-12 20:41:35 +00:00
parent 4598b0de43
commit 163688fc39
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/Armament.cs
View File

@@ -186,6 +186,9 @@ namespace OpenRA.Mods.Common.Traits
if (ammoPool != null && !ammoPool.HasAmmo()) if (ammoPool != null && !ammoPool.HasAmmo())
return null; return null;
if (turret != null && !turret.HasAchievedDesiredFacing)
return null;
if (!target.IsInRange(self.CenterPosition, MaxRange())) if (!target.IsInRange(self.CenterPosition, MaxRange()))
return null; return null;

7
OpenRA.Mods.Common/Traits/Turreted.cs
View File

@@ -113,7 +113,12 @@ namespace OpenRA.Mods.Common.Traits
var delta = target.CenterPosition - self.CenterPosition; var delta = target.CenterPosition - self.CenterPosition;
DesiredFacing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : TurretFacing; DesiredFacing = delta.HorizontalLengthSquared != 0 ? delta.Yaw.Facing : TurretFacing;
MoveTurret(); MoveTurret();
return TurretFacing == DesiredFacing.Value; return HasAchievedDesiredFacing;
}
public bool HasAchievedDesiredFacing
{
get { return DesiredFacing != null && TurretFacing == DesiredFacing.Value; }
} }
// Turret offset in world-space // Turret offset in world-space