diff --git a/OpenRA.Mods.RA/PrimaryBuilding.cs b/OpenRA.Mods.RA/PrimaryBuilding.cs index 301a5f4ded..46f151087a 100755 --- a/OpenRA.Mods.RA/PrimaryBuilding.cs +++ b/OpenRA.Mods.RA/PrimaryBuilding.cs @@ -10,12 +10,21 @@ using System.Collections.Generic; using System.Linq; -using OpenRA.Mods.RA.Orders; using OpenRA.FileFormats; +using OpenRA.Mods.RA.Orders; using OpenRA.Traits; namespace OpenRA.Mods.RA { + static class PrimaryExts + { + public static bool IsPrimaryBuilding(this Actor a) + { + var pb = a.TraitOrDefault(); + return pb != null && pb.IsPrimary; + } + } + [Desc("Used together with ClassicProductionQueue.")] class PrimaryBuildingInfo : TraitInfo { } @@ -26,18 +35,18 @@ namespace OpenRA.Mods.RA public IEnumerable GetTags() { - yield return (isPrimary) ? TagType.Primary : TagType.None; + yield return isPrimary ? TagType.Primary : TagType.None; } public IEnumerable Orders { - get { yield return new DeployOrderTargeter( "PrimaryProducer", 1 ); } + get { yield return new DeployOrderTargeter("PrimaryProducer", 1); } } - public Order IssueOrder( Actor self, IOrderTargeter order, Target target, bool queued ) + public Order IssueOrder(Actor self, IOrderTargeter order, Target target, bool queued) { - if( order.OrderID == "PrimaryProducer" ) - return new Order( order.OrderID, self, false ); + if (order.OrderID == "PrimaryProducer") + return new Order(order.OrderID, self, false); return null; } @@ -63,7 +72,7 @@ namespace OpenRA.Mods.RA .ActorsWithTrait() .Where(a => a.Actor.Owner == self.Owner) .Where(x => x.Trait.IsPrimary - && (x.Actor.Info.Traits.Get().Produces.Contains(p)))) + && x.Actor.Info.Traits.Get().Produces.Contains(p))) b.Trait.SetPrimaryProducer(b.Actor, false); isPrimary = true; @@ -71,13 +80,4 @@ namespace OpenRA.Mods.RA Sound.PlayNotification(self.Owner, "Speech", "PrimaryBuildingSelected", self.Owner.Country.Race); } } - - static class PrimaryExts - { - public static bool IsPrimaryBuilding(this Actor a) - { - var pb = a.TraitOrDefault(); - return pb != null && pb.IsPrimary; - } - } }