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

Made UpgradeMultiplierTraitInfo implement ITraitInfo

Browse Source
This commit is contained in:
atlimit8
2015-06-27 13:52:00 -05:00
parent 527675db8d
commit a8106a9999
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Traits/Multipliers/DamageMultiplier.cs
View File

@@ -16,9 +16,9 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Damage taken by this actor is multiplied based on upgrade level.",
"Decrease to increase actor's apparent strength.",
"Use 0 to make actor invulnerable.")]
public class DamageMultiplierInfo : UpgradeMultiplierTraitInfo, ITraitInfo
public class DamageMultiplierInfo : UpgradeMultiplierTraitInfo
{
public object Create(ActorInitializer init) { return new DamageMultiplier(this, init.Self.Info.Name); }
public override object Create(ActorInitializer init) { return new DamageMultiplier(this, init.Self.Info.Name); }
}
public class DamageMultiplier : UpgradeMultiplierTrait, IDamageModifier

4
OpenRA.Mods.Common/Traits/Multipliers/FirepowerMultiplier.cs
View File

@@ -13,9 +13,9 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The firepower of this actor is multiplied based on upgrade level if specified.")]
public class FirepowerMultiplierInfo : UpgradeMultiplierTraitInfo, ITraitInfo
public class FirepowerMultiplierInfo : UpgradeMultiplierTraitInfo
{
public object Create(ActorInitializer init) { return new FirepowerMultiplier(this, init.Self.Info.Name); }
public override object Create(ActorInitializer init) { return new FirepowerMultiplier(this, init.Self.Info.Name); }
}
public class FirepowerMultiplier : UpgradeMultiplierTrait, IFirepowerModifier

4
OpenRA.Mods.Common/Traits/Multipliers/InaccuracyMultiplier.cs
View File

@@ -13,9 +13,9 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The inaccuracy of this actor is multipled based on upgrade level if specified.")]
public class InaccuracyMultiplierInfo : UpgradeMultiplierTraitInfo, ITraitInfo
public class InaccuracyMultiplierInfo : UpgradeMultiplierTraitInfo
{
public object Create(ActorInitializer init) { return new InaccuracyMultiplier(this, init.Self.Info.Name); }
public override object Create(ActorInitializer init) { return new InaccuracyMultiplier(this, init.Self.Info.Name); }
}
public class InaccuracyMultiplier : UpgradeMultiplierTrait, IInaccuracyModifier

4
OpenRA.Mods.Common/Traits/Multipliers/PowerMultiplier.cs
View File

@@ -14,9 +14,9 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common
{
[Desc("The power usage/output of this actor is multiplied based on upgrade level if specified.")]
public class PowerMultiplierInfo : UpgradeMultiplierTraitInfo, ITraitInfo
public class PowerMultiplierInfo : UpgradeMultiplierTraitInfo
{
public object Create(ActorInitializer init) { return new PowerMultiplier(init.Self, this); }
public override object Create(ActorInitializer init) { return new PowerMultiplier(init.Self, this); }
}
public class PowerMultiplier : UpgradeMultiplierTrait, IPowerModifier, INotifyOwnerChanged

4
OpenRA.Mods.Common/Traits/Multipliers/ReloadDelayMultiplier.cs
View File

@@ -13,9 +13,9 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The reloading time of this actor is multiplied based on upgrade level if specified.")]
public class ReloadDelayMultiplierInfo : UpgradeMultiplierTraitInfo, ITraitInfo
public class ReloadDelayMultiplierInfo : UpgradeMultiplierTraitInfo
{
public object Create(ActorInitializer init) { return new ReloadDelayMultiplier(this, init.Self.Info.Name); }
public override object Create(ActorInitializer init) { return new ReloadDelayMultiplier(this, init.Self.Info.Name); }
}
public class ReloadDelayMultiplier : UpgradeMultiplierTrait, IReloadModifier

4
OpenRA.Mods.Common/Traits/Multipliers/SpeedMultiplier.cs
View File

@@ -13,9 +13,9 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The speed of this actor is multiplied based on upgrade level if specified.")]
public class SpeedMultiplierInfo : UpgradeMultiplierTraitInfo, ITraitInfo
public class SpeedMultiplierInfo : UpgradeMultiplierTraitInfo
{
public object Create(ActorInitializer init) { return new SpeedMultiplier(this, init.Self.Info.Name); }
public override object Create(ActorInitializer init) { return new SpeedMultiplier(this, init.Self.Info.Name); }
}
public class SpeedMultiplier : UpgradeMultiplierTrait, ISpeedModifier

4
OpenRA.Mods.Common/Traits/Multipliers/UpgradableMultiplierTrait.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
public abstract class UpgradeMultiplierTraitInfo
public abstract class UpgradeMultiplierTraitInfo : ITraitInfo
{
[UpgradeUsedReference]
[Desc("Accepted upgrade types.")]
@@ -29,6 +29,8 @@ namespace OpenRA.Mods.Common.Traits
"Repeat last entry to accept time extensions.",
"If no upgrade types are specified, then the first/only modifier is always applied.")]
public readonly int[] Modifier = { };
public abstract object Create(ActorInitializer init);
}
public abstract class UpgradeMultiplierTrait : IUpgradable, IDisabledTrait, ISync