From 1a95e7a9f14bc9b0679d0131c9b98b9d52bb47e3 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Mon, 17 Aug 2015 00:42:10 +0300 Subject: [PATCH] Rename crates' ValidRaces --- .../Traits/Crates/DuplicateUnitCrateAction.cs | 6 +++--- OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs index 5c9ff039de..bfb78ec27b 100644 --- a/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs +++ b/OpenRA.Mods.Common/Traits/Crates/DuplicateUnitCrateAction.cs @@ -33,8 +33,8 @@ namespace OpenRA.Mods.Common.Traits [Desc("The list of unit target types we are allowed to duplicate.")] public readonly string[] ValidTargets = { "Ground", "Water" }; - [Desc("Which races this crate action can occur for.")] - public readonly string[] ValidRaces = { }; + [Desc("Which factions this crate action can occur for.")] + public readonly string[] ValidFactions = { }; [Desc("Is the new duplicates given to a specific owner, regardless of whom collected it?")] public readonly string Owner = null; @@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits public bool CanGiveTo(Actor collector) { - if (info.ValidRaces.Any() && !info.ValidRaces.Contains(collector.Owner.Faction.InternalName)) + if (info.ValidFactions.Any() && !info.ValidFactions.Contains(collector.Owner.Faction.InternalName)) return false; var targetable = collector.Info.Traits.GetOrDefault(); diff --git a/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs index 83ab29ffb9..718ce44520 100644 --- a/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs +++ b/OpenRA.Mods.Common/Traits/Crates/GiveUnitCrateAction.cs @@ -22,8 +22,8 @@ namespace OpenRA.Mods.Common.Traits [ActorReference, FieldLoader.Require] public readonly string[] Units = { }; - [Desc("Races that are allowed to trigger this action")] - public readonly string[] ValidRaces = { }; + [Desc("Factions that are allowed to trigger this action.")] + public readonly string[] ValidFactions = { }; [Desc("Override the owner of the newly spawned unit: e.g. Creeps or Neutral")] public readonly string Owner = null; @@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits public bool CanGiveTo(Actor collector) { - if (info.ValidRaces.Any() && !info.ValidRaces.Contains(collector.Owner.Faction.InternalName)) + if (info.ValidFactions.Any() && !info.ValidFactions.Contains(collector.Owner.Faction.InternalName)) return false; foreach (string unit in info.Units)