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

Introducing per-player shrouds.

Browse Source 
- Each player has their own shroud and their visibility does not extend outside of the shroud. 
- Units and buildings can no longer target other units outside of their visibility. Buildings can still be targetted if they have been explored.
- GPS will provide visibility in the fog-of-war.
- Spies that infiltrate radar domes will gain their victim's exploration and reset it on all clients (if the victim does not have GPS)
This commit is contained in:
Kenny
2012-12-13 15:16:56 -08:00
parent 5249a17d48
commit f41fb32d60
48 changed files with 351 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Game/Actor.cs
View File

@@ -43,6 +43,8 @@ namespace OpenRA
return HasLocation.PxPosition;
}
}
public Shroud.ActorVisibility Sight;
[Sync]
public Player Owner;
@@ -85,6 +87,16 @@ namespace OpenRA
return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2();
});
if(this.HasTrait<RevealsShroud>())
{
Sight = new Shroud.ActorVisibility
{
range = this.Trait<RevealsShroud>().RevealRange,
vis = Shroud.GetVisOrigins(this).ToArray()
};
}
ApplyIRender = x => x.Render(this);
ApplyRenderModifier = (m, p) => p.ModifyRender(this, m);
@@ -99,6 +111,11 @@ namespace OpenRA
currentActivity = Util.RunActivity( this, currentActivity );
}
public void UpdateSight()
{
Sight.vis = Shroud.GetVisOrigins(this).ToArray();
}
public bool IsIdle
{

8
OpenRA.Game/Graphics/Minimap.cs
View File

@@ -139,7 +139,7 @@ namespace OpenRA.Graphics
foreach (var t in world.ActorsWithTrait<IRadarSignature>())
{
if (!world.LocalShroud.IsVisible(t.Actor))
if (!world.RenderedShroud.IsVisible(t.Actor))
continue;
var color = t.Trait.RadarSignatureColor(t.Actor);
@@ -158,7 +158,7 @@ namespace OpenRA.Graphics
var map = world.Map;
var size = Exts.NextPowerOf2(Math.Max(map.Bounds.Width, map.Bounds.Height));
var bitmap = new Bitmap(size, size);
if (world.LocalShroud.Disabled)
if (world.RenderedShroud.Disabled)
return bitmap;
var bitmapData = bitmap.LockBits(bitmap.Bounds(),
@@ -176,9 +176,9 @@ namespace OpenRA.Graphics
{
var mapX = x + map.Bounds.Left;
var mapY = y + map.Bounds.Top;
if (!world.LocalShroud.IsExplored(mapX, mapY))
if (!world.RenderedShroud.IsExplored(mapX, mapY))
*(c + (y * bitmapData.Stride >> 2) + x) = shroud;
else if (!world.LocalShroud.IsVisible(mapX,mapY))
else if (!world.RenderedShroud.IsVisible(mapX,mapY))
*(c + (y * bitmapData.Stride >> 2) + x) = fog;
}
}

16
OpenRA.Game/Graphics/ShroudRenderer.cs
View File

@@ -15,21 +15,25 @@ namespace OpenRA.Graphics
{
public class ShroudRenderer
{
Traits.Shroud shroud;
World world;
Traits.Shroud shroud {
get {
return world.RenderedShroud;
}
}
Sprite[] shadowBits = Game.modData.SpriteLoader.LoadAllSprites("shadow");
Sprite[,] sprites, fogSprites;
bool dirty = true;
Map map;
public ShroudRenderer(World world)
{
this.shroud = world.LocalShroud;
this.world = world;
this.map = world.Map;
sprites = new Sprite[map.MapSize.X, map.MapSize.Y];
fogSprites = new Sprite[map.MapSize.X, map.MapSize.Y];
shroud.Dirty += () => dirty = true;
}
static readonly byte[][] SpecialShroudTiles =
@@ -103,9 +107,9 @@ namespace OpenRA.Graphics
internal void Draw( WorldRenderer wr )
{
if (dirty)
if (shroud != null && shroud.dirty)
{
dirty = false;
shroud.dirty = false;
for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
sprites[i, j] = ChooseShroud(i, j);

4
OpenRA.Game/Graphics/TerrainRenderer.cs
View File

@@ -72,9 +72,9 @@ namespace OpenRA.Graphics
if (firstRow < 0) firstRow = 0;
if (lastRow > map.Bounds.Height) lastRow = map.Bounds.Height;
if (world.LocalPlayer != null && !world.LocalShroud.Disabled && world.LocalShroud.Bounds.HasValue)
if (world.RenderedPlayer != null && !world.RenderedShroud.Disabled && world.RenderedShroud.Bounds.HasValue)
{
var r = world.LocalShroud.Bounds.Value;
var r = world.RenderedShroud.Bounds.Value;
if (firstRow < r.Top - map.Bounds.Top)
firstRow = r.Top - map.Bounds.Top;

2
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -202,7 +202,7 @@ namespace OpenRA.Graphics
cachedScroll = scrollPosition;
}
var b = world.LocalShroud.Bounds;
var b = world.RenderedShroud.Bounds;
return (b.HasValue) ? Rectangle.Intersect(cachedRect, b.Value) : cachedRect;
}
}

3
OpenRA.Game/Network/UnitOrders.cs
View File

@@ -198,8 +198,7 @@ namespace OpenRA.Network
{
var oldStance = p.Stances[target];
p.Stances[target] = s;
if (target == w.LocalPlayer)
w.WorldActor.Trait<Shroud>().UpdatePlayerStance(w, p, oldStance, s);
target.Shroud.UpdatePlayerStance(w, p, oldStance, s);
foreach (var nsc in w.ActorsWithTrait<INotifyStanceChanged>())
nsc.Trait.StanceChanged(nsc.Actor, p, target, oldStance, s);

7
OpenRA.Game/Player.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA
public readonly PlayerReference PlayerReference;
public bool IsBot;
public Shroud Shroud { get { return World.LocalShroud; } }
public Shroud Shroud;
public World World { get; private set; }
static CountryInfo ChooseCountry(World world, string name)
@@ -68,7 +68,7 @@ namespace OpenRA
else
{
// Map player
ClientIndex = 0; // Owned by the host (todo: fix this)
ClientIndex = -1; // Owned by the host (todo: fix this)
ColorRamp = pr.ColorRamp;
PlayerName = pr.Name;
NonCombatant = pr.NonCombatant;
@@ -76,7 +76,8 @@ namespace OpenRA
Country = ChooseCountry(world, pr.Race);
}
PlayerActor = world.CreateActor("Player", new TypeDictionary { new OwnerInit(this) });
Shroud = PlayerActor.Trait<Shroud>();
Shroud.Owner = this;
// Enable the bot logic on the host
IsBot = botType != null;
if (IsBot && Game.IsHost)

8
OpenRA.Game/Traits/CreatesShroud.cs
View File

@@ -29,8 +29,12 @@ namespace OpenRA.Traits
public void Tick(Actor self)
{
if (!self.IsDisabled())
self.World.WorldActor.Trait<Shroud>().HideActor(self, Info.Range);
if (!self.TraitsImplementing<IDisable>().Any(d => d.Disabled)) {
var shrouds = self.World.ActorsWithTrait<Traits.Shroud>().Select(s => s.Actor.Owner.Shroud);
foreach (var shroud in shrouds) {
shroud.HideActor(self, Info.Range);
}
}
}
}
}

4
OpenRA.Game/Traits/Player/DeveloperMode.cs
View File

@@ -77,7 +77,7 @@ namespace OpenRA.Traits
{
DisableShroud ^= true;
if (self.World.LocalPlayer == self.Owner)
self.World.LocalShroud.Disabled = DisableShroud;
self.World.RenderedShroud.Disabled = DisableShroud;
break;
}
case "DevPathDebug":
@@ -88,7 +88,7 @@ namespace OpenRA.Traits
case "DevGiveExploration":
{
if (self.World.LocalPlayer == self.Owner)
self.World.WorldActor.Trait<Shroud>().ExploreAll(self.World);
self.World.LocalPlayer.Shroud.ExploreAll(self.World);
break;
}
case "DevUnlimitedPower":

15
OpenRA.Game/Traits/RevealsShroud.cs
View File

@@ -29,11 +29,22 @@ namespace OpenRA.Traits
public void Tick(Actor self)
{
// todo: don't tick all the time.
World w = self.World;
if(self.Owner == null) return;
if (previousLocation != self.Location)
{
previousLocation = self.Location;
self.World.WorldActor.Trait<Shroud>().UpdateActor(self);
var actors = w.ActorsWithTrait<Shroud>();
foreach( var s in actors )
s.Actor.Owner.Shroud.RemoveActor(self);
self.UpdateSight();
foreach( var s in actors )
s.Actor.Owner.Shroud.AddActor(self);
}
}

4
OpenRA.Game/Traits/SelectionDecorations.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Traits
void DrawPips(WorldRenderer wr, Actor self, float2 basePosition)
{
if (self.Owner != self.World.LocalPlayer) return;
if (self.Owner != self.World.RenderedPlayer) return;
var pipSources = self.TraitsImplementing<IPips>();
if (pipSources.Count() == 0)
@@ -95,7 +95,7 @@ namespace OpenRA.Traits
void DrawTags(WorldRenderer wr, Actor self, float2 basePosition)
{
if (self.Owner != self.World.LocalPlayer) return;
if (self.Owner != self.World.RenderedPlayer) return;
// If a mod wants to implement a unit with multiple tags, then they are placed on multiple rows
var tagxyBase = basePosition + new float2(-16, 2); // Correct for the offset in the shp file

4
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Traits
Color RadarSignatureColor(Actor self);
}
public interface IVisibilityModifier { bool IsVisible(Actor self); }
public interface IVisibilityModifier { bool IsVisible(Shroud s, Actor self); }
public interface IRadarColorModifier { Color RadarColorOverride(Actor self); }
public interface IHasLocation { PPos PxPosition { get; } }
@@ -226,7 +226,7 @@ namespace OpenRA.Traits
public interface ILintPass { void Run(Action<string> emitError, Action<string> emitWarning); }
public interface IObjectivesPanel { string ObjectivesPanel { get; } }
public static class DisableExts
{
public static bool IsDisabled(this Actor a)

2
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Traits
for (int x = clip.Left; x < clip.Right; x++)
for (int y = clip.Top; y < clip.Bottom; y++)
{
if (!world.LocalShroud.IsExplored(new CPos(x, y)))
if (!world.RenderedShroud.IsExplored(new CPos(x, y)))
continue;
var c = content[x, y];

99
OpenRA.Game/Traits/World/Shroud.cs
View File

@@ -25,16 +25,23 @@ namespace OpenRA.Traits
Map map;
World world;
public Player Owner;
public int[,] visibleCells;
public bool[,] exploredCells;
Rectangle? exploredBounds;
public Rectangle? exploredBounds;
bool disabled = false;
public bool dirty = true;
public bool Disabled
{
get { return disabled || world.LocalPlayer == null; }
get { return disabled; }
set { disabled = value; Dirty(); }
}
public bool Observing
{
get { return world.IsShellmap || (world.LocalPlayer == null && Owner == null);; }
}
public Rectangle? Bounds
{
get { return Disabled ? null : exploredBounds; }
@@ -42,6 +49,12 @@ namespace OpenRA.Traits
public event Action Dirty = () => { };
public void Jank()
{
Dirty();
}
public Shroud(World world)
{
this.world = world;
@@ -50,12 +63,13 @@ namespace OpenRA.Traits
exploredCells = new bool[map.MapSize.X, map.MapSize.Y];
world.ActorAdded += AddActor;
world.ActorRemoved += RemoveActor;
Dirty += () => dirty = true;
}
// cache of positions that were added, so no matter what crazy trait code does, it
// can't make us invalid.
class ActorVisibility { public int range; public CPos[] vis; }
Dictionary<Actor, ActorVisibility> vis = new Dictionary<Actor, ActorVisibility>();
public class ActorVisibility { public int range; public CPos[] vis; }
public Dictionary<Actor, ActorVisibility> vis = new Dictionary<Actor, ActorVisibility>();
static IEnumerable<CPos> FindVisibleTiles(World world, CPos a, int r)
{
@@ -72,25 +86,13 @@ namespace OpenRA.Traits
yield return new CPos(i, j);
}
void AddActor(Actor a)
public void AddActor(Actor a)
{
if (!a.HasTrait<RevealsShroud>())
return;
if (a.Owner.World.LocalPlayer == null
|| a.Owner.Stances[a.Owner.World.LocalPlayer] != Stance.Ally) return;
if (vis.ContainsKey(a))
{
Game.Debug("Warning: Actor {0}:{1} at {2} bad vis".F(a.Info.Name, a.ActorID, a.Location));
RemoveActor(a);
}
var v = new ActorVisibility
{
range = a.Trait<RevealsShroud>().RevealRange,
vis = GetVisOrigins(a).ToArray()
};
if (!a.HasTrait<RevealsShroud>()) return;
if (a.Owner == null || Owner == null) return;
if(a.Owner.Stances[Owner] != Stance.Ally) return;
ActorVisibility v = a.Sight;
if (v.range == 0) return; // don't bother for things that can't see
@@ -106,8 +108,6 @@ namespace OpenRA.Traits
exploredBounds = (exploredBounds.HasValue) ? Rectangle.Union(exploredBounds.Value, box) : box;
}
vis[a] = v;
if (!Disabled)
Dirty();
}
@@ -129,6 +129,16 @@ namespace OpenRA.Traits
if (!Disabled)
Dirty();
}
public void MergeShroud(Shroud s) {
for (int i = map.Bounds.Left; i < map.Bounds.Right; i++) {
for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++) {
if (s.exploredCells[i,j] == true)
exploredCells[i, j] = true;
}
exploredBounds = Rectangle.Union(exploredBounds.Value, s.exploredBounds.Value);
}
}
public void UpdatePlayerStance(World w, Player player, Stance oldStance, Stance newStance)
{
@@ -138,7 +148,7 @@ namespace OpenRA.Traits
// No longer our ally; remove unit vis
if (oldStance == Stance.Ally)
{
var toRemove = vis.Select(a => a.Key).Where(a => a.Owner == player).ToList();
var toRemove = w.Actors.Where(a => a.Owner == player).ToList();
foreach (var a in toRemove)
RemoveActor(a);
}
@@ -147,6 +157,16 @@ namespace OpenRA.Traits
foreach (var a in w.Actors.Where( a => a.Owner == player ))
AddActor(a);
}
public int Explored()
{
int seen = 0;
for (int i = map.Bounds.Left; i < map.Bounds.Right; i++)
for (int j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
if(exploredCells[i, j]) seen++;
return seen;
}
public static IEnumerable<CPos> GetVisOrigins(Actor a)
{
@@ -160,17 +180,18 @@ namespace OpenRA.Traits
return new[] { a.CenterLocation.ToCPos() };
}
void RemoveActor(Actor a)
public void RemoveActor(Actor a)
{
ActorVisibility v;
if (!vis.TryGetValue(a, out v)) return;
if (!a.HasTrait<RevealsShroud>())return;
if (a.Owner == null || Owner == null) return;
if(a.Owner.Stances[Owner] != Stance.Ally) return;
ActorVisibility v = a.Sight;
foreach (var p in v.vis)
foreach (var q in FindVisibleTiles(a.World, p, v.range))
--visibleCells[q.X, q.Y];
vis.Remove(a);
if (!Disabled)
Dirty();
}
@@ -222,7 +243,7 @@ namespace OpenRA.Traits
if (!map.IsInMap(x, y))
return false;
if (Disabled)
if (Disabled || Observing)
return true;
return exploredCells[x,y];
@@ -231,7 +252,7 @@ namespace OpenRA.Traits
public bool IsVisible(CPos xy) { return IsVisible(xy.X, xy.Y); }
public bool IsVisible(int x, int y)
{
if (Disabled)
if (Disabled || Observing)
return true;
// Visibility is allowed to extend beyond the map cordon so that
@@ -245,10 +266,20 @@ namespace OpenRA.Traits
// Actors are hidden under shroud, but not under fog by default
public bool IsVisible(Actor a)
{
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(a)))
// I need to pass in the current shroud, otherwise we're just checking that true==true
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(this, a)))
return false;
return Disabled || a.Owner == a.World.LocalPlayer || GetVisOrigins(a).Any(o => IsExplored(o));
if(Owner == null) return true;
return Disabled || Observing || a.Owner.Stances[Owner] == Stance.Ally || GetVisOrigins(a).Any(o => IsExplored(o));
}
public bool IsTargetable(Actor a) {
if (a.TraitsImplementing<IVisibilityModifier>().Any(t => !t.IsVisible(this, a)))
return false;
return GetVisOrigins(a).Any(o => IsVisible(o));
}
}
}

