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

Add Checkbox/Dropdown to lobby options yaml fields.

Browse Source
This commit is contained in:
Paul Chote
2017-12-09 21:02:56 +00:00
committed by reaperrr
parent ea32c758eb
commit 36fccbc453
28 changed files with 333 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Traits/Player/PlayerResources.cs
View File

@@ -19,11 +19,11 @@ namespace OpenRA.Traits
{
[Translate]
[Desc("Descriptive label for the starting cash option in the lobby.")]
public readonly string Label = "Starting Cash";
public readonly string DefaultCashDropdownLabel = "Starting Cash";
[Translate]
[Desc("Tooltip description for the starting cash option in the lobby.")]
public readonly string Description = "Change the amount of cash that players start with";
public readonly string DefaultCashDropdownDescription = "Change the amount of cash that players start with";
[Desc("Starting cash options that are available in the lobby options.")]
public readonly int[] SelectableCash = { 2500, 5000, 10000, 20000 };
@@ -32,13 +32,13 @@ namespace OpenRA.Traits
public readonly int DefaultCash = 5000;
[Desc("Force the DefaultCash option by disabling changes in the lobby.")]
public readonly bool DefaultCashLocked = false;
public readonly bool DefaultCashDropdownLocked = false;
[Desc("Whether to display the DefaultCash option in the lobby.")]
public readonly bool DefaultCashVisible = true;
public readonly bool DefaultCashDropdownVisible = true;
[Desc("Display order for the DefaultCash option.")]
public readonly int DefaultCashDisplayOrder = 0;
public readonly int DefaultCashDropdownDisplayOrder = 0;
[Desc("Speech notification to play when the player does not have any funds.")]
public readonly string InsufficientFundsNotification = null;
@@ -51,8 +51,8 @@ namespace OpenRA.Traits
var startingCash = SelectableCash.ToDictionary(c => c.ToString(), c => "$" + c.ToString());
if (startingCash.Any())
yield return new LobbyOption("startingcash", Label, Description, DefaultCashVisible, DefaultCashDisplayOrder,
new ReadOnlyDictionary<string, string>(startingCash), DefaultCash.ToString(), DefaultCashLocked);
yield return new LobbyOption("startingcash", DefaultCashDropdownLabel, DefaultCashDropdownDescription, DefaultCashDropdownVisible, DefaultCashDropdownDisplayOrder,
new ReadOnlyDictionary<string, string>(startingCash), DefaultCash.ToString(), DefaultCashDropdownLocked);
}
public object Create(ActorInitializer init) { return new PlayerResources(init.Self, this); }

36
OpenRA.Game/Traits/Player/Shroud.cs
View File

@@ -19,50 +19,50 @@ namespace OpenRA.Traits
{
[Translate]
[Desc("Descriptive label for the fog checkbox in the lobby.")]
public readonly string FogLabel = "Fog of War";
public readonly string FogCheckboxLabel = "Fog of War";
[Translate]
[Desc("Tooltip description for the fog checkbox in the lobby.")]
public readonly string FogDescription = "Line of sight is required to view enemy forces";
public readonly string FogCheckboxDescription = "Line of sight is required to view enemy forces";
[Desc("Default value of the fog checkbox in the lobby.")]
public readonly bool FogEnabled = true;
public readonly bool FogCheckboxEnabled = true;
[Desc("Prevent the fog enabled state from being changed in the lobby.")]
public readonly bool FogLocked = false;
public readonly bool FogCheckboxLocked = false;
[Desc("Whether to display the fog checkbox in the lobby.")]
public readonly bool FogVisible = true;
public readonly bool FogCheckboxVisible = true;
[Desc("Display order for the fog checkbox in the lobby.")]
public readonly int FogDisplayOrder = 0;
public readonly int FogCheckboxDisplayOrder = 0;
[Translate]
[Desc("Descriptive label for the explored map checkbox in the lobby.")]
public readonly string ExploredMapLabel = "Explored Map";
public readonly string ExploredMapCheckboxLabel = "Explored Map";
[Translate]
[Desc("Tooltip description for the explored map checkbox in the lobby.")]
public readonly string ExploredMapDescription = "Initial map shroud is revealed";
public readonly string ExploredMapCheckboxDescription = "Initial map shroud is revealed";
[Desc("Default value of the explore map checkbox in the lobby.")]
public readonly bool ExploredMapEnabled = false;
public readonly bool ExploredMapCheckboxEnabled = false;
[Desc("Prevent the explore map enabled state from being changed in the lobby.")]
public readonly bool ExploredMapLocked = false;
public readonly bool ExploredMapCheckboxLocked = false;
[Desc("Whether to display the explore map checkbox in the lobby.")]
public readonly bool ExploredMapVisible = true;
public readonly bool ExploredMapCheckboxVisible = true;
[Desc("Display order for the explore map checkbox in the lobby.")]
public readonly int ExploredMapDisplayOrder = 0;
public readonly int ExploredMapCheckboxDisplayOrder = 0;
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
yield return new LobbyBooleanOption("explored", ExploredMapLabel, ExploredMapDescription,
ExploredMapVisible, ExploredMapDisplayOrder, ExploredMapEnabled, ExploredMapLocked);
yield return new LobbyBooleanOption("fog", FogLabel, FogDescription,
FogVisible, FogDisplayOrder, FogEnabled, FogLocked);
yield return new LobbyBooleanOption("explored", ExploredMapCheckboxLabel, ExploredMapCheckboxDescription,
ExploredMapCheckboxVisible, ExploredMapCheckboxDisplayOrder, ExploredMapCheckboxEnabled, ExploredMapCheckboxLocked);
yield return new LobbyBooleanOption("fog", FogCheckboxLabel, FogCheckboxDescription,
FogCheckboxVisible, FogCheckboxDisplayOrder, FogCheckboxEnabled, FogCheckboxLocked);
}
public object Create(ActorInitializer init) { return new Shroud(init.Self, this); }
@@ -148,9 +148,9 @@ namespace OpenRA.Traits
void INotifyCreated.Created(Actor self)
{
var gs = self.World.LobbyInfo.GlobalSettings;
fogEnabled = gs.OptionOrDefault("fog", info.FogEnabled);
fogEnabled = gs.OptionOrDefault("fog", info.FogCheckboxEnabled);
ExploreMapEnabled = gs.OptionOrDefault("explored", info.ExploredMapEnabled);
ExploreMapEnabled = gs.OptionOrDefault("explored", info.ExploredMapCheckboxEnabled);
if (ExploreMapEnabled)
self.World.AddFrameEndTask(w => ExploreAll());
}

