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

Merge pull request #10630 from reaperrr/UAN-custom-pos

Browse Source 
Make UpgradeActorsNear vertical range customizable
This commit is contained in:
RoosterDragon
2016-05-28 13:37:09 +01:00
parent b08d6e0447 2fe91cd1a2
commit 773eb25917
5 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Game/Traits/World/ActorMap.cs
View File

@@ -98,22 +98,26 @@ namespace OpenRA.Traits
WPos position; WPos position;
WDist range; WDist range;
WDist vRange;
IEnumerable<Actor> currentActors = Enumerable.Empty<Actor>(); IEnumerable<Actor> currentActors = Enumerable.Empty<Actor>();
public ProximityTrigger(WPos pos, WDist range, Action<Actor> onActorEntered, Action<Actor> onActorExited) public ProximityTrigger(WPos pos, WDist range, WDist vRange, Action<Actor> onActorEntered, Action<Actor> onActorExited)
{ {
this.onActorEntered = onActorEntered; this.onActorEntered = onActorEntered;
this.onActorExited = onActorExited; this.onActorExited = onActorExited;
Update(pos, range); Update(pos, range, vRange);
} }
public void Update(WPos newPos, WDist newRange) public void Update(WPos newPos, WDist newRange, WDist newVRange)
{ {
position = newPos; position = newPos;
range = newRange; range = newRange;
vRange = newVRange;
var offset = new WVec(newRange, newRange, newVRange);
var offset = new WVec(newRange, newRange, WDist.Zero);
TopLeft = newPos - offset; TopLeft = newPos - offset;
BottomRight = newPos + offset; BottomRight = newPos + offset;
@@ -128,7 +132,8 @@ namespace OpenRA.Traits
var oldActors = currentActors; var oldActors = currentActors;
var delta = new WVec(range, range, WDist.Zero); var delta = new WVec(range, range, WDist.Zero);
currentActors = am.ActorsInBox(position - delta, position + delta) currentActors = am.ActorsInBox(position - delta, position + delta)
.Where(a => (a.CenterPosition - position).HorizontalLengthSquared < range.LengthSquared) .Where(a => (a.CenterPosition - position).HorizontalLengthSquared < range.LengthSquared
&& (vRange.Length == 0 || (a.World.Map.DistanceAboveTerrain(a.CenterPosition).LengthSquared <= vRange.LengthSquared)))
.ToList(); .ToList();
var entered = currentActors.Except(oldActors); var entered = currentActors.Except(oldActors);
@@ -439,10 +444,10 @@ namespace OpenRA.Traits
} }
} }
public int AddProximityTrigger(WPos pos, WDist range, Action<Actor> onEntry, Action<Actor> onExit) public int AddProximityTrigger(WPos pos, WDist range, WDist vRange, Action<Actor> onEntry, Action<Actor> onExit)
{ {
var id = nextTriggerId++; var id = nextTriggerId++;
var t = new ProximityTrigger(pos, range, onEntry, onExit); var t = new ProximityTrigger(pos, range, vRange, onEntry, onExit);
proximityTriggers.Add(id, t); proximityTriggers.Add(id, t);
foreach (var bin in BinsInBox(t.TopLeft, t.BottomRight)) foreach (var bin in BinsInBox(t.TopLeft, t.BottomRight))
@@ -463,7 +468,7 @@ namespace OpenRA.Traits
t.Dispose(); t.Dispose();
} }
public void UpdateProximityTrigger(int id, WPos newPos, WDist newRange) public void UpdateProximityTrigger(int id, WPos newPos, WDist newRange, WDist newVRange)
{ {
ProximityTrigger t; ProximityTrigger t;
if (!proximityTriggers.TryGetValue(id, out t)) if (!proximityTriggers.TryGetValue(id, out t))
@@ -472,7 +477,7 @@ namespace OpenRA.Traits
foreach (var bin in BinsInBox(t.TopLeft, t.BottomRight)) foreach (var bin in BinsInBox(t.TopLeft, t.BottomRight))
bin.ProximityTriggers.Remove(t); bin.ProximityTriggers.Remove(t);
t.Update(newPos, newRange); t.Update(newPos, newRange, newVRange);
foreach (var bin in BinsInBox(t.TopLeft, t.BottomRight)) foreach (var bin in BinsInBox(t.TopLeft, t.BottomRight))
bin.ProximityTriggers.Add(t); bin.ProximityTriggers.Add(t);

2
OpenRA.Game/WVec.cs
View File

@@ -41,6 +41,8 @@ namespace OpenRA
public int Length { get { return (int)Exts.ISqrt(LengthSquared); } } public int Length { get { return (int)Exts.ISqrt(LengthSquared); } }
public long HorizontalLengthSquared { get { return (long)X * X + (long)Y * Y; } } public long HorizontalLengthSquared { get { return (long)X * X + (long)Y * Y; } }
public int HorizontalLength { get { return (int)Exts.ISqrt(HorizontalLengthSquared); } } public int HorizontalLength { get { return (int)Exts.ISqrt(HorizontalLengthSquared); } }
public long VerticalLengthSquared { get { return (long)Z * Z; } }
public int VerticalLength { get { return (int)Exts.ISqrt(VerticalLengthSquared); } }
public WVec Rotate(WRot rot) public WVec Rotate(WRot rot)
{ {

4
OpenRA.Mods.Common/Scripting/Global/TriggerGlobal.cs
View File

@@ -373,7 +373,7 @@ namespace OpenRA.Mods.Common.Scripting
} }
}; };
triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, invokeEntry, null); triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, WDist.Zero, invokeEntry, null);
return triggerId; return triggerId;
} }
@@ -400,7 +400,7 @@ namespace OpenRA.Mods.Common.Scripting
} }
}; };
triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, null, invokeExit); triggerId = Context.World.ActorMap.AddProximityTrigger(pos, range, WDist.Zero, null, invokeExit);
return triggerId; return triggerId;
} }

