Back action move mode changer

Workbench-Team · Sep 17, 2023 · ea7541f · ea7541f
1 parent b83c43a
commit ea7541f
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 4 deletions.
diff --git a/Content.Shared/Movement/Components/InputMoverComponent.cs b/Content.Shared/Movement/Components/InputMoverComponent.cs
@@ -3,6 +3,8 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Timing;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Shared.Movement.Components
 {
@@ -72,5 +74,14 @@ public sealed partial class InputMoverComponent : Component
 
         [ViewVariables(VVAccess.ReadWrite)]
         public bool CanMove { get; set; } = true;
+
+        [DataField("moveModeToggleAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
+        public string MoveModeToggleAction = "ActionMoveModeToggle";
+
+        [DataField("moveModeToggleActionEntity")]
+        public EntityUid? MoveModeToggleActionEntity;
+
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool SprintMove { get; set; } = true;
     }
 }
diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Input.cs b/Content.Shared/Movement/Systems/SharedMoverController.Input.cs
@@ -1,4 +1,5 @@
 using System.Numerics;
+using Content.Shared.Actions;
 using Content.Shared.CCVar;
 using Content.Shared.Follower.Components;
 using Content.Shared.Input;
@@ -19,6 +20,8 @@ namespace Content.Shared.Movement.Systems
     /// </summary>
     public abstract partial class SharedMoverController
     {
+        [Dependency] private   readonly SharedActionsSystem _actionsSystem = default!;
+
         public bool CameraRotationLocked { get; set; }
 
         private void InitializeInput()
@@ -49,9 +52,11 @@ private void InitializeInput()
                 .Register<SharedMoverController>();
 
             SubscribeLocalEvent<InputMoverComponent, ComponentInit>(OnInputInit);
+            SubscribeLocalEvent<InputMoverComponent, MapInitEvent>(OnInputMapInit);
             SubscribeLocalEvent<InputMoverComponent, ComponentGetState>(OnInputGetState);
             SubscribeLocalEvent<InputMoverComponent, ComponentHandleState>(OnInputHandleState);
             SubscribeLocalEvent<InputMoverComponent, EntParentChangedMessage>(OnInputParentChange);
+            SubscribeLocalEvent<InputMoverComponent, ToggleMoveModeActionEvent>(OnActionPerform);
 
             SubscribeLocalEvent<AutoOrientComponent, EntParentChangedMessage>(OnAutoParentChange);
 
@@ -89,6 +94,9 @@ private void OnInputHandleState(EntityUid uid, InputMoverComponent component, re
             component.TargetRelativeRotation = state.TargetRelativeRotation;
             component.RelativeEntity = EnsureEntity<InputMoverComponent>(state.RelativeEntity, uid);
             component.LerpTarget = state.LerpAccumulator;
+            if (state.ActionEntity is not null)
+                component.MoveModeToggleActionEntity = EnsureEntity<ActionsComponent>(state.ActionEntity, uid);
+            component.SprintMove = state.SprintMove;
         }
 
         private void OnInputGetState(EntityUid uid, InputMoverComponent component, ref ComponentGetState args)
@@ -99,7 +107,9 @@ private void OnInputGetState(EntityUid uid, InputMoverComponent component, ref C
                 component.RelativeRotation,
                 component.TargetRelativeRotation,
                 GetNetEntity(component.RelativeEntity),
-                component.LerpTarget);
+                component.LerpTarget,
+                GetNetEntity(component.MoveModeToggleActionEntity),
+                component.SprintMove);
         }
 
         private void ShutdownInput()
@@ -261,6 +271,24 @@ private void OnInputParentChange(EntityUid uid, InputMoverComponent component, r
             Dirty(uid, component);
         }
 
