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

Examine fixes (#6831)

Browse Source
This commit is contained in:
mirrorcult
2022-02-20 20:42:16 -07:00
committed by GitHub
parent b87806f7ed
commit e88f179b5f
4 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Client/Examine/ExamineSystem.cs
View File

@@ -40,7 +40,6 @@ namespace Content.Client.Examine
SubscribeLocalEvent<GetVerbsEvent<ExamineVerb>>(AddExamineVerb);
SubscribeNetworkEvent<ExamineSystemMessages.ExamineInfoResponseMessage>(OnExamineInfoResponse);
SubscribeNetworkEvent<VerbsResponseEvent>(OnVerbsResponse);
CommandBinds.Builder
.Bind(ContentKeyFunctions.ExamineEntity, new PointerInputCmdHandler(HandleExamine, outsidePrediction: true))
@@ -117,29 +116,13 @@ namespace Content.Client.Examine
// opening at the old tooltip rather than the cursor/another entity,
// since there's probably one open already if it's coming in from the server.
OpenTooltip(player.Value, ev.EntityUid, ev.CenterAtCursor, ev.OpenAtOldTooltip);
UpdateTooltipInfo(player.Value, ev.EntityUid, ev.Message, ev.GetVerbs);
}
private void OnVerbsResponse(VerbsResponseEvent ev)
{
if (ev.Verbs == null || _examineTooltipOpen == null)
return;
var verbs = new List<ExamineVerb>();
foreach (var verb in ev.Verbs)
{
if (verb is ExamineVerb ex)
verbs.Add(ex);
}
AddVerbsToTooltip(verbs);
UpdateTooltipInfo(player.Value, ev.EntityUid, ev.Message, ev.Verbs);
}
public override void SendExamineTooltip(EntityUid player, EntityUid target, FormattedMessage message, bool getVerbs, bool centerAtCursor)
{
OpenTooltip(player, target, centerAtCursor, false);
UpdateTooltipInfo(player, target, message, getVerbs);
UpdateTooltipInfo(player, target, message);
}
/// <summary>
@@ -163,7 +146,7 @@ namespace Content.Client.Examine
if (openAtOldTooltip && oldTooltipPos != null)
{
popupPos = oldTooltipPos.Value;
popupPos = _userInterfaceManager.ScreenToUIPosition(oldTooltipPos.Value);
}
else if (centeredOnCursor)
{
@@ -172,6 +155,7 @@ namespace Content.Client.Examine
else
{
popupPos = _eyeManager.CoordinatesToScreen(Transform(target).Coordinates);
popupPos = _userInterfaceManager.ScreenToUIPosition(popupPos);
}
// Actually open the tooltip.
@@ -221,7 +205,7 @@ namespace Content.Client.Examine
/// <summary>
/// Fills the examine tooltip with a message and buttons if applicable.
/// </summary>
public void UpdateTooltipInfo(EntityUid player, EntityUid target, FormattedMessage message, bool getVerbs = true)
public void UpdateTooltipInfo(EntityUid player, EntityUid target, FormattedMessage message, List<Verb>? verbs=null)
{
var vBox = _examineTooltipOpen?.GetChild(0).GetChild(0);
if (vBox == null)
@@ -239,12 +223,11 @@ namespace Content.Client.Examine
break;
}
if (getVerbs)
{
// Get verbs
var set = _verbSystem.GetVerbs(target, player, typeof(ExamineVerb));
AddVerbsToTooltip(set);
}
verbs ??= new List<Verb>();
var totalVerbs = _verbSystem.GetLocalVerbs(target, player, typeof(ExamineVerb));
totalVerbs.UnionWith(verbs);
AddVerbsToTooltip(totalVerbs);
}
private void AddVerbsToTooltip(IEnumerable<Verb> verbs)