Add delay to AutoOrient (#33479)

It functions identically to how V1 of orientation worked and it's incredibly annoying.

diff --git a/Content.Shared/CCVar/CCVars.Shuttle.cs b/Content.Shared/CCVar/CCVars.Shuttle.cs
index f66fe9ca598d0402272204b910476a7563995cf9..caf7f81b0e135795d257bd9c3e38a7ef4e3d292f 100644 (file)
--- a/Content.Shared/CCVar/CCVars.Shuttle.cs
+++ b/Content.Shared/CCVar/CCVars.Shuttle.cs
@@ -4,6 +4,12 @@ namespace Content.Shared.CCVar;
 
 public sealed partial class CCVars
 {
+    /// <summary>
+    ///     Delay for auto-orientation. Used for people arriving via arrivals.
+    /// </summary>
+    public static readonly CVarDef<double> AutoOrientDelay =
+        CVarDef.Create("shuttle.auto_orient_delay", 2.0, CVar.SERVER | CVar.REPLICATED);
+
     /// <summary>
     ///     If true then the camera will match the grid / map and is unchangeable.
     ///     - When traversing grids it will snap to 0 degrees rotation.

diff --git a/Content.Shared/Movement/Components/AutoOrientComponent.cs b/Content.Shared/Movement/Components/AutoOrientComponent.cs
index 4b89b0cbf4270d58adea89547b4e04f6a50dee77..1031425c7172c05c7d0fd4d41cd3b4e796d7bc53 100644 (file)
--- a/Content.Shared/Movement/Components/AutoOrientComponent.cs
+++ b/Content.Shared/Movement/Components/AutoOrientComponent.cs
@@ -5,8 +5,9 @@ namespace Content.Shared.Movement.Components;
 /// <summary>
 /// Automatically rotates eye upon grid traversals.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, AutoGenerateComponentPause]
 public sealed partial class AutoOrientComponent : Component
 {
-
+    [DataField, AutoNetworkedField, AutoPausedField]
+    public TimeSpan? NextChange;
 }

diff --git a/Content.Shared/Movement/Systems/AutoOrientSystem.cs b/Content.Shared/Movement/Systems/AutoOrientSystem.cs
new file mode 100644 (file)
index 0000000..3bbd715
--- /dev/null
+++ b/Content.Shared/Movement/Systems/AutoOrientSystem.cs
@@ -0,0 +1,51 @@
+using Content.Shared.CCVar;
+using Content.Shared.Movement.Components;
+using Robust.Shared.Configuration;
+using Robust.Shared.Timing;
+
+namespace Content.Shared.Movement.Systems;
+
+public sealed class AutoOrientSystem : EntitySystem
+{
+    [Dependency] private readonly IConfigurationManager _cfgManager = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly SharedMoverController _mover = default!;
+
+    private TimeSpan _delay = TimeSpan.Zero;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<AutoOrientComponent, EntParentChangedMessage>(OnEntParentChanged);
+
+        Subs.CVar(_cfgManager, CCVars.AutoOrientDelay, OnAutoOrient, true);
+    }
+
+    private void OnAutoOrient(double obj)
+    {
+        _delay = TimeSpan.FromSeconds(obj);
+    }
+
+    private void OnEntParentChanged(Entity<AutoOrientComponent> ent, ref EntParentChangedMessage args)
+    {
+        ent.Comp.NextChange = _timing.CurTime + _delay;
+        Dirty(ent);
+    }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<AutoOrientComponent>();
+
+        while (query.MoveNext(out var uid, out var comp))
+        {
+            if (comp.NextChange <= _timing.CurTime)
+            {
+                comp.NextChange = null;
+                Dirty(uid, comp);
+                _mover.ResetCamera(uid);
+            }
+        }
+    }
+}

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
index c11df709f631ba14b22ef14ce859c135ce46c9b5..1fe38b6cdf1b6cc5fe7fe6045bb47dc701a43863 100644 (file)
--- a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -57,8 +57,6 @@ namespace Content.Shared.Movement.Systems
             SubscribeLocalEvent<InputMoverComponent, ComponentHandleState>(OnMoverHandleState);
             SubscribeLocalEvent<InputMoverComponent, EntParentChangedMessage>(OnInputParentChange);
 
-            SubscribeLocalEvent<AutoOrientComponent, EntParentChangedMessage>(OnAutoParentChange);
-
             SubscribeLocalEvent<FollowedComponent, EntParentChangedMessage>(OnFollowedParentChange);
 
             Subs.CVar(_configManager, CCVars.CameraRotationLocked, obj => CameraRotationLocked = obj, true);
@@ -146,11 +144,6 @@ namespace Content.Shared.Movement.Systems
 
         protected virtual void HandleShuttleInput(EntityUid uid, ShuttleButtons button, ushort subTick, bool state) {}
 
-        private void OnAutoParentChange(Entity<AutoOrientComponent> entity, ref EntParentChangedMessage args)
-        {
-            ResetCamera(entity.Owner);
-        }
-
         public void RotateCamera(EntityUid uid, Angle angle)
         {
             if (CameraRotationLocked || !MoverQuery.TryGetComponent(uid, out var mover))