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

Add support for multiple crate actors to be spawned from CrateSpawner

Browse Source
This commit is contained in:
Curtis Shmyr
2013-12-23 19:34:08 -07:00
parent 0c77dab922
commit a65358f191
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OpenRA.Mods.RA/CrateSpawner.cs
View File

@@ -32,14 +32,16 @@ namespace OpenRA.Mods.RA
public readonly string[] ValidWater = { "Water" }; public readonly string[] ValidWater = { "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;
[Desc("Drop crates via DeliveryAircraft: or instantly spawn them on the ground")] [Desc("Airdrop crates via DeliveryAircraft: or instantly spawn them on the ground")]
public readonly bool DeliverByAircraft = false; public readonly bool DeliverByAircraft = false;
[Desc("If DeliverByAircraft: yes, this actor will deliver crates"), ActorReference] [Desc("If DeliverByAircraft: yes, this actor will deliver crates"), ActorReference]
public readonly string DeliveryAircraft = "badr"; public readonly string DeliveryAircraft = "badr";
[Desc("Crate actor to drop"), ActorReference] [Desc("Crate actors to drop"), ActorReference]
public readonly string CrateActor = "crate"; public readonly string[] CrateActors = { "crate" };
[Desc("Chance of each crate actor spawning")]
public readonly int[] CrateActorShares = { 10 };
public object Create(ActorInitializer init) { return new CrateSpawner(this); } public object Create(ActorInitializer init) { return new CrateSpawner(this, init.self); }
} }
public class CrateSpawner : ITick public class CrateSpawner : ITick
@@ -47,8 +49,13 @@ namespace OpenRA.Mods.RA
List<Actor> crates = new List<Actor>(); List<Actor> crates = new List<Actor>();
int ticks = 0; int ticks = 0;
CrateSpawnerInfo Info; CrateSpawnerInfo Info;
Actor self;
public CrateSpawner(CrateSpawnerInfo info) { Info = info; } public CrateSpawner(CrateSpawnerInfo info, Actor self)
{
Info = info;
this.self = self;
}
public void Tick(Actor self) public void Tick(Actor self)
{ {
@@ -79,12 +86,13 @@ namespace OpenRA.Mods.RA
return; return;
var p = pp.Value; var p = pp.Value;
var crateActor = ChooseCrateActor();
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (Info.DeliverByAircraft) if (Info.DeliverByAircraft)
{ {
var crate = w.CreateActor(false, Info.CrateActor, new TypeDictionary { new OwnerInit(w.WorldActor.Owner) }); var crate = w.CreateActor(false, crateActor, new TypeDictionary { new OwnerInit(w.WorldActor.Owner) });
crates.Add(crate); crates.Add(crate);
var startPos = w.ChooseRandomEdgeCell(); var startPos = w.ChooseRandomEdgeCell();
@@ -103,7 +111,7 @@ namespace OpenRA.Mods.RA
} }
else else
{ {
crates.Add(w.CreateActor(Info.CrateActor, new TypeDictionary { new OwnerInit(w.WorldActor.Owner), new LocationInit(p) })); crates.Add(w.CreateActor(crateActor, new TypeDictionary { new OwnerInit(w.WorldActor.Owner), new LocationInit(p) }));
} }
}); });
} }
@@ -129,5 +137,21 @@ namespace OpenRA.Mods.RA
return null; return null;
} }
string ChooseCrateActor()
{
var crateShares = Info.CrateActorShares;
var n = self.World.SharedRandom.Next(crateShares.Sum());
var cumulativeShares = 0;
for (var i = 0; i < crateShares.Length; i++)
{
cumulativeShares += crateShares[i];
if (n <= cumulativeShares)
return Info.CrateActors[i];
}
return null;
}
} }
} }