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

Rename TimedUpgradeBar to TimedConditionBar.

Browse Source
This commit is contained in:
Paul Chote
2016-11-20 16:04:00 +00:00
parent a692c1e761
commit 6f5c4cf969
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -417,7 +417,7 @@
<Compile Include="Traits\Render\RenderVoxels.cs" /> <Compile Include="Traits\Render\RenderVoxels.cs" />
<Compile Include="Traits\Render\ProductionBar.cs" /> <Compile Include="Traits\Render\ProductionBar.cs" />
<Compile Include="Traits\Render\SupportPowerChargeBar.cs" /> <Compile Include="Traits\Render\SupportPowerChargeBar.cs" />
<Compile Include="Traits\Render\TimedUpgradeBar.cs" /> <Compile Include="Traits\Render\TimedConditionBar.cs" />
<Compile Include="Traits\Render\WithSpriteBarrel.cs" /> <Compile Include="Traits\Render\WithSpriteBarrel.cs" />
<Compile Include="Traits\Render\WithBuildingExplosion.cs" /> <Compile Include="Traits\Render\WithBuildingExplosion.cs" />
<Compile Include="Traits\Render\WithAttackAnimation.cs" /> <Compile Include="Traits\Render\WithAttackAnimation.cs" />

16
OpenRA.Mods.Common/Traits/Render/TimedUpgradeBar.cs → OpenRA.Mods.Common/Traits/Render/TimedConditionBar.cs
View File

@@ -15,24 +15,24 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Render namespace OpenRA.Mods.Common.Traits.Render
{ {
[Desc("Visualizes the remaining time for an upgrade.")] [Desc("Visualizes the remaining time for an upgrade.")]
class TimedUpgradeBarInfo : ITraitInfo, Requires<UpgradeManagerInfo> class TimedConditionBarInfo : ITraitInfo, Requires<UpgradeManagerInfo>
{ {
[FieldLoader.Require] [FieldLoader.Require]
[Desc("Upgrade that this bar corresponds to")] [Desc("Condition that this bar corresponds to")]
public readonly string Upgrade = null; public readonly string Condition = null;
public readonly Color Color = Color.Red; 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; readonly Actor self;
float value; float value;
public TimedUpgradeBar(Actor self, TimedUpgradeBarInfo info) public TimedConditionBar(Actor self, TimedConditionBarInfo info)
{ {
this.self = self; this.self = self;
this.info = info; this.info = info;
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits.Render
value = duration > 0 ? remaining * 1f / duration : 0; value = duration > 0 ? remaining * 1f / duration : 0;
} }
string IConditionTimerWatcher.Condition { get { return info.Upgrade; } } string IConditionTimerWatcher.Condition { get { return info.Condition; } }
float ISelectionBar.GetValue() float ISelectionBar.GetValue()
{ {