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

AutomaticAtmosSystem uses MassDataChangedEvent, clarifies TileMassMultiplier (#37548)

Browse Source 
* Initial commit, no tile changes, just mass

* Rename TileMassMultiplier to TileDensityMultiplier
This commit is contained in:
Krunklehorn
2025-05-17 21:57:50 -04:00
committed by GitHub
parent c70e06b2d7
commit abec27737e
2 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
View File

@@ -1,8 +1,7 @@
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.Shuttles.Systems; using Content.Server.Shuttles.Systems;
using Content.Shared.Maps; using Robust.Shared.Map.Components;
using Robust.Shared.Map; using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Components;
namespace Content.Server.Atmos.EntitySystems; namespace Content.Server.Atmos.EntitySystems;
@@ -12,46 +11,29 @@ namespace Content.Server.Atmos.EntitySystems;
/// </summary> /// </summary>
public sealed class AutomaticAtmosSystem : EntitySystem public sealed class AutomaticAtmosSystem : EntitySystem
{ {
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<TileChangedEvent>(OnTileChanged); SubscribeLocalEvent<MapGridComponent, MassDataChangedEvent>(OnMassDataChanged);
} }
private void OnTileChanged(ref TileChangedEvent ev) private void OnMassDataChanged(Entity<MapGridComponent> ent, ref MassDataChangedEvent ev)
{ {
if (_atmosphereSystem.HasAtmosphere(ev.Entity) || !TryComp<PhysicsComponent>(ev.Entity, out var physics)) if (_atmosphereSystem.HasAtmosphere(ent))
return; return;
foreach (var change in ev.Changes) // We can't actually count how many tiles there are efficiently, so instead estimate with the mass.
if (ev.NewMass / ShuttleSystem.TileDensityMultiplier >= 7.0f)
{ {
// Only if a atmos-holding tile has been added or removed. AddComp<GridAtmosphereComponent>(ent);
// Also, these calls are surprisingly slow. Log.Info($"Giving grid {ent} GridAtmosphereComponent.");
// TODO: Make tiledefmanager cache the IsSpace property, and turn this lookup-through-two-interfaces into
// TODO: a simple array lookup, as tile IDs are likely contiguous, and there's at most 2^16 possibilities anyway.
var oldSpace = change.OldTile.IsSpace(_tileDefinitionManager);
var newSpace = change.NewTile.IsSpace(_tileDefinitionManager);
if (!(oldSpace && !newSpace ||
!oldSpace && newSpace))
{
continue;
}
// We can't actually count how many tiles there are efficiently, so instead estimate with the mass.
if (physics.Mass / ShuttleSystem.TileMassMultiplier >= 7.0f)
{
AddComp<GridAtmosphereComponent>(ev.Entity);
Log.Info($"Giving grid {ev.Entity} GridAtmosphereComponent.");
}
// It's not super important to remove it should the grid become too small again.
// If explosions ever gain the ability to outright shatter grids, do rethink this.
return;
} }
// It's not super important to remove it should the grid become too small again.
// If explosions ever gain the ability to outright shatter grids, do rethink this.
return;
} }
} }

4
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -75,7 +75,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
private EntityQuery<PhysicsComponent> _physicsQuery; private EntityQuery<PhysicsComponent> _physicsQuery;
private EntityQuery<TransformComponent> _xformQuery; private EntityQuery<TransformComponent> _xformQuery;
public const float TileMassMultiplier = 0.5f; public const float TileDensityMultiplier = 0.5f;
public override void Initialize() public override void Initialize()
{ {
@@ -111,7 +111,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
{ {
foreach (var fixture in args.NewFixtures) foreach (var fixture in args.NewFixtures)
{ {
_physics.SetDensity(uid, fixture.Key, fixture.Value, TileMassMultiplier, false, manager); _physics.SetDensity(uid, fixture.Key, fixture.Value, TileDensityMultiplier, false, manager);
_fixtures.SetRestitution(uid, fixture.Key, fixture.Value, 0.1f, false, manager); _fixtures.SetRestitution(uid, fixture.Key, fixture.Value, 0.1f, false, manager);
} }
} }