2
OpenRA.Mods.Common/Traits/Modifiers/FrozenUnderFog.cs
View File

@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.Traits
// Explore map-placed actors if the "Explore Map" option is enabled
var shroudInfo = init.World.Map.Rules.Actors["player"].TraitInfo<ShroudInfo>();
var exploredMap = init.World.LobbyInfo.GlobalSettings.OptionOrDefault("explored", shroudInfo.ExploredMapEnabled);
var exploredMap = init.World.LobbyInfo.GlobalSettings.OptionOrDefault("explored", shroudInfo.ExploredMapCheckboxEnabled);
startsRevealed = exploredMap && init.Contains<SpawnedByMapInit>() && !init.Contains<HiddenUnderFogInit>();
var buildingInfo = init.Self.Info.TraitInfoOrDefault<BuildingInfo>();
var footprintCells = buildingInfo != null ? buildingInfo.FrozenUnderFogTiles(init.Self.Location).ToList() : new List<CPos>() { init.Self.Location };

16
OpenRA.Mods.Common/Traits/Player/DeveloperMode.cs
View File

@@ -20,23 +20,23 @@ namespace OpenRA.Mods.Common.Traits
{
[Translate]
[Desc("Descriptive label for the developer mode checkbox in the lobby.")]
public readonly string Label = "Debug Menu";
public readonly string CheckboxLabel = "Debug Menu";
[Translate]
[Desc("Tooltip description for the developer mode checkbox in the lobby.")]
public readonly string Description = "Enables cheats and developer commands";
public readonly string CheckboxDescription = "Enables cheats and developer commands";
[Desc("Default value of the developer mode checkbox in the lobby.")]
public readonly bool Enabled = false;
public readonly bool CheckboxEnabled = false;
[Desc("Prevent the developer mode state from being changed in the lobby.")]
public readonly bool Locked = false;
public readonly bool CheckboxLocked = false;
[Desc("Whether to display the developer mode checkbox in the lobby.")]
public readonly bool Visible = true;
public readonly bool CheckboxVisible = true;
[Desc("Display order for the developer mode checkbox in the lobby.")]
public readonly int DisplayOrder = 0;
public readonly int CheckboxDisplayOrder = 0;
[Desc("Default cash bonus granted by the give cash cheat.")]
public readonly int Cash = 20000;
@@ -64,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
yield return new LobbyBooleanOption("cheats", Label, Description, Visible, DisplayOrder, Enabled, Locked);
yield return new LobbyBooleanOption("cheats", CheckboxLabel, CheckboxDescription, CheckboxVisible, CheckboxDisplayOrder, CheckboxEnabled, CheckboxLocked);
}
public object Create(ActorInitializer init) { return new DeveloperMode(this); }
@@ -107,7 +107,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
Enabled = self.World.LobbyInfo.NonBotPlayers.Count() == 1 || self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("cheats", info.Enabled);
.OptionOrDefault("cheats", info.CheckboxEnabled);
}
public void ResolveOrder(Actor self, Order order)

16
OpenRA.Mods.Common/Traits/World/CrateSpawner.cs
View File

