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

Fix cloak upgrade expiration.

Browse Source
This commit is contained in:
Paul Chote
2014-09-26 14:35:16 +12:00
parent c697a1e7b4
commit 331f2852db
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.RA/Cloak.cs
View File

@@ -71,7 +71,15 @@ namespace OpenRA.Mods.RA
public void UpgradeAvailable(Actor self, string type, bool available) public void UpgradeAvailable(Actor self, string type, bool available)
{ {
if (type == Info.RequiresUpgrade) if (type == Info.RequiresUpgrade)
{
disabled = !available; disabled = !available;
if (disabled)
{
Uncloak();
remainingTime = Info.InitialDelay;
}
}
} }
public void Uncloak() { Uncloak(Info.CloakDelay); } public void Uncloak() { Uncloak(Info.CloakDelay); }
@@ -86,7 +94,7 @@ namespace OpenRA.Mods.RA
public void Attacking(Actor self, Target target, Armament a, Barrel barrel) { if (Info.UncloakOnAttack) Uncloak(); } public void Attacking(Actor self, Target target, Armament a, Barrel barrel) { if (Info.UncloakOnAttack) Uncloak(); }
public bool Cloaked { get { return remainingTime <= 0; } } public bool Cloaked { get { return !disabled && remainingTime <= 0; } }
public void DamageStateChanged(Actor self, AttackInfo e) public void DamageStateChanged(Actor self, AttackInfo e)
{ {
@@ -97,20 +105,25 @@ namespace OpenRA.Mods.RA
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r) public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
{ {
if (remainingTime > 0) if (remainingTime > 0 || disabled)
return r; return r;
if (Cloaked && IsVisible(self, self.World.RenderPlayer)) if (Cloaked && IsVisible(self, self.World.RenderPlayer))
{
if (string.IsNullOrEmpty(Info.Palette)) if (string.IsNullOrEmpty(Info.Palette))
return r; return r;
else else
return r.Select(a => a.WithPalette(wr.Palette(Info.Palette))); return r.Select(a => a.WithPalette(wr.Palette(Info.Palette)));
}
else else
return SpriteRenderable.None; return SpriteRenderable.None;
} }
public void Tick(Actor self) public void Tick(Actor self)
{ {
if (disabled)
return;
if (remainingTime > 0 && !disabled && !damageDisabled && --remainingTime <= 0) if (remainingTime > 0 && !disabled && !damageDisabled && --remainingTime <= 0)
Sound.Play(Info.CloakSound, self.CenterPosition); Sound.Play(Info.CloakSound, self.CenterPosition);