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

Per-map parallax support (#9786)

Browse Source 
* Per-map parallax support

* Comments for future sloth

* c

* bet

* Fix exception

* VV support

* Fix parallax

* mem

* weightless sounds

* Gravity stuff

* placeholder coz im too lazy to stash don't @ me son

* decent clouds

* sky

* Fast parallax

* Imagine spelling

* Loicense

* perish

* Fix weightless status

Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-07-25 15:10:23 +10:00
committed by GitHub
parent aad6a22a6a
commit bfac53e7bc
36 changed files with 607 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,16 +4,16 @@ using JetBrains.Annotations;
namespace Content.Server.Gravity.EntitySystems
{
[UsedImplicitly]
internal sealed class GravitySystem : SharedGravitySystem
public sealed class GravitySystem : SharedGravitySystem
{
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<GravityComponent, ComponentInit>(HandleGravityInitialize);
SubscribeLocalEvent<GravityComponent, ComponentShutdown>(HandleGravityShutdown);
SubscribeLocalEvent<GravityComponent, ComponentInit>(OnGravityInit);
SubscribeLocalEvent<GravityComponent, ComponentShutdown>(OnGravityShutdown);
}
private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args)
private void OnGravityInit(EntityUid uid, GravityComponent component, ComponentInit args)
{
// Incase there's already a generator on the grid we'll just set it now.
var gridId = Transform(component.Owner).GridUid;
@@ -21,25 +21,25 @@ namespace Content.Server.Gravity.EntitySystems
if (gridId == null)
return;
GravityChangedMessage message;
GravityChangedEvent message;
foreach (var generator in EntityManager.EntityQuery<GravityGeneratorComponent>())
{
if (Transform(generator.Owner).GridUid == gridId && generator.GravityActive)
{
component.Enabled = true;
message = new GravityChangedMessage(gridId.Value, true);
message = new GravityChangedEvent(gridId.Value, true);
RaiseLocalEvent(message);
return;
}
}
component.Enabled = false;
message = new GravityChangedMessage(gridId.Value, false);
message = new GravityChangedEvent(gridId.Value, false);
RaiseLocalEvent(message);
}
private void HandleGravityShutdown(EntityUid uid, GravityComponent component, ComponentShutdown args)
private void OnGravityShutdown(EntityUid uid, GravityComponent component, ComponentShutdown args)
{
DisableGravity(component);
}
@@ -53,7 +53,7 @@ namespace Content.Server.Gravity.EntitySystems
return;
comp.Enabled = true;
var message = new GravityChangedMessage(gridId.Value, true);
var message = new GravityChangedEvent(gridId.Value, true);
RaiseLocalEvent(message);
}
@@ -66,7 +66,7 @@ namespace Content.Server.Gravity.EntitySystems
if (gridId == null)
return;
var message = new GravityChangedMessage(gridId.Value, false);
var message = new GravityChangedEvent(gridId.Value, false);
RaiseLocalEvent(message);
}
}

157
Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
View File

@@ -1,157 +0,0 @@
using Content.Shared.Alert;
using Content.Shared.GameTicking;
using Content.Shared.Gravity;
using Content.Shared.Movement.Components;
using JetBrains.Annotations;
using Robust.Shared.Map;
using Robust.Shared.Utility;
namespace Content.Server.Gravity.EntitySystems
{
[UsedImplicitly]
public sealed class WeightlessSystem : EntitySystem
{
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly AlertsSystem _alertsSystem = default!;
private readonly Dictionary<EntityUid, List<AlertsComponent>> _alerts = new();
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<GravityChangedMessage>(GravityChanged);
SubscribeLocalEvent<AlertsComponent, EntParentChangedMessage>(EntParentChanged);
SubscribeLocalEvent<AlertsComponent, AlertSyncEvent>(HandleAlertSyncEvent);
}
public void Reset(RoundRestartCleanupEvent ev)
{
_alerts.Clear();
}
public void AddAlert(AlertsComponent status)
{
var xform = Transform(status.Owner);
if (xform.GridUid != null)
{
var alerts = _alerts.GetOrNew(xform.GridUid.Value);
alerts.Add(status);
}
if (_mapManager.TryGetGrid(xform.GridUid, out var grid))
{
var alerts = _alerts.GetOrNew(xform.GridUid.Value);
alerts.Add(status);
if (EntityManager.GetComponent<GravityComponent>(grid.GridEntityId).Enabled)
{
RemoveWeightless(status.Owner);
}
else
{
AddWeightless(status.Owner);
}
}
else
{
AddWeightless(status.Owner);
}
}
public void RemoveAlert(AlertsComponent status)
{
var grid = EntityManager.GetComponent<TransformComponent>(status.Owner).GridUid;
if (grid == null || !_alerts.TryGetValue(grid.Value, out var statuses))
{
return;
}
statuses.Remove(status);
}
private void GravityChanged(GravityChangedMessage ev)
{
if (!_alerts.TryGetValue(ev.ChangedGridIndex, out var statuses))
{
return;
}
if (ev.HasGravity)
{
foreach (var status in statuses)
{
RemoveWeightless(status.Owner);
}
}
else
{
foreach (var status in statuses)
{
AddWeightless(status.Owner);
}
}
}
private void AddWeightless(EntityUid euid)
{
_alertsSystem.ShowAlert(euid, AlertType.Weightless);
}
private void RemoveWeightless(EntityUid euid)
{
_alertsSystem.ClearAlert(euid, AlertType.Weightless);
}
private void EntParentChanged(EntityUid uid, AlertsComponent status, ref EntParentChangedMessage ev)
{
// First, update the `_alerts` dictionary
if (ev.OldParent is {Valid: true} old &&
EntityManager.TryGetComponent(old, out IMapGridComponent? mapGrid))
{
var oldGrid = mapGrid.Owner;
if (_alerts.TryGetValue(oldGrid, out var oldStatuses))
{
oldStatuses.Remove(status);
}
}
if (ev.Transform.MapID == MapId.Nullspace)
return;
var newGrid = ev.Transform.GridUid;
if (newGrid != null)
{
var newStatuses = _alerts.GetOrNew(newGrid.Value);
newStatuses.Add(status);
}
// then update the actual alert. The alert is only removed if either the player is on a grid with gravity,
// or if they ignore gravity-based movement altogether.
// TODO: update this when planets and the like are added.
// TODO: update alert when the ignore-gravity component is added or removed.
if (_mapManager.TryGetGrid(newGrid, out var grid)
&& TryComp(grid.GridEntityId, out GravityComponent? gravity)
&& gravity.Enabled)
RemoveWeightless(status.Owner);
else if (!HasComp<MovementIgnoreGravityComponent>(uid))
AddWeightless(status.Owner);
}
private void HandleAlertSyncEvent(EntityUid uid, AlertsComponent component, AlertSyncEvent args)
{
switch (component.LifeStage)
{
case ComponentLifeStage.Starting:
AddAlert(component);
break;
case ComponentLifeStage.Removing:
RemoveAlert(component);
break;
}
}
}
}