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

Simplify cloak crate behavior.

Browse Source 
This removes the runtime trait addition which
prevented Cloak from being cached.

The CloakCrateAction in D2K was never used, so
has also been removed.
This commit is contained in:
Paul Chote
2013-08-18 14:50:49 +12:00
parent e5e9ff95d0
commit 1e53434e45
8 changed files with 39 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.RA/Effects/GpsDot.cs
View File

@@ -36,6 +36,7 @@ namespace OpenRA.Mods.RA.Effects
Lazy<HiddenUnderFog> huf;
Lazy<FrozenUnderFog> fuf;
Lazy<Spy> spy;
Lazy<Cloak> cloak;
Cache<Player, GpsWatcher> watcher;
Cache<Player, FrozenActorLayer> frozen;
@@ -53,15 +54,15 @@ namespace OpenRA.Mods.RA.Effects
huf = Lazy.New(() => self.TraitOrDefault<HiddenUnderFog>());
fuf = Lazy.New(() => self.TraitOrDefault<FrozenUnderFog>());
spy = Lazy.New(() => self.TraitOrDefault<Spy>());
cloak = Lazy.New(() => self.TraitOrDefault<Cloak>());
watcher = new Cache<Player, GpsWatcher>(p => p.PlayerActor.Trait<GpsWatcher>());
frozen = new Cache<Player, FrozenActorLayer>(p => p.PlayerActor.Trait<FrozenActorLayer>());
}
bool ShouldShowIndicator()
{
// Can be granted at runtime via a crate, so can't cache
var cloak = self.TraitOrDefault<Cloak>();
if (cloak != null && cloak.Cloaked)
if (cloak.Value != null && cloak.Value.Cloaked)
return false;
if (spy.Value != null && spy.Value.Disguised)