Move IRenderInfantrySequenceModifier to mod code and require explicit...

implementation.
This commit is contained in:
reaperrr
2016-10-22 19:32:50 +02:00
parent 6b29d70520
commit 9dfddaf5d9
5 changed files with 18 additions and 16 deletions

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;
}