Rename UpgradableTrait to ConditionalTrait.

This commit is contained in:
Paul Chote
2016-12-23 23:28:34 +00:00
parent d0270ab866
commit 268ed016ab
57 changed files with 114 additions and 114 deletions

View File

@@ -19,7 +19,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits.Render
{
[Desc("Renders barrels for units with the Turreted trait.")]
public class WithSpriteBarrelInfo : UpgradableTraitInfo, IRenderActorPreviewSpritesInfo, Requires<TurretedInfo>,
public class WithSpriteBarrelInfo : ConditionalTraitInfo, IRenderActorPreviewSpritesInfo, Requires<TurretedInfo>,
Requires<ArmamentInfo>, Requires<RenderSpritesInfo>, Requires<BodyOrientationInfo>
{
[Desc("Sequence name to use.")]
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
public class WithSpriteBarrel : UpgradableTrait<WithSpriteBarrelInfo>
public class WithSpriteBarrel : ConditionalTrait<WithSpriteBarrelInfo>
{
public readonly Animation DefaultAnimation;
readonly RenderSprites rs;