Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

pe_nis (#274)

Browse Source 
* pe_nis

* пук

---------

Co-authored-by: Mona Hmiza <>
This commit is contained in:
RavMorgan
2023-08-07 00:18:27 +03:00
committed by Aviu00
parent d1607ab66d
commit 8c3ae86c88
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -193,7 +193,7 @@ namespace Content.Server.Chat.Managers
("adminChannelName", Loc.GetString("chat-manager-admin-discord-channel-name")), ("adminChannelName", Loc.GetString("chat-manager-admin-discord-channel-name")),
("playerName", sender), ("message", FormattedMessage.EscapeText(message))); ("playerName", sender), ("message", FormattedMessage.EscapeText(message)));
ChatMessageToMany(ChatChannel.Admin, message, wrappedMessage, EntityUid.Invalid, false, true, admins.Select(p => p.ConnectedClient)); ChatMessageToMany(ChatChannel.Admin, message, wrappedMessage, EntityUid.Invalid, false, false, admins.Select(p => p.ConnectedClient));
var asayEventMessage = new UtkaChatEventMessage() var asayEventMessage = new UtkaChatEventMessage()
{ {

19
Content.Server/White/TTS/TTSSystem.cs
View File

@@ -53,7 +53,7 @@ public sealed partial class TTSSystem : EntitySystem
var soundData = await GenerateTTS(ev.Uid, ev.Text, protoVoice.Speaker); var soundData = await GenerateTTS(ev.Uid, ev.Text, protoVoice.Speaker);
if (soundData != null) if (soundData != null)
RaiseNetworkEvent(new PlayTTSEvent(GetNetEntity(ev.Uid), soundData), Filter.SinglePlayer(session)); RaiseNetworkEvent(new PlayTTSEvent(GetNetEntity(ev.Uid), soundData), Filter.SinglePlayer(session), false);
} }
private async void OnEntitySpoke(EntityUid uid, TTSComponent component, EntitySpokeEvent args) private async void OnEntitySpoke(EntityUid uid, TTSComponent component, EntitySpokeEvent args)
@@ -85,7 +85,7 @@ public sealed partial class TTSSystem : EntitySystem
// Say // Say
if (args.ObfuscatedMessage is null) if (args.ObfuscatedMessage is null)
{ {
RaiseNetworkEvent(ttsEvent, Filter.Pvs(uid)); RaiseNetworkEvent(ttsEvent, Filter.Pvs(uid), false);
return; return;
} }
@@ -107,6 +107,8 @@ public sealed partial class TTSSystem : EntitySystem
var xformQuery = GetEntityQuery<TransformComponent>(); var xformQuery = GetEntityQuery<TransformComponent>();
var sourcePos = _xforms.GetWorldPosition(xformQuery.GetComponent(uid), xformQuery); var sourcePos = _xforms.GetWorldPosition(xformQuery.GetComponent(uid), xformQuery);
var receptions = Filter.Pvs(uid).Recipients; var receptions = Filter.Pvs(uid).Recipients;
foreach (var session in receptions) foreach (var session in receptions)
{ {
if (!session.AttachedEntity.HasValue) if (!session.AttachedEntity.HasValue)
@@ -116,7 +118,18 @@ public sealed partial class TTSSystem : EntitySystem
if (distance > (ChatSystem.VoiceRange * ChatSystem.VoiceRange)) if (distance > (ChatSystem.VoiceRange * ChatSystem.VoiceRange))
continue; continue;
RaiseNetworkEvent(distance > ChatSystem.WhisperClearRange ? obfTtsEvent : ttsEvent, session); EntityEventArgs actualEvent;
if (distance > ChatSystem.WhisperClearRange)
{
actualEvent = obfTtsEvent;
}
else
{
actualEvent = ttsEvent;
}
RaiseNetworkEvent(actualEvent, Filter.SinglePlayer(session), false);
} }
} }