From 108edfacdbf6239b9c7553b61b23869d6c72c587 Mon Sep 17 00:00:00 2001 From: Zeuto Date: Wed, 1 May 2019 18:30:41 +0200 Subject: [PATCH] Replaced Voicechat mute notification with an icon next to the map --- ReallifeGamemode.Client/Voice/main.ts | 24 +++++++++++++++--- .../dlcpacks/voiceimages/dlc.rpf | Bin 0 -> 75776 bytes .../Commands/AdminCommands.cs | 1 + 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 ReallifeGamemode.Client/dlcpacks/voiceimages/dlc.rpf diff --git a/ReallifeGamemode.Client/Voice/main.ts b/ReallifeGamemode.Client/Voice/main.ts index ac4ad7aa..b3dd6ce1 100644 --- a/ReallifeGamemode.Client/Voice/main.ts +++ b/ReallifeGamemode.Client/Voice/main.ts @@ -1,5 +1,3 @@ -import playerInteraction from "Interaction/playerinteraction"; - /** * @overview Life of German Reallife - Voice Main main.ts * @author Zeuto @@ -8,6 +6,7 @@ import playerInteraction from "Interaction/playerinteraction"; export default function voice() { + let dictLoaded = false; const Use3d = true; const UseAutoVolume = false; const MaxRange = 30.0; @@ -18,10 +17,27 @@ export default function voice() { mp.keys.bind(0x73, false, _ => { mp.voiceChat.muted = !mp.voiceChat.muted; - - mp.game.graphics.notify("[" + new Date().toLocaleTimeString() + "] Voice-Chat: " + (!mp.voiceChat.muted ? '~g~aktiviert' : '~r~deaktiviert')); }); + let gX = 0.5; + let gY = 0.5; + + mp.events.add('render', () => { + + if (!dictLoaded) { + mp.game.graphics.requestStreamedTextureDict("voiceimages", true); + dictLoaded = true; + } + + var { x, y } = mp.game.graphics.getScreenActiveResolution(0, 0); + + if (!mp.voiceChat.muted) { + mp.game.graphics.drawSprite("voiceimages", "microphone-black-shape", 0.165, 0.952, 0.015, 0.015 * (x / y), 0, 0, 102, 0, 255); + } else { + mp.game.graphics.drawSprite("voiceimages", "microphone-off", 0.165, 0.952, 0.015, 0.015 * (x / y), 0, 255, 51, 51, 255); + } + }) + function addListener(target: PlayerMp) { listeners.push(target); diff --git a/ReallifeGamemode.Client/dlcpacks/voiceimages/dlc.rpf b/ReallifeGamemode.Client/dlcpacks/voiceimages/dlc.rpf new file mode 100644 index 0000000000000000000000000000000000000000..97ce030399bff2515386948a8625f885fa888eac GIT binary patch literal 75776 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 literal 0 HcmV?d00001 diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index fbacb9ad..e31b542f 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -109,6 +109,7 @@ namespace ReallifeGamemode.Server.Commands { SaveManager.SaveAllOnSave(); } + #endregion #region Support [Command("o", "~m~Benutzung: ~s~/o [Nachricht]", GreedyArg = true)]