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

Support for non-fulltile airblockers rotating

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-07 13:57:04 +02:00
parent da4d08432d
commit 2aa1486b13
3 changed files with 89 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
View File

@@ -1,4 +1,5 @@
#nullable enable
using System;
using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Atmos;
using Robust.Server.Interfaces.GameObjects;
@@ -10,6 +11,7 @@ using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -30,6 +32,12 @@ namespace Content.Server.GameObjects.Components.Atmos
private bool _airBlocked = true;
private bool _fixVacuum = false;
[ViewVariables]
private bool _rotateAirBlocked = true;
[ViewVariables]
private bool _fixAirBlockedDirectionInitialize = true;
[ViewVariables(VVAccess.ReadWrite)]
public bool AirBlocked
{
@@ -63,6 +71,8 @@ namespace Content.Server.GameObjects.Components.Atmos
serializer.DataField(ref _airBlocked, "airBlocked", true);
serializer.DataField(ref _fixVacuum, "fixVacuum", true);
serializer.DataField(ref _airBlockedDirection, "airBlockedDirection", (int)AtmosDirection.All, WithFormat.Flags<AtmosDirectionFlags>());
serializer.DataField(ref _rotateAirBlocked, "rotateAirBlocked", true);
serializer.DataField(ref _fixAirBlockedDirectionInitialize, "fixAirBlockedDirectionInitialize", true);
}
public override void Initialize()
@@ -75,9 +85,36 @@ namespace Content.Server.GameObjects.Components.Atmos
if (!Owner.EnsureComponent(out SnapGridComponent _))
Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition.ToString()} didn't have a {nameof(SnapGridComponent)}");
Owner.EntityManager.EventBus.SubscribeEvent<RotateEvent>(EventSource.Local, this, RotateEvent);
if(_fixAirBlockedDirectionInitialize)
RotateEvent(new RotateEvent(Owner, Angle.Zero, Owner.Transform.LocalRotation));
UpdatePosition();
}
private void RotateEvent(RotateEvent ev)
{
if (!_rotateAirBlocked || ev.Sender != Owner || ev.NewRotation == ev.OldRotation)
return;
var diff = ev.NewRotation - ev.OldRotation;
var newAirBlockedDirs = AtmosDirection.Invalid;
// When we make multiZ atmos, special case this.
for (int i = 0; i < Atmospherics.Directions; i++)
{
var direction = (AtmosDirection) i;
if (!AirBlockedDirection.HasFlag(direction)) continue;
var angle = direction.ToAngle();
angle += diff;
newAirBlockedDirs |= angle.ToAtmosDirectionCardinal();
}
AirBlockedDirection = newAirBlockedDirs;
}
public void MapInit()
{
if (Owner.TryGetComponent(out SnapGridComponent? snapGrid))