diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 93310b99ab..9943bf7a26 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -417,7 +417,7 @@ - + diff --git a/OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs b/OpenRA.Mods.Common/Traits/Render/TimedConditionBar.cs similarity index 72% rename from OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs rename to OpenRA.Mods.Common/Traits/Render/TimedConditionBar.cs index 99e1e2ffa2..c97d5f77cd 100644 --- a/OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs +++ b/OpenRA.Mods.Common/Traits/Render/TimedConditionBar.cs @@ -15,24 +15,24 @@ using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits.Render { [Desc("Visualizes the remaining time for an upgrade.")] - class TimedUpgradeBarInfo : ITraitInfo, Requires + class TimedConditionBarInfo : ITraitInfo, Requires { [FieldLoader.Require] - [Desc("Upgrade that this bar corresponds to")] - public readonly string Upgrade = null; + [Desc("Condition that this bar corresponds to")] + public readonly string Condition = null; public readonly Color Color = Color.Red; - public object Create(ActorInitializer init) { return new TimedUpgradeBar(init.Self, this); } + public object Create(ActorInitializer init) { return new TimedConditionBar(init.Self, this); } } - class TimedUpgradeBar : ISelectionBar, IConditionTimerWatcher + class TimedConditionBar : ISelectionBar, IConditionTimerWatcher { - readonly TimedUpgradeBarInfo info; + readonly TimedConditionBarInfo info; readonly Actor self; float value; - public TimedUpgradeBar(Actor self, TimedUpgradeBarInfo info) + public TimedConditionBar(Actor self, TimedConditionBarInfo info) { this.self = self; this.info = info; @@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits.Render value = duration > 0 ? remaining * 1f / duration : 0; } - string IConditionTimerWatcher.Condition { get { return info.Upgrade; } } + string IConditionTimerWatcher.Condition { get { return info.Condition; } } float ISelectionBar.GetValue() {