2
OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs
View File

@@ -164,7 +164,7 @@ namespace OpenRA.Widgets
IEnumerable<Actor> SelectActorsInBox(World world, PPos a, PPos b, Func<Actor, bool> cond)
{
return world.FindUnits(a, b)
.Where( x => x.HasTrait<Selectable>() && world.LocalShroud.IsVisible(x) && cond(x) )
.Where( x => x.HasTrait<Selectable>() && world.RenderedShroud.IsVisible(x) && cond(x) )
.GroupBy(x => x.GetSelectionPriority())
.OrderByDescending(g => g.Key)
.Select( g => g.AsEnumerable() )

22
OpenRA.Game/World.cs
View File

@@ -41,10 +41,29 @@ namespace OpenRA
public Player LocalPlayer { get; private set; }
public readonly Shroud LocalShroud;
public Player RenderedPlayer;
public Shroud RenderedShroud {
get {
if(RenderedPlayer == null)
{
return LocalShroud;
}else{
return RenderedPlayer.Shroud;
}
}
}
public void SetLocalPlayer(string pr)
{
if (!(orderManager.Connection is ReplayConnection))
LocalPlayer = Players.FirstOrDefault(p => p.InternalName == pr);
{
LocalPlayer = Players.FirstOrDefault(p => p.InternalName == pr);
RenderedPlayer = LocalPlayer;
}else{
}
}
public readonly Actor WorldActor;
@@ -138,6 +157,7 @@ namespace OpenRA
a.IsInWorld = false;
actors.Remove(a);
ActorRemoved(a);
}
public void Add(IEffect b) { effects.Add(b); }

