Better Lying Down System (From White Dream)

Content.Client/Buckle/BuckleSystem.cs

@@ -50,17 +50,11 @@ private void OnBuckleAfterAutoHandleState(EntityUid uid, BuckleComponent compone
 
     private void OnAppearanceChange(EntityUid uid, BuckleComponent component, ref AppearanceChangeEvent args)
     {
-        if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals))
+        if (!TryComp<RotationVisualsComponent>(uid, out var rotVisuals)
+            || !Appearance.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var buckled, args.Component)
+            || !buckled || args.Sprite == null)
             return;
 
-        if (!Appearance.TryGetData<bool>(uid, BuckleVisuals.Buckled, out var buckled, args.Component) ||
-            !buckled ||
-            args.Sprite == null)
-        {
-            _rotationVisualizerSystem.SetHorizontalAngle((uid, rotVisuals), rotVisuals.DefaultRotation);
-            return;
-        }
-
         // Animate strapping yourself to something at a given angle
         // TODO: Dump this when buckle is better
         _rotationVisualizerSystem.AnimateSpriteRotation(uid, args.Sprite, rotVisuals.HorizontalRotation, 0.125f);

Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs

@@ -2,6 +2,7 @@
 using Content.Client.Stylesheets;
 using Content.Shared.CCVar;
 using Content.Shared.Input;
+using Content.Shared.Standing;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -103,6 +104,12 @@ private void HandleStaticStorageUI(BaseButton.ButtonToggledEventArgs args)
             _cfg.SaveToFile();
         }
 
+        private void HandleToggleAutoGetUp(BaseButton.ButtonToggledEventArgs args)
+        {
+            _cfg.SetCVar(WhiteCVars.AutoGetUp, args.Pressed);
+            _cfg.SaveToFile();
+        }
+
         public KeyRebindTab()
         {
             IoCManager.InjectDependencies(this);
@@ -186,6 +193,9 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.OfferItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);
             AddButton(ContentKeyFunctions.ToggleStanding);
+            AddButton(ContentKeyFunctions.LookUp); // WD EDIT
+            AddCheckBox("ui-options-function-auto-get-up", _cfg.GetCVar(WhiteCVars.AutoGetUp), HandleToggleAutoGetUp);
+            AddCheckBox("ui-options-function-hold-look-up", _cfg.GetCVar(WhiteCVars.HoldLookUp), HandleHoldLookUp);
 
             AddHeader("ui-options-header-interaction-adv");
             AddButton(ContentKeyFunctions.SmartEquipBackpack);

Content.Client/_White/Standing/LayingDownSystem.cs

@@ -0,0 +1,71 @@
+using Content.Shared.Buckle;
+using Content.Shared.Rotation;
+using Content.Shared.Standing;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Shared.Timing;
+
+namespace Content.Client._White.Standing;
+
+public sealed class LayingDownSystem : SharedLayingDownSystem
+{
+    [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IEyeManager _eyeManager = default!;
+    [Dependency] private readonly StandingStateSystem _standing = default!;
+    [Dependency] private readonly AnimationPlayerSystem _animation = default!;
+    [Dependency] private readonly SharedBuckleSystem _buckle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<LayingDownComponent, MoveEvent>(OnMovementInput);
+
+        SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp);
+    }
+
+    private void OnMovementInput(EntityUid uid, LayingDownComponent component, MoveEvent args)
+    {
+        if (!_timing.IsFirstTimePredicted
+            || !_standing.IsDown(uid)
+            || _buckle.IsBuckled(uid)
+            || _animation.HasRunningAnimation(uid, "rotate")
+            || !TryComp<TransformComponent>(uid, out var transform)
+            || !TryComp<SpriteComponent>(uid, out var sprite)
+            || !TryComp<RotationVisualsComponent>(uid, out var rotationVisuals))
+            return;
+
+        var rotation = transform.LocalRotation + (_eyeManager.CurrentEye.Rotation - (transform.LocalRotation - transform.WorldRotation));
+
+        if (rotation.GetDir() is Direction.SouthEast or Direction.East or Direction.NorthEast or Direction.North)
+        {
+            rotationVisuals.HorizontalRotation = Angle.FromDegrees(270);
+            sprite.Rotation = Angle.FromDegrees(270);
+            return;
+        }
+
+        rotationVisuals.HorizontalRotation = Angle.FromDegrees(90);
+        sprite.Rotation = Angle.FromDegrees(90);
+    }
+
+    private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args)
+    {
+        if (!_timing.IsFirstTimePredicted)
+            return;
+
+        var uid = GetEntity(ev.User);
+
+        if (!TryComp<TransformComponent>(uid, out var transform) || !TryComp<RotationVisualsComponent>(uid, out var rotationVisuals))
+            return;
+
+        var rotation = transform.LocalRotation + (_eyeManager.CurrentEye.Rotation - (transform.LocalRotation - transform.WorldRotation));
+
+        if (rotation.GetDir() is Direction.SouthEast or Direction.East or Direction.NorthEast or Direction.North)
+        {
+            rotationVisuals.HorizontalRotation = Angle.FromDegrees(270);
+            return;
+        }
+
+        rotationVisuals.HorizontalRotation = Angle.FromDegrees(90);
+    }
+}

