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

Rename support power field for consistency.

Browse Source
This commit is contained in:
Matthias Mailänder
2021-12-05 13:59:29 +01:00
committed by reaperrr
parent 9852bd08e4
commit b3d290edd9
15 changed files with 93 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Palette used for the icon.")]
public readonly string IconPalette = "chrome";
public readonly string Name = "";
public readonly string Description = "";
public readonly string LongDesc = "";
[Desc("Allow multiple instances of the same support power.")]
public readonly bool AllowMultiple = false;

32
OpenRA.Mods.Common/UpdateRules/Rules/20201213/RenameSupportPowerDescription.cs Normal file
View File

@@ -0,0 +1,32 @@
#region Copyright & License Information
/*
* Copyright 2007-2021 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System.Collections.Generic;
namespace OpenRA.Mods.Common.UpdateRules.Rules
{
public class RenameSupportPowerDescription : UpdateRule
{
public override string Name => "Support powers now use 'Name' and 'Description' fields like units.";
public override string Description => "'Description' was renamed to 'Name' and 'LongDesc' was renamed to 'Description'.";
public override IEnumerable<string> UpdateActorNode(ModData modData, MiniYamlNode actorNode)
{
foreach (var traitNode in actorNode.ChildrenContaining("Power"))
{
traitNode.RenameChildrenMatching("Description", "Name");
traitNode.RenameChildrenMatching("LongDesc", "Description");
}
yield break;
}
}
}

4
OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs
View File

@@ -53,10 +53,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (sp == lastPower && hotkey == lastHotkey && lastRemainingSeconds == remainingSeconds)
return;
nameLabel.Text = sp.Info.Description;
nameLabel.Text = sp.Info.Name;
var nameSize = nameFont.Measure(nameLabel.Text);
descLabel.Text = sp.Info.LongDesc.Replace("\\n", "\n");
descLabel.Text = sp.Info.Description.Replace("\\n", "\n");
var descSize = descFont.Measure(descLabel.Text);
var customLabel = sp.TooltipTimeTextOverride();

2
OpenRA.Mods.Common/Widgets/SupportPowerTimerWidget.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Widgets
{
var self = p.Instances[0].Self;
var time = WidgetUtils.FormatTime(p.RemainingTicks, false, self.World.Timestep);
var text = Format.F(p.Info.Description, time);
var text = Format.F(p.Info.Name, time);
var playerColor = self.Owner.Color;
if (Game.Settings.Game.UsePlayerStanceColors)