Fix anomaly shuffle particles type (#40624)
* dev it * screw it * Revert "screw it" This reverts commit 5657a1d20128e630bebbaf38f4dcb4dbac28d026. * Revert "dev it" This reverts commit f3d7c355da17de92e43c145efbd348f8378d6146. * slarti best * Revert "slarti best" This reverts commit 8de1caafb254515202aa21d2b96029a1fce24df2. * Reapply "dev it" This reverts commit c603940a73246f8a22a171c5559eb3f3f995e7bc. * Reapply "screw it" This reverts commit 468722abe7bde7e30bc3b421bc28fa90a013bd63. * refactor: renaming +xml-doc --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
This commit is contained in:
@@ -126,6 +126,9 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
|
|||||||
if (_random.Prob(anomaly.Comp.Continuity))
|
if (_random.Prob(anomaly.Comp.Continuity))
|
||||||
SetBehavior(anomaly, GetRandomBehavior());
|
SetBehavior(anomaly, GetRandomBehavior());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var ev = new AnomalyAffectedByParticleEvent(anomaly, args.OtherEntity);
|
||||||
|
RaiseLocalEvent(anomaly, ref ev);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
using Content.Server.Anomaly.Components;
|
using Content.Server.Anomaly.Components;
|
||||||
using Content.Shared.Anomaly.Components;
|
using Content.Shared.Anomaly.Components;
|
||||||
using Robust.Shared.Physics.Events;
|
|
||||||
using Robust.Shared.Random;
|
using Robust.Shared.Random;
|
||||||
|
|
||||||
namespace Content.Server.Anomaly.Effects;
|
namespace Content.Server.Anomaly.Effects;
|
||||||
|
|
||||||
public sealed class ShuffleParticlesAnomalySystem : EntitySystem
|
public sealed class ShuffleParticlesAnomalySystem : EntitySystem
|
||||||
{
|
{
|
||||||
[Dependency] private readonly AnomalySystem _anomaly = default!;
|
[Dependency] private readonly AnomalySystem _anomaly = default!;
|
||||||
@@ -12,19 +12,16 @@ public sealed class ShuffleParticlesAnomalySystem : EntitySystem
|
|||||||
public override void Initialize()
|
public override void Initialize()
|
||||||
{
|
{
|
||||||
SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, AnomalyPulseEvent>(OnPulse);
|
SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, AnomalyPulseEvent>(OnPulse);
|
||||||
SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, StartCollideEvent>(OnStartCollide);
|
SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, AnomalyAffectedByParticleEvent>(OnAffectedByParticle);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnStartCollide(Entity<ShuffleParticlesAnomalyComponent> ent, ref StartCollideEvent args)
|
private void OnAffectedByParticle(Entity<ShuffleParticlesAnomalyComponent> ent, ref AnomalyAffectedByParticleEvent args)
|
||||||
{
|
{
|
||||||
if (!TryComp<AnomalyComponent>(ent, out var anomaly))
|
if (!TryComp<AnomalyComponent>(ent, out var anomalyComp))
|
||||||
return;
|
|
||||||
|
|
||||||
if (!HasComp<AnomalousParticleComponent>(args.OtherEntity))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (ent.Comp.ShuffleOnParticleHit && _random.Prob(ent.Comp.Prob))
|
if (ent.Comp.ShuffleOnParticleHit && _random.Prob(ent.Comp.Prob))
|
||||||
_anomaly.ShuffleParticlesEffect((ent, anomaly));
|
_anomaly.ShuffleParticlesEffect((args.Anomaly, anomalyComp));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnPulse(Entity<ShuffleParticlesAnomalyComponent> ent, ref AnomalyPulseEvent args)
|
private void OnPulse(Entity<ShuffleParticlesAnomalyComponent> ent, ref AnomalyPulseEvent args)
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
using Content.Shared.Anomaly;
|
namespace Content.Shared.Anomaly.Components;
|
||||||
using Content.Shared.Anomaly.Components;
|
|
||||||
|
|
||||||
namespace Content.Server.Anomaly.Components;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is used for projectiles which affect anomalies through colliding with them.
|
/// This is used for projectiles which affect anomalies through colliding with them.
|
||||||
@@ -324,3 +324,10 @@ public readonly record struct AnomalyHealthChangedEvent(EntityUid Anomaly, float
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[ByRefEvent]
|
[ByRefEvent]
|
||||||
public readonly record struct AnomalyBehaviorChangedEvent(EntityUid Anomaly, ProtoId<AnomalyBehaviorPrototype>? Old, ProtoId<AnomalyBehaviorPrototype>? New);
|
public readonly record struct AnomalyBehaviorChangedEvent(EntityUid Anomaly, ProtoId<AnomalyBehaviorPrototype>? Old, ProtoId<AnomalyBehaviorPrototype>? New);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Event of anomaly being affected by exotic particle.
|
||||||
|
/// Is raised when particle collides with artifact.
|
||||||
|
/// </summary>
|
||||||
|
[ByRefEvent]
|
||||||
|
public record struct AnomalyAffectedByParticleEvent(EntityUid Anomaly, EntityUid Particle);
|
||||||
|
|||||||
Reference in New Issue
Block a user