2
OpenRA.Game/WorldUtils.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA
public static IEnumerable<Actor> FindUnitsAtMouse(this World world, int2 mouseLocation)
{
var loc = Game.viewport.ViewToWorldPx(mouseLocation);
return FindUnits(world, loc, loc).Where(a => world.LocalShroud.IsVisible(a));
return FindUnits(world, loc, loc).Where(a => world.RenderedShroud.IsVisible(a));
}
public static IEnumerable<Actor> FindUnits(this World world, PPos a, PPos b)

3
OpenRA.Mods.RA/Activities/Attack.cs
View File

@@ -54,6 +54,9 @@ namespace OpenRA.Mods.RA.Activities
if (!Target.IsValid)
return NextActivity;
if (!self.Owner.HasFogVisibility() && Target.Actor != null && Target.Actor.HasTrait<Mobile>() && !self.Owner.Shroud.IsTargetable(Target.Actor))
return NextActivity;
if (targetable != null && !targetable.TargetableBy(Target.Actor, self))
return NextActivity;

1
OpenRA.Mods.RA/Attack/AttackTesla.cs
View File

@@ -50,6 +50,7 @@ namespace OpenRA.Mods.RA
{
return new TeslaAttack( newTarget );
}
public override void ResolveOrder(Actor self, Order order)
{

20
OpenRA.Mods.RA/AutoTarget.cs
View File

@@ -111,11 +111,21 @@ namespace OpenRA.Mods.RA
var inRange = self.World.FindUnitsInCircle(self.CenterLocation, (int)(Game.CellSize * range));
return inRange
.Where(a => a.AppearsHostileTo(self))
.Where(a => !a.HasTrait<AutoTargetIgnore>())
.Where(a => attack.HasAnyValidWeapons(Target.FromActor(a)))
.ClosestTo( self.CenterLocation );
if (self.Owner.HasFogVisibility()) {
return inRange
.Where(a => a.AppearsHostileTo(self))
.Where(a => !a.HasTrait<AutoTargetIgnore>())
.Where(a => attack.HasAnyValidWeapons(Target.FromActor(a)))
.ClosestTo( self.CenterLocation );
}
else {
return inRange
.Where(a => a.AppearsHostileTo(self))
.Where(a => !a.HasTrait<AutoTargetIgnore>())
.Where(a => attack.HasAnyValidWeapons(Target.FromActor(a)))
.Where(a => self.Owner.Shroud.IsTargetable(a))
.ClosestTo( self.CenterLocation );
}
}
}

