From ae4b2591bf9d9583893b78e5774c64add7a8fed9 Mon Sep 17 00:00:00 2001 From: Torleif West Date: Sun, 8 Dec 2019 19:47:54 +1300 Subject: [PATCH] fix for RA2 cloning vats formatting minor formatting passing CI closing line bracket use production unit opening should not be followed by a blank line revert tab change --- OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs b/OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs index 67e87747b4..a3b59243ad 100644 --- a/OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs +++ b/OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs @@ -24,6 +24,10 @@ namespace OpenRA.Mods.Cnc.Traits [Desc("Uses the \"Cloneable\" trait to determine whether or not we should clone a produced unit.")] public readonly BitSet CloneableTypes = default(BitSet); + [FieldLoader.Require] + [Desc("e.g. Infantry, Vehicles, Aircraft, Buildings")] + public readonly string ProductionType = ""; + public override object Create(ActorInitializer init) { return new ClonesProducedUnits(init, this); } } @@ -55,7 +59,7 @@ namespace OpenRA.Mods.Cnc.Traits // Stop as soon as one production trait successfully produced foreach (var p in productionTraits) { - if (!string.IsNullOrEmpty(productionType) && !p.Info.Produces.Contains(productionType)) + if (!string.IsNullOrEmpty(Info.ProductionType) && !p.Info.Produces.Contains(Info.ProductionType)) continue; var inits = new TypeDictionary @@ -64,7 +68,7 @@ namespace OpenRA.Mods.Cnc.Traits factionInit ?? new FactionInit(BuildableInfo.GetInitialFaction(produced.Info, p.Faction)) }; - if (p.Produce(self, produced.Info, productionType, inits)) + if (p.Produce(self, produced.Info, Info.ProductionType, inits)) return; } }