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());
}