2
OpenRA.Mods.RA/Buildings/BibLayer.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.RA.Buildings
{
if (!cliprect.Contains(kv.Key.X, kv.Key.Y))
continue;
if (!world.LocalShroud.IsExplored(kv.Key))
if (!world.RenderedShroud.IsExplored(kv.Key))
continue;
bibSprites[kv.Value.type - 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");

2
OpenRA.Mods.RA/ChronoshiftDeploy.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.RA
if (chargeTick <= 0 // Can jump
&& (self.Location - xy).Length <= Info.JumpDistance // Within jump range
&& movement.CanEnterCell(xy) // Can enter cell
&& (ignoreVis || self.World.LocalShroud.IsExplored(xy))) // Not in shroud
&& (ignoreVis || self.Owner.Shroud.IsExplored(xy))) // Not in shroud
return true;
else
return false;

6
OpenRA.Mods.RA/Chronoshiftable.cs
View File

@@ -44,12 +44,10 @@ namespace OpenRA.Mods.RA
}
// Can't be used in synced code, except with ignoreVis.
public virtual bool CanChronoshiftTo(Actor self, CPos targetLocation, bool ignoreVis)
public virtual bool CanChronoshiftTo(Actor self, CPos targetLocation)
{
// Todo: Allow enemy units to be chronoshifted into bad terrain to kill them
return self.HasTrait<ITeleportable>() &&
self.Trait<ITeleportable>().CanEnterCell(targetLocation) &&
(ignoreVis || self.World.LocalShroud.IsExplored(targetLocation));
return (self.HasTrait<ITeleportable>() && self.Trait<ITeleportable>().CanEnterCell(targetLocation));
}
public virtual bool Teleport(Actor self, CPos targetLocation, int duration, bool killCargo, Actor chronosphere)

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

