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

Move prone-related logic from DamageWarhead to TakeCover

Browse Source 
Add DamageTypes to DamageWarhead and DamageTypeModifiers to TakeCover
This commit is contained in:
penev92
2015-04-21 13:56:16 +03:00
parent 1b31001661
commit aa57d5f956
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/GameRules/DamageWarhead.cs
View File

@@ -18,18 +18,15 @@ namespace OpenRA.GameRules
{ {
public abstract class DamageWarhead : Warhead public abstract class DamageWarhead : Warhead
{ {
[Desc("How much (raw) damage to deal")] [Desc("How much (raw) damage to deal.")]
public readonly int Damage = 0; public readonly int Damage = 0;
[Desc("Infantry death animation to use")] [Desc("Types of damage that this warhead causes. Leave empty for no damage.")]
public readonly string[] DamageTypes = new string[0];
[Desc("Infantry death animation to use.")]
public readonly string DeathType = "1"; public readonly string DeathType = "1";
[Desc("Whether we should prevent prone response for infantry.")]
public readonly bool PreventProne = false;
[Desc("By what percentage should damage be modified against prone infantry.")]
public readonly int ProneModifier = 50;
[FieldLoader.LoadUsing("LoadVersus")] [FieldLoader.LoadUsing("LoadVersus")]
[Desc("Damage percentage versus each armortype. 0% = can't target.")] [Desc("Damage percentage versus each armortype. 0% = can't target.")]
public readonly Dictionary<string, int> Versus; public readonly Dictionary<string, int> Versus;

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

@@ -8,6 +8,8 @@
*/ */
#endregion #endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;
@@ -22,11 +24,27 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Prone movement speed as a percentage of the normal speed.")] [Desc("Prone movement speed as a percentage of the normal speed.")]
public readonly int SpeedModifier = 50; public readonly int SpeedModifier = 50;
[Desc("Damage types that trigger prone state. Defined on the warheads.")]
public readonly string[] DamageTriggers = new string[0];
[FieldLoader.LoadUsing("LoadModifiers")]
[Desc("Damage modifiers for each damage type (defined on the warheads) while the unit is prone.")]
public readonly Dictionary<string, int> DamageModifiers = new Dictionary<string, int>();
public readonly WVec ProneOffset = new WVec(85, 0, -171); public readonly WVec ProneOffset = new WVec(85, 0, -171);
public readonly string ProneSequencePrefix = "prone-"; public readonly string ProneSequencePrefix = "prone-";
public override object Create(ActorInitializer init) { return new TakeCover(init, this); } public override object Create(ActorInitializer init) { return new TakeCover(init, this); }
public static object LoadModifiers(MiniYaml yaml)
{
var md = yaml.ToDictionary();
return md.ContainsKey("DamageModifiers")
? md["DamageModifiers"].ToDictionary(my => FieldLoader.GetValue<int>("(value)", my.Value))
: new Dictionary<string, int>();
}
} }
public class TakeCover : Turreted, INotifyDamage, IDamageModifier, ISpeedModifier, ISync, IRenderInfantrySequenceModifier public class TakeCover : Turreted, INotifyDamage, IDamageModifier, ISpeedModifier, ISync, IRenderInfantrySequenceModifier
@@ -46,14 +64,13 @@ namespace OpenRA.Mods.Common.Traits
public void Damaged(Actor self, AttackInfo e) public void Damaged(Actor self, AttackInfo e)
{ {
/* Don't go prone when healed */ if (e.Damage <= 0 || e.Warhead == null || !e.Warhead.DamageTypes.Any(x => info.DamageTriggers.Contains(x)))
if (e.Damage > 0 && (e.Warhead == null || !e.Warhead.PreventProne)) return;
{
if (!IsProne)
localOffset = info.ProneOffset;
remainingProneTime = info.ProneTime; if (!IsProne)
} localOffset = info.ProneOffset;
remainingProneTime = info.ProneTime;
} }
public override void Tick(Actor self) public override void Tick(Actor self)
@@ -66,7 +83,11 @@ namespace OpenRA.Mods.Common.Traits
public int GetDamageModifier(Actor attacker, DamageWarhead warhead) public int GetDamageModifier(Actor attacker, DamageWarhead warhead)
{ {
return IsProne && warhead != null ? warhead.ProneModifier : 100; if (!IsProne)
return 100;
var modifierPercentages = info.DamageModifiers.Where(x => warhead.DamageTypes.Contains(x.Key)).Select(x => x.Value);
return Util.ApplyPercentageModifiers(100, modifierPercentages);
} }
public int GetSpeedModifier() public int GetSpeedModifier()