tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Global ghost hearing (#3954)

Browse Source 
* Add global hearing for ghosts

* Fix speech bubbles breaking when out of PVS
This commit is contained in:
ShadowCommander
2021-05-11 01:37:40 -07:00
committed by GitHub
parent 743a12750c
commit 4780179058
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Chat/SpeechBubble.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using Content.Client.Interfaces.Chat; using Content.Client.Interfaces.Chat;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.UserInterface; using Robust.Client.UserInterface;
@@ -110,6 +110,9 @@ namespace Content.Client.Chat
_verticalOffsetAchieved = MathHelper.Lerp(_verticalOffsetAchieved, VerticalOffset, 10 * args.DeltaSeconds); _verticalOffsetAchieved = MathHelper.Lerp(_verticalOffsetAchieved, VerticalOffset, 10 * args.DeltaSeconds);
} }
if (!_senderEntity.Transform.Coordinates.IsValid(_senderEntity.EntityManager))
return;
var worldPos = _senderEntity.Transform.WorldPosition; var worldPos = _senderEntity.Transform.WorldPosition;
worldPos += (0, EntityVerticalOffset); worldPos += (0, EntityVerticalOffset);

10
Content.Server/Chat/ChatManager.cs
View File

@@ -144,8 +144,12 @@ namespace Content.Server.Chat
message = message.Trim(); message = message.Trim();
var pos = source.Transform.Coordinates; var mapPos = source.Transform.MapPosition;
var clients = _playerManager.GetPlayersInRange(pos, VoiceRange).Select(p => p.ConnectedClient);
var clients = _playerManager.GetPlayersBy((x) => x.AttachedEntity != null
&& (x.AttachedEntity.HasComponent<GhostComponent>()
|| mapPos.InRange(x.AttachedEntity.Transform.MapPosition, VoiceRange)))
.Select(p => p.ConnectedClient).ToList();
if (message.StartsWith(';')) if (message.StartsWith(';'))
{ {
@@ -184,7 +188,7 @@ namespace Content.Server.Chat
msg.Message = message; msg.Message = message;
msg.MessageWrap = Loc.GetString("{0} says, \"{{0}}\"", source.Name); msg.MessageWrap = Loc.GetString("{0} says, \"{{0}}\"", source.Name);
msg.SenderEntity = source.Uid; msg.SenderEntity = source.Uid;
_netManager.ServerSendToMany(msg, clients.ToList()); _netManager.ServerSendToMany(msg, clients);
} }
public void EntityMe(IEntity source, string action) public void EntityMe(IEntity source, string action)