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

Fix guidebook examine not working in lobby (#17093)

Browse Source
This commit is contained in:
Leon Friedrich
2023-06-05 09:33:50 +12:00
committed by GitHub
parent cd8e5ae34a
commit 5b36355541
5 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Content.Client/Guidebook/GuidebookSystem.cs
View File

@@ -9,6 +9,7 @@ using Content.Shared.Tag;
using Content.Shared.Verbs;
using Robust.Client.GameObjects;
using Robust.Client.Player;
using Robust.Shared.Map;
using Robust.Shared.Player;
using Robust.Shared.Utility;
@@ -29,6 +30,8 @@ public sealed class GuidebookSystem : EntitySystem
public event Action<List<string>, List<string>?, string?, bool, string?>? OnGuidebookOpen;
public const string GuideEmbedTag = "GuideEmbeded";
private EntityUid _defaultUser;
/// <inheritdoc/>
public override void Initialize()
{
@@ -41,6 +44,23 @@ public sealed class GuidebookSystem : EntitySystem
OnGuidebookControlsTestGetAlternateVerbs);
}
/// <summary>
/// Gets a user entity to use for verbs and examinations. If the player has no attached entity, this will use a
/// dummy client-side entity so that users can still use the guidebook when not attached to anything (e.g., in the
/// lobby)
/// </summary>
public EntityUid GetGuidebookUser()
{
var user = _playerManager.LocalPlayer!.ControlledEntity;
if (user != null)
return user.Value;
if (!Exists(_defaultUser))
_defaultUser = Spawn(null, MapCoordinates.Nullspace);
return _defaultUser;
}
private void OnGetVerbs(EntityUid uid, GuideHelpComponent component, GetVerbsEvent<ExamineVerb> args)
{
if (component.Guides.Count == 0 || _tags.HasTag(uid, GuideEmbedTag))
@@ -114,34 +134,26 @@ public sealed class GuidebookSystem : EntitySystem
_audioSystem.PlayGlobal(speech.SpeechSounds, Filter.Local(), false, speech.AudioParams);
}
public void FakeClientActivateInWorld(EntityUid activated)
{
var user = _playerManager.LocalPlayer!.ControlledEntity;
if (user is null)
return;
var activateMsg = new ActivateInWorldEvent(user.Value, activated);
RaiseLocalEvent(activated, activateMsg, true);
var activateMsg = new ActivateInWorldEvent(GetGuidebookUser(), activated);
RaiseLocalEvent(activated, activateMsg);
}
public void FakeClientAltActivateInWorld(EntityUid activated)
{
var user = _playerManager.LocalPlayer!.ControlledEntity;
if (user is null)
return;
// Get list of alt-interact verbs
var verbs = _verbSystem.GetLocalVerbs(activated, user.Value, typeof(AlternativeVerb));
var verbs = _verbSystem.GetLocalVerbs(activated, GetGuidebookUser(), typeof(AlternativeVerb), force: true);
if (!verbs.Any())
return;
_verbSystem.ExecuteVerb(verbs.First(), user.Value, activated);
_verbSystem.ExecuteVerb(verbs.First(), GetGuidebookUser(), activated);
}
public void FakeClientUse(EntityUid activated)
{
var user = _playerManager.LocalPlayer!.ControlledEntity ?? EntityUid.Invalid;
var activateMsg = new InteractHandEvent(user, activated);
RaiseLocalEvent(activated, activateMsg, true);
var activateMsg = new InteractHandEvent(GetGuidebookUser(), activated);
RaiseLocalEvent(activated, activateMsg);
}
}