diff --git a/QSB/Audio/Patches/PlayerAudioControllerPatches.cs b/QSB/Audio/Patches/PlayerAudioControllerPatches.cs index 395c8648..7432baaa 100644 --- a/QSB/Audio/Patches/PlayerAudioControllerPatches.cs +++ b/QSB/Audio/Patches/PlayerAudioControllerPatches.cs @@ -14,14 +14,6 @@ internal class PlayerAudioControllerPatches : QSBPatch private static void PlayOneShot(AudioType audioType) => new PlayerAudioControllerOneShotMessage(audioType, QSBPlayerManager.LocalPlayerId).Send(); - [HarmonyPostfix] - [HarmonyPatch(typeof(PlayerAudioController), nameof(PlayerAudioController.PlayMarshmallowCatchFire))] - public static void PlayerAudioController_PlayMarshmallowCatchFire() => PlayOneShot(AudioType.ToolMarshmallowIgnite); - - [HarmonyPostfix] - [HarmonyPatch(typeof(PlayerAudioController), nameof(PlayerAudioController.PlayMarshmallowBlowOut))] - public static void PlayerAudioController_PlayMarshmallowBlowOut() => PlayOneShot(AudioType.ToolMarshmallowBlowOut); - [HarmonyPostfix] [HarmonyPatch(typeof(PlayerAudioController), nameof(PlayerAudioController.PlayMarshmallowEat))] public static void PlayerAudioController_PlayMarshmallowEat() => PlayOneShot(AudioType.ToolMarshmallowEat); @@ -31,6 +23,14 @@ internal class PlayerAudioControllerPatches : QSBPatch public static void PlayerAudioController_PlayMarshmallowEatBurnt() => PlayOneShot(AudioType.ToolMarshmallowEatBurnt); [HarmonyPostfix] - [HarmonyPatch(typeof(PlayerAudioController), nameof(PlayerAudioController.PlayMarshmallowReplace))] - public static void PlayerAudioController_PlayMarshmallowReplace() => PlayOneShot(AudioType.ToolMarshmallowReplace); + [HarmonyPatch(typeof(PlayerAudioController), nameof(PlayerAudioController.PlayPatchPuncture))] + public static void PlayerAudioController_PlayPatchPuncture() => PlayOneShot(AudioType.PlayerSuitPatchPuncture); + + [HarmonyPostfix] + [HarmonyPatch(typeof(PlayerAudioController), nameof(PlayerAudioController.PlayMedkit))] + public static void PlayerAudioController_PlayMedkit() => PlayOneShot(AudioType.ShipCabinUseMedkit); + + [HarmonyPostfix] + [HarmonyPatch(typeof(PlayerAudioController), nameof(PlayerAudioController.PlayRefuel))] + public static void PlayerAudioController_PlayRefuel() => PlayOneShot(AudioType.ShipCabinUseRefueller); } \ No newline at end of file diff --git a/QSB/RoastingSync/QSBMarshmallow.cs b/QSB/RoastingSync/QSBMarshmallow.cs index db755f58..b6f01a44 100644 --- a/QSB/RoastingSync/QSBMarshmallow.cs +++ b/QSB/RoastingSync/QSBMarshmallow.cs @@ -53,6 +53,8 @@ public class QSBMarshmallow : MonoBehaviour _mallowRenderer.enabled = true; _mallowState = Marshmallow.MallowState.Default; enabled = true; + + _attachedPlayer.AudioController.PlayOneShot(AudioType.ToolMarshmallowReplace); } public void Disable() @@ -68,6 +70,8 @@ public class QSBMarshmallow : MonoBehaviour { _fireRenderer.enabled = false; _mallowState = Marshmallow.MallowState.Default; + + _attachedPlayer.AudioController.PlayOneShot(AudioType.ToolMarshmallowBlowOut); } } @@ -142,6 +146,8 @@ public class QSBMarshmallow : MonoBehaviour _toastedFraction = 1f; _initBurnTime = Time.time; _mallowState = Marshmallow.MallowState.Burning; + + _attachedPlayer.AudioController.PlayOneShot(AudioType.ToolMarshmallowIgnite); } }