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

Demolishable, trivial optimization.

Browse Source
This commit is contained in:
Vapre
2022-07-18 22:02:05 +02:00
committed by Gustas
parent 3f3687f71d
commit e8748200f7
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
OpenRA.Mods.Common/Traits/Demolishable.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.Traits
public override object Create(ActorInitializer init) { return new Demolishable(this); } public override object Create(ActorInitializer init) { return new Demolishable(this); }
} }
public class Demolishable : ConditionalTrait<DemolishableInfo>, IDemolishable, ITick public class Demolishable : ConditionalTrait<DemolishableInfo>, IDemolishable, ITick, INotifyOwnerChanged
{ {
class DemolishAction class DemolishAction
{ {
@@ -48,10 +48,23 @@ namespace OpenRA.Mods.Common.Traits
readonly List<DemolishAction> actions = new List<DemolishAction>(); readonly List<DemolishAction> actions = new List<DemolishAction>();
readonly List<DemolishAction> removeActions = new List<DemolishAction>(); readonly List<DemolishAction> removeActions = new List<DemolishAction>();
IDamageModifier[] damageModifiers;
public Demolishable(DemolishableInfo info) public Demolishable(DemolishableInfo info)
: base(info) { } : base(info) { }
protected override void Created(Actor self)
{
damageModifiers = self.TraitsImplementing<IDamageModifier>()
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>()).ToArray();
}
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
damageModifiers = self.TraitsImplementing<IDamageModifier>()
.Concat(newOwner.PlayerActor.TraitsImplementing<IDamageModifier>()).ToArray();
}
bool IDemolishable.IsValidTarget(Actor self, Actor saboteur) bool IDemolishable.IsValidTarget(Actor self, Actor saboteur)
{ {
return !IsTraitDisabled; return !IsTraitDisabled;
@@ -68,18 +81,14 @@ namespace OpenRA.Mods.Common.Traits
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (IsTraitDisabled) if (IsTraitDisabled || actions.Count == 0)
return; return;
foreach (var a in actions) foreach (var a in actions)
{ {
if (a.Delay-- <= 0) if (a.Delay-- <= 0)
{ {
var modifiers = self.TraitsImplementing<IDamageModifier>() if (Util.ApplyPercentageModifiers(100, damageModifiers.Select(t => t.GetDamageModifier(self, null))) > 0)
.Concat(self.Owner.PlayerActor.TraitsImplementing<IDamageModifier>())
.Select(t => t.GetDamageModifier(self, null));
if (Util.ApplyPercentageModifiers(100, modifiers) > 0)
self.Kill(a.Saboteur, a.DamageTypes); self.Kill(a.Saboteur, a.DamageTypes);
else if (a.Token != Actor.InvalidConditionToken) else if (a.Token != Actor.InvalidConditionToken)
{ {