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

#1462 extracted MapGrid's HasGravity property to separate Content com… (#4200)

Browse Source 
* #1462 extracted MapGrid's HasGravity property to separate Content component

* #1462 - PR suggestions

* Merge to master

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Galactic Chimp
2021-06-27 07:43:39 +02:00
committed by GitHub
parent 3cb627531f
commit afb5f5c8eb
10 changed files with 192 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Content.Server/Gravity/EntitySystems/GravitySystem.cs
View File

@@ -15,7 +15,7 @@ using Robust.Shared.Random;
namespace Content.Server.Gravity.EntitySystems
{
[UsedImplicitly]
internal sealed class GravitySystem : EntitySystem
internal sealed class GravitySystem : SharedGravitySystem
{
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
@@ -29,59 +29,95 @@ namespace Content.Server.Gravity.EntitySystems
private float _internalTimer = 0.0f;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<GravityComponent, ComponentInit>(HandleGravityInitialize);
SubscribeLocalEvent<GravityGeneratorUpdateEvent>(HandleGeneratorUpdate);
}
private void HandleGeneratorUpdate(GravityGeneratorUpdateEvent ev)
{
if (ev.GridId == GridId.Invalid) return;
var gravity = ComponentManager.GetComponent<GravityComponent>(_mapManager.GetGrid(ev.GridId).GridEntityId);
if (ev.Status == GravityGeneratorStatus.On)
{
EnableGravity(gravity);
}
else
{
DisableGravity(gravity);
}
}
private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args)
{
// Incase there's already a generator on the grid we'll just set it now.
var gridId = component.Owner.Transform.GridID;
foreach (var generator in ComponentManager.EntityQuery<GravityGeneratorComponent>(true))
{
if (generator.Owner.Transform.GridID == gridId && generator.Status == GravityGeneratorStatus.On)
{
component.Enabled = true;
return;
}
}
component.Enabled = false;
}
public override void Update(float frameTime)
{
_internalTimer += frameTime;
var gridsWithGravity = new List<GridId>();
// TODO: Pointless iteration, just make both of these event-based PLEASE
foreach (var generator in ComponentManager.EntityQuery<GravityGeneratorComponent>(true))
{
if (generator.NeedsUpdate)
{
generator.UpdateState();
}
if (generator.Status == GravityGeneratorStatus.On)
{
gridsWithGravity.Add(generator.Owner.Transform.GridID);
}
}
foreach (var grid in _mapManager.GetAllGrids())
if (_gridsToShake.Count > 0)
{
if (grid.HasGravity && !gridsWithGravity.Contains(grid.Index))
_internalTimer += frameTime;
if (_internalTimer > 0.2f)
{
DisableGravity(grid);
}
else if (!grid.HasGravity && gridsWithGravity.Contains(grid.Index))
{
EnableGravity(grid);
// TODO: Could just have clients do this themselves via event and save bandwidth.
ShakeGrids();
_internalTimer -= 0.2f;
}
}
if (_internalTimer > 0.2f)
else
{
ShakeGrids();
_internalTimer = 0.0f;
}
}
private void EnableGravity(IMapGrid grid)
private void EnableGravity(GravityComponent comp)
{
grid.HasGravity = true;
ScheduleGridToShake(grid.Index, ShakeTimes);
if (comp.Enabled) return;
comp.Enabled = true;
var message = new GravityChangedMessage(grid);
var gridId = comp.Owner.Transform.GridID;
ScheduleGridToShake(gridId, ShakeTimes);
var message = new GravityChangedMessage(gridId, true);
RaiseLocalEvent(message);
}
private void DisableGravity(IMapGrid grid)
private void DisableGravity(GravityComponent comp)
{
grid.HasGravity = false;
ScheduleGridToShake(grid.Index, ShakeTimes);
if (!comp.Enabled) return;
comp.Enabled = false;
var message = new GravityChangedMessage(grid);
var gridId = comp.Owner.Transform.GridID;
ScheduleGridToShake(gridId, ShakeTimes);
var message = new GravityChangedMessage(gridId, false);
RaiseLocalEvent(message);
}