diff --git a/OpenRA.Mods.Common/Lint/CheckPlayers.cs b/OpenRA.Mods.Common/Lint/CheckPlayers.cs index 29e43e19c7..88836c4d7e 100644 --- a/OpenRA.Mods.Common/Lint/CheckPlayers.cs +++ b/OpenRA.Mods.Common/Lint/CheckPlayers.cs @@ -62,7 +62,7 @@ namespace OpenRA.Mods.Common.Lint if (!string.IsNullOrWhiteSpace(player.Faction) && !factions.Contains(player.Faction)) emitError("Invalid faction {0} chosen for player {1}.".F(player.Faction, player.Name)); - if (worldActor.HasTraitInfo()) + if (worldActor.HasTraitInfo()) { var playerCount = players.Count(p => p.Value.Playable); var spawns = new List(); diff --git a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs b/OpenRA.Mods.Common/Traits/World/CreateMapPlayers.cs similarity index 97% rename from OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs rename to OpenRA.Mods.Common/Traits/World/CreateMapPlayers.cs index 77e725b168..f74fd832a1 100644 --- a/OpenRA.Mods.Common/Traits/World/CreateMPPlayers.cs +++ b/OpenRA.Mods.Common/Traits/World/CreateMapPlayers.cs @@ -19,7 +19,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { [Desc("Attach this to the world actor.")] - public class CreateMPPlayersInfo : TraitInfo, ICreatePlayersInfo + public class CreateMapPlayersInfo : TraitInfo, ICreatePlayersInfo { /// /// Returns a list of GameInformation.Players that matches the indexing of ICreatePlayers.CreatePlayers. @@ -80,7 +80,7 @@ namespace OpenRA.Mods.Common.Traits } } - public class CreateMPPlayers : ICreatePlayers + public class CreateMapPlayers : ICreatePlayers { void ICreatePlayers.CreatePlayers(World w, MersenneTwister playerRandom) { diff --git a/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs b/OpenRA.Mods.Common/Traits/World/MapStartingLocations.cs similarity index 95% rename from OpenRA.Mods.Common/Traits/World/MPStartLocations.cs rename to OpenRA.Mods.Common/Traits/World/MapStartingLocations.cs index ff1450d166..3ba8085aa9 100644 --- a/OpenRA.Mods.Common/Traits/World/MPStartLocations.cs +++ b/OpenRA.Mods.Common/Traits/World/MapStartingLocations.cs @@ -20,7 +20,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { [Desc("Allows the map to have working spawnpoints. Also controls the 'Separate Team Spawns' checkbox in the lobby options.")] - public class MPStartLocationsInfo : TraitInfo, ILobbyOptions, IAssignSpawnPointsInfo + public class MapStartingLocationsInfo : TraitInfo, ILobbyOptions, IAssignSpawnPointsInfo { public readonly WDist InitialExploreRange = WDist.FromCells(5); @@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.Traits [Desc("Display order for the spawn positions checkbox in the lobby.")] public readonly int SeparateTeamSpawnsCheckboxDisplayOrder = 0; - public override object Create(ActorInitializer init) { return new MPStartLocations(this); } + public override object Create(ActorInitializer init) { return new MapStartingLocations(this); } IEnumerable ILobbyOptions.LobbyOptions(Ruleset rules) { @@ -103,15 +103,15 @@ namespace OpenRA.Mods.Common.Traits } } - public class MPStartLocations : IWorldLoaded, INotifyCreated, IAssignSpawnPoints + public class MapStartingLocations : IWorldLoaded, INotifyCreated, IAssignSpawnPoints { - readonly MPStartLocationsInfo info; + readonly MapStartingLocationsInfo info; readonly Dictionary occupiedSpawnPoints = new Dictionary(); bool separateTeamSpawns; CPos[] spawnLocations; List availableSpawnPoints; - public MPStartLocations(MPStartLocationsInfo info) + public MapStartingLocations(MapStartingLocationsInfo info) { this.info = info; } diff --git a/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs b/OpenRA.Mods.Common/Traits/World/MapStartingUnits.cs similarity index 88% rename from OpenRA.Mods.Common/Traits/World/MPStartUnits.cs rename to OpenRA.Mods.Common/Traits/World/MapStartingUnits.cs index 314cdbf826..7297acc143 100644 --- a/OpenRA.Mods.Common/Traits/World/MPStartUnits.cs +++ b/OpenRA.Mods.Common/Traits/World/MapStartingUnits.cs @@ -14,8 +14,8 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { - [Desc("Used by SpawnMPUnits. Attach these to the world actor. You can have multiple variants by adding @suffixes.")] - public class MPStartUnitsInfo : TraitInfo + [Desc("Used by SpawnStartingUnits. Attach these to the world actor. You can have multiple variants by adding @suffixes.")] + public class StartingUnitsInfo : TraitInfo { [Desc("Internal class ID.")] public readonly string Class = "none"; @@ -50,5 +50,5 @@ namespace OpenRA.Mods.Common.Traits public readonly WAngle? SupportActorsFacing = null; } - public class MPStartUnits { } + public class StartingUnits { } } diff --git a/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs b/OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs similarity index 90% rename from OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs rename to OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs index b17637282b..37993e91e4 100644 --- a/OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs +++ b/OpenRA.Mods.Common/Traits/World/SpawnStartingUnits.cs @@ -19,7 +19,7 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits { [Desc("Spawn base actor at the spawnpoint and support units in an annulus around the base actor. Both are defined at MPStartUnits. Attach this to the world actor.")] - public class SpawnMPUnitsInfo : TraitInfo, Requires, ILobbyOptions + public class SpawnStartingUnitsInfo : TraitInfo, Requires, ILobbyOptions { public readonly string StartingUnitsClass = "none"; @@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits var startingUnits = new Dictionary(); // Duplicate classes are defined for different race variants - foreach (var t in rules.Actors["world"].TraitInfos()) + foreach (var t in rules.Actors["world"].TraitInfos()) startingUnits[t.Class] = t.ClassName; if (startingUnits.Any()) @@ -51,14 +51,14 @@ namespace OpenRA.Mods.Common.Traits new ReadOnlyDictionary(startingUnits), StartingUnitsClass, DropdownLocked); } - public override object Create(ActorInitializer init) { return new SpawnMPUnits(this); } + public override object Create(ActorInitializer init) { return new SpawnStartingUnits(this); } } - public class SpawnMPUnits : IWorldLoaded + public class SpawnStartingUnits : IWorldLoaded { - readonly SpawnMPUnitsInfo info; + readonly SpawnStartingUnitsInfo info; - public SpawnMPUnits(SpawnMPUnitsInfo info) + public SpawnStartingUnits(SpawnStartingUnitsInfo info) { this.info = info; } @@ -75,7 +75,7 @@ namespace OpenRA.Mods.Common.Traits var spawnClass = p.PlayerReference.StartingUnitsClass ?? w.LobbyInfo.GlobalSettings .OptionOrDefault("startingunits", info.StartingUnitsClass); - var unitGroup = w.Map.Rules.Actors["world"].TraitInfos() + var unitGroup = w.Map.Rules.Actors["world"].TraitInfos() .Where(g => g.Class == spawnClass && g.Factions != null && g.Factions.Contains(p.Faction.InternalName)) .RandomOrDefault(w.SharedRandom); diff --git a/mods/cnc/maps/blank-shellmap/map.yaml b/mods/cnc/maps/blank-shellmap/map.yaml index 9a423f1d0a..8e05aecaed 100644 --- a/mods/cnc/maps/blank-shellmap/map.yaml +++ b/mods/cnc/maps/blank-shellmap/map.yaml @@ -27,8 +27,8 @@ Actors: Rules: World: - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: -CrateSpawner: MusicPlaylist: BackgroundMusic: map1 diff --git a/mods/cnc/maps/the-hot-box/rules.yaml b/mods/cnc/maps/the-hot-box/rules.yaml index 7126c409bb..3b7a9329c0 100644 --- a/mods/cnc/maps/the-hot-box/rules.yaml +++ b/mods/cnc/maps/the-hot-box/rules.yaml @@ -7,8 +7,8 @@ World: SpawnInterval: 125 CrateActors: unitcrate InitialSpawnDelay: 0 - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: MapBuildRadius: AllyBuildRadiusCheckboxLocked: True AllyBuildRadiusCheckboxEnabled: False diff --git a/mods/cnc/rules/campaign-maprules.yaml b/mods/cnc/rules/campaign-maprules.yaml index 53be5ab1a3..91c9fd4b02 100644 --- a/mods/cnc/rules/campaign-maprules.yaml +++ b/mods/cnc/rules/campaign-maprules.yaml @@ -1,6 +1,6 @@ World: - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: -CrateSpawner: ObjectivesPanel: PanelName: MISSION_OBJECTIVES diff --git a/mods/cnc/rules/world.yaml b/mods/cnc/rules/world.yaml index ecbf44433b..49919f5923 100644 --- a/mods/cnc/rules/world.yaml +++ b/mods/cnc/rules/world.yaml @@ -193,51 +193,51 @@ World: ShortGameCheckboxDisplayOrder: 2 TechLevelDropdownDisplayOrder: 2 GameSpeedDropdownDisplayOrder: 3 - MPStartLocations: + MapStartingLocations: SeparateTeamSpawnsCheckboxDisplayOrder: 6 - CreateMPPlayers: - MPStartUnits@mcvonly: + CreateMapPlayers: + StartingUnits@mcvonly: Class: none ClassName: MCV Only Factions: gdi, nod BaseActor: mcv - MPStartUnits@defaultgdia: + StartingUnits@defaultgdia: Class: light ClassName: Light Support Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e3,e3,jeep - MPStartUnits@defaultnoda: + StartingUnits@defaultnoda: Class: light ClassName: Light Support Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e1,e3,e3,bggy - MPStartUnits@heavynoda: + StartingUnits@heavynoda: Class: heavy ClassName: Heavy Support Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e1,e3,e3,ltnk,ltnk,ftnk - MPStartUnits@heavynodb: + StartingUnits@heavynodb: Class: heavy ClassName: Heavy Support Factions: nod BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e3,e3,e3,ftnk,ftnk - MPStartUnits@heavygdia: + StartingUnits@heavygdia: Class: heavy ClassName: Heavy Support Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e1,e3,e3,jeep,mtnk,mtnk - MPStartUnits@heavygdib: + StartingUnits@heavygdib: Class: heavy ClassName: Heavy Support Factions: gdi BaseActor: mcv SupportActors: e1,e1,e1,e1,e1,e2,e2,e2,e3,e3,apc,mtnk - SpawnMPUnits: + SpawnStartingUnits: DropdownDisplayOrder: 0 CrateSpawner: Minimum: 1 diff --git a/mods/d2k/maps/shellmap/rules.yaml b/mods/d2k/maps/shellmap/rules.yaml index 31523eb8ca..67df6fe581 100644 --- a/mods/d2k/maps/shellmap/rules.yaml +++ b/mods/d2k/maps/shellmap/rules.yaml @@ -4,8 +4,8 @@ Player: World: -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: ResourceType@Spice: ValuePerUnit: 0 ActorSpawnManager: diff --git a/mods/d2k/rules/campaign-rules.yaml b/mods/d2k/rules/campaign-rules.yaml index fad2544c16..b4868172a3 100644 --- a/mods/d2k/rules/campaign-rules.yaml +++ b/mods/d2k/rules/campaign-rules.yaml @@ -16,8 +16,8 @@ Player: World: -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: ObjectivesPanel: PanelName: MISSION_OBJECTIVES ActorSpawnManager: diff --git a/mods/d2k/rules/world.yaml b/mods/d2k/rules/world.yaml index 2b1af9b6dd..b0c1a287ad 100644 --- a/mods/d2k/rules/world.yaml +++ b/mods/d2k/rules/world.yaml @@ -166,15 +166,15 @@ World: ShortGameCheckboxDisplayOrder: 2 TechLevelDropdownDisplayOrder: 2 GameSpeedDropdownDisplayOrder: 3 - CreateMPPlayers: - MPStartLocations: + CreateMapPlayers: + MapStartingLocations: SeparateTeamSpawnsCheckboxDisplayOrder: 6 - MPStartUnits@mcv: + StartingUnits@mcv: Class: none ClassName: MCV Only BaseActor: mcv Factions: atreides, ordos, harkonnen - MPStartUnits@lightatreides: + StartingUnits@lightatreides: Class: light ClassName: Light Support Factions: atreides @@ -182,7 +182,7 @@ World: SupportActors: light_inf, light_inf, light_inf, trooper, grenadier, trike, quad InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@lightharkonnen: + StartingUnits@lightharkonnen: Class: light ClassName: Light Support Factions: harkonnen @@ -190,7 +190,7 @@ World: SupportActors: light_inf, light_inf, light_inf, trooper, trooper, trike, quad InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@lightordos: + StartingUnits@lightordos: Class: light ClassName: Light Support Factions: ordos @@ -198,7 +198,7 @@ World: SupportActors: light_inf, light_inf, light_inf, trooper, engineer, raider, quad InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@heavyatreides: + StartingUnits@heavyatreides: Class: heavy ClassName: Heavy Support Factions: atreides @@ -206,7 +206,7 @@ World: SupportActors: light_inf, light_inf, light_inf, trooper, grenadier, trike, combat_tank_a, missile_tank InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@heavyharkonnen: + StartingUnits@heavyharkonnen: Class: heavy ClassName: Heavy Support Factions: harkonnen @@ -214,7 +214,7 @@ World: SupportActors: light_inf, light_inf, light_inf, trooper, engineer, quad, combat_tank_h, siege_tank InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@heavyordos: + StartingUnits@heavyordos: Class: heavy ClassName: Heavy Support Factions: ordos @@ -222,7 +222,7 @@ World: SupportActors: light_inf, light_inf, light_inf, trooper, engineer, raider, combat_tank_o, missile_tank InnerSupportRadius: 3 OuterSupportRadius: 5 - SpawnMPUnits: + SpawnStartingUnits: DropdownDisplayOrder: 1 PathFinder: ValidateOrder: diff --git a/mods/ra/maps/bomber-john/rules.yaml b/mods/ra/maps/bomber-john/rules.yaml index 6d5ceb0a9b..21d66d0d54 100644 --- a/mods/ra/maps/bomber-john/rules.yaml +++ b/mods/ra/maps/bomber-john/rules.yaml @@ -3,7 +3,7 @@ World: CheckboxEnabled: False CheckboxLocked: True CheckboxVisible: False - -SpawnMPUnits: + -SpawnStartingUnits: MapBuildRadius: AllyBuildRadiusCheckboxLocked: True AllyBuildRadiusCheckboxEnabled: False @@ -15,7 +15,7 @@ World: TechLevelDropdownLocked: True TechLevelDropdownVisible: False TechLevel: unrestricted - MPStartLocations: + MapStartingLocations: SeparateTeamSpawnsCheckboxVisible: false Locomotor@LIGHTTRACKED: WaitAverage: 1 diff --git a/mods/ra/maps/desert-shellmap/rules.yaml b/mods/ra/maps/desert-shellmap/rules.yaml index 1b9a9109bd..cf01387c16 100644 --- a/mods/ra/maps/desert-shellmap/rules.yaml +++ b/mods/ra/maps/desert-shellmap/rules.yaml @@ -6,8 +6,8 @@ Player: World: -CrateSpawner: - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: MusicPlaylist: BackgroundMusic: intro AllowMuteBackgroundMusic: true diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml index 3ca3fba15c..4c54b3c1fb 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml @@ -4,8 +4,8 @@ World: SpawnInterval: 125 CrateActors: unitcrate InitialSpawnDelay: 0 - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: MapBuildRadius: AllyBuildRadiusCheckboxVisible: False BuildRadiusCheckboxVisible: False diff --git a/mods/ra/maps/drop-zone-w/rules.yaml b/mods/ra/maps/drop-zone-w/rules.yaml index a6fb78bc46..e176c3f29a 100644 --- a/mods/ra/maps/drop-zone-w/rules.yaml +++ b/mods/ra/maps/drop-zone-w/rules.yaml @@ -5,8 +5,8 @@ World: WaterChance: 100 CrateActors: unitcrate InitialSpawnDelay: 0 - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: MapBuildRadius: AllyBuildRadiusCheckboxVisible: False BuildRadiusCheckboxVisible: False diff --git a/mods/ra/maps/drop-zone/rules.yaml b/mods/ra/maps/drop-zone/rules.yaml index 3ca3fba15c..4c54b3c1fb 100644 --- a/mods/ra/maps/drop-zone/rules.yaml +++ b/mods/ra/maps/drop-zone/rules.yaml @@ -4,8 +4,8 @@ World: SpawnInterval: 125 CrateActors: unitcrate InitialSpawnDelay: 0 - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: MapBuildRadius: AllyBuildRadiusCheckboxVisible: False BuildRadiusCheckboxVisible: False diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index edf91e5e5c..a5f21d99a7 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -4,7 +4,7 @@ World: Maximum: 4 SpawnInterval: 1000 CrateActors: fortcrate - MPStartUnits@mcvonly: + StartingUnits@mcvonly: BaseActor: tent WeatherOverlay: WindTick: 150, 550 @@ -31,7 +31,7 @@ World: MapBuildRadius: AllyBuildRadiusCheckboxVisible: False BuildRadiusCheckboxVisible: False - SpawnMPUnits: + SpawnStartingUnits: DropdownVisible: False MapOptions: TechLevelDropdownLocked: True @@ -53,7 +53,7 @@ World: endless: Endless mode Default: hard DisplayOrder: 5 - MPStartLocations: + MapStartingLocations: SeparateTeamSpawnsCheckboxEnabled: False SeparateTeamSpawnsCheckboxLocked: True SeparateTeamSpawnsCheckboxVisible: False diff --git a/mods/ra/maps/oil-spill/rules.yaml b/mods/ra/maps/oil-spill/rules.yaml index 84ab89de2b..372cc0c5ac 100644 --- a/mods/ra/maps/oil-spill/rules.yaml +++ b/mods/ra/maps/oil-spill/rules.yaml @@ -1,9 +1,9 @@ World: LuaScript: Scripts: oil-spill.lua - SpawnMPUnits: + SpawnStartingUnits: DropdownVisible: False - MPStartUnits@mcvonly: + StartingUnits@mcvonly: BaseActor: fcom FCOM: diff --git a/mods/ra/rules/campaign-rules.yaml b/mods/ra/rules/campaign-rules.yaml index b330efa7d4..7f6c32cb78 100644 --- a/mods/ra/rules/campaign-rules.yaml +++ b/mods/ra/rules/campaign-rules.yaml @@ -19,8 +19,8 @@ World: CrateSpawner: CheckboxEnabled: False CheckboxLocked: True - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: ObjectivesPanel: PanelName: MISSION_OBJECTIVES MapBuildRadius: diff --git a/mods/ra/rules/world.yaml b/mods/ra/rules/world.yaml index d30ce0273d..d0f475a995 100644 --- a/mods/ra/rules/world.yaml +++ b/mods/ra/rules/world.yaml @@ -220,13 +220,13 @@ World: ShortGameCheckboxDisplayOrder: 2 TechLevelDropdownDisplayOrder: 2 GameSpeedDropdownDisplayOrder: 3 - CreateMPPlayers: - MPStartUnits@mcvonly: + CreateMapPlayers: + StartingUnits@mcvonly: Class: none ClassName: MCV Only Factions: allies, england, france, germany, soviet, russia, ukraine BaseActor: mcv - MPStartUnits@lightallies: + StartingUnits@lightallies: Class: light ClassName: Light Support Factions: allies, england, france, germany @@ -234,7 +234,7 @@ World: SupportActors: e1,e1,e1,e3,e3,jeep,1tnk InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@lightsoviet: + StartingUnits@lightsoviet: Class: light ClassName: Light Support Factions: soviet, russia, ukraine @@ -242,7 +242,7 @@ World: SupportActors: e1,e1,e1,e3,e3,apc,ftrk InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@heavyallies: + StartingUnits@heavyallies: Class: heavy ClassName: Heavy Support Factions: allies, england, france, germany @@ -250,7 +250,7 @@ World: SupportActors: e1,e1,e1,e3,e3,jeep,1tnk,2tnk,2tnk,2tnk InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@heavysoviet: + StartingUnits@heavysoviet: Class: heavy ClassName: Heavy Support Factions: soviet, russia, ukraine @@ -258,9 +258,9 @@ World: SupportActors: e1,e1,e1,e3,e3,apc,ftrk,3tnk,3tnk InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartLocations: + MapStartingLocations: SeparateTeamSpawnsCheckboxDisplayOrder: 6 - SpawnMPUnits: + SpawnStartingUnits: DropdownDisplayOrder: 1 PathFinder: ValidateOrder: diff --git a/mods/ts/maps/fields-of-green/rules.yaml b/mods/ts/maps/fields-of-green/rules.yaml index 5527ef07eb..ae276a3503 100644 --- a/mods/ts/maps/fields-of-green/rules.yaml +++ b/mods/ts/maps/fields-of-green/rules.yaml @@ -4,8 +4,8 @@ Player: World: -CrateSpawner: -StartGameNotification: - -SpawnMPUnits: - -MPStartLocations: + -SpawnStartingUnits: + -MapStartingLocations: LuaScript: Scripts: fields-of-green.lua ResourceType@Tiberium: diff --git a/mods/ts/rules/world.yaml b/mods/ts/rules/world.yaml index b562f0791f..0102fc2a3f 100644 --- a/mods/ts/rules/world.yaml +++ b/mods/ts/rules/world.yaml @@ -293,13 +293,13 @@ World: ShortGameCheckboxDisplayOrder: 2 TechLevelDropdownDisplayOrder: 2 GameSpeedDropdownDisplayOrder: 3 - CreateMPPlayers: - MPStartUnits@MCV: + CreateMapPlayers: + StartingUnits@MCV: Class: none ClassName: MCV Only Factions: gdi, nod BaseActor: mcv - MPStartUnits@light.gdi: + StartingUnits@light.gdi: Class: light ClassName: Light Factions: gdi @@ -307,7 +307,7 @@ World: SupportActors: e1,e1,e1,smech InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@light.nod: + StartingUnits@light.nod: Class: light ClassName: Light Factions: nod @@ -315,7 +315,7 @@ World: SupportActors: e1,e1,e1,bggy InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@med.gdi: + StartingUnits@med.gdi: Class: medium ClassName: Medium Factions: gdi @@ -323,7 +323,7 @@ World: SupportActors: e1,e1,e2,e2,jumpjet,smech InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@med.nod: + StartingUnits@med.nod: Class: medium ClassName: Medium Factions: nod @@ -331,7 +331,7 @@ World: SupportActors: e1,e1,e3,e3,cyborg,bggy InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@heavy.gdi: + StartingUnits@heavy.gdi: Class: heavy ClassName: Heavy Factions: gdi @@ -339,7 +339,7 @@ World: SupportActors: e1,e1,e2,e2,jumpjet,smech,smech,mmch InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartUnits@heavy.nod: + StartingUnits@heavy.nod: Class: heavy ClassName: Heavy Factions: nod @@ -347,9 +347,9 @@ World: SupportActors: e1,e1,e3,e3,cyborg,bggy,bike,ttnk InnerSupportRadius: 3 OuterSupportRadius: 5 - MPStartLocations: + MapStartingLocations: SeparateTeamSpawnsCheckboxDisplayOrder: 6 - SpawnMPUnits: + SpawnStartingUnits: DropdownDisplayOrder: 1 CrateSpawner: Minimum: 1