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

Merge pull request #12287 from reaperrr/interface-cleanups03

Browse Source 
Third round of interface moving, making explicit and cleanup
This commit is contained in:
Paul Chote
2016-11-05 18:02:39 +00:00
committed by GitHub
parent 8cda0dd360 162fef3da1
commit 77e0c579ba
18 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -233,14 +233,6 @@ namespace OpenRA.Traits
}
public interface IRenderModifier { IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> 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<string, MutablePalette> b); }
@@ -321,12 +313,6 @@ namespace OpenRA.Traits
public interface INotifyBecomingIdle { void OnBecomingIdle(Actor self); }
public interface INotifyIdle { void TickIdle(Actor self); }
public interface IRenderInfantrySequenceModifier
{
bool IsModifyingSequence { get; }
string SequencePrefix { get; }
}
public interface IRenderAboveWorld { void RenderAboveWorld(Actor self, WorldRenderer wr); }
public interface IRenderShroud { void RenderShroud(Shroud shroud, WorldRenderer wr); }
public interface IRenderAboveShroud { IEnumerable<IRenderable> RenderAboveShroud(Actor self, WorldRenderer wr); }

2
OpenRA.Mods.Cnc/Traits/AttackPopupTurreted.cs
View File

@@ -112,7 +112,7 @@ namespace OpenRA.Mods.Cnc.Traits
}
}
public int GetDamageModifier(Actor attacker, Damage damage)
int IDamageModifier.GetDamageModifier(Actor attacker, Damage damage)
{
return state == PopupState.Closed ? info.ClosedDamageMultiplier : 100;
}

4
OpenRA.Mods.Common/Traits/Harvester.cs
View File

@@ -447,9 +447,9 @@ namespace OpenRA.Mods.Common.Traits
yield return GetPipAt(i);
}
public bool ShouldExplode(Actor self) { return !IsEmpty; }
bool IExplodeModifier.ShouldExplode(Actor self) { return !IsEmpty; }
public int GetSpeedModifier()
int ISpeedModifier.GetSpeedModifier()
{
return 100 - (100 - Info.FullyLoadedSpeed) * contents.Values.Sum() / Info.Capacity;
}

14
OpenRA.Mods.Common/Traits/Infantry/ScaredyCat.cs
View File

@@ -38,8 +38,8 @@ namespace OpenRA.Mods.Common.Traits
[Sync] int panicStartedTick;
bool Panicking { get { return panicStartedTick > 0; } }
public bool IsModifyingSequence { get { return Panicking; } }
public string SequencePrefix { get { return info.PanicSequencePrefix; } }
bool IRenderInfantrySequenceModifier.IsModifyingSequence { get { return Panicking; } }
string IRenderInfantrySequenceModifier.SequencePrefix { get { return info.PanicSequencePrefix; } }
public ScaredyCat(Actor self, ScaredyCatInfo info)
{
@@ -48,7 +48,7 @@ namespace OpenRA.Mods.Common.Traits
mobile = self.Trait<Mobile>();
}
public void Panic()
void Panic()
{
if (!Panicking)
self.CancelActivity();
@@ -56,7 +56,7 @@ namespace OpenRA.Mods.Common.Traits
panicStartedTick = self.World.WorldTick;
}
public void Tick(Actor self)
void ITick.Tick(Actor self)
{
if (!Panicking)
return;
@@ -68,7 +68,7 @@ namespace OpenRA.Mods.Common.Traits
}
}
public void TickIdle(Actor self)
void INotifyIdle.TickIdle(Actor self)
{
if (!Panicking)
return;
@@ -76,7 +76,7 @@ namespace OpenRA.Mods.Common.Traits
mobile.Nudge(self, self, true);
}
public void Damaged(Actor self, AttackInfo e)
void INotifyDamage.Damaged(Actor self, AttackInfo e)
{
if (e.Damage.Value > 0)
Panic();
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyAttack.PreparingAttack(Actor self, Target target, Armament a, Barrel barrel) { }
public int GetSpeedModifier()
int ISpeedModifier.GetSpeedModifier()
{
return Panicking ? info.PanicSpeedModifier : 100;
}

10
OpenRA.Mods.Common/Traits/Infantry/TakeCover.cs
View File

@@ -45,8 +45,8 @@ namespace OpenRA.Mods.Common.Traits
[Sync] int remainingProneTime = 0;
bool IsProne { get { return remainingProneTime > 0; } }
public bool IsModifyingSequence { get { return IsProne; } }
public string SequencePrefix { get { return info.ProneSequencePrefix; } }
bool IRenderInfantrySequenceModifier.IsModifyingSequence { get { return IsProne; } }
string IRenderInfantrySequenceModifier.SequencePrefix { get { return info.ProneSequencePrefix; } }
public TakeCover(ActorInitializer init, TakeCoverInfo info)
: base(init, info)
@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits
this.info = info;
}
public void Damaged(Actor self, AttackInfo e)
void INotifyDamage.Damaged(Actor self, AttackInfo e)
{
if (e.Damage.Value <= 0 || !e.Damage.DamageTypes.Overlaps(info.DamageTriggers))
return;
@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Traits
get { return true; }
}
public int GetDamageModifier(Actor attacker, Damage damage)
int IDamageModifier.GetDamageModifier(Actor attacker, Damage damage)
{
if (!IsProne)
return 100;
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Common.Traits
return Util.ApplyPercentageModifiers(100, modifierPercentages);
}
public int GetSpeedModifier()
int ISpeedModifier.GetSpeedModifier()
{
return IsProne ? info.SpeedModifier : 100;
}

