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

Add TargetTypes to HealActorsCrateAction

Browse Source
This commit is contained in:
abcdefg30
2020-04-08 15:53:41 +02:00
committed by reaperrr
parent 24130dfcdc
commit 07c16cee1d
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Crates/HealActorsCrateAction.cs
View File

@@ -10,6 +10,7 @@
#endregion #endregion
using System.Linq; using System.Linq;
using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -17,18 +18,26 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Heals all actors that belong to the owner of the collector.")] [Desc("Heals all actors that belong to the owner of the collector.")]
class HealActorsCrateActionInfo : CrateActionInfo class HealActorsCrateActionInfo : CrateActionInfo
{ {
[Desc("The target type(s) of the actors this crate action will heal. Leave empty to heal all actors.")]
public readonly BitSet<TargetableType> TargetTypes = default(BitSet<TargetableType>);
public override object Create(ActorInitializer init) { return new HealActorsCrateAction(init.Self, this); } public override object Create(ActorInitializer init) { return new HealActorsCrateAction(init.Self, this); }
} }
class HealActorsCrateAction : CrateAction class HealActorsCrateAction : CrateAction
{ {
readonly HealActorsCrateActionInfo info;
public HealActorsCrateAction(Actor self, HealActorsCrateActionInfo info) public HealActorsCrateAction(Actor self, HealActorsCrateActionInfo info)
: base(self, info) { } : base(self, info)
{
this.info = info;
}
public override void Activate(Actor collector) public override void Activate(Actor collector)
{ {
foreach (var healable in collector.World.ActorsWithTrait<IHealth>().Where(tp => tp.Actor.Owner == collector.Owner)) foreach (var healable in collector.World.ActorsWithTrait<IHealth>().Where(tp => tp.Actor.Owner == collector.Owner))
if (!healable.Trait.IsDead) if (!healable.Trait.IsDead && (info.TargetTypes.IsEmpty || info.TargetTypes.Overlaps(healable.Actor.GetEnabledTargetTypes())))
healable.Trait.InflictDamage(healable.Actor, healable.Actor, new Damage(-(healable.Trait.MaxHP - healable.Trait.HP)), true); healable.Trait.InflictDamage(healable.Actor, healable.Actor, new Damage(-(healable.Trait.MaxHP - healable.Trait.HP)), true);
base.Activate(collector); base.Activate(collector);