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

Explore shroud on first GPS launch, ignoring power/radar.

Browse Source
This commit is contained in:
Paul Chote
2016-09-04 16:40:48 +01:00
parent 48c9e74bb4
commit 142caa6691
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.Mods.RA/Traits/GpsWatcher.cs
View File

@@ -32,6 +32,9 @@ namespace OpenRA.Mods.RA.Traits
[Sync] public bool GrantedAllies { get; private set; } [Sync] public bool GrantedAllies { get; private set; }
[Sync] public bool Granted { get; private set; } [Sync] public bool Granted { get; private set; }
// Whether this watcher has explored the terrain (by becoming Launched, or an ally becoming Launched)
[Sync] bool explored;
readonly Player owner; readonly Player owner;
readonly List<Actor> actors = new List<Actor>(); readonly List<Actor> actors = new List<Actor>();
@@ -70,21 +73,23 @@ namespace OpenRA.Mods.RA.Traits
foreach (var i in atek.World.ActorsWithTrait<GpsWatcher>()) foreach (var i in atek.World.ActorsWithTrait<GpsWatcher>())
i.Trait.RefreshGranted(); i.Trait.RefreshGranted();
if ((Granted || GrantedAllies) && atek.Owner.IsAlliedWith(owner))
atek.Owner.Shroud.ExploreAll();
} }
void RefreshGranted() void RefreshGranted()
{ {
var wasGranted = Granted; var wasGranted = Granted;
var wasGrantedAllies = GrantedAllies; var wasGrantedAllies = GrantedAllies;
var allyWatchers = owner.World.ActorsWithTrait<GpsWatcher>().Where(kv => kv.Actor.Owner.IsAlliedWith(owner));
Granted = actors.Count > 0 && Launched; Granted = actors.Count > 0 && Launched;
GrantedAllies = owner.World.ActorsHavingTrait<GpsWatcher>(g => g.Granted).Any(p => p.Owner.IsAlliedWith(owner)); GrantedAllies = allyWatchers.Any(w => w.Trait.Granted);
if (Granted || GrantedAllies) var allyLaunched = allyWatchers.Any(w => w.Trait.Launched);
if ((Launched || allyLaunched) && !explored)
{
explored = true;
owner.Shroud.ExploreAll(); owner.Shroud.ExploreAll();
}
if (wasGranted != Granted || wasGrantedAllies != GrantedAllies) if (wasGranted != Granted || wasGrantedAllies != GrantedAllies)
foreach (var tp in notifyOnRefresh.ToList()) foreach (var tp in notifyOnRefresh.ToList())