Content.Server/Standing/LayingDownSystem.cs

@@ -1,101 +1,27 @@
-using Content.Shared.ActionBlocker;
-using Content.Shared.Input;
-using Content.Shared.Movement.Systems;
-using Content.Shared.Popups;
 using Content.Shared.Standing;
-using Robust.Shared.Input.Binding;
-using Robust.Shared.Player;
-using Robust.Shared.Timing;
+using Robust.Shared.Configuration;
 
 namespace Content.Server.Standing;
 
-/// <remarks>Unfortunately cannot be shared because some standing conditions are server-side only</remarks>
-public sealed class LayingDownSystem : EntitySystem
+public sealed class LayingDownSystem : SharedLayingDownSystem
 {
-    [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
-    [Dependency] private readonly MovementSpeedModifierSystem _movement = default!;
-    [Dependency] private readonly SharedPopupSystem _popups = default!;
-    [Dependency] private readonly Shared.Standing.StandingStateSystem _standing = default!; // WHY IS THERE TWO DIFFERENT STANDING SYSTEMS?!
-    [Dependency] private readonly IGameTiming _timing = default!;
-
+    [Dependency] private readonly INetConfigurationManager _cfg = default!;
 
     public override void Initialize()
     {
-        CommandBinds.Builder
-            .Bind(ContentKeyFunctions.ToggleStanding, InputCmdHandler.FromDelegate(ToggleStanding, handle: false, outsidePrediction: false))
-            .Register<LayingDownSystem>();
-
-        SubscribeLocalEvent<LayingDownComponent, StoodEvent>(DoRefreshMovementSpeed);
-        SubscribeLocalEvent<LayingDownComponent, DownedEvent>(DoRefreshMovementSpeed);
-        SubscribeLocalEvent<LayingDownComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
-        SubscribeLocalEvent<LayingDownComponent, EntParentChangedMessage>(OnParentChanged);
-    }
-
-    public override void Shutdown()
-    {
-        base.Shutdown();
-
-        CommandBinds.Unregister<LayingDownSystem>();
-    }
+        base.Initialize();
 
-    private void DoRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, object args)
-    {
-        _movement.RefreshMovementSpeedModifiers(uid);
+        SubscribeNetworkEvent<CheckAutoGetUpEvent>(OnCheckAutoGetUp);
     }
 
-    private void OnRefreshMovementSpeed(EntityUid uid, LayingDownComponent component, RefreshMovementSpeedModifiersEvent args)
+    private void OnCheckAutoGetUp(CheckAutoGetUpEvent ev, EntitySessionEventArgs args)
     {
-        if (TryComp<StandingStateComponent>(uid, out var standingState) && standingState.Standing)
-            return;
+        var uid = GetEntity(ev.User);
 
-        args.ModifySpeed(component.DownedSpeedMultiplier, component.DownedSpeedMultiplier, bypassImmunity: true);
-    }
-
-    private void OnParentChanged(EntityUid uid, LayingDownComponent component, EntParentChangedMessage args)
-    {
-        // If the entity is not on a grid, try to make it stand up to avoid issues
-        if (!TryComp<StandingStateComponent>(uid, out var standingState)
-            || standingState.Standing
-            || Transform(uid).GridUid != null)
+        if (!TryComp(uid, out LayingDownComponent? layingDown))
             return;
 
-        _standing.Stand(uid, standingState);
-    }
-
-    private void ToggleStanding(ICommonSession? session)
-    {
-        if (session is not { AttachedEntity: { Valid: true } uid } playerSession
-            || !Exists(uid)
-            || !TryComp<StandingStateComponent>(uid, out var standingState)
-            || !TryComp<LayingDownComponent>(uid, out var layingDown))
-            return;
-
-        // If successful, show popup to self and others. Otherwise, only to self.
-        if (ToggleStandingImpl(uid, standingState, layingDown, out var popupBranch))
-        {
-            _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-other", ("entity", uid)), uid, Filter.PvsExcept(uid), true);
-            layingDown.NextToggleAttempt = _timing.CurTime + layingDown.Cooldown;
-        }
-
-        _popups.PopupEntity(Loc.GetString($"laying-comp-{popupBranch}-self", ("entity", uid)), uid, uid);
-    }
-
-    private bool ToggleStandingImpl(EntityUid uid, StandingStateComponent standingState, LayingDownComponent layingDown, out string popupBranch)
-    {
-        var success = layingDown.NextToggleAttempt <= _timing.CurTime;
-
-        if (_standing.IsDown(uid, standingState))
-        {
-            success = success && _standing.Stand(uid, standingState, force: false);
-            popupBranch = success ? "stand-success" : "stand-fail";
-        }
-        else
-        {
-            success = success && Transform(uid).GridUid != null; // Do not allow laying down when not on a surface.
-            success = success && _standing.Down(uid, standingState: standingState, playSound: true, dropHeldItems: false);
-            popupBranch = success ? "lay-success" : "lay-fail";
-        }
-
-        return success;
+        layingDown.AutoGetUp = _cfg.GetClientCVar(args.SenderSession.Channel, WhiteCVars.AutoGetUp);
+        Dirty(uid, layingDown);
     }
 }