@@ -23,23 +23,23 @@ namespace OpenRA.Mods.Common.Traits
{
[Translate]
[Desc("Descriptive label for the crates checkbox in the lobby.")]
public readonly string Label = "Crates";
public readonly string CheckboxLabel = "Crates";
[Translate]
[Desc("Tooltip description for the crates checkbox in the lobby.")]
public readonly string Description = "Collect crates with units to recieve random bonuses or penalties";
public readonly string CheckboxDescription = "Collect crates with units to recieve random bonuses or penalties";
[Desc("Default value of the crates checkbox in the lobby.")]
public readonly bool Enabled = true;
public readonly bool CheckboxEnabled = true;
[Desc("Prevent the crates state from being changed in the lobby.")]
public readonly bool Locked = false;
public readonly bool CheckboxLocked = false;
[Desc("Whether to display the crates checkbox in the lobby.")]
public readonly bool Visible = true;
public readonly bool CheckboxVisible = true;
[Desc("Display order for the crates checkbox in the lobby.")]
public readonly int DisplayOrder = 0;
public readonly int CheckboxDisplayOrder = 0;
[Desc("Minimum number of crates.")]
public readonly int Minimum = 1;
@@ -81,7 +81,7 @@ namespace OpenRA.Mods.Common.Traits
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
yield return new LobbyBooleanOption("crates", Label, Description, Visible, DisplayOrder, Enabled, Locked);
yield return new LobbyBooleanOption("crates", CheckboxLabel, CheckboxDescription, CheckboxVisible, CheckboxDisplayOrder, CheckboxEnabled, CheckboxLocked);
}
public object Create(ActorInitializer init) { return new CrateSpawner(init.Self, this); }
@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
enabled = self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("crates", info.Enabled);
.OptionOrDefault("crates", info.CheckboxEnabled);
}
void ITick.Tick(Actor self)

36
OpenRA.Mods.Common/Traits/World/MapBuildRadius.cs
View File

@@ -19,51 +19,51 @@ namespace OpenRA.Mods.Common.Traits
{
[Translate]
[Desc("Descriptive label for the ally build radius checkbox in the lobby.")]
public readonly string AllyBuildRadiusLabel = "Build off Allies";
public readonly string AllyBuildRadiusCheckboxLabel = "Build off Allies";
[Translate]
[Desc("Tooltip description for the ally build radius checkbox in the lobby.")]
public readonly string AllyBuildRadiusDescription = "Allow allies to place structures inside your build area";
public readonly string AllyBuildRadiusCheckboxDescription = "Allow allies to place structures inside your build area";
[Desc("Default value of the ally build radius checkbox in the lobby.")]
public readonly bool AllyBuildRadiusEnabled = true;
public readonly bool AllyBuildRadiusCheckboxEnabled = true;
[Desc("Prevent the ally build radius state from being changed in the lobby.")]
public readonly bool AllyBuildRadiusLocked = false;
public readonly bool AllyBuildRadiusCheckboxLocked = false;
[Desc("Whether to display the ally build radius checkbox in the lobby.")]
public readonly bool AllyBuildRadiusVisible = true;
public readonly bool AllyBuildRadiusCheckboxVisible = true;
[Desc("Display order for the ally build radius checkbox in the lobby.")]
public readonly int AllyBuildRadiusDisplayOrder = 0;
public readonly int AllyBuildRadiusCheckboxDisplayOrder = 0;
[Translate]
[Desc("Tooltip description for the build radius checkbox in the lobby.")]
public readonly string BuildRadiusLabel = "Limit Build Area";
public readonly string BuildRadiusCheckboxLabel = "Limit Build Area";
[Translate]
[Desc("Tooltip description for the build radius checkbox in the lobby.")]
public readonly string BuildRadiusDescription = "Limits structure placement to areas around Construction Yards";
public readonly string BuildRadiusCheckboxDescription = "Limits structure placement to areas around Construction Yards";
[Desc("Default value of the build radius checkbox in the lobby.")]
public readonly bool BuildRadiusEnabled = true;
public readonly bool BuildRadiusCheckboxEnabled = true;
[Desc("Prevent the build radius state from being changed in the lobby.")]
public readonly bool BuildRadiusLocked = false;
public readonly bool BuildRadiusCheckboxLocked = false;
[Desc("Display the build radius checkbox in the lobby.")]
public readonly bool BuildRadiusVisible = true;
public readonly bool BuildRadiusCheckboxVisible = true;
[Desc("Display order for the build radius checkbox in the lobby.")]
public readonly int BuildRadiusDisplayOrder = 0;
public readonly int BuildRadiusCheckboxDisplayOrder = 0;
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
yield return new LobbyBooleanOption("allybuild", AllyBuildRadiusLabel, AllyBuildRadiusDescription,
AllyBuildRadiusVisible, AllyBuildRadiusDisplayOrder, AllyBuildRadiusEnabled, AllyBuildRadiusLocked);
yield return new LobbyBooleanOption("allybuild", AllyBuildRadiusCheckboxLabel, AllyBuildRadiusCheckboxDescription,
AllyBuildRadiusCheckboxVisible, AllyBuildRadiusCheckboxDisplayOrder, AllyBuildRadiusCheckboxEnabled, AllyBuildRadiusCheckboxLocked);
yield return new LobbyBooleanOption("buildradius", BuildRadiusLabel, BuildRadiusDescription,
BuildRadiusVisible, BuildRadiusDisplayOrder, BuildRadiusEnabled, BuildRadiusLocked);
yield return new LobbyBooleanOption("buildradius", BuildRadiusCheckboxLabel, BuildRadiusCheckboxDescription,
BuildRadiusCheckboxVisible, BuildRadiusCheckboxDisplayOrder, BuildRadiusCheckboxEnabled, BuildRadiusCheckboxLocked);
}
public object Create(ActorInitializer init) { return new MapBuildRadius(this); }
@@ -83,9 +83,9 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
AllyBuildRadiusEnabled = self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("allybuild", info.AllyBuildRadiusEnabled);
.OptionOrDefault("allybuild", info.AllyBuildRadiusCheckboxEnabled);
BuildRadiusEnabled = self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("buildradius", info.BuildRadiusEnabled);
.OptionOrDefault("buildradius", info.BuildRadiusCheckboxEnabled);
}
}
}

