Feet update (#9344)

* Footstep sounds update

* adjustments I thought of

Content.Shared/Movement/Systems/SharedMoverController.cs

@@ -36,7 +36,8 @@ namespace Content.Shared.Movement.Systems
         private const float StepSoundMoveDistanceWalking = 1.5f;
 
         private const float FootstepVariation = 0f;
-        private const float FootstepVolume = 1f;
+        private const float FootstepVolume = 6f;
+        private const float FootstepWalkingVolumeModifier = 0.2f;
 
         /// <summary>
         /// <see cref="CCVars.MinimumFrictionSpeed"/>
@@ -275,11 +276,12 @@ namespace Content.Shared.Movement.Systems
                     : worldTotal.ToWorldAngle();
                 xform.DeferUpdates = false;
 
-                if (TryGetSound(mover, mobMover, xform, out var variation, out var sound))
+                if (!weightless && TryGetSound(mover, mobMover, xform, out var variation, out var sound))
                 {
+                    var soundModifier = mover.Sprinting ? 1.0f : FootstepWalkingVolumeModifier;
                     SoundSystem.Play(sound,
                         GetSoundPlayers(mover.Owner),
-                        mover.Owner, AudioHelpers.WithVariation(variation).WithVolume(FootstepVolume));
+                        mover.Owner, AudioHelpers.WithVariation(variation).WithVolume(FootstepVolume * soundModifier));
                 }
             }
 

Resources/Audio/Effects/Footsteps/sources.txt

@@ -1,4 +1,9 @@
-Sounds in this folder taken from here: 
+Most sounds in this folder taken from here unless otherwise specified: 
 https://github.com/discordia-space/CEV-Eris/tree/04f9e57ecf8a1c89ae2cba0f6803b6c5e9887c15/sound/effects/footstep
 https://github.com/tgstation/tgstation/tree/f8ee37afc00bce1ad421615eaa0e4cbddd5eea90/sound/effects
 https://github.com/vgstation-coders/vgstation13/tree/fbe7abec4cbadf2ad01369838828704fd7ca81ea/sound/effects
+
+catwalk, floor, plating, tile, hull and wood sfx modified by mirrorcult.
+
+grass1.ogg and grass2.ogg are taken from https://freesound.org/people/D001447733/sounds/464609/ by D001447733 licensed under CC BY-3.0 and split by mirrorcult
+grass3.ogg and grass4.ogg are taken from https://freesound.org/people/jevans27/sounds/563529/ by jevans27 licensed under CC-0 and split/modified by mirrorcult

Resources/Prototypes/SoundCollections/footsteps.yml

@@ -55,10 +55,10 @@
 - type: soundCollection
   id: footstep_tile
   files:
-  - /Audio/Effects/Footsteps/tile1.wav
+  - /Audio/Effects/Footsteps/tile1.ogg
-  - /Audio/Effects/Footsteps/tile2.wav
+  - /Audio/Effects/Footsteps/tile2.ogg
-  - /Audio/Effects/Footsteps/tile3.wav
+  - /Audio/Effects/Footsteps/tile3.ogg
-  - /Audio/Effects/Footsteps/tile4.wav
+  - /Audio/Effects/Footsteps/tile4.ogg
 
 - type: soundCollection
   id: footstep_clown
@@ -90,3 +90,11 @@
   id: footstep_snow
   files:
   - /Audio/Effects/Footsteps/snowstep.ogg
+
+- type: soundCollection
+  id: footstep_grass
+  files:
+  - /Audio/Effects/Footsteps/grass1.ogg
+  - /Audio/Effects/Footsteps/grass2.ogg
+  - /Audio/Effects/Footsteps/grass3.ogg
+  - /Audio/Effects/Footsteps/grass4.ogg

Resources/Prototypes/Tiles/floors.yml

@@ -15,21 +15,6 @@
   thermalConductivity: 0.04
   heatCapacity: 10000
 
-- type: tile
-  id: FloorMetalDiamond
-  name: diamond plate floor
-  texture: "metaldiamond"
-  base_turfs:
-  - plating
-  is_subfloor: false
-  can_crowbar: true
-  footstep_sounds:
-    collection: footstep_floor
-  friction: 0.30
-  item_drop: FloorTileItemMetalDiamond
-  thermalConductivity: 0.04
-  heatCapacity: 10000
-
 - type: tile
   id: floor_wood
   name: wood
@@ -58,7 +43,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.25
   item_drop: FloorTileItemWhite
   thermalConductivity: 0.04
@@ -75,7 +60,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemDark
   thermalConductivity: 0.04
@@ -90,7 +75,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_hull
   friction: 0.30
   item_drop: FloorTileItemTechmaint
   thermalConductivity: 0.04
@@ -105,7 +90,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_hull
   friction: 0.30
   item_drop: FloorTileItemReinforced
   thermalConductivity: 0.04
@@ -120,7 +105,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemMono
   thermalConductivity: 0.04
@@ -135,7 +120,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemLino
   thermalConductivity: 0.04
@@ -165,7 +150,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_hull
   friction: 0.30
   item_drop: FloorTileItemElevatorShaft
   thermalConductivity: 0.04
@@ -180,7 +165,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_asteroid
   friction: 0.30
   item_drop: FloorTileItemRockVault
   thermalConductivity: 0.04
@@ -195,7 +180,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemBlue
   thermalConductivity: 0.04
@@ -211,7 +196,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_hull
   friction: 0.30
   item_drop: FloorTileItemFreezer
   thermalConductivity: 0.04
@@ -303,7 +288,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemKitchen
   thermalConductivity: 0.04
@@ -318,7 +303,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemLaundry
   thermalConductivity: 0.04
@@ -334,7 +319,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_carpet
   friction: 0.40
   item_drop: FloorTileItemArcadeBlue
   thermalConductivity: 0.04
@@ -349,7 +334,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_carpet
   friction: 0.40
   item_drop: FloorTileItemArcadeBlue2
   thermalConductivity: 0.04
@@ -364,7 +349,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_carpet
   friction: 0.40
   item_drop: FloorTileItemArcadeRed
   thermalConductivity: 0.04
@@ -379,7 +364,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_carpet
   friction: 0.40
   item_drop: FloorTileItemEighties
   thermalConductivity: 0.04
@@ -394,7 +379,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_carpet
   friction: 0.40
   item_drop: FloorTileItemCarpetClown
   thermalConductivity: 0.04
@@ -409,7 +394,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_carpet
   friction: 0.40
   item_drop: FloorTileItemCarpetOffice
   thermalConductivity: 0.04
@@ -536,7 +521,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemGold
   thermalConductivity: 0.04
@@ -551,7 +536,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: FloorTileItemSilver
   thermalConductivity: 0.04
@@ -566,7 +551,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: SheetGlass1
   thermalConductivity: 0.04
@@ -581,12 +566,27 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_tile
   friction: 0.30
   item_drop: SheetRGlass1
   thermalConductivity: 0.04
   heatCapacity: 10000
 
+- type: tile
+  id: FloorMetalDiamond
+  name: diamond plate floor
+  texture: "metaldiamond"
+  base_turfs:
+  - plating
+  is_subfloor: false
+  can_crowbar: true
+  footstep_sounds:
+    collection: footstep_tile
+  friction: 0.30
+  item_drop: FloorTileItemMetalDiamond
+  thermalConductivity: 0.04
+  heatCapacity: 10000
+
 # Circuits
 - type: tile
   id: floor_green_circuit
@@ -597,7 +597,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_hull
   friction: 0.30
   item_drop: FloorTileItemGCircuit
   thermalConductivity: 0.04
@@ -612,7 +612,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_hull
   friction: 0.30
   item_drop: FloorTileItemBCircuit
   thermalConductivity: 0.04
@@ -643,7 +643,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_grass
   friction: 0.30
   item_drop: FloorTileItemGrass
   thermalConductivity: 0.04
@@ -658,7 +658,7 @@
   is_subfloor: false
   can_crowbar: true
   footstep_sounds:
-    collection: footstep_floor
+    collection: footstep_grass
   friction: 0.30
   item_drop: FloorTileItemGrassJungle
   thermalConductivity: 0.04