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

Merge pull request #12258 from reaperrr/move-icon

Browse Source 
Move production icon sequence from Tooltip to Buildable
This commit is contained in:
abcdefg30
2016-10-22 21:10:32 +02:00
committed by GitHub
parent 192f2358b9 5ac6c51162
commit 1a99e716de
10 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Force a specific faction variant, overriding the faction of the producing actor.")]
public readonly string ForceFaction = null;
[Desc("Sequence of the actor that contains the icon.")]
[SequenceReference] public readonly string Icon = "icon";
[Desc("Palette used for the production icon.")]
[PaletteReference] public readonly string IconPalette = "chrome";

3
OpenRA.Mods.Common/Traits/Tooltip.cs
View File

@@ -42,9 +42,6 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Show the actor's owner and their faction flag")]
public readonly bool ShowOwnerRow = true;
[Desc("Sequence of the actor that contains the cameo.")]
public readonly string Icon = "icon";
public override object Create(ActorInitializer init) { return new Tooltip(init.Self, this); }
public string TooltipForPlayerStance(Stance stance)