@@ -92,14 +92,27 @@ namespace OpenRA.Mods.RA
lastPos = self.Location;
}
}
public bool IsVisible(Actor self)
{
if (!Cloaked || self.Owner == self.World.LocalPlayer ||
self.World.LocalPlayer == null ||
self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally)
return true;
return IsVisible(null, self);
}
public bool IsVisible(Shroud s, Actor self)
{
if (self.World.LocalPlayer != null) {
if (s == null) {
if (!Cloaked || self.Owner == self.World.LocalPlayer ||
self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally)
return true;
}
else {
if (!Cloaked || self.Owner == s.Owner ||
self.Owner.Stances[s.Owner] == Stance.Ally)
return true;
}
}
return self.World.ActorsWithTrait<DetectCloaked>().Any(a =>
a.Actor.Owner.Stances[self.Owner] != Stance.Ally &&
(self.Location - a.Actor.Location).Length < a.Actor.Info.Traits.Get<DetectCloakedInfo>().Range);

4
OpenRA.Mods.RA/ConquestVictoryConditions.cs
View File

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA
if (self.Owner == self.World.LocalPlayer)
{
self.World.LocalShroud.Disabled = true;
self.World.RenderedShroud.Disabled = true;
Game.RunAfterDelay(Info.NotificationDelay, () =>
{
if (Game.IsCurrentWorld(self.World))
@@ -79,7 +79,7 @@ namespace OpenRA.Mods.RA
Game.Debug("{0} is victorious.".F(self.Owner.PlayerName));
if (self.Owner == self.World.LocalPlayer)
{
self.World.LocalShroud.Disabled = true;
self.World.RenderedShroud.Disabled = true;
Game.RunAfterDelay(Info.NotificationDelay, () => Sound.PlayNotification(self.Owner, "Speech", "Win", self.Owner.Country.Race));
}
}

5
OpenRA.Mods.RA/Crates/HideMapCrateAction.cs
View File

@@ -25,8 +25,7 @@ namespace OpenRA.Mods.RA
public override int GetSelectionShares (Actor collector)
{
// don't ever hide the map for people who have GPS.
var gpsWatcher = collector.Owner.PlayerActor.TraitOrDefault<GpsWatcher>();
if (gpsWatcher != null && (gpsWatcher.Granted || gpsWatcher.GrantedAllies))
if (collector.Owner.HasFogVisibility())
return 0;
return base.GetSelectionShares (collector);
@@ -36,7 +35,7 @@ namespace OpenRA.Mods.RA
{
base.Activate(collector);
if (collector.Owner == collector.World.LocalPlayer)
collector.World.WorldActor.Trait<Shroud>().ResetExploration();
collector.Owner.Shroud.ResetExploration();
}
}
}

2
OpenRA.Mods.RA/Crates/RevealMapCrateAction.cs
View File

@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA
base.Activate(collector);
if (ShouldReveal( collector.Owner ))
collector.World.WorldActor.Trait<Shroud>().ExploreAll(collector.World);
collector.Owner.Shroud.ExploreAll(collector.World);
}
}
}

