Update CarryingSystem And ContestsSystem

Content.Server/Nyanotrasen/Carrying/CarriableComponent.cs → Content.Server/_EE/Carrying/CarriableComponent.cs

@@ -9,9 +9,16 @@ public sealed partial class CarriableComponent : Component
         ///     Number of free hands required
         ///     to carry the entity
         /// </summary>
-        [DataField("freeHandsRequired")]
+        [DataField]
         public int FreeHandsRequired = 2;
 
         public CancellationTokenSource? CancelToken;
+
+        /// <summary>
+        ///     The base duration (In Seconds) of how long it should take to pick up this entity
+        ///     before Contests are considered.
+        /// </summary>
+        [DataField]
+        public float PickupDuration = 3;
     }
 }

Content.Shared/CCVar/CCVars.cs

@@ -2279,5 +2279,62 @@ public static readonly CVarDef<float>
         /// </summary>
         public static readonly CVarDef<bool> DebugPow3rDisableParallel =
             CVarDef.Create("debug.pow3r_disable_parallel", true, CVar.SERVERONLY);
+
+        // Start EE Code
+        #region Contests System
+
+        /// <summary>
+        ///     The MASTER TOGGLE for the entire Contests System.
+        ///     ALL CONTESTS BELOW, regardless of type or setting will output 1f when false.
+        /// </summary>
+        public static readonly CVarDef<bool> DoContestsSystem =
+            CVarDef.Create("contests.do_contests_system", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Contest functions normally include an optional override to bypass the clamp set by max_percentage.
+        ///     This CVar disables the bypass when false, forcing all implementations to comply with max_percentage.
+        /// </summary>
+        public static readonly CVarDef<bool> AllowClampOverride =
+            CVarDef.Create("contests.allow_clamp_override", true, CVar.REPLICATED | CVar.SERVER);
+        /// <summary>
+        ///     Toggles all MassContest functions. All mass contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoMassContests =
+            CVarDef.Create("contests.do_mass_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles all StaminaContest functions. All stamina contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoStaminaContests =
+            CVarDef.Create("contests.do_stamina_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles all HealthContest functions. All health contests output 1f when false
+        /// </summary>
+        public static readonly CVarDef<bool> DoHealthContests =
+            CVarDef.Create("contests.do_health_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles all MindContest functions. All mind contests output 1f when false.
+        ///     MindContests are not currently implemented, and are awaiting completion of the Psionic Refactor
+        /// </summary>
+        public static readonly CVarDef<bool> DoMindContests =
+            CVarDef.Create("contests.do_mind_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     Toggles all MoodContest functions. All mood contests output 1f when false.
+        /// </summary>
+        public static readonly CVarDef<bool> DoMoodContests =
+            CVarDef.Create("contests.do_mood_contests", true, CVar.REPLICATED | CVar.SERVER);
+
+        /// <summary>
+        ///     The maximum amount that Mass Contests can modify a physics multiplier, given as a +/- percentage
+        ///     Default of 0.25f outputs between * 0.75f and 1.25f
+        /// </summary>
+        public static readonly CVarDef<float> MassContestsMaxPercentage =
+            CVarDef.Create("contests.max_percentage", 0.25f, CVar.REPLICATED | CVar.SERVER);
+
+        #endregion
+        // End EE Code
     }
 }

Content.Shared/_EE/Carrying/CarryingDoAfterEvent.cs

@@ -0,0 +1,8 @@
+using Robust.Shared.Serialization;
+using Content.Shared.DoAfter;
+
+namespace Content.Shared.Carrying
+{
+    [Serializable, NetSerializable]
+    public sealed partial class CarryDoAfterEvent : SimpleDoAfterEvent { }
+}

Content.Shared/Nyanotrasen/Carrying/CarryingSlowdownComponent.cs → Content.Shared/_EE/Carrying/CarryingSlowdownComponent.cs

@@ -7,15 +7,15 @@ namespace Content.Shared.Carrying
 
     public sealed partial class CarryingSlowdownComponent : Component
     {
-        [DataField("walkModifier", required: true)] [ViewVariables(VVAccess.ReadWrite)]
+        [DataField(required: true)]
         public float WalkModifier = 1.0f;
 
-        [DataField("sprintModifier", required: true)] [ViewVariables(VVAccess.ReadWrite)]
+        [DataField(required: true)]
         public float SprintModifier = 1.0f;
     }
 
     [Serializable, NetSerializable]
-    public sealed partial class CarryingSlowdownComponentState : ComponentState
+    public sealed class CarryingSlowdownComponentState : ComponentState
     {
         public float WalkModifier;
         public float SprintModifier;

Content.Shared/Nyanotrasen/Carrying/CarryingSlowdownSystem.cs → Content.Shared/_EE/Carrying/CarryingSlowdownSystem.cs

@@ -31,13 +31,12 @@ private void OnGetState(EntityUid uid, CarryingSlowdownComponent component, ref
 
         private void OnHandleState(EntityUid uid, CarryingSlowdownComponent component, ref ComponentHandleState args)
         {
-            if (args.Current is CarryingSlowdownComponentState state)
-            {
-                component.WalkModifier = state.WalkModifier;
-                component.SprintModifier = state.SprintModifier;
+            if (args.Current is not CarryingSlowdownComponentState state)
+                return;
 
-                _movementSpeed.RefreshMovementSpeedModifiers(uid);
-            }
+            component.WalkModifier = state.WalkModifier;
+            component.SprintModifier = state.SprintModifier;
+            _movementSpeed.RefreshMovementSpeedModifiers(uid);
         }
         private void OnRefreshMoveSpeed(EntityUid uid, CarryingSlowdownComponent component, RefreshMovementSpeedModifiersEvent args)
         {