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

Moved production description from Tooltip to Buildable

Browse Source
This commit is contained in:
Tyson Liddell
2016-10-02 13:23:22 +11:00
parent e9d2da948e
commit aeb1e07823
4 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,9 @@ namespace OpenRA.Mods.Common.Traits
// TODO: UI fluff; doesn't belong here // TODO: UI fluff; doesn't belong here
public readonly int BuildPaletteOrder = 9999; public readonly int BuildPaletteOrder = 9999;
[Desc("Text shown in the production tooltip.")]
[Translate] public readonly string Description = "";
} }
public class Buildable { } public class Buildable { }

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

@@ -15,7 +15,6 @@ namespace OpenRA.Mods.Common.Traits
{ {
public abstract class TooltipInfoBase : ITraitInfo public abstract class TooltipInfoBase : ITraitInfo
{ {
[Translate] public readonly string Description = "";
[Translate] public readonly string Name = ""; [Translate] public readonly string Name = "";
public abstract object Create(ActorInitializer init); public abstract object Create(ActorInitializer init);

19
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -397,6 +397,25 @@ namespace OpenRA.Mods.Common.UtilityCommands
} }
} }
// Move production description from Tooltip to Buildable
if (engineVersion < 20161016)
{
var tooltipChild = node.Value.Nodes.FirstOrDefault(n => n.Key == "Tooltip");
if (tooltipChild != null || (tooltipChild = node.Value.Nodes.FirstOrDefault(n => n.Key == "DisguiseToolTip")) != null)
{
var descNode = tooltipChild.Value.Nodes.FirstOrDefault(n => n.Key == "Description");
if (descNode != null)
{
var buildableNode = node.Value.Nodes.FirstOrDefault(n => n.Key == "Buildable");
if (buildableNode == null)
node.Value.Nodes.Add(buildableNode = new MiniYamlNode("Buildable", ""));
buildableNode.Value.Nodes.Add(descNode);
tooltipChild.Value.Nodes.Remove(descNode);
}
}
}
UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1); UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
} }

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ProductionTooltipLogic.cs
View File

@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
costLabel.GetColor = () => pr.Cash + pr.Resources >= cost costLabel.GetColor = () => pr.Cash + pr.Resources >= cost
? Color.White : Color.Red; ? Color.White : Color.Red;
var descString = tooltip.Description.Replace("\\n", "\n"); var descString = buildable.Description.Replace("\\n", "\n");
descLabel.GetText = () => descString; descLabel.GetText = () => descString;
var leftWidth = new[] { nameWidth + hotkeyWidth, requiresFont.Measure(requiresString).X, descFont.Measure(descString).X }.Aggregate(Math.Max); var leftWidth = new[] { nameWidth + hotkeyWidth, requiresFont.Measure(requiresString).X, descFont.Measure(descString).X }.Aggregate(Math.Max);