From c027919618821be4427e65a3d92332953e70bd01 Mon Sep 17 00:00:00 2001 From: LittleNyanCat Date: Thu, 17 Oct 2024 02:38:02 +0100 Subject: [PATCH] Several small SFX tweaks (#28897) * Several small sfx tweaks * fix small yml oopsie * Redo the basin code to use events * now uses an event for when the transfer is successful, not when there's just an attempt * forgot to remove this * Update Content.Server/Botany/Components/PlantHolderComponent.cs Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * Update Content.Server/Botany/Systems/PlantHolderSystem.cs Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> * adds sound variations to shoes as well * variations on honkbots and the H.O.N.K mech * Update Content.Server/Botany/Systems/PlantHolderSystem.cs * Update Content.Server/Botany/Systems/PlantHolderSystem.cs * fix compile issue * oops forgot to delete this * cleanup --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- .../Botany/Components/PlantHolderComponent.cs | 4 ++++ .../Botany/Systems/PlantHolderSystem.cs | 7 ++++++- .../Nutrition/EntitySystems/DrinkSystem.cs | 2 +- .../Nutrition/EntitySystems/FoodSystem.cs | 2 +- .../VendingMachineComponent.cs | 5 +++-- Resources/Audio/Machines/attributions.yml | 1 + Resources/Audio/Machines/machine_vend.ogg | Bin 17353 -> 13777 bytes .../Entities/Clothing/Shoes/boots.yml | 2 ++ .../Entities/Clothing/Shoes/specific.yml | 10 ++++++++++ .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 8 ++++++++ .../Entities/Objects/Specific/Mech/mechs.yml | 2 ++ .../Computers/base_structurecomputers.yml | 2 ++ .../Entities/Structures/hydro_tray.yml | 5 +++++ 13 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Content.Server/Botany/Components/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs index 8218bead72..f0661e4a30 100644 --- a/Content.Server/Botany/Components/PlantHolderComponent.cs +++ b/Content.Server/Botany/Components/PlantHolderComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Chemistry.Components; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; +using Robust.Shared.Audio; namespace Content.Server.Botany.Components; @@ -23,6 +24,9 @@ public sealed partial class PlantHolderComponent : Component [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] public TimeSpan LastCycle = TimeSpan.Zero; + [DataField] + public SoundSpecifier? WateringSound; + [DataField] public bool UpdateSpriteAfterUpdate; diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index fa03265692..b17c261371 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -11,6 +11,7 @@ using Content.Shared.Chemistry.Reagent; using Content.Shared.Coordinates.Helpers; using Content.Shared.Examine; using Content.Shared.FixedPoint; +using Content.Shared.Fluids.Components; using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; @@ -37,7 +38,6 @@ public sealed class PlantHolderSystem : EntitySystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedPointLightSystem _pointLight = default!; [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly RandomHelperSystem _randomHelper = default!; @@ -53,6 +53,7 @@ public sealed class PlantHolderSystem : EntitySystem SubscribeLocalEvent(OnExamine); SubscribeLocalEvent(OnInteractUsing); SubscribeLocalEvent(OnInteractHand); + SubscribeLocalEvent(OnSolutionTransferred); } public override void Update(float frameTime) @@ -320,6 +321,10 @@ public sealed class PlantHolderSystem : EntitySystem } } + private void OnSolutionTransferred(Entity ent, ref SolutionTransferredEvent args) + { + _audio.PlayPvs(ent.Comp.WateringSound, ent.Owner); + } private void OnInteractHand(Entity entity, ref InteractHandEvent args) { DoHarvest(entity, args.User, entity.Comp); diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index f04d79b47d..90a925e39f 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -317,7 +317,7 @@ public sealed class DrinkSystem : SharedDrinkSystem _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} drank {ToPrettyString(entity.Owner):drink}"); } - _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f)); + _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f).WithVariation(0.25f)); _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1); diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index d7daf632d6..158c7f4955 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -296,7 +296,7 @@ public sealed class FoodSystem : EntitySystem _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(args.User):target} ate {ToPrettyString(entity.Owner):food}"); } - _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-1f)); + _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-1f).WithVariation(0.20f)); // Try to break all used utensils foreach (var utensil in utensils) diff --git a/Content.Shared/VendingMachines/VendingMachineComponent.cs b/Content.Shared/VendingMachines/VendingMachineComponent.cs index 50023a023a..f3fe3a1ecd 100644 --- a/Content.Shared/VendingMachines/VendingMachineComponent.cs +++ b/Content.Shared/VendingMachines/VendingMachineComponent.cs @@ -87,12 +87,13 @@ namespace Content.Shared.VendingMachines /// Sound that plays when ejecting an item /// [DataField("soundVend")] - // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg + // Grabbed from: https://github.com/tgstation/tgstation/blob/d34047a5ae911735e35cd44a210953c9563caa22/sound/machines/machine_vend.ogg public SoundSpecifier SoundVend = new SoundPathSpecifier("/Audio/Machines/machine_vend.ogg") { Params = new AudioParams { - Volume = -2f + Volume = -4f, + Variation = 0.15f } }; diff --git a/Resources/Audio/Machines/attributions.yml b/Resources/Audio/Machines/attributions.yml index 1b4ea74741..7675162a04 100644 --- a/Resources/Audio/Machines/attributions.yml +++ b/Resources/Audio/Machines/attributions.yml @@ -163,6 +163,7 @@ - chime.ogg - buzz-sigh.ogg - buzztwo.ogg + - machine_vend.gg license: "CC-BY-SA-3.0" copyright: "Taken from TG station." source: "https://github.com/tgstation/tgstation/tree/d4f678a1772007ff8d7eddd21cf7218c8e07bfc0" diff --git a/Resources/Audio/Machines/machine_vend.ogg b/Resources/Audio/Machines/machine_vend.ogg index 8f7c187d0c37c130b4a2094e13755fd7430106dd..92867a1f3d3bd6b5b9a22e766ebeca6590420770 100644 GIT binary patch delta 12964 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 UY}ezAu81yMdKff3|I`flUlW=CT>t<8 delta 16489 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 diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index fbaeba6047..4223f2217e 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -204,6 +204,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSpurs + params: + variation: 0.09 - type: entity parent: ClothingShoesBootsCowboyBrown diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index a4fbe012c5..87a0c06c4a 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -40,6 +40,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepClown + params: + variation: 0.17 # for H.O.N.K. construction - type: Tag tags: @@ -59,6 +61,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSlip + params: + variation: 0.10 - type: Construction graph: BananaClownShoes node: shoes @@ -79,6 +83,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepClown + params: + variation: 0.17 - type: PointLight enabled: true radius: 3 @@ -215,6 +221,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepJester + params: + variation: 0.07 - type: entity parent: ClothingShoesClown @@ -274,3 +282,5 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSkates + params: + variation: 0.08 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index f82f4c43ff..5883790b66 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -166,6 +166,8 @@ maxInterval: 12 sound: collection: BikeHorn + params: + variation: 0.125 - type: Sprite sprite: Mobs/Silicon/Bots/honkbot.rsi state: honkbot @@ -210,6 +212,8 @@ interactFailureString: petting-failure-honkbot interactSuccessSound: path: /Audio/Items/bikehorn.ogg + params: + variation: 0.125 - type: entity parent: MobHonkBot @@ -220,6 +224,8 @@ - type: SpamEmitSound sound: collection: CluwneHorn + params: + variation: 0.125 - type: Sprite state: jonkbot - type: Construction @@ -235,6 +241,8 @@ - type: InteractionPopup interactSuccessSound: path: /Audio/Items/brokenbikehorn.ogg + params: + variation: 0.125 - type: Vocal sounds: Unsexed: Cluwne diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 1fbde27e71..4c4e44c28c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -167,6 +167,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepClown + params: + variation: 0.17 - type: Mech baseState: honker openState: honker-open diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml index 9baca8b4b6..e961cf94d3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml @@ -60,6 +60,8 @@ collection: Keyboard params: volume: -1 + variation: 0.10 + pitch: 1.10 # low pitch keyboard sounds feel kinda weird - type: ContainerContainer containers: board: !type:Container diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml index 7224c154f9..b1cbcc8b86 100644 --- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml @@ -67,6 +67,11 @@ False: { visible: false } - type: PlantHolder drawWarnings: true + wateringSound: + path: /Audio/Effects/Fluids/slosh.ogg + params: + volume: -6 + variation: 0.20 - type: Destructible thresholds: - trigger: -- 2.52.0