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

Small code cleanup

Browse Source
This commit is contained in:
abcdefg30
2015-08-13 23:09:43 +02:00
parent a2af88da21
commit 10c2a897f4
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,13 +19,13 @@ namespace OpenRA.Mods.Common.Traits
{ {
public class CrateSpawnerInfo : ITraitInfo public class CrateSpawnerInfo : ITraitInfo
{ {
[Desc("Minimum number of crates")] [Desc("Minimum number of crates.")]
public readonly int Minimum = 1; public readonly int Minimum = 1;
[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 (seconds) between crate spawn.")]
public readonly int SpawnInterval = 180; public readonly int SpawnInterval = 180;
[Desc("Delay (in seconds) before the first crate spawns.")] [Desc("Delay (in seconds) before the first crate spawns.")]
@@ -37,7 +37,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Which terrain types count as water?")] [Desc("Which terrain types count as water?")]
public readonly HashSet<string> ValidWater = new HashSet<string> { "Water" }; public readonly HashSet<string> ValidWater = new HashSet<string> { "Water" };
[Desc("Chance of generating a water crate instead of a land crate")] [Desc("Chance of generating a water crate instead of a land crate.")]
public readonly float WaterChance = .2f; public readonly float WaterChance = .2f;
[ActorReference] [ActorReference]
@@ -94,9 +94,8 @@ namespace OpenRA.Mods.Common.Traits
void SpawnCrate(Actor self) void SpawnCrate(Actor self)
{ {
var threshold = 100;
var inWater = self.World.SharedRandom.NextFloat() < info.WaterChance; var inWater = self.World.SharedRandom.NextFloat() < info.WaterChance;
var pp = ChooseDropCell(self, inWater, threshold); var pp = ChooseDropCell(self, inWater, 100);
if (pp == null) if (pp == null)
return; return;