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

Add SupportPowerPaletteOrder to SupportPowerInfo

Browse Source
This commit is contained in:
Ivaylo Draganov
2019-06-07 01:46:42 +03:00
committed by abcdefg30
parent a8b7fcaf87
commit a85b634655
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.Common/Traits/SupportPowers/SupportPower.cs
View File

@@ -106,6 +106,9 @@ namespace OpenRA.Mods.Common.Traits
public readonly string OrderName; public readonly string OrderName;
[Desc("Sort order for the support power palette. Smaller numbers are presented earlier.")]
public readonly int SupportPowerPaletteOrder = 9999;
public SupportPowerInfo() { OrderName = GetType().Name + "Order"; } public SupportPowerInfo() { OrderName = GetType().Name + "Order"; }
} }

4
OpenRA.Mods.Common/Widgets/ObserverSupportPowerIconsWidget.cs
View File

@@ -102,7 +102,9 @@ namespace OpenRA.Mods.Common.Widgets
return; return;
var powers = player.PlayerActor.Trait<SupportPowerManager>().Powers var powers = player.PlayerActor.Trait<SupportPowerManager>().Powers
.Where(x => !x.Value.Disabled).Select((a, i) => new { a, i }) .Where(x => !x.Value.Disabled)
.OrderBy(p => p.Value.Info.SupportPowerPaletteOrder)
.Select((a, i) => new { a, i })
.ToList(); .ToList();
foreach (var power in powers) foreach (var power in powers)

3
OpenRA.Mods.Common/Widgets/SupportPowersWidget.cs
View File

@@ -123,7 +123,8 @@ namespace OpenRA.Mods.Common.Widgets
public void RefreshIcons() public void RefreshIcons()
{ {
icons = new Dictionary<Rectangle, SupportPowerIcon>(); icons = new Dictionary<Rectangle, SupportPowerIcon>();
var powers = spm.Powers.Values.Where(p => !p.Disabled); var powers = spm.Powers.Values.Where(p => !p.Disabled)
.OrderBy(p => p.Info.SupportPowerPaletteOrder);
var oldIconCount = IconCount; var oldIconCount = IconCount;
IconCount = 0; IconCount = 0;