2
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -153,7 +153,7 @@ namespace OpenRA.Mods.RA.Effects
var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
var pos = float2.Lerp(Args.src.ToFloat2(), Args.dest.ToFloat2(), at) - new float2(0, altitude);
if (Args.firedBy.World.LocalShroud.IsVisible(((PPos) pos.ToInt2()).ToCPos()))
if (Args.firedBy.World.RenderedShroud.IsVisible(((PPos) pos.ToInt2()).ToCPos()))
{
if (Info.High || Info.Angle > 0)
{

4
OpenRA.Mods.RA/Effects/Contrail.cs
View File

@@ -91,8 +91,8 @@ namespace OpenRA.Mods.RA
var conPos = positions[i];
var nextPos = positions[i - 1];
if (self.World.LocalShroud.IsVisible(conPos.ToCPos()) ||
self.World.LocalShroud.IsVisible(nextPos.ToCPos()))
if (self.World.RenderedShroud.IsVisible(conPos.ToCPos()) ||
self.World.RenderedShroud.IsVisible(nextPos.ToCPos()))
{
Game.Renderer.WorldLineRenderer.DrawLine(conPos.ToFloat2(), nextPos.ToFloat2(), trailStart, trailEnd);

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

@@ -57,7 +57,7 @@ namespace OpenRA.Mods.RA.Effects
if (
self.IsInWorld
&& (watcher.Granted || watcher.GrantedAllies)
&& !self.Trait<HiddenUnderFog>().IsVisible(self)
&& !self.Trait<HiddenUnderFog>().IsVisible(self.World.RenderedShroud, self) // WRONG
&& (!self.HasTrait<Cloak>() || !self.Trait<Cloak>().Cloaked)
&& (!self.HasTrait<Spy>() || !self.Trait<Spy>().Disguised)
)

2
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -154,7 +154,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<Renderable> Render()
{
if (Args.firedBy.World.LocalShroud.IsVisible(PxPosition.ToCPos()))
if (Args.firedBy.World.RenderedShroud.IsVisible(PxPosition.ToCPos()))
yield return new Renderable(anim.Image, PxPosition.ToFloat2() - 0.5f * anim.Image.size - new float2(0, Altitude),
Args.weapon.Underwater ? "shadow" : "effect", PxPosition.Y);

2
OpenRA.Mods.RA/Harvester.cs
View File

@@ -428,7 +428,7 @@ namespace OpenRA.Mods.RA
public bool CanTargetLocation(Actor self, CPos location, List<Actor> actorsAtLocation, bool forceAttack, bool forceQueued, ref string cursor)
{
// Don't leak info about resources under the shroud
if (!self.World.LocalShroud.IsExplored(location)) return false;
if (!self.Owner.Shroud.IsExplored(location)) return false;
var res = self.World.WorldActor.Trait<ResourceLayer>().GetResource(location);
var info = self.Info.Traits.Get<HarvesterInfo>();

15
OpenRA.Mods.RA/InfiltrateForExploration.cs
View File

@@ -20,18 +20,9 @@ namespace OpenRA.Mods.RA
{
public void OnInfiltrate(Actor self, Actor spy)
{
/* todo: changes for per-player shrouds:
* - apply this everywhere, not just on the victim's client
* - actually steal their exploration before resetting it
*/
if (self.World.LocalPlayer != null && self.World.LocalPlayer.Stances[self.Owner] == Stance.Ally)
{
var gpsWatcher = self.Owner.PlayerActor.TraitOrDefault<GpsWatcher>();
if (gpsWatcher != null && (gpsWatcher.Granted || gpsWatcher.GrantedAllies))
return;
self.Owner.Shroud.ResetExploration();
}
spy.Owner.Shroud.MergeShroud(self.Owner.Shroud);
if (!self.Owner.HasFogVisibility())
self.Owner.Shroud.ResetExploration();
}
}
}

4
OpenRA.Mods.RA/InvisibleToEnemy.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA
class InvisibleToEnemy : IRenderModifier, IVisibilityModifier, IRadarColorModifier
{
public bool IsVisible(Actor self)
public bool IsVisible(Shroud s, Actor self)
{
return self.World.LocalPlayer == null ||
self.Owner.Stances[self.World.LocalPlayer] == Stance.Ally;
@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
return IsVisible(self) ? r : Nothing;
return IsVisible(self.Owner.Shroud, self) ? r : Nothing;
}
}
}

6
OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs
View File

@@ -18,15 +18,15 @@ namespace OpenRA.Mods.RA
class FrozenUnderFog : IRenderModifier, IVisibilityModifier
{
public bool IsVisible(Actor self)
public bool IsVisible(Shroud s, Actor self)
{
return Shroud.GetVisOrigins(self).Any(o => self.World.LocalShroud.IsVisible(o));
return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
}
Renderable[] cache = { };
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
if (IsVisible(self))
if (IsVisible(self.World.RenderedShroud, self))
cache = r.ToArray();
return cache;
}

6
OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs
View File

@@ -18,15 +18,15 @@ namespace OpenRA.Mods.RA
class HiddenUnderFog : IRenderModifier, IVisibilityModifier
{
public bool IsVisible(Actor self)
public bool IsVisible(Shroud s, Actor self)
{
return Shroud.GetVisOrigins(self).Any(o => self.World.LocalShroud.IsVisible(o));
return Shroud.GetVisOrigins(self).Any(o => s.IsVisible(o));
}
static Renderable[] Nothing = { };
public IEnumerable<Renderable> ModifyRender(Actor self, IEnumerable<Renderable> r)
{
return IsVisible(self) ? r : Nothing;
return IsVisible(self.World.RenderedShroud, self) ? r : Nothing;
}
}
}

1
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -276,6 +276,7 @@
<Compile Include="Player\PlaceBuilding.cs" />
<Compile Include="Player\ProductionQueue.cs" />
<Compile Include="Player\TechTree.cs" />
<Compile Include="PlayerExts.cs" />
<Compile Include="PrimaryBuilding.cs" />
<Compile Include="Production.cs" />
<Compile Include="ProductionBar.cs" />

25
OpenRA.Mods.RA/PlayerExts.cs Normal file
View File

@@ -0,0 +1,25 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* 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
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
public static class PlayerExts
{
public static bool HasFogVisibility( this Player a )
{
var gpsWatcher = a.PlayerActor.TraitOrDefault<GpsWatcher>();
return gpsWatcher != null && (gpsWatcher.Granted || gpsWatcher.GrantedAllies);
}
}
}

2
OpenRA.Mods.RA/ProductionBar.cs
View File

@@ -27,7 +27,7 @@ namespace OpenRA.Mods.RA
public float GetValue()
{
// only people we like should see our production status.
if (self.World.LocalPlayer != null && self.Owner.Stances[self.World.LocalPlayer] != Stance.Ally)
if (self.World.RenderedPlayer != null && self.Owner.Stances[self.World.RenderedPlayer] != Stance.Ally)
return 0;
var queue = self.TraitsImplementing<ProductionQueue>().FirstOrDefault(q => q.CurrentItem() != null);

2
OpenRA.Mods.RA/Scripting/RASpecialPowers.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Scripting
var target = kv.First;
var targetCell = kv.Second;
var cs = target.Trait<Chronoshiftable>();
if (cs.CanChronoshiftTo(target, targetCell, true))
if (chronosphere.Owner.Shroud.IsExplored(targetCell) && cs.CanChronoshiftTo(target, targetCell))
cs.Teleport(target, targetCell, duration, killCargo,chronosphere);
}
}