4
OpenRA.Mods.Common/Traits/ProximityCapturable.cs
View File

@@ -67,7 +67,7 @@ namespace OpenRA.Mods.Common.Traits
return; return;
// TODO: Eventually support CellTriggers as well // TODO: Eventually support CellTriggers as well
proximityTrigger = self.World.ActorMap.AddProximityTrigger(self.CenterPosition, Info.Range, ActorEntered, ActorLeft); proximityTrigger = self.World.ActorMap.AddProximityTrigger(self.CenterPosition, Info.Range, WDist.Zero, ActorEntered, ActorLeft);
} }
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self) void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
@@ -84,7 +84,7 @@ namespace OpenRA.Mods.Common.Traits
if (!self.IsInWorld || self.CenterPosition == prevPosition) if (!self.IsInWorld || self.CenterPosition == prevPosition)
return; return;
self.World.ActorMap.UpdateProximityTrigger(proximityTrigger, self.CenterPosition, Info.Range); self.World.ActorMap.UpdateProximityTrigger(proximityTrigger, self.CenterPosition, Info.Range, WDist.Zero);
prevPosition = self.CenterPosition; prevPosition = self.CenterPosition;
} }

15
OpenRA.Mods.Common/Traits/Upgrades/UpgradeActorsNear.cs
View File

@@ -23,6 +23,10 @@ namespace OpenRA.Mods.Common.Traits
[Desc("The range to search for actors to upgrade.")] [Desc("The range to search for actors to upgrade.")]
public readonly WDist Range = WDist.FromCells(3); public readonly WDist Range = WDist.FromCells(3);
[Desc("The maximum vertical range above terrain to search for actors to upgrade.",
"Ignored if 0 (actors are upgraded regardless of vertical distance).")]
public readonly WDist MaximumVerticalOffset = WDist.Zero;
[Desc("What diplomatic stances are affected.")] [Desc("What diplomatic stances are affected.")]
public readonly Stance ValidStances = Stance.Ally; public readonly Stance ValidStances = Stance.Ally;
@@ -44,6 +48,8 @@ namespace OpenRA.Mods.Common.Traits
WPos cachedPosition; WPos cachedPosition;
WDist cachedRange; WDist cachedRange;
WDist desiredRange; WDist desiredRange;
WDist cachedVRange;
WDist desiredVRange;
bool cachedDisabled = true; bool cachedDisabled = true;
@@ -52,12 +58,13 @@ namespace OpenRA.Mods.Common.Traits
this.info = info; this.info = info;
this.self = self; this.self = self;
cachedRange = info.Range; cachedRange = info.Range;
cachedVRange = info.MaximumVerticalOffset;
} }
public void AddedToWorld(Actor self) public void AddedToWorld(Actor self)
{ {
cachedPosition = self.CenterPosition; cachedPosition = self.CenterPosition;
proximityTrigger = self.World.ActorMap.AddProximityTrigger(cachedPosition, cachedRange, ActorEntered, ActorExited); proximityTrigger = self.World.ActorMap.AddProximityTrigger(cachedPosition, cachedRange, cachedVRange, ActorEntered, ActorExited);
} }
public void RemovedFromWorld(Actor self) public void RemovedFromWorld(Actor self)
@@ -73,14 +80,16 @@ namespace OpenRA.Mods.Common.Traits
{ {
Game.Sound.Play(disabled ? info.DisableSound : info.EnableSound, self.CenterPosition); Game.Sound.Play(disabled ? info.DisableSound : info.EnableSound, self.CenterPosition);
desiredRange = disabled ? WDist.Zero : info.Range; desiredRange = disabled ? WDist.Zero : info.Range;
desiredVRange = disabled ? WDist.Zero : info.MaximumVerticalOffset;
cachedDisabled = disabled; cachedDisabled = disabled;
} }
if (self.CenterPosition != cachedPosition || desiredRange != cachedRange) if (self.CenterPosition != cachedPosition || desiredRange != cachedRange || desiredVRange != cachedVRange)
{ {
cachedPosition = self.CenterPosition; cachedPosition = self.CenterPosition;
cachedRange = desiredRange; cachedRange = desiredRange;
self.World.ActorMap.UpdateProximityTrigger(proximityTrigger, cachedPosition, cachedRange); cachedVRange = desiredVRange;
self.World.ActorMap.UpdateProximityTrigger(proximityTrigger, cachedPosition, cachedRange, cachedVRange);
} }
} }