16
OpenRA.Mods.Common/Traits/World/MapCreeps.cs
View File

@@ -19,27 +19,27 @@ namespace OpenRA.Mods.Common.Traits
{
[Translate]
[Desc("Descriptive label for the creeps checkbox in the lobby.")]
public readonly string Label = "Creep Actors";
public readonly string CheckboxLabel = "Creep Actors";
[Translate]
[Desc("Tooltip description for the creeps checkbox in the lobby.")]
public readonly string Description = "Hostile forces spawn on the battlefield";
public readonly string CheckboxDescription = "Hostile forces spawn on the battlefield";
[Desc("Default value of the creeps checkbox in the lobby.")]
public readonly bool Enabled = true;
public readonly bool CheckboxEnabled = true;
[Desc("Prevent the creeps state from being changed in the lobby.")]
public readonly bool Locked = false;
public readonly bool CheckboxLocked = false;
[Desc("Whether to display the creeps checkbox in the lobby.")]
public readonly bool Visible = true;
public readonly bool CheckboxVisible = true;
[Desc("Display order for the creeps checkbox in the lobby.")]
public readonly int DisplayOrder = 0;
public readonly int CheckboxDisplayOrder = 0;
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
yield return new LobbyBooleanOption("creeps", Label, Description, Visible, DisplayOrder, Enabled, Locked);
yield return new LobbyBooleanOption("creeps", CheckboxLabel, CheckboxDescription, CheckboxVisible, CheckboxDisplayOrder, CheckboxEnabled, CheckboxLocked);
}
public object Create(ActorInitializer init) { return new MapCreeps(this); }
@@ -58,7 +58,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
Enabled = self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("creeps", info.Enabled);
.OptionOrDefault("creeps", info.CheckboxEnabled);
}
}
}

46
OpenRA.Mods.Common/Traits/World/MapOptions.cs
View File

