vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests

Browse Source
This commit is contained in:
Evil Factory
2022-04-08 12:52:28 -03:00
parent 0702d41a73 164d72ae3a
commit ccf5600ad1
990 changed files with 44338 additions and 38589 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Networking/ChatMessage.cs
+8 -4
View File
@@ -56,9 +56,9 @@ namespace Barotrauma.Networking
{
if (Type.HasFlag(ChatMessageType.Server) || Type.HasFlag(ChatMessageType.Error) || Type.HasFlag(ChatMessageType.ServerLog))
{
if (translatedText == null || translatedText.Length == 0)
if (translatedText.IsNullOrEmpty())
{
translatedText = TextManager.GetServerMessage(Text);
translatedText = TextManager.GetServerMessage(Text).Value;
}
return translatedText;
@@ -214,8 +214,12 @@ namespace Barotrauma.Networking
public static string ApplyDistanceEffect(string message, ChatMessageType type, Character sender, Character receiver)
{
if (sender == null) { return ""; }
string spokenMsg = ApplyDistanceEffect(receiver, sender, message, SpeakRange * (1.0f - sender.SpeechImpediment / 100.0f), 3.0f);
float range = SpeakRange;
if (type == ChatMessageType.Default && sender.SpeechImpediment > 0)
{
range *= 1.0f - sender.SpeechImpediment / 100.0f;
}
string spokenMsg = ApplyDistanceEffect(receiver, sender, message, range, 3.0f);
switch (type)
{