+        private void OnActionPerform(EntityUid uid, InputMoverComponent component, ToggleMoveModeActionEvent args)
+        {
+            if (args.Handled)
+                return;
+
+            var movementSpeed = EnsureComp<MovementSpeedModifierComponent>(uid);
+            (movementSpeed.BaseSprintSpeed, movementSpeed.BaseWalkSpeed) = (movementSpeed.BaseWalkSpeed, movementSpeed.BaseSprintSpeed);
+
+            component.SprintMove = !component.SprintMove;
+
+            if (component.MoveModeToggleActionEntity != null)
+                _actionsSystem.SetToggled(component.MoveModeToggleActionEntity, component.SprintMove);
+
+            Dirty(uid, movementSpeed);
+
+            args.Handled = true;
+        }
+
         private void HandleDirChange(EntityUid entity, Direction dir, ushort subTick, bool state)
         {
             // Relayed movement just uses the same keybinds given we're moving the relayed entity
@@ -313,6 +341,11 @@ private void OnInputInit(EntityUid uid, InputMoverComponent component, Component
             component.TargetRelativeRotation = Angle.Zero;
         }
 
+        private void OnInputMapInit(EntityUid uid, InputMoverComponent component, MapInitEvent args)
+        {
+            _actionsSystem.AddAction(uid, ref component.MoveModeToggleActionEntity, component.MoveModeToggleAction);
+        }
+
         private void HandleRunChange(EntityUid uid, ushort subTick, bool walking)
         {
             MoverQuery.TryGetComponent(uid, out var moverComp);
@@ -582,14 +615,19 @@ private sealed class InputMoverComponentState : ComponentState
             public NetEntity? RelativeEntity;
             public TimeSpan LerpAccumulator;
 
-            public InputMoverComponentState(MoveButtons buttons, bool canMove, Angle relativeRotation, Angle targetRelativeRotation, NetEntity? relativeEntity, TimeSpan lerpTarget)
+            public NetEntity? ActionEntity;
+            public bool SprintMove;
+
+            public InputMoverComponentState(MoveButtons buttons, bool canMove, Angle relativeRotation, Angle targetRelativeRotation, NetEntity? relativeEntity, TimeSpan lerpTarget, NetEntity? actionEntity, bool sprintMove)
             {
                 Buttons = buttons;
                 CanMove = canMove;
                 RelativeRotation = relativeRotation;
                 TargetRelativeRotation = targetRelativeRotation;
                 RelativeEntity = relativeEntity;
                 LerpAccumulator = lerpTarget;
+                ActionEntity = actionEntity;
+                SprintMove = sprintMove;
             }
         }
 
@@ -638,4 +676,5 @@ public enum ShuttleButtons : byte
         Brake = 1 << 6,
     }
 
+    public sealed partial class ToggleMoveModeActionEvent : InstantActionEvent { }
 }
diff --git a/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl b/Resources/Locale/en-US/escape-menu/ui/options-menu.ftl
@@ -87,7 +87,7 @@ ui-options-function-move-up = Move Up
 ui-options-function-move-left = Move Left
 ui-options-function-move-down = Move Down
 ui-options-function-move-right = Move Right
-ui-options-function-walk = Walk
+ui-options-function-walk = Walk/Sprint
 
 ui-options-function-camera-rotate-left = Rotate left
 ui-options-function-camera-rotate-right = Rotate right

diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/actions/types.ftl
@@ -61,3 +61,6 @@ ent-ActionWake = Wake up
 ent-ActionActivateHonkImplant = Honk
     .desc = Activates your honking implant, which will produce the signature sound of the clown.
     .suffix = { "" }
+ent-ActionMoveModeToggle = Toggle sprint
+    .desc = Settings walk/sprint move mode by default.
+    .suffix = { "" }
diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl
@@ -84,7 +84,7 @@ ui-options-function-move-up = Двигаться вверх
 ui-options-function-move-left = Двигаться налево
 ui-options-function-move-down = Двигаться вниз
 ui-options-function-move-right = Двигаться направо
-ui-options-function-walk = Идти
+ui-options-function-walk = Идти/Бежать
 ui-options-function-camera-rotate-left = Повернуть налево
 ui-options-function-camera-rotate-right = Повернуть направо
 ui-options-function-camera-reset = Сбросить камеру

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl
@@ -61,3 +61,6 @@ ent-ActionWake = Проснуться
 ent-ActionActivateHonkImplant = Хонк
     .desc = Активирует ваш хонкающий имплантат, который будет издавать фирменный звук клоуна.
     .suffix = { "" }
+ent-ActionMoveModeToggle = Переключение ходьба/бег
+    .desc = Устанавливает ходьбу/бег по умолчанию.
+    .suffix = { "" }
diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml
@@ -254,3 +254,16 @@
     icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon }
     event: !type:ActivateImplantEvent
     useDelay: 1
+
+- type: entity
+  id: ActionMoveModeToggle
+  name: "Toggle sprint"
+  description: Toggles walk/sprint mode by default
+  noSpawn: true
+  components:
+  - type: InstantAction
+    checkCanInteract: false
+    icon: Interface/Actions/running.png
+    iconOn: Interface/Actions/walking.png
+    event: !type:ToggleMoveModeActionEvent
+    priority: -20
diff --git a/Resources/Textures/Interface/Actions/running.png b/Resources/Textures/Interface/Actions/running.png
diff --git a/Resources/Textures/Interface/Actions/walking.png b/Resources/Textures/Interface/Actions/walking.png