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

declare AttackTurreted -> Turreted dep; do trait lookup at spawn time

Browse Source
This commit is contained in:
Chris Forbes
2011-08-21 21:27:36 +12:00
parent 78a0c3e506
commit 6a092dbfda
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.RA/Attack/AttackTurreted.cs
View File

@@ -18,7 +18,7 @@ using OpenRA.Traits.Activities;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
class AttackTurretedInfo : AttackBaseInfo class AttackTurretedInfo : AttackBaseInfo, Requires<TurretedInfo>
{ {
public override object Create(ActorInitializer init) { return new AttackTurreted( init.self ); } public override object Create(ActorInitializer init) { return new AttackTurreted( init.self ); }
} }
@@ -26,7 +26,12 @@ namespace OpenRA.Mods.RA
class AttackTurreted : AttackBase, INotifyBuildComplete class AttackTurreted : AttackBase, INotifyBuildComplete
{ {
protected Target target; protected Target target;
public AttackTurreted(Actor self) : base(self) { } protected Turreted turret;
public AttackTurreted(Actor self) : base(self)
{
turret = self.Trait<Turreted>();
}
protected override bool CanAttack( Actor self, Target target ) protected override bool CanAttack( Actor self, Target target )
{ {
@@ -34,9 +39,8 @@ namespace OpenRA.Mods.RA
return false; return false;
if (!target.IsValid) return false; if (!target.IsValid) return false;
var turreted = self.Trait<Turreted>(); turret.desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, turret.turretFacing );
turreted.desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, turreted.turretFacing ); if( turret.desiredFacing != turret.turretFacing )
if( turreted.desiredFacing != turreted.turretFacing )
return false; return false;
return base.CanAttack( self, target ); return base.CanAttack( self, target );