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

Generalize RallyPointInfo.Offset to support arbitrary length paths.

Browse Source
This commit is contained in:
Paul Chote
2020-02-09 15:30:14 +00:00
committed by abcdefg30
parent 9dc4ea8541
commit b2f0ac15e8
16 changed files with 80 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/BotModules/BaseBuilderBotModule.cs
View File

@@ -228,8 +228,10 @@ namespace OpenRA.Mods.Common.Traits
{
foreach (var rp in world.ActorsWithTrait<RallyPoint>())
{
if (rp.Actor.Owner == player &&
!IsRallyPointValid(rp.Trait.Path[0], rp.Actor.Info.TraitInfoOrDefault<BuildingInfo>()))
if (rp.Actor.Owner != player)
continue;
if (rp.Trait.Path.Count == 0 || !IsRallyPointValid(rp.Trait.Path[0], rp.Actor.Info.TraitInfoOrDefault<BuildingInfo>()))
{
bot.QueueOrder(new Order("SetRallyPoint", rp.Actor, Target.FromCell(world, ChooseRallyLocationNear(rp.Actor)), false)
{

5
OpenRA.Mods.Common/Traits/Buildings/RallyPoint.cs
View File

@@ -39,7 +39,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Custom palette is a player palette BaseName")]
public readonly bool IsPlayerPalette = true;
public readonly CVec Offset = new CVec(1, 3);
[Desc("A list of 0 or more offsets defining the initial rally point path.")]
public readonly CVec[] Path = { new CVec(1, 3) };
public object Create(ActorInitializer init) { return new RallyPoint(init.Self, this); }
}
@@ -57,7 +58,7 @@ namespace OpenRA.Mods.Common.Traits
public void ResetPath(Actor self)
{
Path = new List<CPos> { self.Location + Info.Offset };
Path = Info.Path.Select(p => self.Location + p).ToList();
}
public RallyPoint(Actor self, RallyPointInfo info)

2
OpenRA.Mods.Common/Traits/Production.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
initialFacing = delta.Yaw.Facing;
}
exitLocations = rp.Value != null ? rp.Value.Path : new List<CPos> { exit };
exitLocations = rp.Value != null && rp.Value.Path.Count > 0 ? rp.Value.Path : new List<CPos> { exit };
td.Add(new LocationInit(exit));
td.Add(new CenterPositionInit(spawn));

2
OpenRA.Mods.Common/Traits/ProductionFromMapEdge.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.Traits
var aircraftInfo = producee.TraitInfoOrDefault<AircraftInfo>();
var mobileInfo = producee.TraitInfoOrDefault<MobileInfo>();
var destinations = rp != null ? rp.Path : new List<CPos> { self.Location };
var destinations = rp != null && rp.Path.Count > 0 ? rp.Path : new List<CPos> { self.Location };
var location = spawnLocation;
if (!location.HasValue)

2
OpenRA.Mods.Common/Traits/ProductionParadrop.cs
View File

@@ -123,7 +123,7 @@ namespace OpenRA.Mods.Common.Traits
var initialFacing = exitinfo.Facing < 0 ? (to - spawn).Yaw.Facing : exitinfo.Facing;
exitLocations = rp.Value != null ? rp.Value.Path : new List<CPos> { exit };
exitLocations = rp.Value != null && rp.Value.Path.Count > 0 ? rp.Value.Path : new List<CPos> { exit };
td.Add(new LocationInit(exit));
td.Add(new CenterPositionInit(spawn));