Add bare footstep sounds (#10272)

This commit is contained in:
Morb
2022-08-08 12:03:56 +03:00
committed by GitHub
parent 5fbecff3ad
commit 1e6e4a2e34
20 changed files with 52 additions and 7 deletions

View File

@@ -37,6 +37,8 @@ namespace Content.Shared.Maps
[DataField("footstep_sounds")] public SoundSpecifier? FootstepSounds { get; } [DataField("footstep_sounds")] public SoundSpecifier? FootstepSounds { get; }
[DataField("barestep_sounds")] public SoundSpecifier? BarestepSounds { get; } = new SoundCollectionSpecifier("barestep_hard");
[DataField("friction")] public float Friction { get; set; } [DataField("friction")] public float Friction { get; set; }
[DataField("variants")] public byte Variants { get; set; } = 1; [DataField("variants")] public byte Variants { get; set; } = 1;

View File

@@ -355,10 +355,10 @@ namespace Content.Shared.Movement.Systems
return true; return true;
} }
return TryGetFootstepSound(coordinates, out sound); return TryGetFootstepSound(coordinates, shoes != null, out sound);
} }
private bool TryGetFootstepSound(EntityCoordinates coordinates, [NotNullWhen(true)] out SoundSpecifier? sound) private bool TryGetFootstepSound(EntityCoordinates coordinates, bool haveShoes, [NotNullWhen(true)] out SoundSpecifier? sound)
{ {
sound = null; sound = null;
var gridUid = coordinates.GetGridUid(EntityManager); var gridUid = coordinates.GetGridUid(EntityManager);
@@ -393,7 +393,7 @@ namespace Content.Shared.Movement.Systems
// Walking on a tile. // Walking on a tile.
var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId]; var def = (ContentTileDefinition) _tileDefinitionManager[tile.Tile.TypeId];
sound = def.FootstepSounds; sound = haveShoes ? def.FootstepSounds : def.BarestepSounds;
return sound != null; return sound != null;
} }
} }

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -3,6 +3,8 @@ https://github.com/discordia-space/CEV-Eris/tree/04f9e57ecf8a1c89ae2cba0f6803b6c
https://github.com/tgstation/tgstation/tree/f8ee37afc00bce1ad421615eaa0e4cbddd5eea90/sound/effects https://github.com/tgstation/tgstation/tree/f8ee37afc00bce1ad421615eaa0e4cbddd5eea90/sound/effects
https://github.com/vgstation-coders/vgstation13/tree/fbe7abec4cbadf2ad01369838828704fd7ca81ea/sound/effects https://github.com/vgstation-coders/vgstation13/tree/fbe7abec4cbadf2ad01369838828704fd7ca81ea/sound/effects
bare foorsteps taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e0bbbca40f6cdbcf2b497228215a37e9c9ec8473
catwalk, floor, plating, tile, hull and wood sfx modified by mirrorcult. 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 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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -101,3 +101,30 @@
- /Audio/Effects/Footsteps/grass2.ogg - /Audio/Effects/Footsteps/grass2.ogg
- /Audio/Effects/Footsteps/grass3.ogg - /Audio/Effects/Footsteps/grass3.ogg
- /Audio/Effects/Footsteps/grass4.ogg - /Audio/Effects/Footsteps/grass4.ogg
- type: soundCollection
id: barestep_hard
files:
- /Audio/Effects/Footsteps/hardbarefoot1.ogg
- /Audio/Effects/Footsteps/hardbarefoot2.ogg
- /Audio/Effects/Footsteps/hardbarefoot3.ogg
- /Audio/Effects/Footsteps/hardbarefoot4.ogg
- /Audio/Effects/Footsteps/hardbarefoot5.ogg
- type: soundCollection
id: barestep_carpet
files:
- /Audio/Effects/Footsteps/carpetbarefoot1.ogg
- /Audio/Effects/Footsteps/carpetbarefoot2.ogg
- /Audio/Effects/Footsteps/carpetbarefoot3.ogg
- /Audio/Effects/Footsteps/carpetbarefoot4.ogg
- /Audio/Effects/Footsteps/carpetbarefoot5.ogg
- type: soundCollection
id: barestep_wood
files:
- /Audio/Effects/Footsteps/woodbarefoot1.ogg
- /Audio/Effects/Footsteps/woodbarefoot2.ogg
- /Audio/Effects/Footsteps/woodbarefoot3.ogg
- /Audio/Effects/Footsteps/woodbarefoot4.ogg
- /Audio/Effects/Footsteps/woodbarefoot5.ogg

View File

@@ -27,6 +27,8 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_sounds:
collection: footstep_wood collection: footstep_wood
barestep_sounds:
collection: barestep_wood
friction: 0.30 friction: 0.30
item_drop: FloorTileItemWood item_drop: FloorTileItemWood
thermalConductivity: 0.04 thermalConductivity: 0.04
@@ -335,6 +337,8 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_sounds:
collection: footstep_carpet collection: footstep_carpet
barestep_sounds:
collection: barestep_carpet
friction: 0.40 friction: 0.40
item_drop: FloorTileItemArcadeBlue item_drop: FloorTileItemArcadeBlue
thermalConductivity: 0.04 thermalConductivity: 0.04
@@ -350,6 +354,8 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_sounds:
collection: footstep_carpet collection: footstep_carpet
barestep_sounds:
collection: barestep_carpet
friction: 0.40 friction: 0.40
item_drop: FloorTileItemArcadeBlue2 item_drop: FloorTileItemArcadeBlue2
thermalConductivity: 0.04 thermalConductivity: 0.04
@@ -365,6 +371,8 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_sounds:
collection: footstep_carpet collection: footstep_carpet
barestep_sounds:
collection: barestep_carpet
friction: 0.40 friction: 0.40
item_drop: FloorTileItemArcadeRed item_drop: FloorTileItemArcadeRed
thermalConductivity: 0.04 thermalConductivity: 0.04
@@ -380,6 +388,8 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_sounds:
collection: footstep_carpet collection: footstep_carpet
barestep_sounds:
collection: barestep_carpet
friction: 0.40 friction: 0.40
item_drop: FloorTileItemEighties item_drop: FloorTileItemEighties
thermalConductivity: 0.04 thermalConductivity: 0.04
@@ -395,6 +405,8 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_sounds:
collection: footstep_carpet collection: footstep_carpet
barestep_sounds:
collection: barestep_carpet
friction: 0.40 friction: 0.40
item_drop: FloorTileItemCarpetClown item_drop: FloorTileItemCarpetClown
thermalConductivity: 0.04 thermalConductivity: 0.04
@@ -410,6 +422,8 @@
can_crowbar: true can_crowbar: true
footstep_sounds: footstep_sounds:
collection: footstep_carpet collection: footstep_carpet
barestep_sounds:
collection: barestep_carpet
friction: 0.40 friction: 0.40
item_drop: FloorTileItemCarpetOffice item_drop: FloorTileItemCarpetOffice
thermalConductivity: 0.04 thermalConductivity: 0.04