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

Don't cache ActorSpawners at creation

Browse Source 
Re-evaluate before every spawn attempt instead.
Also accounts for ActorSpawner being conditional now.

While a bit more costly in terms of performance, this allows to create spawns mid-game.
This commit is contained in:
reaperrr
2018-02-25 16:56:47 +01:00
parent 711bad91a3
commit 55b11d1745
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Mods.Common/Traits/World/ActorSpawnManager.cs
View File

@@ -45,7 +45,6 @@ namespace OpenRA.Mods.Common.Traits
public class ActorSpawnManager : ConditionalTrait<ActorSpawnManagerInfo>, ITick, INotifyCreated public class ActorSpawnManager : ConditionalTrait<ActorSpawnManagerInfo>, ITick, INotifyCreated
{ {
readonly ActorSpawnManagerInfo info; readonly ActorSpawnManagerInfo info;
TraitPair<ActorSpawner>[] spawnPointActors;
bool enabled; bool enabled;
int spawnCountdown; int spawnCountdown;
@@ -58,14 +57,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self) void INotifyCreated.Created(Actor self)
{ {
self.World.AddFrameEndTask(w => enabled = self.Trait<MapCreeps>().Enabled;
{
spawnPointActors = w.ActorsWithTrait<ActorSpawner>()
.Where(x => info.Types.Overlaps(x.Trait.Types) || !x.Trait.Types.Any())
.ToArray();
enabled = self.Trait<MapCreeps>().Enabled && spawnPointActors.Any();
});
} }
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
@@ -79,19 +71,23 @@ namespace OpenRA.Mods.Common.Traits
if (--spawnCountdown > 0 && actorsPresent >= info.Minimum) if (--spawnCountdown > 0 && actorsPresent >= info.Minimum)
return; return;
var spawnPoint = GetRandomSpawnPoint(self.World, self.World.SharedRandom);
if (spawnPoint == null)
return;
spawnCountdown = info.SpawnInterval; spawnCountdown = info.SpawnInterval;
do do
{ {
// Always spawn at least one actor, plus // Always spawn at least one actor, plus
// however many needed to reach the minimum. // however many needed to reach the minimum.
SpawnActor(self); SpawnActor(self, spawnPoint);
} while (actorsPresent < info.Minimum); } while (actorsPresent < info.Minimum);
} }
WPos SpawnActor(Actor self) WPos SpawnActor(Actor self, Actor spawnPoint)
{ {
var spawnPoint = GetRandomSpawnPoint(self.World.SharedRandom);
self.World.AddFrameEndTask(w => w.CreateActor(info.Actors.Random(self.World.SharedRandom), new TypeDictionary self.World.AddFrameEndTask(w => w.CreateActor(info.Actors.Random(self.World.SharedRandom), new TypeDictionary
{ {
new OwnerInit(w.Players.First(x => x.PlayerName == info.Owner)), new OwnerInit(w.Players.First(x => x.PlayerName == info.Owner)),
@@ -103,9 +99,13 @@ namespace OpenRA.Mods.Common.Traits
return spawnPoint.CenterPosition; return spawnPoint.CenterPosition;
} }
Actor GetRandomSpawnPoint(Support.MersenneTwister random) Actor GetRandomSpawnPoint(World world, Support.MersenneTwister random)
{ {
return spawnPointActors.Random(random).Actor; var spawnPointActors = world.ActorsWithTrait<ActorSpawner>()
.Where(x => !x.Trait.IsTraitDisabled && (info.Types.Overlaps(x.Trait.Types) || !x.Trait.Types.Any()))
.ToArray();
return spawnPointActors.Any() ? spawnPointActors.Random(random).Actor : null;
} }
public void DecreaseActorCount() public void DecreaseActorCount()