From 4d11195989f24890914ca5584258bae408e6e690 Mon Sep 17 00:00:00 2001 From: Pavel Penev Date: Tue, 11 Aug 2015 04:00:08 +0300 Subject: [PATCH] Rename MPStartUnitsInfo.Races to Factions Also add an upgrade rule. --- .../Traits/World/MPStartUnits.cs | 4 ++-- .../Traits/World/SpawnMPUnits.cs | 2 +- .../UtilityCommands/UpgradeRules.cs | 7 +++++++ mods/cnc/rules/world.yaml | 20 +++++++++---------- mods/d2k/rules/world.yaml | 14 ++++++------- mods/ra/rules/world.yaml | 10 +++++----- mods/ts/rules/world.yaml | 14 ++++++------- 7 files changed, 39 insertions(+), 32 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs b/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs index 313746046d..25610ed0c6 100644 --- a/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs +++ b/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs @@ -21,8 +21,8 @@ namespace OpenRA.Mods.Common.Traits [Desc("Exposed via the UI to the player.")] public readonly string ClassName = "Unlabeled"; - [Desc("Only available when selecting this faction.", "Leave empty for no restrictions.")] - public readonly string[] Races = { }; + [Desc("Only available when selecting one of these factions.", "Leave empty for no restrictions.")] + public readonly string[] Factions = { }; [Desc("The mobile construction vehicle.")] public readonly string BaseActor = null; diff --git a/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs b/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs index 341c46a912..3c0c0daa5d 100644 --- a/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs +++ b/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs @@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits { var spawnClass = p.PlayerReference.StartingUnitsClass ?? w.LobbyInfo.GlobalSettings.StartingUnitsClass; var unitGroup = w.Map.Rules.Actors["world"].Traits.WithInterface() - .Where(g => g.Class == spawnClass && g.Races != null && g.Races.Contains(p.Faction.InternalName)) + .Where(g => g.Class == spawnClass && g.Factions != null && g.Factions.Contains(p.Faction.InternalName)) .RandomOrDefault(w.SharedRandom); if (unitGroup == null) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 28a8e7cfee..e07144ac3e 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -1751,6 +1751,13 @@ namespace OpenRA.Mods.Common.UtilityCommands if (race != null) race.Key = "Factions"; } + + if (node.Key.StartsWith("MPStartUnits")) + { + var race = node.Value.Nodes.FirstOrDefault(x => x.Key == "Races"); + if (race != null) + race.Key = "Factions"; + } } UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1); diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index caf99c322b..f9a8019633 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -79,60 +79,60 @@ World: MPStartUnits@mcvonly: Class: none ClassName: MCV Only - Races: gdi, nod + Factions: gdi, nod BaseActor: mcv MPStartUnits@defaultgdia: Class: light ClassName: Light Support - Races: gdi + Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e3,e3,jeep MPStartUnits@defaultgdib: Class: light ClassName: Light Support - Races: gdi + Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e1,e3,apc MPStartUnits@defaultnoda: Class: light ClassName: Light Support - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e1,e3,bggy,bike MPStartUnits@defaultnodb: Class: light ClassName: Light Support - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e3,e3,e3,bggy MPStartUnits@defaultnodc: Class: light ClassName: Light Support - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e1,e1,e3,bike MPStartUnits@heavynoda: Class: heavy ClassName: Heavy Support - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e1,e3,e3,ltnk,ltnk,ftnk MPStartUnits@heavynodb: Class: heavy ClassName: Heavy Support - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e3,e3,e3,ftnk,ftnk MPStartUnits@heavygdia: Class: heavy ClassName: Heavy Support - Races: gdi + Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e1,e3,e3,jeep,mtnk,mtnk MPStartUnits@heavygdib: Class: heavy ClassName: Heavy Support - Races: gdi + Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e2,e2,e2,e3,e3,apc,mtnk SpawnMPUnits: diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index 8f6988cf1d..7608919683 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -85,11 +85,11 @@ World: Class: none ClassName: MCV Only BaseActor: mcv - Races: atreides, ordos, harkonnen + Factions: atreides, ordos, harkonnen MPStartUnits@lightatreides: Class: light ClassName: Light Support - Races: atreides + Factions: atreides BaseActor: mcv SupportActors: rifle, rifle, rifle, bazooka, grenadier, trike, quad InnerSupportRadius: 3 @@ -97,7 +97,7 @@ World: MPStartUnits@lightharkonnen: Class: light ClassName: Light Support - Races: harkonnen + Factions: harkonnen BaseActor: mcv SupportActors: rifle, rifle, rifle, bazooka, bazooka, trike, quad InnerSupportRadius: 3 @@ -105,7 +105,7 @@ World: MPStartUnits@lightordos: Class: light ClassName: Light Support - Races: ordos + Factions: ordos BaseActor: mcv SupportActors: rifle, rifle, rifle, bazooka, engineer, raider, quad InnerSupportRadius: 3 @@ -113,7 +113,7 @@ World: MPStartUnits@heavyatreides: Class: heavy ClassName: Heavy Support - Races: atreides + Factions: atreides BaseActor: mcv SupportActors: rifle, rifle, rifle, bazooka, grenadier, trike, combata, missiletank InnerSupportRadius: 3 @@ -121,7 +121,7 @@ World: MPStartUnits@heavyharkonnen: Class: heavy ClassName: Heavy Support - Races: harkonnen + Factions: harkonnen BaseActor: mcv SupportActors: rifle, rifle, rifle, bazooka, engineer, quad, combath, siegetank InnerSupportRadius: 3 @@ -129,7 +129,7 @@ World: MPStartUnits@heavyordos: Class: heavy ClassName: Heavy Support - Races: ordos + Factions: ordos BaseActor: mcv SupportActors: rifle, rifle, rifle, bazooka, engineer, raider, combato, missiletank InnerSupportRadius: 3 diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index d71a0f176e..a899109488 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -123,12 +123,12 @@ World: MPStartUnits@mcvonly: Class: none ClassName: MCV Only - Races: allies, england, france, germany, soviet, russia, ukraine + Factions: allies, england, france, germany, soviet, russia, ukraine BaseActor: mcv MPStartUnits@lightallies: Class: light ClassName: Light Support - Races: allies, england, france, germany + Factions: allies, england, france, germany BaseActor: mcv SupportActors: e1,e1,e1,e3,e3,jeep,1tnk InnerSupportRadius: 3 @@ -136,7 +136,7 @@ World: MPStartUnits@lightsoviet: Class: light ClassName: Light Support - Races: soviet, russia, ukraine + Factions: soviet, russia, ukraine BaseActor: mcv SupportActors: e1,e1,e1,e3,e3,apc,ftrk InnerSupportRadius: 3 @@ -144,7 +144,7 @@ World: MPStartUnits@heavyallies: Class: heavy ClassName: Heavy Support - Races: allies, england, france, germany + Factions: allies, england, france, germany BaseActor: mcv SupportActors: e1,e1,e1,e3,e3,jeep,1tnk,2tnk,2tnk,2tnk InnerSupportRadius: 3 @@ -152,7 +152,7 @@ World: MPStartUnits@heavysoviet: Class: heavy ClassName: Heavy Support - Races: soviet, russia, ukraine + Factions: soviet, russia, ukraine BaseActor: mcv SupportActors: e1,e1,e1,e3,e3,apc,ftrk,3tnk,3tnk InnerSupportRadius: 3 diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index 952b6fd8ff..9a2dd718ed 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -102,12 +102,12 @@ World: MPStartUnits@MCV: Class: none ClassName: MCV Only - Races: gdi, nod + Factions: gdi, nod BaseActor: mcv MPStartUnits@light.gdi: Class: light ClassName: Light - Races: gdi + Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e2,e2 InnerSupportRadius: 3 @@ -115,7 +115,7 @@ World: MPStartUnits@light.nod: Class: light ClassName: Light - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e3,e3 InnerSupportRadius: 3 @@ -123,7 +123,7 @@ World: MPStartUnits@med.gdi: Class: medium ClassName: Medium - Races: gdi + Factions: gdi BaseActor: mcv SupportActors: e1,e1,e2,jumpjet,smech InnerSupportRadius: 3 @@ -131,7 +131,7 @@ World: MPStartUnits@med.nod: Class: medium ClassName: Medium - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e1,e3,cyborg,bggy InnerSupportRadius: 3 @@ -139,7 +139,7 @@ World: MPStartUnits@heavy.gdi: Class: heavy ClassName: Heavy - Races: gdi + Factions: gdi BaseActor: mcv SupportActors: e1,e2,e2,smech,mmch InnerSupportRadius: 3 @@ -147,7 +147,7 @@ World: MPStartUnits@heavy.nod: Class: heavy ClassName: Heavy - Races: nod + Factions: nod BaseActor: mcv SupportActors: e1,e3,bggy,bike,ttnk InnerSupportRadius: 3