Merge pull request #5824 from reaperrr/pronedamage

Moved ProneDamage to Warhead
This commit is contained in:
Paul Chote
2014-07-09 11:02:02 +12:00
3 changed files with 32 additions and 3 deletions

View File

@@ -17,7 +17,6 @@ namespace OpenRA.Mods.RA
public class TakeCoverInfo : TurretedInfo
{
public readonly int ProneTime = 100; /* ticks, =4s */
public readonly float ProneDamage = .5f;
public readonly decimal ProneSpeed = .5m;
public readonly WVec ProneOffset = new WVec(85, 0, -171);
@@ -56,9 +55,10 @@ namespace OpenRA.Mods.RA
LocalOffset = WVec.Zero;
}
public float GetDamageModifier(Actor attacker, WarheadInfo warhead )
public float GetDamageModifier(Actor attacker, WarheadInfo warhead)
{
return IsProne ? Info.ProneDamage : 1f;
var proneDamage = (warhead.ProneModifier / 100f);
return IsProne ? proneDamage : 1f;
}
public decimal GetSpeedModifier()