Splits the singularity into its component parts + ECS singularity + Support for singularities in containers. (#12132)
* InitialCommit (Broken) * Fixes compile errors * PR comments. More doc comments. Fixes * Makes a singularity/event horizon without radiation/physics a valid state to be in * VV 'fake' setters, fixes the visualizer, fixes the singularity trying to eat itself instead of nearby things. * Removes unused dependency from Content.Client.GravityWellSystem * Testing containment and fake VV setters for SingularityGeneratorComponent * Fixes gravity wells (broken due to LookupFlags.None). Adds recursive Event Horizon consumption * Fix merge skew * Fixes for the master merge * Fix engine commit * Dirty is obsolete * Switch over dirty * Fix requested changes * ambiant -> ambient * Moves EventHorionComponent to Shared * Proper container handling * Fixes master merge. Fixes post insertion assertions for singularities. Extends proper container handling to gravity wells and the distortion shader. * Better support for admemes throwing singularities. * Moves update timing from accumulators to target times * Update doc comments
This commit is contained in:
@@ -1,20 +1,126 @@
|
||||
using Content.Server.ParticleAccelerator.Components;
|
||||
using Content.Server.Singularity.Components;
|
||||
using Content.Shared.Singularity.Components;
|
||||
using Robust.Shared.Physics.Dynamics;
|
||||
using Robust.Shared.Physics.Events;
|
||||
|
||||
namespace Content.Server.Singularity.EntitySystems;
|
||||
|
||||
public sealed class SingularityGeneratorSystem : EntitySystem
|
||||
{
|
||||
#region Dependencies
|
||||
[Dependency] private readonly IViewVariablesManager _vvm = default!;
|
||||
#endregion Dependencies
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<ParticleProjectileComponent, StartCollideEvent>(HandleParticleCollide);
|
||||
|
||||
var vvHandle = _vvm.GetTypeHandler<SingularityGeneratorComponent>();
|
||||
vvHandle.AddPath(nameof(SingularityGeneratorComponent.Power), (_, comp) => comp.Power, SetPower);
|
||||
vvHandle.AddPath(nameof(SingularityGeneratorComponent.Threshold), (_, comp) => comp.Threshold, SetThreshold);
|
||||
}
|
||||
|
||||
public override void Shutdown()
|
||||
{
|
||||
var vvHandle = _vvm.GetTypeHandler<SingularityGeneratorComponent>();
|
||||
vvHandle.RemovePath(nameof(SingularityGeneratorComponent.Power));
|
||||
vvHandle.RemovePath(nameof(SingularityGeneratorComponent.Threshold));
|
||||
|
||||
base.Shutdown();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Handles what happens when a singularity generator passes its power threshold.
|
||||
/// Default behavior is to reset the singularities power level and spawn a singularity.
|
||||
/// </summary>
|
||||
/// <param name="uid">The uid of the singularity generator.</param>
|
||||
/// <param name="comp">The state of the singularity generator.</param>
|
||||
private void OnPassThreshold(EntityUid uid, SingularityGeneratorComponent? comp)
|
||||
{
|
||||
if(!Resolve(uid, ref comp))
|
||||
return;
|
||||
|
||||
SetPower(comp, 0);
|
||||
EntityManager.SpawnEntity(comp.SpawnPrototype, Transform(comp.Owner).Coordinates);
|
||||
}
|
||||
|
||||
#region Getters/Setters
|
||||
/// <summary>
|
||||
/// Setter for <see cref="SingularityGeneratorComponent.Power"/>
|
||||
/// If the singularity generator passes its threshold it also spawns a singularity.
|
||||
/// </summary>
|
||||
/// <param name="comp">The singularity generator component.</param>
|
||||
/// <param name="value">The new power level for the generator component to have.</param>
|
||||
public void SetPower(SingularityGeneratorComponent comp, float value)
|
||||
{
|
||||
var oldValue = comp.Power;
|
||||
if (value == oldValue)
|
||||
return;
|
||||
|
||||
comp.Power = value;
|
||||
if (comp.Power >= comp.Threshold && oldValue < comp.Threshold)
|
||||
OnPassThreshold(comp.Owner, comp);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Setter for <see cref="SingularityGeneratorComponent.Threshold"/>
|
||||
/// If the singularity generator has passed its new threshold it also spawns a singularity.
|
||||
/// </summary>
|
||||
/// <param name="comp">The singularity generator component.</param>
|
||||
/// <param name="value">The new threshold power level for the generator component to have.</param>
|
||||
public void SetThreshold(SingularityGeneratorComponent comp, float value)
|
||||
{
|
||||
var oldValue = comp.Threshold;
|
||||
if (value == comp.Threshold)
|
||||
return;
|
||||
|
||||
comp.Power = value;
|
||||
if (comp.Power >= comp.Threshold && comp.Power < oldValue)
|
||||
OnPassThreshold(comp.Owner, comp);
|
||||
}
|
||||
#region VV
|
||||
/// <summary>
|
||||
/// VV setter for <see cref="SingularityGeneratorComponent.Power"/>
|
||||
/// If the singularity generator passes its threshold it also spawns a singularity.
|
||||
/// </summary>
|
||||
/// <param name="uid">The entity hosting the singularity generator that is being modified.</param>
|
||||
/// <param name="value">The value of the new power level the singularity generator should have.</param>
|
||||
/// <param name="comp">The singularity generator to change the power level of.</param>
|
||||
public void SetPower(EntityUid uid, float value, SingularityGeneratorComponent? comp)
|
||||
{
|
||||
if(!Resolve(uid, ref comp))
|
||||
return;
|
||||
SetPower(comp, value);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// VV setter for <see cref="SingularityGeneratorComponent.Threshold"/>
|
||||
/// If the singularity generator has passed its new threshold it also spawns a singularity.
|
||||
/// </summary>
|
||||
/// <param name="uid">The entity hosting the singularity generator that is being modified.</param>
|
||||
/// <param name="value">The value of the new threshold power level the singularity generator should have.</param>
|
||||
/// <param name="comp">The singularity generator to change the threshold power level of.</param>
|
||||
public void SetThreshold(EntityUid uid, float value, SingularityGeneratorComponent? comp)
|
||||
{
|
||||
if(!Resolve(uid, ref comp))
|
||||
return;
|
||||
SetThreshold(comp, value);
|
||||
}
|
||||
#endregion VV
|
||||
#endregion Getters/Setters
|
||||
|
||||
#region Event Handlers
|
||||
/// <summary>
|
||||
/// Handles PA Particles colliding with a singularity generator.
|
||||
/// Adds the power from the particles to the generator.
|
||||
/// TODO: Desnowflake this.
|
||||
/// </summary>
|
||||
/// <param name="uid">The uid of the PA particles have collided with.</param>
|
||||
/// <param name="component">The state of the PA particles.</param>
|
||||
/// <param name="args">The state of the beginning of the collision.</param>
|
||||
private void HandleParticleCollide(EntityUid uid, ParticleProjectileComponent component, ref StartCollideEvent args)
|
||||
{
|
||||
if (EntityManager.TryGetComponent<SingularityGeneratorComponent?>(args.OtherFixture.Body.Owner, out var singularityGeneratorComponent))
|
||||
@@ -31,4 +137,5 @@ public sealed class SingularityGeneratorSystem : EntitySystem
|
||||
EntityManager.QueueDeleteEntity(uid);
|
||||
}
|
||||
}
|
||||
#endregion Event Handlers
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user