Rework climbing (#7706)

Content.Shared/Climbing/SharedClimbingComponent.cs

@@ -1,122 +1,38 @@
-using Content.Shared.ActionBlocker;
-using Content.Shared.Physics;
 using Robust.Shared.GameStates;
-using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Climbing
+namespace Content.Shared.Climbing;
+
+[NetworkedComponent]
+public abstract class SharedClimbingComponent : Component
 {
-    [NetworkedComponent()]
-    public abstract class SharedClimbingComponent : Component
+    /// <summary>
+    /// Whether the owner is climbing on a climbable entity.
+    /// </summary>
+    [ViewVariables]
+    public virtual bool IsClimbing { get; set; }
+
+    /// <summary>
+    /// Whether the owner is being moved onto the climbed entity.
+    /// </summary>
+    [ViewVariables]
+    public virtual bool OwnerIsTransitioning { get; set; }
+
+    /// <summary>
+    ///     We'll launch the mob onto the table and give them at least this amount of time to be on it.
+    /// </summary>
+    public const float BufferTime = 0.3f;
+
+    [Serializable, NetSerializable]
+    public sealed class ClimbModeComponentState : ComponentState
     {
-        [Dependency] private readonly IEntityManager _entMan = default!;
-        [Dependency] private readonly IEntitySystemManager _sysMan = default!;
-
-        /// <summary>
-        ///     List of fixtures that had vault-impassable prior to an entity being downed. Required when re-adding the
-        ///     collision mask.
-        /// </summary>
-        [DataField("vaultImpassableFixtures")]
-        public List<string> VaultImpassableFixtures = new();
-
-        protected bool IsOnClimbableThisFrame
+        public ClimbModeComponentState(bool climbing, bool isTransitioning)
         {
-            get
-            {
-                if (!_entMan.TryGetComponent<PhysicsComponent>(Owner, out var physicsComponent)) return false;
-
-                foreach (var entity in physicsComponent.GetBodiesIntersecting())
-                {
-                    if ((entity.CollisionLayer & (int) CollisionGroup.VaultImpassable) != 0) return true;
-                }
-
-                return false;
-            }
+            Climbing = climbing;
+            IsTransitioning = isTransitioning;
         }
 
-        [ViewVariables]
-        public virtual bool OwnerIsTransitioning
-        {
-            get => _ownerIsTransitioning;
-            set
-            {
-                if (_ownerIsTransitioning == value) return;
-                _ownerIsTransitioning = value;
-                if (!_entMan.TryGetComponent<PhysicsComponent>(Owner, out var physicsComponent)) return;
-                if (value)
-                {
-                    physicsComponent.BodyType = BodyType.Dynamic;
-                }
-                else
-                {
-                    physicsComponent.BodyType = BodyType.KinematicController;
-                }
-
-                _sysMan.GetEntitySystem<ActionBlockerSystem>().UpdateCanMove(Owner);
-            }
-        }
-
-        private bool _ownerIsTransitioning = false;
-
-        protected TimeSpan StartClimbTime = TimeSpan.Zero;
-
-        /// <summary>
-        ///     We'll launch the mob onto the table and give them at least this amount of time to be on it.
-        /// </summary>
-        public const float BufferTime = 0.3f;
-
-        public virtual bool IsClimbing
-        {
-            get => _isClimbing;
-            set
-            {
-                if (_isClimbing == value) return;
-                _isClimbing = value;
-
-                ToggleSmallPassable(value);
-            }
-        }
-
-        private bool _isClimbing;
-
-        // TODO: Layers need a re-work
-        private void ToggleSmallPassable(bool value)
-        {
-            // Hope the mob has one fixture
-            if (!_entMan.TryGetComponent<FixturesComponent>(Owner, out var fixturesComponent) || fixturesComponent.Deleted) return;
-
-            if (value)
-            {
-                foreach (var (key, fixture) in fixturesComponent.Fixtures)
-                {
-                    if ((fixture.CollisionMask & (int) CollisionGroup.VaultImpassable) == 0)
-                        continue;
-
-                    VaultImpassableFixtures.Add(key);
-                    fixture.CollisionMask &= ~(int) CollisionGroup.VaultImpassable;
-                }
-                return;
-            }
-
-            foreach (var key in VaultImpassableFixtures)
-            {
-                if (fixturesComponent.Fixtures.TryGetValue(key, out var fixture))
-                    fixture.CollisionMask |= (int) CollisionGroup.VaultImpassable;
-            }
-            VaultImpassableFixtures.Clear();
-        }
-
-        [Serializable, NetSerializable]
-        protected sealed class ClimbModeComponentState : ComponentState
-        {
-            public ClimbModeComponentState(bool climbing, bool isTransitioning)
-            {
-                Climbing = climbing;
-                IsTransitioning = isTransitioning;
-            }
-
-            public bool Climbing { get; }
-            public bool IsTransitioning { get; }
-        }
+        public bool Climbing { get; }
+        public bool IsTransitioning { get; }
     }
 }