diff --git a/Modules/OptionShower.cs b/Modules/OptionShower.cs index bc5bec32b..4e81c14e8 100644 --- a/Modules/OptionShower.cs +++ b/Modules/OptionShower.cs @@ -60,7 +60,7 @@ public static class OptionShower { if (Options.CurrentGameMode == CustomGameMode.Standard) { - sb.Append($"{Utils.GetRoleName(CustomRoles.GM)}: {(Main.GM.Value ? GetString("RoleRate") : GetString("RoleOff"))}\n\n"); + sb.Append($"{Utils.GetRoleName(CustomRoles.GM)}: {(Main.GM.Value ? GetString("RoleRate") : GetString("RoleOff"))}\n\n"); sb.Append(GetString("ActiveRolesList")).Append('\n'); var count = 4; @@ -156,4 +156,5 @@ public static class OptionShower if (opt.Value.GetBool()) ShowChildren(opt.Value, ref sb, color, deep + 1); } } -} \ No newline at end of file + +} diff --git a/Modules/Utils.cs b/Modules/Utils.cs index c6431850f..ac322463d 100644 --- a/Modules/Utils.cs +++ b/Modules/Utils.cs @@ -1395,7 +1395,7 @@ public static class Utils } StringBuilder sb = new(""); - sb.Append($"{GetRoleName(CustomRoles.GM)}: {(Main.GM.Value ? GetString("RoleRate") : GetString("RoleOff"))}"); + sb.Append($"{GetRoleName(CustomRoles.GM)}: {(Main.GM.Value ? GetString("RoleRate") : GetString("RoleOff"))}"); Dictionary> roles = new() { diff --git a/Patches/ChatCommandPatch.cs b/Patches/ChatCommandPatch.cs index 9f8c1a1ba..93b6edb7a 100644 --- a/Patches/ChatCommandPatch.cs +++ b/Patches/ChatCommandPatch.cs @@ -659,6 +659,7 @@ internal static class ChatCommands if (realKiller != targetId) { rb.Notified = false; + RPC.PlaySoundRPC(player.PlayerId, Sounds.SabotageSound); Utils.SendMessage("\n", player.PlayerId, GetString("Retributionist.Fail")); } else @@ -1276,6 +1277,7 @@ internal static class ChatCommands if (deadPlayer == 0 && (!NoteKiller.RealNames.TryGetValue(0, out string name) || name != guess)) { NoteKiller.CanGuess = false; + RPC.PlaySoundRPC(player.PlayerId, Sounds.SabotageSound); Utils.SendMessage(GetString("DeathNoteCommand.WrongName"), player.PlayerId); return; } diff --git a/Roles/Crewmate/CameraMan.cs b/Roles/Crewmate/CameraMan.cs index 6552c5e1a..534814efc 100644 --- a/Roles/Crewmate/CameraMan.cs +++ b/Roles/Crewmate/CameraMan.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using AmongUs.GameOptions; +using EHR.Modules; namespace EHR.Crewmate; @@ -94,6 +95,7 @@ public class CameraMan : RoleBase LateTask.New(() => { BasePos = pc.Pos(); + pc.RPCPlayCustomSound("teleport"); if (pc.TP(CameraPosition)) IsTeleported = true; }, 2f, "CameraMan Teleport"); } @@ -110,6 +112,7 @@ public class CameraMan : RoleBase pc.RpcRemoveAbilityUse(); BasePos = pc.Pos(); + pc.RPCPlayCustomSound("teleport"); if (pc.TP(CameraPosition)) IsTeleported = true; } else @@ -133,4 +136,4 @@ public class CameraMan : RoleBase { return !IsThisRole(pc) || pc.Is(CustomRoles.Nimble) || pc.GetClosestVent()?.Id == ventId; } -} \ No newline at end of file +} diff --git a/Roles/Crewmate/Convener.cs b/Roles/Crewmate/Convener.cs index 002857bd4..595459997 100644 --- a/Roles/Crewmate/Convener.cs +++ b/Roles/Crewmate/Convener.cs @@ -1,4 +1,5 @@ using AmongUs.GameOptions; +using EHR.Modules; namespace EHR.Crewmate; @@ -65,6 +66,7 @@ internal class Convener : RoleBase { if (pc == null || pc.GetAbilityUseLimit() < 1f) return; + pc.RPCPlayCustomSound("Teleport"); LateTask.New(() => Main.AllAlivePlayerControls.MassTP(pc.Pos(), log: true), isPet ? 0.5f : 2f, "Convener TP"); pc.RpcRemoveAbilityUse(); } @@ -73,4 +75,4 @@ internal class Convener : RoleBase { return !IsThisRole(pc) || pc.Is(CustomRoles.Nimble) || pc.GetClosestVent()?.Id == ventId; } -} \ No newline at end of file +} diff --git a/Roles/Neutral/QuizMaster.cs b/Roles/Neutral/QuizMaster.cs index 07acd48dc..6287ed011 100644 --- a/Roles/Neutral/QuizMaster.cs +++ b/Roles/Neutral/QuizMaster.cs @@ -285,6 +285,7 @@ internal class QuizMaster : RoleBase MessagesToSend[Target] = sample; + RPC.PlaySoundRPC(Target, Sounds.TaskUpdateSound); Logger.Info($"Question for {Utils.GetPlayerById(Target)?.GetNameWithRole()}: {msgTitle} - Choices: {string.Join('/', CurrentQuestion.Answers)} - Correct Answer: {CurrentQuestion.Answers[CurrentQuestion.CorrectAnswerIndex]}", "QuizMaster"); }