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

fix for RA2 cloning vats

Browse Source 
formatting

minor formatting

passing CI

closing line bracket

use production unit

opening should not be followed by a blank line

revert tab change
This commit is contained in:
Torleif West
2019-12-08 19:47:54 +13:00
committed by reaperrr
parent b0c65c5eb9
commit ae4b2591bf
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs
View File

@@ -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.")] [Desc("Uses the \"Cloneable\" trait to determine whether or not we should clone a produced unit.")]
public readonly BitSet<CloneableType> CloneableTypes = default(BitSet<CloneableType>); public readonly BitSet<CloneableType> CloneableTypes = default(BitSet<CloneableType>);
[FieldLoader.Require]
[Desc("e.g. Infantry, Vehicles, Aircraft, Buildings")]
public readonly string ProductionType = "";
public override object Create(ActorInitializer init) { return new ClonesProducedUnits(init, this); } 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 // Stop as soon as one production trait successfully produced
foreach (var p in productionTraits) 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; continue;
var inits = new TypeDictionary var inits = new TypeDictionary
@@ -64,7 +68,7 @@ namespace OpenRA.Mods.Cnc.Traits
factionInit ?? new FactionInit(BuildableInfo.GetInitialFaction(produced.Info, p.Faction)) 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; return;
} }
} }