From f8077dc1132942f97f95e24a822079c69d70c79a Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 22 Oct 2016 19:15:05 +0200 Subject: [PATCH] Move combat modifier interfaces (damage, speed etc.) to mod code --- OpenRA.Game/Traits/TraitsInterfaces.cs | 8 -------- OpenRA.Mods.Common/TraitsInterfaces.cs | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 05c67c4dd8..eeb343030e 100644 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -233,14 +233,6 @@ namespace OpenRA.Traits } public interface IRenderModifier { IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r); } - public interface IDamageModifier { int GetDamageModifier(Actor attacker, Damage damage); } - public interface ISpeedModifier { int GetSpeedModifier(); } - public interface IFirepowerModifier { int GetFirepowerModifier(); } - public interface IReloadModifier { int GetReloadModifier(); } - public interface IInaccuracyModifier { int GetInaccuracyModifier(); } - public interface IRangeModifier { int GetRangeModifier(); } - public interface IRangeModifierInfo : ITraitInfoInterface { int GetRangeModifierDefault(); } - public interface IPowerModifier { int GetPowerModifier(); } public interface ILoadsPalettes { void LoadPalettes(WorldRenderer wr); } public interface ILoadsPlayerPalettes { void LoadPlayerPalettes(WorldRenderer wr, string playerName, HSLColor playerColor, bool replaceExisting); } public interface IPaletteModifier { void AdjustPalette(IReadOnlyDictionary b); } diff --git a/OpenRA.Mods.Common/TraitsInterfaces.cs b/OpenRA.Mods.Common/TraitsInterfaces.cs index 4c1b89effe..4bcf3f9bbb 100644 --- a/OpenRA.Mods.Common/TraitsInterfaces.cs +++ b/OpenRA.Mods.Common/TraitsInterfaces.cs @@ -202,4 +202,13 @@ namespace OpenRA.Mods.Common.Traits bool IsModifyingSequence { get; } string SequencePrefix { get; } } + + public interface IDamageModifier { int GetDamageModifier(Actor attacker, Damage damage); } + public interface ISpeedModifier { int GetSpeedModifier(); } + public interface IFirepowerModifier { int GetFirepowerModifier(); } + public interface IReloadModifier { int GetReloadModifier(); } + public interface IInaccuracyModifier { int GetInaccuracyModifier(); } + public interface IRangeModifier { int GetRangeModifier(); } + public interface IRangeModifierInfo : ITraitInfoInterface { int GetRangeModifierDefault(); } + public interface IPowerModifier { int GetPowerModifier(); } }