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

Introduce Weapon.TargetActorCenter and adapt projectiles

Browse Source 
This also fixes issues with attackers that don't have their own Attack
trait.
This commit is contained in:
reaperrr
2017-06-18 22:27:27 +02:00
committed by Paul Chote
parent 6b3c04a584
commit edffaa4987
15 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,8 +102,6 @@ namespace OpenRA.Mods.Common.Traits
public readonly Barrel[] Barrels;
readonly Actor self;
readonly AttackBase[] attackTraits;
AttackBase attack;
Turreted turret;
AmmoPool ammoPool;
BodyOrientation coords;
@@ -143,7 +141,6 @@ namespace OpenRA.Mods.Common.Traits
barrels.Add(new Barrel { Offset = WVec.Zero, Yaw = WAngle.Zero });
Barrels = barrels.ToArray();
attackTraits = self.TraitsImplementing<AttackBase>().Where(a => a.Info.Armaments.Contains(Info.Name)).ToArray();
}
public virtual WDist MaxRange()
@@ -206,10 +203,6 @@ namespace OpenRA.Mods.Common.Traits
// The world coordinate model uses Actor.Orientation
public virtual Barrel CheckFire(Actor self, IFacing facing, Target target)
{
attack = attackTraits.FirstOrDefault(Exts.IsTraitEnabled);
if (attack == null)
return null;
if (IsReloading)
return null;
@@ -246,7 +239,7 @@ namespace OpenRA.Mods.Common.Traits
Source = muzzlePosition(),
CurrentSource = muzzlePosition,
SourceActor = self,
PassiveTarget = attack.Info.AttackTargetCenter ? target.CenterPosition : target.Positions.PositionClosestTo(muzzlePosition()),
PassiveTarget = Weapon.TargetActorCenter ? target.CenterPosition : target.Positions.PositionClosestTo(muzzlePosition()),
GuidedTarget = target
};