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

Replace seconds by ticks

Browse Source
This commit is contained in:
abcdefg30
2015-08-16 22:40:25 +02:00
parent 7fd3ae7db9
commit 277f9acb89
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Mods.Common/Traits/World/CrateSpawner.cs
View File

@@ -25,11 +25,11 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Maximum number of crates.")] [Desc("Maximum number of crates.")]
public readonly int Maximum = 255; public readonly int Maximum = 255;
[Desc("Average time (seconds) between crate spawn.")] [Desc("Average time (ticks) between crate spawn.")]
public readonly int SpawnInterval = 180; public readonly int SpawnInterval = 180 * 25;
[Desc("Delay (in seconds) before the first crate spawns.")] [Desc("Delay (in ticks) before the first crate spawns.")]
public readonly int InitialSpawnDelay = 300; public readonly int InitialSpawnDelay = 300 * 25;
[Desc("Which terrain types can we drop on?")] [Desc("Which terrain types can we drop on?")]
public readonly HashSet<string> ValidGround = new HashSet<string> { "Clear", "Rough", "Road", "Ore", "Beach" }; public readonly HashSet<string> ValidGround = new HashSet<string> { "Clear", "Rough", "Road", "Ore", "Beach" };
@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits
this.info = info; this.info = info;
this.self = self; this.self = self;
ticks = info.InitialSpawnDelay * 25; ticks = info.InitialSpawnDelay;
} }
public void Tick(Actor self) public void Tick(Actor self)
@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Traits
if (--ticks <= 0) if (--ticks <= 0)
{ {
ticks = info.SpawnInterval * 25; ticks = info.SpawnInterval;
var toSpawn = Math.Max(0, info.Minimum - crates) var toSpawn = Math.Max(0, info.Minimum - crates)
+ (crates < info.Maximum ? 1 : 0); + (crates < info.Maximum ? 1 : 0);