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

Clean up AttackPopupTurreted.

Browse Source
This commit is contained in:
Paul Chote
2014-03-08 12:11:02 +13:00
parent 93c8be4e79
commit a8bd25a6a5
1 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
OpenRA.Mods.RA/Attack/AttackPopupTurreted.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information #region Copyright & License Information
/* /*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS) * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made * This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
@@ -16,73 +16,74 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA namespace OpenRA.Mods.RA
{ {
class AttackPopupTurretedInfo : AttackTurretedInfo class AttackPopupTurretedInfo : AttackTurretedInfo, Requires<BuildingInfo>, Requires<RenderBuildingInfo>
{ {
public int CloseDelay = 125; public int CloseDelay = 125;
public int DefaultFacing = 0; public int DefaultFacing = 0;
public float ClosedDamageMultiplier = 0.5f; public float ClosedDamageMultiplier = 0.5f;
public override object Create(ActorInitializer init) { return new AttackPopupTurreted( init, this ); }
public override object Create(ActorInitializer init) { return new AttackPopupTurreted(init, this); }
} }
class AttackPopupTurreted : AttackTurreted, INotifyBuildComplete, INotifyIdle, IDamageModifier class AttackPopupTurreted : AttackTurreted, INotifyBuildComplete, INotifyIdle, IDamageModifier
{ {
enum PopupState { Open, Rotating, Transitioning, Closed }; enum PopupState { Open, Rotating, Transitioning, Closed }
AttackPopupTurretedInfo Info; AttackPopupTurretedInfo info;
int IdleTicks = 0; RenderBuilding rb;
PopupState State = PopupState.Open;
int idleTicks = 0;
PopupState state = PopupState.Open;
Turreted turret; Turreted turret;
public AttackPopupTurreted(ActorInitializer init, AttackPopupTurretedInfo info) : base(init.self) public AttackPopupTurreted(ActorInitializer init, AttackPopupTurretedInfo info)
: base(init.self)
{ {
Info = info; this.info = info;
buildComplete = init.Contains<SkipMakeAnimsInit>(); buildComplete = init.Contains<SkipMakeAnimsInit>();
turret = turrets.FirstOrDefault(); turret = turrets.FirstOrDefault();
rb = init.self.Trait<RenderBuilding>();
} }
protected override bool CanAttack( Actor self, Target target ) protected override bool CanAttack(Actor self, Target target)
{ {
if (State == PopupState.Transitioning) if (state == PopupState.Transitioning || !buildComplete)
return false; return false;
if( self.HasTrait<Building>() && !buildComplete ) if (!base.CanAttack(self, target))
return false; return false;
if (!base.CanAttack( self, target )) idleTicks = 0;
return false; if (state == PopupState.Closed)
IdleTicks = 0;
if (State == PopupState.Closed)
{ {
State = PopupState.Transitioning; state = PopupState.Transitioning;
var rb = self.Trait<RenderBuilding>();
rb.PlayCustomAnimThen(self, "opening", () => rb.PlayCustomAnimThen(self, "opening", () =>
{ {
State = PopupState.Open; state = PopupState.Open;
rb.PlayCustomAnimRepeating(self, "idle"); rb.PlayCustomAnimRepeating(self, "idle");
}); });
return false; return false;
} }
if (!turret.FaceTarget(self,target)) return false; if (!turret.FaceTarget(self, target))
return false;
return true; return true;
} }
public void TickIdle(Actor self) public void TickIdle(Actor self)
{ {
if (State == PopupState.Open && IdleTicks++ > Info.CloseDelay) if (state == PopupState.Open && idleTicks++ > info.CloseDelay)
{ {
turret.desiredFacing = Info.DefaultFacing; turret.desiredFacing = info.DefaultFacing;
State = PopupState.Rotating; state = PopupState.Rotating;
} }
else if (State == PopupState.Rotating && turret.turretFacing == Info.DefaultFacing) else if (state == PopupState.Rotating && turret.turretFacing == info.DefaultFacing)
{ {
State = PopupState.Transitioning; state = PopupState.Transitioning;
var rb = self.Trait<RenderBuilding>();
rb.PlayCustomAnimThen(self, "closing", () => rb.PlayCustomAnimThen(self, "closing", () =>
{ {
State = PopupState.Closed; state = PopupState.Closed;
rb.PlayCustomAnimRepeating(self, "closed-idle"); rb.PlayCustomAnimRepeating(self, "closed-idle");
turret.desiredFacing = null; turret.desiredFacing = null;
}); });
@@ -94,17 +95,17 @@ namespace OpenRA.Mods.RA
// Set true for SkipMakeAnimsInit // Set true for SkipMakeAnimsInit
if (buildComplete) if (buildComplete)
{ {
State = PopupState.Closed; state = PopupState.Closed;
self.Trait<RenderBuilding>() rb.PlayCustomAnimRepeating(self, "closed-idle");
.PlayCustomAnimRepeating(self, "closed-idle");
turret.desiredFacing = null; turret.desiredFacing = null;
} }
buildComplete = true; buildComplete = true;
} }
public float GetDamageModifier(Actor attacker, WarheadInfo warhead) public float GetDamageModifier(Actor attacker, WarheadInfo warhead)
{ {
return State == PopupState.Closed ? Info.ClosedDamageMultiplier : 1f; return state == PopupState.Closed ? info.ClosedDamageMultiplier : 1f;
} }
} }
} }