2
OpenRA.Mods.Common/Traits/Infantry/TerrainModifiesDamage.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits
this.self = self;
}
public int GetDamageModifier(Actor attacker, Damage damage)
int IDamageModifier.GetDamageModifier(Actor attacker, Damage damage)
{
if (attacker.Owner.IsAlliedWith(self.Owner) && damage.Value < 0 && !Info.ModifyHealing)
return FullDamage;

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

@@ -26,6 +26,6 @@ namespace OpenRA.Mods.Common.Traits
public DamageMultiplier(DamageMultiplierInfo info, string actorType)
: base(info, "DamageMultiplier", actorType) { }
public int GetDamageModifier(Actor attacker, Damage damage) { return GetModifier(); }
int IDamageModifier.GetDamageModifier(Actor attacker, Damage damage) { return GetModifier(); }
}
}

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

@@ -9,8 +9,6 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The firepower of this actor is multiplied based on upgrade level if specified.")]
@@ -24,6 +22,6 @@ namespace OpenRA.Mods.Common.Traits
public FirepowerMultiplier(FirepowerMultiplierInfo info, string actorType)
: base(info, "FirepowerMultiplier", actorType) { }
public int GetFirepowerModifier() { return GetModifier(); }
int IFirepowerModifier.GetFirepowerModifier() { return GetModifier(); }
}
}

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

@@ -9,8 +9,6 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The inaccuracy of this actor is multiplied based on upgrade level if specified.")]
@@ -24,6 +22,6 @@ namespace OpenRA.Mods.Common.Traits
public InaccuracyMultiplier(InaccuracyMultiplierInfo info, string actorType)
: base(info, "InaccuracyMultiplier", actorType) { }
public int GetInaccuracyModifier() { return GetModifier(); }
int IInaccuracyModifier.GetInaccuracyModifier() { return GetModifier(); }
}
}

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

@@ -26,9 +26,11 @@ namespace OpenRA.Mods.Common.Traits
public PowerMultiplier(Actor self, PowerMultiplierInfo info)
: base(info, "PowerMultiplier", self.Info.Name) { power = self.Owner.PlayerActor.Trait<PowerManager>(); }
public int GetPowerModifier() { return GetModifier(); }
int IPowerModifier.GetPowerModifier() { return GetModifier(); }
protected override void Update(Actor self) { power.UpdateActor(self); }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
power = newOwner.PlayerActor.Trait<PowerManager>();
}

6
OpenRA.Mods.Common/Traits/Multipliers/RangeMultiplier.cs
View File

@@ -9,8 +9,6 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Range of this actor is multiplied based on upgrade level.")]
@@ -18,7 +16,7 @@ namespace OpenRA.Mods.Common.Traits
{
public override object Create(ActorInitializer init) { return new RangeMultiplier(this, init.Self.Info.Name); }
public int GetRangeModifierDefault()
int IRangeModifierInfo.GetRangeModifierDefault()
{
return BaseLevel > 0 || UpgradeTypes.Length == 0 ? 100 : Modifier[0];
}
@@ -29,6 +27,6 @@ namespace OpenRA.Mods.Common.Traits
public RangeMultiplier(RangeMultiplierInfo info, string actorType)
: base(info, "RangeMultiplier", actorType) { }
public int GetRangeModifier() { return GetModifier(); }
int IRangeModifier.GetRangeModifier() { return GetModifier(); }
}
}

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

@@ -9,8 +9,6 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The reloading time of this actor is multiplied based on upgrade level if specified.")]
@@ -24,6 +22,6 @@ namespace OpenRA.Mods.Common.Traits
public ReloadDelayMultiplier(ReloadDelayMultiplierInfo info, string actorType)
: base(info, "ReloadDelayMultiplier", actorType) { }
public int GetReloadModifier() { return GetModifier(); }
int IReloadModifier.GetReloadModifier() { return GetModifier(); }
}
}

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

