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

Merge pull request #10015 from atlimit8/MapEditorTooltips

Browse Source 
Add map editor only tooltips
This commit is contained in:
Paul Chote
2015-12-28 18:46:07 +00:00
parent 5e04c45dd9 e417ecb93f
commit 12df496f5b
10 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,12 +12,23 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Shown in the build palette widget.")]
public class TooltipInfo : ITraitInfo, ITooltipInfo
public abstract class TooltipInfoBase : ITraitInfo
{
[Translate] public readonly string Description = "";
[Translate] public readonly string Name = "";
public abstract object Create(ActorInitializer init);
}
[Desc("Shown in map editor.")]
public class EditorOnlyTooltipInfo : TooltipInfoBase
{
public override object Create(ActorInitializer init) { return this; }
}
[Desc("Shown in the build palette widget.")]
public class TooltipInfo : TooltipInfoBase, ITooltipInfo
{
[Desc("An optional generic name (i.e. \"Soldier\" or \"Structure\")" +
"to be shown to chosen players.")]
[Translate] public readonly string GenericName = null;
@@ -34,7 +45,7 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Sequence of the actor that contains the cameo.")]
public readonly string Icon = "icon";
public virtual object Create(ActorInitializer init) { return new Tooltip(init.Self, this); }
public override object Create(ActorInitializer init) { return new Tooltip(init.Self, this); }
public string TooltipForPlayerStance(Stance stance)
{

2
OpenRA.Mods.Common/Traits/World/EditorActorPreview.cs
View File

@@ -69,7 +69,7 @@ namespace OpenRA.Mods.Common.Traits
Footprint = new ReadOnlyDictionary<CPos, SubCell>(footprint);
}
var tooltip = Info.TraitInfoOrDefault<TooltipInfo>();
var tooltip = Info.TraitInfoOrDefault<EditorOnlyTooltipInfo>() as TooltipInfoBase ?? Info.TraitInfoOrDefault<TooltipInfo>();
Tooltip = (tooltip == null ? " < " + Info.Name + " >" : tooltip.Name) + "\n" + owner.Name + " (" + owner.Faction + ")"
+ "\nID: " + ID + "\nType: " + Info.Name;

2
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
View File

@@ -136,7 +136,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
item.Bounds.Height = preview.Bounds.Height + 2 * preview.Bounds.Y;
item.IsVisible = () => true;
var tooltip = actor.TraitInfoOrDefault<TooltipInfo>();
var tooltip = actor.TraitInfoOrDefault<EditorOnlyTooltipInfo>() as TooltipInfoBase ?? actor.TraitInfoOrDefault<TooltipInfo>();
item.GetTooltipText = () => (tooltip == null ? "Type: " : tooltip.Name + "\nType: ") + actor.Name;
panel.AddChild(item);