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

Add remappable support to production icons.

Browse Source
This commit is contained in:
Matthias Mailänder
2020-01-26 17:40:43 +01:00
committed by abcdefg30
parent df4c363e9c
commit 9050a2447b
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Traits/Buildable.cs
View File

@@ -38,10 +38,13 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Sequence of the actor that contains the icon.")] [Desc("Sequence of the actor that contains the icon.")]
public readonly string Icon = "icon"; public readonly string Icon = "icon";
[PaletteReference] [PaletteReference("IconPaletteIsPlayerPalette")]
[Desc("Palette used for the production icon.")] [Desc("Palette used for the production icon.")]
public readonly string IconPalette = "chrome"; public readonly string IconPalette = "chrome";
[Desc("Custom palette is a player palette BaseName")]
public readonly bool IconPaletteIsPlayerPalette = false;
[Desc("Base build time in frames (-1 indicates to use the unit's Value).")] [Desc("Base build time in frames (-1 indicates to use the unit's Value).")]
public readonly int BuildDuration = -1; public readonly int BuildDuration = -1;

2
OpenRA.Mods.Common/Traits/Player/PlayerStatistics.cs
View File

@@ -164,6 +164,7 @@ namespace OpenRA.Mods.Common.Traits
public readonly ActorInfo ActorInfo; public readonly ActorInfo ActorInfo;
public readonly Animation Icon; public readonly Animation Icon;
public readonly string IconPalette; public readonly string IconPalette;
public readonly bool IconPaletteIsPlayerPalette;
public readonly int ProductionQueueOrder; public readonly int ProductionQueueOrder;
public readonly int BuildPaletteOrder; public readonly int BuildPaletteOrder;
public readonly TooltipInfo TooltipInfo; public readonly TooltipInfo TooltipInfo;
@@ -189,6 +190,7 @@ namespace OpenRA.Mods.Common.Traits
Icon = new Animation(owner.World, image); Icon = new Animation(owner.World, image);
Icon.Play(BuildableInfo.Icon); Icon.Play(BuildableInfo.Icon);
IconPalette = BuildableInfo.IconPalette; IconPalette = BuildableInfo.IconPalette;
IconPaletteIsPlayerPalette = BuildableInfo.IconPaletteIsPlayerPalette;
BuildPaletteOrder = BuildableInfo.BuildPaletteOrder; BuildPaletteOrder = BuildableInfo.BuildPaletteOrder;
ProductionQueueOrder = queues.Where(q => BuildableInfo.Queue.Contains(q.Type)) ProductionQueueOrder = queues.Where(q => BuildableInfo.Queue.Contains(q.Type))
.Select(q => q.DisplayOrder) .Select(q => q.DisplayOrder)

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

@@ -107,7 +107,8 @@ namespace OpenRA.Mods.Common.Widgets
var iconTopLeft = RenderOrigin + topLeftOffset; var iconTopLeft = RenderOrigin + topLeftOffset;
var centerPosition = iconTopLeft; var centerPosition = iconTopLeft;
WidgetUtils.DrawSHPCentered(icon.Image, centerPosition + 0.5f * iconSize, worldRenderer.Palette(unit.IconPalette), 0.5f); var palette = unit.IconPaletteIsPlayerPalette ? unit.IconPalette + player.InternalName : unit.IconPalette;
WidgetUtils.DrawSHPCentered(icon.Image, centerPosition + 0.5f * iconSize, worldRenderer.Palette(palette), 0.5f);
armyIcons.Add(new ArmyIcon armyIcons.Add(new ArmyIcon
{ {

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

@@ -146,7 +146,8 @@ namespace OpenRA.Mods.Common.Widgets
var iconTopLeft = RenderOrigin + topLeftOffset; var iconTopLeft = RenderOrigin + topLeftOffset;
var centerPosition = iconTopLeft + 0.5f * iconSize; var centerPosition = iconTopLeft + 0.5f * iconSize;
WidgetUtils.DrawSHPCentered(icon.Image, centerPosition, worldRenderer.Palette(bi.IconPalette), 0.5f); var palette = bi.IconPaletteIsPlayerPalette ? bi.IconPalette + player.InternalName : bi.IconPalette;
WidgetUtils.DrawSHPCentered(icon.Image, centerPosition, worldRenderer.Palette(palette), 0.5f);
var rect = new Rectangle((int)iconTopLeft.X, (int)iconTopLeft.Y, (int)iconSize.X, (int)iconSize.Y); var rect = new Rectangle((int)iconTopLeft.X, (int)iconTopLeft.Y, (int)iconSize.X, (int)iconSize.Y);
productionIcons.Add(new ProductionIcon productionIcons.Add(new ProductionIcon

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

@@ -433,13 +433,15 @@ namespace OpenRA.Mods.Common.Widgets
var bi = item.TraitInfo<BuildableInfo>(); var bi = item.TraitInfo<BuildableInfo>();
icon.Play(bi.Icon); icon.Play(bi.Icon);
var palette = bi.IconPaletteIsPlayerPalette ? bi.IconPalette + producer.Actor.Owner.InternalName : bi.IconPalette;
var pi = new ProductionIcon() var pi = new ProductionIcon()
{ {
Actor = item, Actor = item,
Name = item.Name, Name = item.Name,
Hotkey = DisplayedIconCount < HotkeyCount ? hotkeys[DisplayedIconCount] : null, Hotkey = DisplayedIconCount < HotkeyCount ? hotkeys[DisplayedIconCount] : null,
Sprite = icon.Image, Sprite = icon.Image,
Palette = worldRenderer.Palette(bi.IconPalette), Palette = worldRenderer.Palette(palette),
IconClockPalette = worldRenderer.Palette(ClockPalette), IconClockPalette = worldRenderer.Palette(ClockPalette),
IconDarkenPalette = worldRenderer.Palette(NotBuildablePalette), IconDarkenPalette = worldRenderer.Palette(NotBuildablePalette),
Pos = new float2(rect.Location), Pos = new float2(rect.Location),