diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 5baa053d9d..5c3857ff11 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -924,6 +924,7 @@ + diff --git a/OpenRA.Mods.Common/Traits/Armor.cs b/OpenRA.Mods.Common/Traits/Armor.cs index ca2c08508b..5b0174f2ec 100644 --- a/OpenRA.Mods.Common/Traits/Armor.cs +++ b/OpenRA.Mods.Common/Traits/Armor.cs @@ -11,6 +11,9 @@ namespace OpenRA.Mods.Common.Traits { + // Type tag for armor type bits + public class ArmorType { } + [Desc("Used to define weapon efficiency modifiers with different percentages per Type.")] public class ArmorInfo : ConditionalTraitInfo { diff --git a/OpenRA.Mods.Common/Traits/HitShape.cs b/OpenRA.Mods.Common/Traits/HitShape.cs index 4d6f0aa405..5314f2dcb6 100644 --- a/OpenRA.Mods.Common/Traits/HitShape.cs +++ b/OpenRA.Mods.Common/Traits/HitShape.cs @@ -12,6 +12,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common.HitShapes; +using OpenRA.Primitives; using OpenRA.Traits; namespace OpenRA.Mods.Common.Traits @@ -25,6 +26,10 @@ namespace OpenRA.Mods.Common.Traits [Desc("Create a targetable position at the center of each occupied cell. Stacks with TargetableOffsets.")] public readonly bool UseTargetableCellsOffsets = false; + [Desc("Defines which Armor types apply when the actor receives damage to this HitShape.", + "If none specified, all armor types the actor has are valid.")] + public readonly BitSet ArmorTypes = default(BitSet); + [FieldLoader.LoadUsing("LoadShape")] public readonly IHitShape Type; diff --git a/OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemoveHealthPercentageRing.cs b/OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemoveHealthPercentageRing.cs new file mode 100644 index 0000000000..a4807b29a2 --- /dev/null +++ b/OpenRA.Mods.Common/UpdateRules/Rules/20180923/RemoveHealthPercentageRing.cs @@ -0,0 +1,45 @@ +#region Copyright & License Information +/* + * Copyright 2007-2018 The OpenRA Developers (see AUTHORS) + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. For more + * information, see COPYING. + */ +#endregion + +using System.Collections.Generic; + +namespace OpenRA.Mods.Common.UpdateRules.Rules +{ + public class RemoveHealthPercentageRing : UpdateRule + { + public override string Name { get { return "Remove ring support from HealthPercentageDamage warheads' Spread"; } } + public override string Description + { + get + { + return "Setting a second value in this warheads' Spread to define a 'ring' is no longer supported."; + } + } + + public override IEnumerable UpdateWeaponNode(ModData modData, MiniYamlNode weaponNode) + { + foreach (var node in weaponNode.ChildrenMatching("Warhead")) + { + if (node.NodeValue() == "HealthPercentageDamage") + { + foreach (var spreadNode in node.ChildrenMatching("Spread")) + { + var oldValue = spreadNode.NodeValue(); + if (oldValue.Length > 1) + spreadNode.ReplaceValue(oldValue[0]); + } + } + } + + yield break; + } + } +} diff --git a/OpenRA.Mods.Common/Warheads/DamageWarhead.cs b/OpenRA.Mods.Common/Warheads/DamageWarhead.cs index 1d3af899c5..2dd320a16a 100644 --- a/OpenRA.Mods.Common/Warheads/DamageWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/DamageWarhead.cs @@ -30,20 +30,25 @@ namespace OpenRA.Mods.Common.Warheads public override bool IsValidAgainst(Actor victim, Actor firedBy) { + // Cannot be damaged without a Health trait + if (!victim.Info.HasTraitInfo()) + return false; + if (Damage < 0 && victim.GetDamageState() == DamageState.Undamaged) return false; return base.IsValidAgainst(victim, firedBy); } - public int DamageVersus(Actor victim) + public int DamageVersus(Actor victim, HitShapeInfo shapeInfo) { // If no Versus values are defined, DamageVersus would return 100 anyway, so we might as well do that early. if (Versus.Count == 0) return 100; var armor = victim.TraitsImplementing() - .Where(a => !a.IsTraitDisabled && a.Info.Type != null && Versus.ContainsKey(a.Info.Type)) + .Where(a => !a.IsTraitDisabled && a.Info.Type != null && Versus.ContainsKey(a.Info.Type) && + (shapeInfo.ArmorTypes == default(BitSet) || shapeInfo.ArmorTypes.Contains(a.Info.Type))) .Select(a => Versus[a.Info.Type]); return Util.ApplyPercentageModifiers(100, armor); @@ -51,22 +56,28 @@ namespace OpenRA.Mods.Common.Warheads public override void DoImpact(Target target, Actor firedBy, IEnumerable damageModifiers) { - // Used by traits that damage a single actor, rather than a position + // Used by traits or warheads that damage a single actor, rather than a position if (target.Type == TargetType.Actor) - DoImpact(target.Actor, firedBy, damageModifiers); + { + var victim = target.Actor; + + if (!IsValidAgainst(victim, firedBy)) + return; + + var closestActiveShape = victim.TraitsImplementing().Where(Exts.IsTraitEnabled) + .MinByOrDefault(t => t.Info.Type.DistanceFromEdge(victim.CenterPosition, victim)); + + // Cannot be damaged without an active HitShape + if (closestActiveShape == null) + return; + + var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim, closestActiveShape.Info))); + victim.InflictDamage(firedBy, new Damage(damage, DamageTypes)); + } else if (target.Type != TargetType.Invalid) DoImpact(target.CenterPosition, firedBy, damageModifiers); } public abstract void DoImpact(WPos pos, Actor firedBy, IEnumerable damageModifiers); - - public virtual void DoImpact(Actor victim, Actor firedBy, IEnumerable damageModifiers) - { - if (!IsValidAgainst(victim, firedBy)) - return; - - var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim))); - victim.InflictDamage(firedBy, new Damage(damage, DamageTypes)); - } } } diff --git a/OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs b/OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs index 2ec835df54..aad058cf7c 100644 --- a/OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/HealthPercentageDamageWarhead.cs @@ -10,45 +10,17 @@ #endregion using System.Collections.Generic; -using System.Linq; using OpenRA.Mods.Common.Traits; using OpenRA.Traits; namespace OpenRA.Mods.Common.Warheads { - public class HealthPercentageDamageWarhead : DamageWarhead + public class HealthPercentageDamageWarhead : TargetDamageWarhead { - [Desc("Size of the area. Damage will be applied to this area.", "If two spreads are defined, the area of effect is a ring, where the second value is the inner radius.")] - public readonly WDist[] Spread = { new WDist(43) }; - - public override void DoImpact(WPos pos, Actor firedBy, IEnumerable damageModifiers) + protected override void InflictDamage(Actor victim, Actor firedBy, HitShapeInfo hitshapeInfo, IEnumerable damageModifiers) { - var world = firedBy.World; - - var debugVis = world.WorldActor.TraitOrDefault(); - if (debugVis != null && debugVis.CombatGeometry) - world.WorldActor.Trait().AddImpact(pos, Spread, DebugOverlayColor); - - var range = Spread[0]; - var hitActors = world.FindActorsInCircle(pos, range); - if (Spread.Length > 1 && Spread[1].Length > 0) - hitActors = hitActors.Except(world.FindActorsInCircle(pos, Spread[1])); - - foreach (var victim in hitActors) - DoImpact(victim, firedBy, damageModifiers); - } - - public override void DoImpact(Actor victim, Actor firedBy, IEnumerable damageModifiers) - { - if (!IsValidAgainst(victim, firedBy)) - return; - - var healthInfo = victim.Info.TraitInfoOrDefault(); - if (healthInfo == null) - return; - - // Damage is measured as a percentage of the target health - var damage = Util.ApplyPercentageModifiers(healthInfo.MaxHP, damageModifiers.Append(Damage, DamageVersus(victim))); + var healthInfo = victim.Info.TraitInfo(); + var damage = Util.ApplyPercentageModifiers(healthInfo.HP, damageModifiers.Append(Damage, DamageVersus(victim, hitshapeInfo))); victim.InflictDamage(firedBy, new Damage(damage, DamageTypes)); } } diff --git a/OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs b/OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs index 119e1ff597..4b794d0560 100644 --- a/OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/SpreadDamageWarhead.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.GameRules; using OpenRA.Mods.Common.Traits; +using OpenRA.Primitives; using OpenRA.Traits; namespace OpenRA.Mods.Common.Warheads @@ -45,30 +46,27 @@ namespace OpenRA.Mods.Common.Warheads public override void DoImpact(WPos pos, Actor firedBy, IEnumerable damageModifiers) { - var world = firedBy.World; - - var debugVis = world.WorldActor.TraitOrDefault(); + var debugVis = firedBy.World.WorldActor.TraitOrDefault(); if (debugVis != null && debugVis.CombatGeometry) - world.WorldActor.Trait().AddImpact(pos, Range, DebugOverlayColor); + firedBy.World.WorldActor.Trait().AddImpact(pos, Range, DebugOverlayColor); - var hitActors = world.FindActorsOnCircle(pos, Range[Range.Length - 1]); - - foreach (var victim in hitActors) + foreach (var victim in firedBy.World.FindActorsOnCircle(pos, Range[Range.Length - 1])) { - // Cannot be damaged without a Health trait - var healthInfo = victim.Info.TraitInfoOrDefault(); - if (healthInfo == null) + if (!IsValidAgainst(victim, firedBy)) continue; + var closestActiveShape = victim.TraitsImplementing() + .Where(Exts.IsTraitEnabled) + .Select(s => Pair.New(s, s.Info.Type.DistanceFromEdge(pos, victim))) + .MinByOrDefault(s => s.Second); + // Cannot be damaged without an active HitShape - var activeShapes = victim.TraitsImplementing().Where(Exts.IsTraitEnabled); - if (!activeShapes.Any()) + if (closestActiveShape.First == null) continue; - var distance = activeShapes.Min(t => t.Info.Type.DistanceFromEdge(pos, victim)); - var localModifiers = damageModifiers.Append(GetDamageFalloff(distance.Length)); - - DoImpact(victim, firedBy, localModifiers); + var localModifiers = damageModifiers.Append(GetDamageFalloff(closestActiveShape.Second.Length)); + var damage = Util.ApplyPercentageModifiers(Damage, localModifiers.Append(DamageVersus(victim, closestActiveShape.First.Info))); + victim.InflictDamage(firedBy, new Damage(damage, DamageTypes)); } } diff --git a/OpenRA.Mods.Common/Warheads/TargetDamageWarhead.cs b/OpenRA.Mods.Common/Warheads/TargetDamageWarhead.cs index c538b3ba07..95566777f8 100644 --- a/OpenRA.Mods.Common/Warheads/TargetDamageWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/TargetDamageWarhead.cs @@ -10,50 +10,49 @@ #endregion using System.Collections.Generic; +using System.Linq; using OpenRA.Mods.Common.Traits; +using OpenRA.Primitives; using OpenRA.Traits; namespace OpenRA.Mods.Common.Warheads { public class TargetDamageWarhead : DamageWarhead { - public override void DoImpact(Target target, Actor firedBy, IEnumerable damageModifiers) - { - // Damages a single actor, rather than a position. Only support by InstantHit for now. - // TODO: Add support for 'area of damage' - if (target.Type == TargetType.Actor) - DoImpact(target.Actor, firedBy, damageModifiers); - } + [Desc("Damage will be applied to actors in this area. A value of zero means only targeted actor will be damaged.")] + public readonly WDist Spread = WDist.Zero; public override void DoImpact(WPos pos, Actor firedBy, IEnumerable damageModifiers) { - // For now this only displays debug overlay - // TODO: Add support for 'area of effect' / multiple targets - var world = firedBy.World; - var debugOverlayRange = new[] { WDist.Zero, new WDist(128) }; - - var debugVis = world.WorldActor.TraitOrDefault(); - if (debugVis != null && debugVis.CombatGeometry) - world.WorldActor.Trait().AddImpact(pos, debugOverlayRange, DebugOverlayColor); - } - - public override void DoImpact(Actor victim, Actor firedBy, IEnumerable damageModifiers) - { - if (!IsValidAgainst(victim, firedBy)) + if (Spread == WDist.Zero) return; - var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim))); - victim.InflictDamage(firedBy, new Damage(damage, DamageTypes)); + var debugVis = firedBy.World.WorldActor.TraitOrDefault(); + if (debugVis != null && debugVis.CombatGeometry) + firedBy.World.WorldActor.Trait().AddImpact(pos, new[] { WDist.Zero, Spread }, DebugOverlayColor); - var world = firedBy.World; - if (world.LocalPlayer != null) + foreach (var victim in firedBy.World.FindActorsOnCircle(pos, Spread)) { - var debugOverlayRange = new[] { WDist.Zero, new WDist(128) }; + if (!IsValidAgainst(victim, firedBy)) + continue; - var debugVis = world.WorldActor.TraitOrDefault(); - if (debugVis != null && debugVis.CombatGeometry) - world.WorldActor.Trait().AddImpact(victim.CenterPosition, debugOverlayRange, DebugOverlayColor); + var closestActiveShape = victim.TraitsImplementing() + .Where(Exts.IsTraitEnabled) + .Select(s => Pair.New(s, s.Info.Type.DistanceFromEdge(pos, victim))) + .MinByOrDefault(s => s.Second); + + // Cannot be damaged without an active HitShape or if HitShape is outside Spread + if (closestActiveShape.First == null || closestActiveShape.Second > Spread) + continue; + + InflictDamage(victim, firedBy, closestActiveShape.First.Info, damageModifiers); } } + + protected virtual void InflictDamage(Actor victim, Actor firedBy, HitShapeInfo hitshapeInfo, IEnumerable damageModifiers) + { + var damage = Util.ApplyPercentageModifiers(Damage, damageModifiers.Append(DamageVersus(victim, hitshapeInfo))); + victim.InflictDamage(firedBy, new Damage(damage, DamageTypes)); + } } }