@@ -20,82 +20,82 @@ namespace OpenRA.Mods.Common.Traits
{
[Translate]
[Desc("Descriptive label for the short game checkbox in the lobby.")]
public readonly string ShortGameLabel = "Short Game";
public readonly string ShortGameCheckboxLabel = "Short Game";
[Translate]
[Desc("Tooltip description for the short game checkbox in the lobby.")]
public readonly string ShortGameDescription = "Players are defeated when their bases are destroyed";
public readonly string ShortGameCheckboxDescription = "Players are defeated when their bases are destroyed";
[Desc("Default value of the short game checkbox in the lobby.")]
public readonly bool ShortGameEnabled = true;
public readonly bool ShortGameCheckboxEnabled = true;
[Desc("Prevent the short game enabled state from being changed in the lobby.")]
public readonly bool ShortGameLocked = false;
public readonly bool ShortGameCheckboxLocked = false;
[Desc("Whether to display the short game checkbox in the lobby.")]
public readonly bool ShortGameVisible = true;
public readonly bool ShortGameCheckboxVisible = true;
[Desc("Display order for the short game checkbox in the lobby.")]
public readonly int ShortGameDisplayOrder = 0;
public readonly int ShortGameCheckboxDisplayOrder = 0;
[Translate]
[Desc("Descriptive label for the tech level option in the lobby.")]
public readonly string TechLevelLabel = "Tech Level";
public readonly string TechLevelDropdownLabel = "Tech Level";
[Translate]
[Desc("Tooltip description for the tech level option in the lobby.")]
public readonly string TechLevelDescription = "Change the units and abilities at your disposal";
public readonly string TechLevelDropdownDescription = "Change the units and abilities at your disposal";
[Desc("Default tech level.")]
public readonly string TechLevel = "unrestricted";
[Desc("Prevent the tech level from being changed in the lobby.")]
public readonly bool TechLevelLocked = false;
public readonly bool TechLevelDropdownLocked = false;
[Desc("Display the tech level option in the lobby.")]
public readonly bool TechLevelVisible = true;
public readonly bool TechLevelDropdownVisible = true;
[Desc("Display order for the tech level option in the lobby.")]
public readonly int TechLevelDisplayOrder = 0;
public readonly int TechLevelDropdownDisplayOrder = 0;
[Translate]
[Desc("Tooltip description for the game speed option in the lobby.")]
public readonly string GameSpeedLabel = "Game Speed";
public readonly string GameSpeedDropdownLabel = "Game Speed";
[Translate]
[Desc("Description of the game speed option in the lobby.")]
public readonly string GameSpeedDescription = "Change the rate at which time passes";
public readonly string GameSpeedDropdownDescription = "Change the rate at which time passes";
[Desc("Default game speed.")]
public readonly string GameSpeed = "default";
[Desc("Prevent the game speed from being changed in the lobby.")]
public readonly bool GameSpeedLocked = false;
public readonly bool GameSpeedDropdownLocked = false;
[Desc("Display the game speed option in the lobby.")]
public readonly bool GameSpeedVisible = true;
public readonly bool GameSpeedDropdownVisible = true;
[Desc("Display order for the game speed option in the lobby.")]
public readonly int GameSpeedDisplayOrder = 0;
public readonly int GameSpeedDropdownDisplayOrder = 0;
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
yield return new LobbyBooleanOption("shortgame", ShortGameLabel, ShortGameDescription,
ShortGameVisible, ShortGameDisplayOrder, ShortGameEnabled, ShortGameLocked);
yield return new LobbyBooleanOption("shortgame", ShortGameCheckboxLabel, ShortGameCheckboxDescription,
ShortGameCheckboxVisible, ShortGameCheckboxDisplayOrder, ShortGameCheckboxEnabled, ShortGameCheckboxLocked);
var techLevels = rules.Actors["player"].TraitInfos<ProvidesTechPrerequisiteInfo>()
.ToDictionary(t => t.Id, t => t.Name);
if (techLevels.Any())
yield return new LobbyOption("techlevel", TechLevelLabel, TechLevelDescription, TechLevelVisible, TechLevelDisplayOrder,
new ReadOnlyDictionary<string, string>(techLevels), TechLevel, TechLevelLocked);
yield return new LobbyOption("techlevel", TechLevelDropdownLabel, TechLevelDropdownDescription, TechLevelDropdownVisible, TechLevelDropdownDisplayOrder,
new ReadOnlyDictionary<string, string>(techLevels), TechLevel, TechLevelDropdownLocked);
var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>().Speeds
.ToDictionary(s => s.Key, s => s.Value.Name);
// NOTE: The server hardcodes special-case logic for this option id
yield return new LobbyOption("gamespeed", GameSpeedLabel, GameSpeedDescription, GameSpeedVisible, GameSpeedDisplayOrder,
new ReadOnlyDictionary<string, string>(gameSpeeds), GameSpeed, GameSpeedLocked);
yield return new LobbyOption("gamespeed", GameSpeedDropdownLabel, GameSpeedDropdownDescription, GameSpeedDropdownVisible, GameSpeedDropdownDisplayOrder,
new ReadOnlyDictionary<string, string>(gameSpeeds), GameSpeed, GameSpeedDropdownLocked);
}
void IRulesetLoaded<ActorInfo>.RulesetLoaded(Ruleset rules, ActorInfo info)
@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyCreated.Created(Actor self)
{
ShortGame = self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("shortgame", info.ShortGameEnabled);
.OptionOrDefault("shortgame", info.ShortGameCheckboxEnabled);
TechLevel = self.World.LobbyInfo.GlobalSettings
.OptionOrDefault("techlevel", info.TechLevel);

14
OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs
View File

@@ -25,20 +25,20 @@ namespace OpenRA.Mods.Common.Traits
[Translate]
[Desc("Descriptive label for the starting units option in the lobby.")]
public readonly string Label = "Starting Units";
public readonly string DropdownLabel = "Starting Units";
[Translate]
[Desc("Tooltip description for the starting units option in the lobby.")]
public readonly string Description = "Change the units that you start the game with";
public readonly string DropdownDescription = "Change the units that you start the game with";
[Desc("Prevent the starting units option from being changed in the lobby.")]
public readonly bool Locked = false;
public readonly bool DropdownLocked = false;
[Desc("Whether to display the starting units option in the lobby.")]
public readonly bool Visible = true;
public readonly bool DropdownVisible = true;
[Desc("Display order for the starting units option in the lobby.")]
public readonly int DisplayOrder = 0;
public readonly int DropdownDisplayOrder = 0;
IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
{
@@ -49,8 +49,8 @@ namespace OpenRA.Mods.Common.Traits
startingUnits[t.Class] = t.ClassName;
if (startingUnits.Any())
yield return new LobbyOption("startingunits", Label, Description, Visible, DisplayOrder,
new ReadOnlyDictionary<string, string>(startingUnits), StartingUnitsClass, Locked);
yield return new LobbyOption("startingunits", DropdownLabel, DropdownDescription, DropdownVisible, DropdownDisplayOrder,
new ReadOnlyDictionary<string, string>(startingUnits), StartingUnitsClass, DropdownLocked);
}
public object Create(ActorInitializer init) { return new SpawnMPUnits(this); }

107
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -1373,6 +1373,113 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
if (engineVersion < 20171212)
{
if (node.Key.StartsWith("SpawnMPUnits", StringComparison.Ordinal))
{
var locked = node.Value.Nodes.FirstOrDefault(n => n.Key == "Locked");
if (locked != null)
locked.Key = "DropdownLocked";
}
if (node.Key.StartsWith("Shroud", StringComparison.Ordinal))
{
var fogLocked = node.Value.Nodes.FirstOrDefault(n => n.Key == "FogLocked");
if (fogLocked != null)
fogLocked.Key = "FogCheckboxLocked";
var fogEnabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "FogEnabled");
if (fogEnabled != null)
fogEnabled.Key = "FogCheckboxEnabled";
var exploredMapLocked = node.Value.Nodes.FirstOrDefault(n => n.Key == "ExploredMapLocked");
if (exploredMapLocked != null)
exploredMapLocked.Key = "ExploredMapCheckboxLocked";
var exploredMapEnabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "ExploredMapEnabled");
if (exploredMapEnabled != null)
exploredMapEnabled.Key = "ExploredMapCheckboxEnabled";
}
if (node.Key.StartsWith("MapOptions", StringComparison.Ordinal))
{
var shortGameLocked = node.Value.Nodes.FirstOrDefault(n => n.Key == "ShortGameLocked");
if (shortGameLocked != null)
shortGameLocked.Key = "ShortGameCheckboxLocked";
var shortGameEnabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "ShortGameEnabled");
if (shortGameEnabled != null)
shortGameEnabled.Key = "ShortGameCheckboxEnabled";
var techLevelLocked = node.Value.Nodes.FirstOrDefault(n => n.Key == "TechLevelLocked");
if (techLevelLocked != null)
techLevelLocked.Key = "TechLevelDropdownLocked";
var gameSpeedLocked = node.Value.Nodes.FirstOrDefault(n => n.Key == "GameSpeedLocked");
if (gameSpeedLocked != null)
gameSpeedLocked.Key = "GameSpeedDropdownLocked";
}
if (node.Key.StartsWith("MapCreeps", StringComparison.Ordinal))
{
var locked = node.Value.Nodes.FirstOrDefault(n => n.Key == "Locked");
if (locked != null)
locked.Key = "CheckboxLocked";
var enabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "Enabled");
if (enabled != null)
enabled.Key = "CheckboxEnabled";
}
if (node.Key.StartsWith("MapBuildRadius", StringComparison.Ordinal))
{
var alllyLocked = node.Value.Nodes.FirstOrDefault(n => n.Key == "AllyBuildRadiusLocked");
if (alllyLocked != null)
alllyLocked.Key = "AllyBuildRadiusCheckboxLocked";
var allyEnabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "AllyBuildRadiusEnabled");
if (allyEnabled != null)
allyEnabled.Key = "AllyBuildRadiusCheckboxEnabled";
var buildRadiusLocked = node.Value.Nodes.FirstOrDefault(n => n.Key == "BuildRadiusLocked");
if (buildRadiusLocked != null)
buildRadiusLocked.Key = "BuildRadiusCheckboxLocked";
var buildRadiusEnabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "BuildRadiusEnabled");
if (buildRadiusEnabled != null)
buildRadiusEnabled.Key = "BuildRadiusCheckboxEnabled";
}
if (node.Key.StartsWith("DeveloperMode", StringComparison.Ordinal))
{
var locked = node.Value.Nodes.FirstOrDefault(n => n.Key == "Locked");
if (locked != null)
locked.Key = "CheckboxLocked";
var enabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "Enabled");
if (enabled != null)
enabled.Key = "CheckboxEnabled";
}
if (node.Key.StartsWith("CrateSpawner", StringComparison.Ordinal))
{
var locked = node.Value.Nodes.FirstOrDefault(n => n.Key == "Locked");
if (locked != null)
locked.Key = "CheckboxLocked";
var enabled = node.Value.Nodes.FirstOrDefault(n => n.Key == "Enabled");
if (enabled != null)
enabled.Key = "CheckboxEnabled";
}
if (node.Key.StartsWith("PlayerResources", StringComparison.Ordinal))
{
var locked = node.Value.Nodes.FirstOrDefault(n => n.Key == "Locked");
if (locked != null)
locked.Key = "DefaultCashDropdownLocked";
}
}
UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
}

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoLogic.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Can't use DeveloperMode.Enabled because there is a hardcoded hack to *always*
// enable developer mode for singleplayer games, but we only want to show the button
// if it has been explicitly enabled
var def = world.Map.Rules.Actors["player"].TraitInfo<DeveloperModeInfo>().Enabled;
var def = world.Map.Rules.Actors["player"].TraitInfo<DeveloperModeInfo>().CheckboxEnabled;
var developerEnabled = world.LobbyInfo.GlobalSettings.OptionOrDefault("cheats", def);
if (lp != null && developerEnabled)
{

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs
View File

@@ -79,7 +79,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Can't use DeveloperMode.Enabled because there is a hardcoded hack to *always*
// enable developer mode for singleplayer games, but we only want to show the button
// if it has been explicitly enabled
var def = world.Map.Rules.Actors["player"].TraitInfo<DeveloperModeInfo>().Enabled;
var def = world.Map.Rules.Actors["player"].TraitInfo<DeveloperModeInfo>().CheckboxEnabled;
var enabled = world.LobbyInfo.GlobalSettings.OptionOrDefault("cheats", def);
debug.IsVisible = () => enabled;
debug.IsDisabled = () => disableSystemButtons;

4
mods/cnc/maps/funpark01/rules.yaml
View File

@@ -8,8 +8,8 @@ World:
BriefingVideo: generic.vqa
StartVideo: dino.vqa
MapOptions:
ShortGameLocked: True
ShortGameEnabled: False
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False
ScriptLobbyDropdown@difficulty:
ID: difficulty
Label: Difficulty

4
mods/cnc/maps/gdi05a/rules.yaml
View File

@@ -11,8 +11,8 @@ World:
WinVideo: nodlose.vqa
LossVideo: gdilose.vqa
MapOptions:
ShortGameLocked: True
ShortGameEnabled: False
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False
SmudgeLayer@SCORCH:
InitialSmudges:
41,55: sc4,0

4
mods/cnc/maps/gdi06/rules.yaml
View File

@@ -30,8 +30,8 @@ World:
WinVideo: sabotage.vqa
LossVideo: gdilose.vqa
MapOptions:
ShortGameLocked: True
ShortGameEnabled: True
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: True
ScriptLobbyDropdown@difficulty:
ID: difficulty
Label: Difficulty

20
mods/cnc/maps/nod02a/rules.yaml
View File

@@ -21,10 +21,10 @@ Player:
MissionObjectives:
EarlyGameOver: true
Shroud:
FogLocked: True
FogEnabled: True
ExploredMapLocked: True
ExploredMapEnabled: False
FogCheckboxLocked: True
FogCheckboxEnabled: True
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True
DefaultCash: 4000
@@ -47,14 +47,14 @@ World:
WinVideo: airstrk.vqa
LossVideo: deskill.vqa
MapCreeps:
Locked: True
Enabled: False
CheckboxLocked: True
CheckboxEnabled: False
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
MapOptions:
ShortGameLocked: True
ShortGameEnabled: False
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False
^Vehicle:
Tooltip:

22
mods/cnc/maps/the-hot-box/rules.yaml
View File

@@ -1,7 +1,7 @@
World:
CrateSpawner:
Enabled: true
Locked: true
CheckboxEnabled: true
CheckboxLocked: true
Maximum: 4
SpawnInterval: 125
CrateActors: unitcrate
@@ -9,12 +9,12 @@ World:
-SpawnMPUnits:
-MPStartLocations:
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
TechLevelLocked: True
TechLevelDropdownLocked: True
TechLevel: unrestricted
UNITCRATE:
@@ -48,10 +48,10 @@ APC:
Player:
Shroud:
FogLocked: True
FogEnabled: False
ExploredMapLocked: True
ExploredMapEnabled: True
FogCheckboxLocked: True
FogCheckboxEnabled: False
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: True
CrateLocked: True
CrateEnabled: True
PlayerResources:

24
mods/cnc/rules/campaign-maprules.yaml
View File

@@ -5,26 +5,26 @@ World:
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MapCreeps:
Locked: True
Enabled: False
CheckboxLocked: True
CheckboxEnabled: False
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
ShortGameLocked: True
ShortGameEnabled: False
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False
Player:
-ConquestVictoryConditions:
MissionObjectives:
EarlyGameOver: true
Shroud:
FogLocked: True
FogEnabled: True
ExploredMapLocked: True
ExploredMapEnabled: False
FogCheckboxLocked: True
FogCheckboxEnabled: True
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True
DefaultCash: 5000

2
mods/cnc/rules/world.yaml
View File

@@ -77,7 +77,7 @@ World:
WarheadDebugOverlay:
CustomTerrainDebugOverlay:
MapCreeps:
Visible: False
CheckboxVisible: False
SpawnMapActors:
MapBuildRadius:
AllyBuildRadiusDisplayOrder: 4

22
mods/d2k/rules/campaign-rules.yaml
View File

@@ -3,10 +3,10 @@ Player:
MissionObjectives:
EarlyGameOver: true
Shroud:
FogLocked: True
FogEnabled: True
ExploredMapLocked: True
ExploredMapEnabled: False
FogCheckboxLocked: True
FogCheckboxEnabled: True
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True
@@ -20,12 +20,12 @@ World:
Minimum: 1
Maximum: 1
MapCreeps:
Locked: True
Enabled: True
CheckboxLocked: True
CheckboxEnabled: True
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
MapOptions:
TechLevelLocked: True
ShortGameLocked: True
ShortGameEnabled: False
TechLevelDropdownLocked: True
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False

6
mods/d2k/rules/world.yaml
View File

@@ -96,9 +96,9 @@ World:
Sequence: sandcraters
SmokePercentage: 0
MapCreeps:
Label: Worms
Description: Worms roam the map and devour unprepared forces
DisplayOrder: 5
CheckboxLabel: Worms
CheckboxDescription: Worms roam the map and devour unprepared forces
CheckboxDisplayOrder: 5
SpawnMapActors:
MapBuildRadius:
AllyBuildRadiusDisplayOrder: 4

22
mods/ra/maps/bomber-john/rules.yaml
View File

@@ -1,15 +1,15 @@
World:
CrateSpawner:
Enabled: False
Locked: True
CheckboxEnabled: False
CheckboxLocked: True
-SpawnMPUnits:
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
TechLevelLocked: True
TechLevelDropdownLocked: True
TechLevel: unrestricted
APWR:
@@ -58,10 +58,10 @@ SILO:
Player:
Shroud:
FogLocked: True
FogEnabled: True
ExploredMapLocked: True
ExploredMapEnabled: False
FogCheckboxLocked: True
FogCheckboxEnabled: True
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True
DefaultCash: 60

18
mods/ra/maps/drop-zone-battle-of-tikiaki/rules.yaml
View File

@@ -7,12 +7,12 @@ World:
-SpawnMPUnits:
-MPStartLocations:
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
TechLevelLocked: True
TechLevelDropdownLocked: True
TechLevel: unrestricted
UNITCRATE:
@@ -79,10 +79,10 @@ DOG:
Player:
Shroud:
FogLocked: True
FogEnabled: False
ExploredMapLocked: True
ExploredMapEnabled: True
FogCheckboxLocked: True
FogCheckboxEnabled: False
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: True
PlayerResources:
DefaultCashLocked: True
DefaultCash: 5000

18
mods/ra/maps/drop-zone-w/rules.yaml
View File

@@ -8,12 +8,12 @@ World:
-SpawnMPUnits:
-MPStartLocations:
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
TechLevelLocked: True
TechLevelDropdownLocked: True
TechLevel: unrestricted
UNITCRATE:
@@ -73,10 +73,10 @@ MSUB:
Player:
Shroud:
FogLocked: True
FogEnabled: False
ExploredMapLocked: True
ExploredMapEnabled: True
FogCheckboxLocked: True
FogCheckboxEnabled: False
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: True
PlayerResources:
DefaultCashLocked: True
DefaultCash: 5000

18
mods/ra/maps/drop-zone/rules.yaml
View File

@@ -7,12 +7,12 @@ World:
-SpawnMPUnits:
-MPStartLocations:
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
TechLevelLocked: True
TechLevelDropdownLocked: True
TechLevel: unrestricted
UNITCRATE:
@@ -79,10 +79,10 @@ DOG:
Player:
Shroud:
FogLocked: True
FogEnabled: False
ExploredMapLocked: True
ExploredMapEnabled: True
FogCheckboxLocked: True
FogCheckboxEnabled: False
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: True
PlayerResources:
DefaultCashLocked: True
DefaultCash: 5000

24
mods/ra/maps/fort-lonestar/rules.yaml
View File

@@ -29,17 +29,17 @@ World:
LuaScript:
Scripts: fort-lonestar.lua, fort-lonestar-AI.lua
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: True
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: True
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
SpawnMPUnits:
Locked: True
DropdownLocked: True
MapOptions:
TechLevelLocked: True
TechLevelDropdownLocked: True
TechLevel: unrestricted
ShortGameLocked: True
ShortGameEnabled: False
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False
ScriptLobbyDropdown@difficulty:
ID: difficulty
Label: Difficulty
@@ -91,10 +91,10 @@ Player:
BuildDurationModifier: 250
-EnemyWatcher:
Shroud:
FogLocked: True
FogEnabled: True
ExploredMapLocked: True
ExploredMapEnabled: False
FogCheckboxLocked: True
FogCheckboxEnabled: True
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True
DefaultCash: 50

18
mods/ra/maps/training-camp/rules.yaml
View File

@@ -3,12 +3,12 @@ World:
-SpawnMPUnits:
-MPStartLocations:
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
TechLevelLocked: True
TechLevelDropdownLocked: True
TechLevel: unrestricted
Player:
@@ -17,10 +17,10 @@ Player:
ClassicProductionQueue@Vehicle:
BuildDurationModifier: 250
Shroud:
FogLocked: True
FogEnabled: True
ExploredMapLocked: True
ExploredMapEnabled: False
FogCheckboxLocked: True
FogCheckboxEnabled: True
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True
DefaultCash: 100

26
mods/ra/rules/campaign-rules.yaml
View File

@@ -3,31 +3,31 @@ Player:
MissionObjectives:
EarlyGameOver: true
Shroud:
FogLocked: True
FogEnabled: True
ExploredMapLocked: True
ExploredMapEnabled: False
FogCheckboxLocked: True
FogCheckboxEnabled: True
ExploredMapCheckboxLocked: True
ExploredMapCheckboxEnabled: False
PlayerResources:
DefaultCashLocked: True
DefaultCash: 0
World:
CrateSpawner:
Enabled: False
Locked: True
CheckboxEnabled: False
CheckboxLocked: True
-SpawnMPUnits:
-MPStartLocations:
ObjectivesPanel:
PanelName: MISSION_OBJECTIVES
MapBuildRadius:
AllyBuildRadiusLocked: True
AllyBuildRadiusEnabled: False
BuildRadiusLocked: True
BuildRadiusEnabled: True
AllyBuildRadiusCheckboxLocked: True
AllyBuildRadiusCheckboxEnabled: False
BuildRadiusCheckboxLocked: True
BuildRadiusCheckboxEnabled: True
MapOptions:
TechLevelLocked: True
ShortGameLocked: True
ShortGameEnabled: False
TechLevelDropdownLocked: True
ShortGameCheckboxLocked: True
ShortGameCheckboxEnabled: False
E7:
-Crushable: