silent footsteps for ninja (#33280)

* waow

* nice suggestion

* nullable sound

* fix stuff

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

diff --git a/Content.Client/Tips/TippyUIController.cs b/Content.Client/Tips/TippyUIController.cs
index 7737a3d6982e20616a6bd4242aa6fe8de711285f..77c10193a5d1fc45cfe809e5a4170b4e7dac7b48 100644 (file)
--- a/Content.Client/Tips/TippyUIController.cs
+++ b/Content.Client/Tips/TippyUIController.cs
@@ -104,7 +104,7 @@ public sealed class TippyUIController : UIController
                 ? -WaddleRotation
                 : WaddleRotation;
 
-            if (EntityManager.TryGetComponent(_entity, out FootstepModifierComponent? step))
+            if (EntityManager.TryGetComponent(_entity, out FootstepModifierComponent? step) && step.FootstepSoundCollection != null)
             {
                 var audioParams = step.FootstepSoundCollection.Params
                     .AddVolume(-7f)

diff --git a/Content.Shared/Movement/Components/FootstepModifierComponent.cs b/Content.Shared/Movement/Components/FootstepModifierComponent.cs
index bd7b5377bd49de1ba1f43c12a6c3665d5a9aa2e6..e658f6d948bb99df3da26b24bc5de001e8a28e29 100644 (file)
--- a/Content.Shared/Movement/Components/FootstepModifierComponent.cs
+++ b/Content.Shared/Movement/Components/FootstepModifierComponent.cs
@@ -9,6 +9,6 @@ namespace Content.Shared.Movement.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class FootstepModifierComponent : Component
 {
-    [DataField(required: true), AutoNetworkedField]
-    public SoundSpecifier FootstepSoundCollection = default!;
+    [DataField, AutoNetworkedField]
+    public SoundSpecifier? FootstepSoundCollection;
 }

diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs
index 472d56b1d692d71619f0ef5b51df6454be8ff05d..5de74d72940802731ac2c77439cc0796abdff810 100644 (file)
--- a/Content.Shared/Movement/Systems/SharedMoverController.cs
+++ b/Content.Shared/Movement/Systems/SharedMoverController.cs
@@ -439,14 +439,14 @@ public abstract partial class SharedMoverController : VirtualController
         if (FootstepModifierQuery.TryComp(uid, out var moverModifier))
         {
             sound = moverModifier.FootstepSoundCollection;
-            return true;
+            return sound != null;
         }
 
         if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) &&
             FootstepModifierQuery.TryComp(shoes, out var modifier))
         {
             sound = modifier.FootstepSoundCollection;
-            return true;
+            return sound != null;
         }
 
         return TryGetFootstepSound(uid, xform, shoes != null, out sound, tileDef: tileDef);
@@ -467,10 +467,9 @@ public abstract partial class SharedMoverController : VirtualController
             if (FootstepModifierQuery.TryComp(xform.MapUid, out var modifier))
             {
                 sound = modifier.FootstepSoundCollection;
-                return true;
             }
 
-            return false;
+            return sound != null;
         }
 
         var position = grid.LocalToTile(xform.Coordinates);
@@ -493,7 +492,7 @@ public abstract partial class SharedMoverController : VirtualController
             if (FootstepModifierQuery.TryComp(maybeFootstep, out var footstep))
             {
                 sound = footstep.FootstepSoundCollection;
-                return true;
+                return sound != null;
             }
         }
 

diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
index 87a0c06c4a0b557b5b8ff74729525789a239fc85..46fb16b1f25805ceb9dcb786ba4077b75b5e9fb4 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
@@ -136,6 +136,9 @@
     # ninja are masters of sneaking around relatively quickly, won't break cloak
     walkModifier: 1.1
     sprintModifier: 1.3
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: null
 
 - type: entity
   parent: ClothingShoesBaseButcherable