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

Require explicit implementation of IDamageModifier

Browse Source
This commit is contained in:
reaperrr
2016-10-22 19:34:39 +02:00
parent f8077dc113
commit 97c2c24e8d
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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; return state == PopupState.Closed ? info.ClosedDamageMultiplier : 100;
} }

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

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits
this.self = self; 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) if (attacker.Owner.IsAlliedWith(self.Owner) && damage.Value < 0 && !Info.ModifyHealing)
return FullDamage; 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) public DamageMultiplier(DamageMultiplierInfo info, string actorType)
: base(info, "DamageMultiplier", actorType) { } : base(info, "DamageMultiplier", actorType) { }
public int GetDamageModifier(Actor attacker, Damage damage) { return GetModifier(); } int IDamageModifier.GetDamageModifier(Actor attacker, Damage damage) { return GetModifier(); }
} }
} }

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

@@ -203,6 +203,7 @@ namespace OpenRA.Mods.Common.Traits
string SequencePrefix { get; } string SequencePrefix { get; }
} }
[RequireExplicitImplementation]
public interface IDamageModifier { int GetDamageModifier(Actor attacker, Damage damage); } public interface IDamageModifier { int GetDamageModifier(Actor attacker, Damage damage); }
public interface ISpeedModifier { int GetSpeedModifier(); } public interface ISpeedModifier { int GetSpeedModifier(); }
public interface IFirepowerModifier { int GetFirepowerModifier(); } public interface IFirepowerModifier { int GetFirepowerModifier(); }