@@ -9,8 +9,6 @@
*/
#endregion
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
{
[Desc("The speed of this actor is multiplied based on upgrade level if specified.")]
@@ -24,6 +22,6 @@ namespace OpenRA.Mods.Common.Traits
public SpeedMultiplier(SpeedMultiplierInfo info, string actorType)
: base(info, "SpeedMultiplier", actorType) { }
public int GetSpeedModifier() { return GetModifier(); }
int ISpeedModifier.GetSpeedModifier() { return GetModifier(); }
}
}

4
OpenRA.Mods.Common/Traits/Power/AffectedByPowerOutage.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
bool ISelectionBar.DisplayWhenEmpty { get { return false; } }
public int GetPowerModifier()
int IPowerModifier.GetPowerModifier()
{
return playerPower.PowerOutageRemainingTicks > 0 ? 0 : 100;
}
@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits
get { return playerPower.PowerOutageRemainingTicks > 0; }
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
playerPower = newOwner.PlayerActor.Trait<PowerManager>();
}

7
OpenRA.Mods.Common/Traits/Power/CanPowerDown.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Mods.Common.Traits
public bool Disabled { get { return disabled; } }
public void ResolveOrder(Actor self, Order order)
void IResolveOrder.ResolveOrder(Actor self, Order order)
{
if (!IsTraitDisabled && order.OrderString == "PowerDown")
{
@@ -72,12 +72,12 @@ namespace OpenRA.Mods.Common.Traits
}
}
public int GetPowerModifier()
int IPowerModifier.GetPowerModifier()
{
return !IsTraitDisabled && disabled ? 0 : 100;
}
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
power = newOwner.PlayerActor.Trait<PowerManager>();
}
@@ -86,6 +86,7 @@ namespace OpenRA.Mods.Common.Traits
{
if (!disabled || !Info.CancelWhenDisabled)
return;
disabled = false;
if (Info.PowerupSound != null)

7
OpenRA.Mods.Common/Traits/Power/ScalePowerWithHealth.cs
View File

@@ -30,13 +30,14 @@ namespace OpenRA.Mods.Common.Traits
health = self.Trait<Health>();
}
public int GetPowerModifier()
int IPowerModifier.GetPowerModifier()
{
return 100 * health.HP / health.MaxHP;
}
public void Damaged(Actor self, AttackInfo e) { power.UpdateActor(self); }
public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
void INotifyDamage.Damaged(Actor self, AttackInfo e) { power.UpdateActor(self); }
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
power = newOwner.PlayerActor.Trait<PowerManager>();
}

31
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -195,4 +195,35 @@ namespace OpenRA.Mods.Common.Traits
[RequireExplicitImplementation]
public interface INotifyRearm { void Rearming(Actor host, Actor other); }
[RequireExplicitImplementation]
public interface IRenderInfantrySequenceModifier
{
bool IsModifyingSequence { get; }
string SequencePrefix { get; }
}
[RequireExplicitImplementation]
public interface IDamageModifier { int GetDamageModifier(Actor attacker, Damage damage); }
[RequireExplicitImplementation]
public interface ISpeedModifier { int GetSpeedModifier(); }
[RequireExplicitImplementation]
public interface IFirepowerModifier { int GetFirepowerModifier(); }
[RequireExplicitImplementation]
public interface IReloadModifier { int GetReloadModifier(); }
[RequireExplicitImplementation]
public interface IInaccuracyModifier { int GetInaccuracyModifier(); }
[RequireExplicitImplementation]
public interface IRangeModifier { int GetRangeModifier(); }
[RequireExplicitImplementation]
public interface IRangeModifierInfo : ITraitInfoInterface { int GetRangeModifierDefault(); }
[RequireExplicitImplementation]
public interface IPowerModifier { int GetPowerModifier(); }
}

7
OpenRA.Mods.TS/Traits/Render/WithPermanentInjury.cs
View File

@@ -9,6 +9,7 @@
*/
#endregion
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
namespace OpenRA.Mods.TS.Traits.Render
@@ -29,15 +30,15 @@ namespace OpenRA.Mods.TS.Traits.Render
bool isInjured;
public bool IsModifyingSequence { get { return isInjured; } }
public string SequencePrefix { get { return info.InjuredSequencePrefix; } }
bool IRenderInfantrySequenceModifier.IsModifyingSequence { get { return isInjured; } }
string IRenderInfantrySequenceModifier.SequencePrefix { get { return info.InjuredSequencePrefix; } }
public WithPermanentInjury(ActorInitializer init, WithPermanentInjuryInfo info)
{
this.info = info;
}
public void Damaged(Actor self, AttackInfo e)
void INotifyDamage.Damaged(Actor self, AttackInfo e)
{
if (e.DamageState == info.TriggeringDamageStage)
isInjured = true;