Content.Server/Traits/Assorted/LayingDownModifierSystem.cs

@@ -1,5 +1,5 @@
 using Content.Server.Traits.Assorted;
-using Content.Server.Standing;
+using Content.Shared.Standing;
 
 namespace Content.Shared.Traits.Assorted.Systems;
 
@@ -16,7 +16,7 @@ private void OnStartup(EntityUid uid, LayingDownModifierComponent component, Com
         if (!TryComp<LayingDownComponent>(uid, out var layingDown))
             return;
 
-        layingDown.Cooldown *= component.LayingDownCooldownMultiplier;
-        layingDown.DownedSpeedMultiplier *= component.DownedSpeedMultiplierMultiplier;
+        layingDown.StandingUpTime *= component.LayingDownCooldownMultiplier;
+        layingDown.SpeedModify *= component.DownedSpeedMultiplierMultiplier;
     }
 }

Content.Shared/CCVar/CCVars.cs

@@ -2471,5 +2471,15 @@ public static readonly CVarDef<float>
             CVarDef.Create("mood.decreases_speed", true, CVar.SERVER);
 
         #endregion
+
+        #region Lying Down System
+
+        public static readonly CVarDef<bool> AutoGetUp =
+            CVarDef.Create("rest.auto_get_up", true, CVar.CLIENT | CVar.ARCHIVE | CVar.REPLICATED);
+
+        public static readonly CVarDef<bool> HoldLookUp =
+            CVarDef.Create("rest.hold_look_up", false, CVar.CLIENT | CVar.ARCHIVE);
+
+        #endregion
     }
 }

Content.Shared/Standing/LayingDownComponent.cs

@@ -0,0 +1,26 @@
+using Robust.Shared.GameStates;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Standing;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class LayingDownComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public float StandingUpTime { get; set; } = 1f;
+
+    [DataField, AutoNetworkedField]
+    public float SpeedModify { get; set; } = 0.4f;
+
+    [DataField, AutoNetworkedField]
+    public bool AutoGetUp;
+}
+
+[Serializable, NetSerializable]
+public sealed class ChangeLayingDownEvent : CancellableEntityEventArgs;
+
+[Serializable, NetSerializable]
+public sealed class CheckAutoGetUpEvent(NetEntity user) : CancellableEntityEventArgs
+{
+    public NetEntity User = user;
+}