Merge pull request #335 from Corvax-Frontier/revert-325-lie-down-2

Revert "Ляжания вторая попытка - ДОДЕЛАННОЕ, РАБОЧЕЕ ГАВНО"

Content.Client/Input/ContentContexts.cs

@@ -81,7 +81,6 @@ public static void SetupContexts(IInputContextContainer contexts)
             human.AddFunction(ContentKeyFunctions.Arcade1);
             human.AddFunction(ContentKeyFunctions.Arcade2);
             human.AddFunction(ContentKeyFunctions.Arcade3);
-            human.AddFunction(ContentKeyFunctions.LieDownStandUp);
 
             // actions should be common (for ghosts, mobs, etc)
             common.AddFunction(ContentKeyFunctions.OpenActionsMenu);

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

@@ -181,7 +181,6 @@ void AddCheckBox(string checkBoxName, bool currentState, Action<BaseButton.Butto
             AddButton(ContentKeyFunctions.Drop);
             AddButton(ContentKeyFunctions.ExamineEntity);
             AddButton(ContentKeyFunctions.SwapHands);
-            AddButton(ContentKeyFunctions.LieDownStandUp);
             AddButton(ContentKeyFunctions.MoveStoredItem);
             AddButton(ContentKeyFunctions.RotateStoredItem);
             AddButton(ContentKeyFunctions.SaveItemLocation);

Content.Shared/Input/ContentKeyFunctions.cs

@@ -56,7 +56,6 @@ public static class ContentKeyFunctions
         public static readonly BoundKeyFunction ZoomOut = "ZoomOut";
         public static readonly BoundKeyFunction ZoomIn = "ZoomIn";
         public static readonly BoundKeyFunction ResetZoom = "ResetZoom";
-        public static readonly BoundKeyFunction LieDownStandUp = "LieDownStandUp";
 
         public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp";
         public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown";

Content.Shared/Standing/StandingStateComponent.cs

@@ -1,45 +1,24 @@
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
-using Content.Shared.Actions;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Shared.Standing;
-
-
-[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
-[Access(typeof(StandingStateSystem))]
-public sealed partial class StandingStateComponent : Component
+namespace Content.Shared.Standing
 {
-    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField]
-    public SoundSpecifier DownSound { get; private set; } = new SoundCollectionSpecifier("BodyFall");
-
-    [DataField, AutoNetworkedField]
-    public bool Standing = true;
-
-    /// <summary>
-    ///     List of fixtures that had their collision mask changed when the entity was downed.
-    ///     Required for re-adding the collision mask.
-    /// </summary>
-    [DataField, AutoNetworkedField]
-    public List<string> ChangedFixtures = new();
-
-    [DataField]
-    public EntProtoId LieDownAction = "ActionLieDown";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? LieDownActionEntity;
-
-    [DataField("stand-up-action")]
-    public EntProtoId StandUpAction = "ActionStandUp";
-
-    [DataField, AutoNetworkedField]
-    public EntityUid? StandUpActionEntity;
+    [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+    [Access(typeof(StandingStateSystem))]
+    public sealed partial class StandingStateComponent : Component
+    {
+        [ViewVariables(VVAccess.ReadWrite)]
+        [DataField]
+        public SoundSpecifier DownSound { get; private set; } = new SoundCollectionSpecifier("BodyFall");
+
+        [DataField, AutoNetworkedField]
+        public bool Standing { get; set; } = true;
+
+        /// <summary>
+        ///     List of fixtures that had their collision mask changed when the entity was downed.
+        ///     Required for re-adding the collision mask.
+        /// </summary>
+        [DataField, AutoNetworkedField]
+        public List<string> ChangedFixtures = new();
+    }
 }
-
-public sealed partial class LieDownActionEvent : InstantActionEvent {}
-public sealed partial class StandUpActionEvent : InstantActionEvent {}
-

Content.Shared/Standing/StandingStateSystem.cs

@@ -1,7 +1,4 @@
-using Content.Shared.Actions;
 using Content.Shared.Hands.Components;
-using Content.Shared.LieDown;
-using Content.Shared.Movement.Systems;
 using Content.Shared.Physics;
 using Content.Shared.Rotation;
 using Robust.Shared.Audio;
@@ -16,20 +13,10 @@ public sealed class StandingStateSystem : EntitySystem
         [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-        [Dependency] private readonly SharedActionsSystem _actions = default!;
-        [Dependency] private readonly SharedLieDownSystem _lieDown = default!;
-        [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
 
         // If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited.
-        private const int StandingCollisionLayer = (int)CollisionGroup.MidImpassable;
+        private const int StandingCollisionLayer = (int) CollisionGroup.MidImpassable;
 
-        public override void Initialize()
-        {
-            SubscribeLocalEvent<StandingStateComponent, ComponentStartup>(OnComponentInit);
-            SubscribeLocalEvent<StandingStateComponent, LieDownActionEvent>(OnLieDownAction);
-            SubscribeLocalEvent<StandingStateComponent, StandUpActionEvent>(OnStandUpAction);
-            SubscribeLocalEvent<StandingStateComponent, MapInitEvent>(OnMapInit);
-        }
         public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
         {
             if (!Resolve(uid, ref standingState, false))
@@ -38,37 +25,6 @@ public bool IsDown(EntityUid uid, StandingStateComponent? standingState = null)
             return !standingState.Standing;
         }
 
-        private void OnMapInit(EntityUid uid, StandingStateComponent component, MapInitEvent args)
-        {
-            _actionContainer.EnsureAction(uid, ref component.LieDownActionEntity, component.LieDownAction);
-            _actionContainer.EnsureAction(uid, ref component.StandUpActionEntity, component.StandUpAction);
-            Dirty(uid, component);
-        }
-
-        /// <summary>
-        ///     When component is added to player, add an action.
-        /// </summary>
-        private void OnComponentInit(EntityUid uid, StandingStateComponent component, ComponentStartup args)
-        {
-            _actions.AddAction(uid, ref component.LieDownActionEntity, component.LieDownAction);
-        }
-
-        /// <summary>
-        ///     Event that being risen on lie down attempt.
-        /// </summary>
-        private void OnLieDownAction(EntityUid uid, StandingStateComponent component, LieDownActionEvent args)
-        {
-            _lieDown.TryLieDown(uid);
-        }
-
-        /// <summary>
-        ///     Event that being risen on stand up attempt.
-        /// </summary>
-        private void OnStandUpAction(EntityUid uid, StandingStateComponent component, StandUpActionEvent args)
-        {
-            _lieDown.TryStandUp(uid);
-        }
-
         public bool Down(EntityUid uid, bool playSound = true, bool dropHeldItems = true,
             StandingStateComponent? standingState = null,
             AppearanceComponent? appearance = null,

Resources/keybinds.yml

@@ -1,4 +1,4 @@
-version: 1 # Not used right now, whatever.
+version: 1 # Not used right now, whatever.
 binds:
 - function: UIClick
   type: State
@@ -540,7 +540,3 @@ binds:
 - function: Hotbar9
   type: State
   key: Num9
-- function: LieDownStandUp
-  type: State
-  key: Z
-  mod1: Shift