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

ExplosionOnDamageTransition now Conditional.

Browse Source
This commit is contained in:
Andre Mohren
2021-03-02 11:49:40 +01:00
committed by reaperrr
parent fcc3008b00
commit f5f06b86ad
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Mods.Common/Traits/ExplosionOnDamageTransition.cs
View File

@@ -15,7 +15,7 @@ using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
{ {
[Desc("This actor triggers an explosion on itself when transitioning to a specific damage state.")] [Desc("This actor triggers an explosion on itself when transitioning to a specific damage state.")]
public class ExplosionOnDamageTransitionInfo : TraitInfo, IRulesetLoaded, Requires<IHealthInfo> public class ExplosionOnDamageTransitionInfo : ConditionalTraitInfo, IRulesetLoaded, Requires<IHealthInfo>
{ {
[WeaponReference] [WeaponReference]
[FieldLoader.Require] [FieldLoader.Require]
@@ -32,8 +32,10 @@ namespace OpenRA.Mods.Common.Traits
public override object Create(ActorInitializer init) { return new ExplosionOnDamageTransition(this, init.Self); } public override object Create(ActorInitializer init) { return new ExplosionOnDamageTransition(this, init.Self); }
public void RulesetLoaded(Ruleset rules, ActorInfo ai) public override void RulesetLoaded(Ruleset rules, ActorInfo ai)
{ {
base.RulesetLoaded(rules, ai);
if (string.IsNullOrEmpty(Weapon)) if (string.IsNullOrEmpty(Weapon))
return; return;
@@ -45,14 +47,13 @@ namespace OpenRA.Mods.Common.Traits
} }
} }
public class ExplosionOnDamageTransition : INotifyDamageStateChanged public class ExplosionOnDamageTransition : ConditionalTrait<ExplosionOnDamageTransitionInfo>, INotifyDamageStateChanged
{ {
readonly ExplosionOnDamageTransitionInfo info;
bool triggered; bool triggered;
public ExplosionOnDamageTransition(ExplosionOnDamageTransitionInfo info, Actor self) public ExplosionOnDamageTransition(ExplosionOnDamageTransitionInfo info, Actor self)
: base(info)
{ {
this.info = info;
} }
void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e) void INotifyDamageStateChanged.DamageStateChanged(Actor self, AttackInfo e)
@@ -63,13 +64,16 @@ namespace OpenRA.Mods.Common.Traits
if (triggered) if (triggered)
return; return;
if (e.DamageState >= info.DamageState && e.PreviousDamageState < info.DamageState) if (IsTraitDisabled)
return;
if (e.DamageState >= Info.DamageState && e.PreviousDamageState < Info.DamageState)
{ {
if (info.TriggerOnlyOnce) if (Info.TriggerOnlyOnce)
triggered = true; triggered = true;
// Use .FromPos since the actor might have been killed, don't use Target.FromActor // Use .FromPos since the actor might have been killed, don't use Target.FromActor
info.WeaponInfo.Impact(Target.FromPos(self.CenterPosition), e.Attacker); Info.WeaponInfo.Impact(Target.FromPos(self.CenterPosition), e.Attacker);
} }
} }
} }