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

feat: ActorSpawnManager.SpawnInterval supports 1 or 2 values

Browse Source 
Providing 2 values creates a range from which a value is randomly selected.
This commit is contained in:
Taryn Hill
2020-10-31 07:21:43 -05:00
committed by Paul Chote
parent 04cda69ef9
commit 2671e40c1d
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Mods.Common;
using OpenRA.Primitives; using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
@@ -25,8 +26,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Maximum number of actors.")] [Desc("Maximum number of actors.")]
public readonly int Maximum = 4; public readonly int Maximum = 4;
[Desc("Time (in ticks) between actor spawn.")] [Desc("Time (in ticks) between actor spawn. Supports 1 or 2 values.\nIf 2 values are provided they are used as a range from which a value is randomly selected.")]
public readonly int SpawnInterval = 6000; public readonly int[] SpawnInterval = { 6000 };
[FieldLoader.Require] [FieldLoader.Require]
[ActorReference] [ActorReference]
@@ -38,6 +39,20 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Type of ActorSpawner with which it connects.")] [Desc("Type of ActorSpawner with which it connects.")]
public readonly HashSet<string> Types = new HashSet<string>() { }; public readonly HashSet<string> Types = new HashSet<string>() { };
public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{
base.RulesetLoaded(rules, ai);
if (SpawnInterval.Length == 0 || SpawnInterval.Length > 2)
throw new YamlException("{0}.{1} must be either 1 or 2 values".F(nameof(ActorSpawnManager), nameof(SpawnInterval)));
if (SpawnInterval.Length == 2 && SpawnInterval[0] >= SpawnInterval[1])
throw new YamlException("{0}.{1}'s first value must be less than the second value".F(nameof(ActorSpawnManager), nameof(SpawnInterval)));
if (SpawnInterval.Any(it => it < 0))
throw new YamlException("{0}.{1}'s value(s) must not be less than 0".F(nameof(ActorSpawnManager), nameof(SpawnInterval)));
}
public override object Create(ActorInitializer init) { return new ActorSpawnManager(init.Self, this); } public override object Create(ActorInitializer init) { return new ActorSpawnManager(init.Self, this); }
} }
@@ -77,7 +92,7 @@ namespace OpenRA.Mods.Common.Traits
if (spawnPoint == null) if (spawnPoint == null)
return; return;
spawnCountdown = info.SpawnInterval; spawnCountdown = Util.RandomDelay(self.World, info.SpawnInterval);
do do
{ {