2
OpenRA.Mods.RA/SmokeTrailWhenDamaged.cs
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA
var altitude = new PVecInt(0, move.Altitude);
position = (self.CenterLocation - Combat.GetTurretPosition(self, facing, smokeTurret));
if (self.World.LocalShroud.IsVisible(position.ToCPos()))
if (self.World.RenderedShroud.IsVisible(position.ToCPos()))
self.World.AddFrameEndTask(
w => w.Add(new Smoke(w, position - altitude, "smokey")));
}

91
OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
View File

@@ -45,9 +45,8 @@ namespace OpenRA.Mods.RA
var targetCell = target.Location + (order.TargetLocation - order.ExtraLocation);
var cpi = Info as ChronoshiftPowerInfo;
if (cs.CanChronoshiftTo(target, targetCell, true))
cs.Teleport(target, targetCell,
cpi.Duration * 25, cpi.KillCargo, self);
if (self.Owner.Shroud.IsExplored(targetCell) && cs.CanChronoshiftTo(target, targetCell))
cs.Teleport(target, targetCell, cpi.Duration * 25, cpi.KillCargo, self);
}
}
@@ -61,6 +60,48 @@ namespace OpenRA.Mods.RA
return units.Distinct().Where(a => a.HasTrait<Chronoshiftable>());
}
public bool SimilarTerrain(CPos xy, CPos sourceLocation) {
if (!self.Owner.Shroud.IsExplored(xy))
return false;
int range = (Info as ChronoshiftPowerInfo).Range;
var sourceTiles = self.World.FindTilesInCircle(xy, range);
var destTiles = self.World.FindTilesInCircle(sourceLocation, range);
List<string> sourceTerrain = new List<string>();
List<string> destTerrain = new List<string>();
int j = 0;
foreach (var t in sourceTiles) {
j = j + 1;
if (!self.Owner.Shroud.IsExplored(t))
return false;
sourceTerrain.Add(self.World.GetTerrainType( t ));
}
j = 0;
foreach (var t in destTiles) {
j = j + 1;
if (!self.Owner.Shroud.IsExplored(t)) {
return false;
}
self.World.GetTerrainType( t );
destTerrain.Add(self.World.GetTerrainType( t ));
}
// HACK but I don't want to write a comparison function
if (sourceTerrain.Count != destTerrain.Count)
return false;
for (int i = 0; i < sourceTerrain.Count; i++) {
if (!sourceTerrain[i].Equals(destTerrain[i]))
return false;
}
return true;
}
class SelectTarget : IOrderGenerator
{
@@ -99,8 +140,11 @@ namespace OpenRA.Mods.RA
{
var xy = Game.viewport.ViewToWorld(Viewport.LastMousePos);
var targetUnits = power.UnitsInRange(xy);
foreach (var unit in targetUnits)
wr.DrawSelectionBox(unit, Color.Red);
foreach (var unit in targetUnits) {
if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility()) {
wr.DrawSelectionBox(unit, Color.Red);
}
}
}
public void RenderBeforeWorld(WorldRenderer wr, World world)
@@ -175,8 +219,11 @@ namespace OpenRA.Mods.RA
public void RenderAfterWorld(WorldRenderer wr, World world)
{
foreach (var unit in power.UnitsInRange(sourceLocation))
wr.DrawSelectionBox(unit, Color.Red);
foreach (var unit in power.UnitsInRange(sourceLocation)) {
if (manager.self.Owner.Shroud.IsTargetable(unit) || manager.self.Owner.HasFogVisibility()) {
wr.DrawSelectionBox(unit, Color.Red);
}
}
}
public void RenderBeforeWorld(WorldRenderer wr, World world)
@@ -194,20 +241,24 @@ namespace OpenRA.Mods.RA
// Unit previews
foreach (var unit in power.UnitsInRange(sourceLocation))
{
var targetCell = unit.Location + (xy - sourceLocation);
foreach (var r in unit.Render())
r.Sprite.DrawAt(r.Pos - Traits.Util.CenterOfCell(unit.Location).ToFloat2() + Traits.Util.CenterOfCell(targetCell).ToFloat2(),
wr.GetPaletteIndex(r.Palette),
r.Scale*r.Sprite.size);
if (manager.self.Owner.Shroud.IsTargetable(unit)) {
var targetCell = unit.Location + (xy - sourceLocation);
foreach (var r in unit.Render())
r.Sprite.DrawAt(r.Pos - Traits.Util.CenterOfCell(unit.Location).ToFloat2() + Traits.Util.CenterOfCell(targetCell).ToFloat2(),
wr.GetPaletteIndex(r.Palette),
r.Scale*r.Sprite.size);
}
}
// Unit tiles
foreach (var unit in power.UnitsInRange(sourceLocation))
{
var targetCell = unit.Location + (xy - sourceLocation);
var canEnter = unit.Trait<Chronoshiftable>().CanChronoshiftTo(unit,targetCell, false);
var tile = canEnter ? validTile : invalidTile;
tile.DrawAt( wr, targetCell.ToPPos().ToFloat2(), "terrain" );
if (manager.self.Owner.Shroud.IsTargetable(unit)) {
var targetCell = unit.Location + (xy - sourceLocation);
var canEnter = ((manager.self.Owner.Shroud.IsExplored(targetCell) || manager.self.Owner.HasFogVisibility())&& unit.Trait<Chronoshiftable>().CanChronoshiftTo(unit,targetCell));
var tile = canEnter ? validTile : invalidTile;
tile.DrawAt( wr, targetCell.ToPPos().ToFloat2(), "terrain" );
}
}
}
@@ -217,12 +268,18 @@ namespace OpenRA.Mods.RA
foreach (var unit in power.UnitsInRange(sourceLocation))
{
var targetCell = unit.Location + (xy - sourceLocation);
if (unit.Trait<Chronoshiftable>().CanChronoshiftTo(unit,targetCell, false))
if (manager.self.Owner.Shroud.IsExplored(targetCell) && unit.Trait<Chronoshiftable>().CanChronoshiftTo(unit,targetCell))
{
canTeleport = true;
break;
}
}
if (!canTeleport) {
// Check the terrain types. This will allow chronoshifts to occur on empty terrain to terrain of
// a similar type. This also keeps the cursor from changing in non-visible property, alerting the
// chronoshifter of enemy unit presence
canTeleport = power.SimilarTerrain(sourceLocation,xy);
}
return canTeleport;
}

