From b5b943fee84bec23339a4c42c768d795eb8d7824 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Fri, 16 Apr 2010 20:39:55 +1200 Subject: [PATCH] factor out a couple of hardcoded strings from ParatroopersPower --- OpenRA.Mods.RA/ParatroopersPower.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.RA/ParatroopersPower.cs b/OpenRA.Mods.RA/ParatroopersPower.cs index b8b93017b3..c5e95b3f9c 100644 --- a/OpenRA.Mods.RA/ParatroopersPower.cs +++ b/OpenRA.Mods.RA/ParatroopersPower.cs @@ -27,6 +27,9 @@ namespace OpenRA.Mods.RA class ParatroopersPowerInfo : SupportPowerInfo { public string[] DropItems = { }; + public string UnitType = "badr"; + public string FlareType = "flare"; + public override object Create(Actor self) { return new ParatroopersPower(self,this); } } @@ -54,14 +57,15 @@ namespace OpenRA.Mods.RA } } - static void DoParadrop(Player owner, int2 p, string[] items) + void DoParadrop(Player owner, int2 p, string[] items) { var startPos = owner.World.ChooseRandomEdgeCell(); owner.World.AddFrameEndTask(w => { - var flare = w.CreateActor("FLARE", p, owner); + var flareType = (Info as ParatroopersPowerInfo).FlareType; + var flare = flareType != null ? w.CreateActor(flareType, p, owner) : null; - var a = w.CreateActor("BADR", startPos, owner); + var a = w.CreateActor((Info as ParatroopersPowerInfo).UnitType, startPos, owner); a.traits.Get().Facing = Util.GetFacing(p - startPos, 0); a.traits.Get().Altitude = a.Info.Traits.Get().CruiseAltitude;