tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small anomaly behavior fix (#28290)

Browse Source 
* Small anomaly behavior fix

* well put together code
This commit is contained in:
Nemanja
2024-05-27 20:52:56 -04:00
committed by GitHub
parent c740fbc68c
commit a269f9bb9e
3 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs
View File

@@ -15,26 +15,26 @@ public sealed class ShuffleParticlesAnomalySystem : EntitySystem
SubscribeLocalEvent<ShuffleParticlesAnomalyComponent, StartCollideEvent>(OnStartCollide);
}
private void OnStartCollide(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, StartCollideEvent args)
private void OnStartCollide(Entity<ShuffleParticlesAnomalyComponent> ent, ref StartCollideEvent args)
{
if (!TryComp<AnomalyComponent>(uid, out var anomaly))
if (!TryComp<AnomalyComponent>(ent, out var anomaly))
return;
if (shuffle.ShuffleOnParticleHit && _random.Prob(shuffle.Prob))
_anomaly.ShuffleParticlesEffect(anomaly);
if (!TryComp<AnomalousParticleComponent>(args.OtherEntity, out var particle))
if (!HasComp<AnomalousParticleComponent>(args.OtherEntity))
return;
if (ent.Comp.ShuffleOnParticleHit && _random.Prob(ent.Comp.Prob))
_anomaly.ShuffleParticlesEffect((ent, anomaly));
}
private void OnPulse(EntityUid uid, ShuffleParticlesAnomalyComponent shuffle, AnomalyPulseEvent args)
private void OnPulse(Entity<ShuffleParticlesAnomalyComponent> ent, ref AnomalyPulseEvent args)
{
if (!TryComp<AnomalyComponent>(uid, out var anomaly))
if (!TryComp<AnomalyComponent>(ent, out var anomaly))
return;
if (shuffle.ShuffleOnPulse && _random.Prob(shuffle.Prob))
if (ent.Comp.ShuffleOnPulse && _random.Prob(ent.Comp.Prob))
{
_anomaly.ShuffleParticlesEffect(anomaly);
_anomaly.ShuffleParticlesEffect((ent, anomaly));
}
}
}