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

cnc sams rotate to home position before closing, lower ROT to something sane.

Browse Source
This commit is contained in:
Paul Chote
2011-01-31 21:17:07 +13:00
parent cd5e7409ef
commit 5f65d4102b
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Cnc/AttackPopupTurreted.cs
View File

@@ -31,18 +31,21 @@ namespace OpenRA.Mods.Cnc
enum PopupState
{
Open,
Rotating,
Transitioning,
Closed
};
protected Target target;
AttackPopupTurretedInfo Info;
Turreted Turret;
int IdleTicks = 0;
PopupState State = PopupState.Open;
public AttackPopupTurreted(Actor self, AttackPopupTurretedInfo info) : base(self)
{
Info = info;
Turret = self.Trait<Turreted>();
}
protected override bool CanAttack( Actor self, Target target )
@@ -69,9 +72,8 @@ namespace OpenRA.Mods.Cnc
return false;
}
var turreted = self.Trait<Turreted>();
turreted.desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, turreted.turretFacing );
if( turreted.desiredFacing != turreted.turretFacing )
Turret.desiredFacing = Util.GetFacing( target.CenterLocation - self.CenterLocation, Turret.turretFacing );
if( Turret.desiredFacing != Turret.turretFacing )
return false;
return true;
@@ -86,6 +88,11 @@ namespace OpenRA.Mods.Cnc
public void TickIdle(Actor self)
{
if (State == PopupState.Open && IdleTicks++ > Info.CloseDelay)
{
Turret.desiredFacing = 0;
State = PopupState.Rotating;
}
else if (State == PopupState.Rotating && Turret.turretFacing == 0)
{
State = PopupState.Transitioning;
var rb = self.Trait<RenderBuilding>();
@@ -93,6 +100,7 @@ namespace OpenRA.Mods.Cnc
{
State = PopupState.Closed;
rb.PlayCustomAnimRepeating(self, "closed-idle");
Turret.desiredFacing = null;
});
}
}