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

Allow different color picker preview actors per faction.

Browse Source
This commit is contained in:
Andre Mohren
2018-10-26 07:26:01 +02:00
committed by Paul Chote
parent 8e00ddedc7
commit 89e3b62f61
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Widgets/Logic/ColorPickerLogic.cs
View File

@@ -25,11 +25,12 @@ namespace OpenRA.Mods.Common.Widgets.Logic
int paletteTabHighlighted = 0; int paletteTabHighlighted = 0;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public ColorPickerLogic(Widget widget, ModData modData, World world, HSLColor initialColor, Action<HSLColor> onChange, Dictionary<string, MiniYaml> logicArgs) public ColorPickerLogic(Widget widget, ModData modData, World world, HSLColor initialColor, string initialFaction, Action<HSLColor> onChange,
Dictionary<string, MiniYaml> logicArgs)
{ {
string actorType; string actorType;
if (!ChromeMetrics.TryGet("ColorPickerActorType", out actorType)) if (initialFaction == null || !ChromeMetrics.TryGet("ColorPickerActorType-" + initialFaction, out actorType))
actorType = "mcv"; actorType = ChromeMetrics.Get<string>("ColorPickerActorType");
var preview = widget.GetOrNull<ActorPreviewWidget>("PREVIEW"); var preview = widget.GetOrNull<ActorPreviewWidget>("PREVIEW");
var actor = world.Map.Rules.Actors[actorType]; var actor = world.Map.Rules.Actors[actorType];
@@ -194,7 +195,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var colorChooser = Game.LoadWidget(world, "COLOR_CHOOSER", null, new WidgetArgs() var colorChooser = Game.LoadWidget(world, "COLOR_CHOOSER", null, new WidgetArgs()
{ {
{ "onChange", onChange }, { "onChange", onChange },
{ "initialColor", Game.Settings.Player.Color } { "initialColor", Game.Settings.Player.Color },
{ "initialFaction", null }
}); });
color.AttachPanel(colorChooser, onExit); color.AttachPanel(colorChooser, onExit);

3
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -217,7 +217,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var colorChooser = Game.LoadWidget(world, "COLOR_CHOOSER", null, new WidgetArgs() var colorChooser = Game.LoadWidget(world, "COLOR_CHOOSER", null, new WidgetArgs()
{ {
{ "onChange", onChange }, { "onChange", onChange },
{ "initialColor", client.Color } { "initialColor", client.Color },
{ "initialFaction", client.Faction }
}); });
color.AttachPanel(colorChooser, onExit); color.AttachPanel(colorChooser, onExit);