12
OpenRA.Mods.RA/SupportPowers/GpsPower.cs
View File

@@ -58,15 +58,12 @@ namespace OpenRA.Mods.RA
public void RefreshGps(Actor atek)
{
RefreshGranted();
foreach (TraitPair<GpsWatcher> i in atek.World.ActorsWithTrait<GpsWatcher>())
i.Trait.RefreshGranted();
if (atek.World.LocalPlayer == null)
return;
if ((Granted || GrantedAllies) && (atek.World.LocalPlayer.Stances[atek.Owner] == Stance.Ally))
atek.World.WorldActor.Trait<Shroud>().ExploreAll(atek.World);
if ((Granted || GrantedAllies) && atek.World.LocalPlayer != null && (atek.World.LocalPlayer.Stances[atek.Owner] == Stance.Ally))
atek.Owner.Shroud.ExploreAll(atek.World);
}
void RefreshGranted()
@@ -74,6 +71,9 @@ namespace OpenRA.Mods.RA
Granted = (actors.Count > 0 && Launched);
GrantedAllies = owner.World.ActorsWithTrait<GpsWatcher>().Any(p =>
p.Actor.Owner.Stances[owner] == Stance.Ally && p.Trait.Granted);
if (Granted || GrantedAllies)
owner.Shroud.ExploreAll(owner.World);
}
}

40
OpenRA.Mods.RA/SupportPowers/SupportPowerManager.cs
View File

@@ -131,32 +131,38 @@ namespace OpenRA.Mods.RA
Key = key;
}
static bool InstanceDisabled(SupportPower sp)
{
return sp.self.TraitsImplementing<IDisable>().Any(d => d.Disabled);
}
bool notifiedCharging;
bool notifiedReady;
public void Tick()
{
Active = !Disabled && Instances.Any(i => !i.self.IsDisabled());
if (!Active)
return;
if (Manager.devMode.FastCharge && RemainingTime > 25)
RemainingTime = 25;
if (RemainingTime > 0) --RemainingTime;
var power = Instances.First();
if (!notifiedCharging)
if (Active)
{
power.Charging(power.self, Key);
notifiedCharging = true;
}
var power = Instances.First();
if (Manager.devMode.FastCharge && RemainingTime > 25)
RemainingTime = 25;
if (RemainingTime == 0 && !notifiedReady)
{
power.Charged(power.self, Key);
notifiedReady = true;
if (RemainingTime > 0) --RemainingTime;
if (!notifiedCharging)
{
power.Charging(power.self, Key);
notifiedCharging = true;
}
if (RemainingTime == 0
&& !notifiedReady)
{
power.Charged(power.self, Key);
notifiedReady = true;
}
}
}
@@ -173,7 +179,7 @@ namespace OpenRA.Mods.RA
if (!Ready)
return;
var power = Instances.First(i => !i.self.IsDisabled());
var power = Instances.First(i => !InstanceDisabled(i));
// Note: order.Subject is the *player* actor
power.Activate(power.self, order);

2
OpenRA.Mods.RA/Widgets/WorldTooltipWidget.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Widgets
var cell = Game.viewport.ViewToWorld(Viewport.LastMousePos);
if (!world.Map.IsInMap(cell)) return;
if (world.LocalPlayer != null && !world.LocalPlayer.Shroud.IsExplored(cell))
if (world.LocalPlayer != null && !world.RenderedShroud.IsExplored(cell))
{
var utext = "Unexplored Terrain";
var usz = Game.Renderer.Fonts["Bold"].Measure(utext) + new int2(20, 24);

2
OpenRA.Mods.RA/World/SmudgeLayer.cs
View File

@@ -83,7 +83,7 @@ namespace OpenRA.Mods.RA
{
if (!cliprect.Contains(kv.Key.X,kv.Key.Y))
continue;
if (localPlayer != null && !localPlayer.Shroud.IsExplored(kv.Key))
if (localPlayer != null && !world.RenderedShroud.IsExplored(kv.Key))
continue;
smudgeSprites[kv.Value.type- 1][kv.Value.index].DrawAt(wr, kv.Key.ToPPos().ToFloat2(), "terrain");

BIN
mods/d2k/bits/TURRET1.aud
View File

Binary file not shown.

1
mods/ra/rules/system.yaml
View File

@@ -188,6 +188,7 @@ Player:
DebugResourceOre:
DebugResourceOreCapacity:
GpsWatcher:
Shroud:
BaseAttackNotifier:
World: