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

Step three in implementing sandworms

Browse Source 
Removed/fixed comments

Code style fixes

Fixed AttackWander, addressed style nits

Fix Travis crash
This commit is contained in:
penev92
2014-11-03 00:14:53 +02:00
parent 1057f8ff3b
commit c4efd269d4
16 changed files with 154 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
OpenRA.Mods.D2k/WormManager.cs
View File

@@ -15,73 +15,76 @@ using OpenRA.Traits;
namespace OpenRA.Mods.D2k
{
[Desc("Controls the spawning of sandworms. Attach this to the world actor.")]
class WormManagerInfo : ITraitInfo
{
[Desc("Minimum number of worms")]
public readonly int Minimum = 1;
[Desc("Controls the spawning of sandworms. Attach this to the world actor.")]
class WormManagerInfo : ITraitInfo
{
[Desc("Minimum number of worms")]
public readonly int Minimum = 1;
[Desc("Maximum number of worms")]
public readonly int Maximum = 5;
[Desc("Maximum number of worms")]
public readonly int Maximum = 5;
[Desc("Average time (seconds) between crate spawn")]
public readonly int SpawnInterval = 180;
[Desc("Average time (seconds) between worm spawn")]
public readonly int SpawnInterval = 180;
public readonly string WormSignature = "sandworm";
public readonly string WormOwnerPlayer = "Creeps";
public readonly string WormSignature = "sandworm";
public readonly string WormOwnerPlayer = "Creeps";
public object Create (ActorInitializer init) { return new WormManager(this, init.self); }
}
public object Create (ActorInitializer init) { return new WormManager(this, init.self); }
}
class WormManager : ITick
{
int countdown;
int wormsPresent;
readonly WormManagerInfo info;
readonly Lazy<Actor[]> spawnPoints;
class WormManager : ITick
{
int countdown;
int wormsPresent;
readonly WormManagerInfo info;
readonly Lazy<Actor[]> spawnPoints;
public WormManager(WormManagerInfo info, Actor self)
{
this.info = info;
spawnPoints = Exts.Lazy(() => self.World.ActorsWithTrait<WormSpawner>().Select(x => x.Actor).ToArray());
}
public WormManager(WormManagerInfo info, Actor self)
{
this.info = info;
spawnPoints = Exts.Lazy(() => self.World.ActorsWithTrait<WormSpawner>().Select(x => x.Actor).ToArray());
}
public void Tick(Actor self)
{
// TODO: Add a lobby option to disable worms just like crates
public void Tick(Actor self)
{
// TODO: Add a lobby option to disable worms just like crates
if (--countdown > 0)
return;
// TODO: It would be even better to stop
if (!spawnPoints.Value.Any())
return;
countdown = info.SpawnInterval * 25;
if (wormsPresent < info.Maximum)
SpawnWorm(self);
}
if (--countdown > 0)
return;
private void SpawnWorm (Actor self)
{
var spawnLocation = GetRandomSpawnPosition(self);
self.World.AddFrameEndTask(w =>
w.CreateActor(info.WormSignature, new TypeDictionary
{
new OwnerInit(w.Players.First(x => x.PlayerName == info.WormOwnerPlayer)),
new LocationInit(spawnLocation)
}));
wormsPresent++;
}
countdown = info.SpawnInterval * 25;
if (wormsPresent < info.Maximum)
SpawnWorm(self);
}
private CPos GetRandomSpawnPosition(Actor self)
{
// TODO: This is here only for testing, while the maps don't have valid spawn points
if (!spawnPoints.Value.Any())
return self.World.Map.ChooseRandomEdgeCell(self.World.SharedRandom);
void SpawnWorm (Actor self)
{
var spawnLocation = GetRandomSpawnPosition(self);
self.World.AddFrameEndTask(w => w.CreateActor(info.WormSignature, new TypeDictionary
{
new OwnerInit(w.Players.First(x => x.PlayerName == info.WormOwnerPlayer)),
new LocationInit(spawnLocation)
}));
wormsPresent++;
}
return spawnPoints.Value[self.World.SharedRandom.Next(0, spawnPoints.Value.Count() - 1)].Location;
}
CPos GetRandomSpawnPosition(Actor self)
{
return spawnPoints.Value.Random(self.World.SharedRandom).Location;
}
public void DecreaseWorms()
{
wormsPresent--;
}
}
public void DecreaseWorms()
{
wormsPresent--;
}
}
[Desc("An actor with this trait indicates a valid spawn point for sandworms.")]
class WormSpawnerInfo : TraitInfo<WormSpawner> { }
class WormSpawner { }
}