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

Refactor Context Menus and make them use XAML & stylesheets (#4768)

Browse Source 
* XAML verb menu

* fix ghost FOV

* spacing

* rename missed "ContextMenu"->"EntityMenu" instances

* move visibility checks to verb system

* update comment

* Remove CanSeeContainerCheck

* use ScrollContainer measure option

* MaxWidth / texxt line wrapping

* verb category default

Now when you click on a verb category, it should default to running the first member of that category.

This makes it much more convenient to eject/insert when there is only a single option

* only apply style to first verb category entry

* Use new visibility flags

* FoV -> Fov

* Revert "only apply style to first verb category entry"

This reverts commit 9a6a17dba600e3ae0421caed59fcab145c260c99.

* make all entity menu visibility checks clientside

* Fix empty unbuckle category

* fix merge
This commit is contained in:
Leon Friedrich
2021-10-28 18:21:19 +13:00
committed by GitHub
parent 224952110e
commit 49296e33a0
36 changed files with 1421 additions and 1535 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Administration/AdminVerbSystem.cs
View File

@@ -57,7 +57,7 @@ namespace Content.Server.Administration
Verb verb = new();
verb.Text = Loc.GetString("delete-verb-get-data-text");
verb.Category = VerbCategory.Debug;
verb.IconTexture = "/Textures/Interface/VerbIcons/delete.svg.192dpi.png";
verb.IconTexture = "/Textures/Interface/VerbIcons/delete_transparent.svg.192dpi.png";
verb.Act = () => args.Target.Delete();
args.Verbs.Add(verb);
}
@@ -200,7 +200,7 @@ namespace Content.Server.Administration
// TODO CHEMISTRY
// Add reagent ui broke after solution refactor. Needs fixing
verb.Disabled = true;
verb.Tooltip = "Currently non functional after solution refactor.";
verb.Message = "Currently non functional after solution refactor.";
verb.Priority = -2;
args.Verbs.Add(verb);

3
Content.Server/Buckle/Systems/BuckleSystem.cs
View File

@@ -43,7 +43,8 @@ namespace Content.Server.Buckle.Systems
Verb verb = new();
verb.Act = () => component.TryUnbuckle(args.User);
verb.Category = VerbCategory.Unbuckle;
verb.Text = Loc.GetString("verb-categories-unbuckle");
verb.IconTexture = "/Textures/Interface/VerbIcons/unbuckle.svg.192dpi.png";
if (args.Target == args.User && args.Using == null)
{

4
Content.Server/Cabinet/ItemCabinetSystem.cs
View File

@@ -64,12 +64,12 @@ namespace Content.Server.Cabinet
toggleVerb.Act = () => ToggleItemCabinet(uid, cabinet);
if (cabinet.Opened)
{
toggleVerb.Text = Loc.GetString("verb-categories-close");
toggleVerb.Text = Loc.GetString("verb-common-close");
toggleVerb.IconTexture = "/Textures/Interface/VerbIcons/close.svg.192dpi.png";
}
else
{
toggleVerb.Text = Loc.GetString("verb-categories-open");
toggleVerb.Text = Loc.GetString("verb-common-open");
toggleVerb.IconTexture = "/Textures/Interface/VerbIcons/open.svg.192dpi.png";
}
args.Verbs.Add(toggleVerb);

39
Content.Server/Items/ItemSystem.cs
View File

@@ -1,39 +0,0 @@
using Content.Shared.Item;
using Content.Shared.Verbs;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
namespace Content.Server.Items
{
public class ItemSystem : EntitySystem
{
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<SharedItemComponent, GetInteractionVerbsEvent>(AddPickupVerb);
}
private void AddPickupVerb(EntityUid uid, SharedItemComponent component, GetInteractionVerbsEvent args)
{
if (args.Hands == null ||
args.Using != null ||
!args.CanAccess ||
!args.CanInteract ||
!component.CanPickup(args.User, popup: false))
return;
Verb verb = new();
verb.Act = () => args.Hands.TryPutInActiveHandOrAny(args.Target);
verb.IconTexture = "/Textures/Interface/VerbIcons/pickup.svg.192dpi.png";
// if the item already in the user's inventory, change the text
if (args.Target.TryGetContainer(out var container) && container.Owner == args.User)
verb.Text = Loc.GetString("pick-up-verb-get-data-text-inventory");
else
verb.Text = Loc.GetString("pick-up-verb-get-data-text");
args.Verbs.Add(verb);
}
}
}

2
Content.Server/Light/EntitySystems/HandHeldLightSystem.cs
View File

@@ -54,7 +54,7 @@ namespace Content.Server.Light.EntitySystems
return;
Verb verb = new();
verb.Text = Loc.GetString("verb-toggle-light");
verb.Text = Loc.GetString("verb-common-toggle-light");
verb.IconTexture = "/Textures/Interface/VerbIcons/light.svg.192dpi.png";
verb.Act = component.Activated
? () => component.TurnOff()

8
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -70,12 +70,12 @@ namespace Content.Server.Storage.EntitySystems
Verb verb = new();
if (component.Open)
{
verb.Text = Loc.GetString("verb-categories-close");
verb.Text = Loc.GetString("verb-common-close");
verb.IconTexture = "/Textures/Interface/VerbIcons/close.svg.192dpi.png";
}
else
{
verb.Text = Loc.GetString("verb-categories-open");
verb.Text = Loc.GetString("verb-common-open");
verb.IconTexture = "/Textures/Interface/VerbIcons/open.svg.192dpi.png";
}
verb.Act = () => component.ToggleOpen(args.User);
@@ -102,12 +102,12 @@ namespace Content.Server.Storage.EntitySystems
verb.Act = () => component.OpenStorageUI(args.User);
if (uiOpen)
{
verb.Text = Loc.GetString("verb-categories-close");
verb.Text = Loc.GetString("verb-common-close-ui");
verb.IconTexture = "/Textures/Interface/VerbIcons/close.svg.192dpi.png";
}
else
{
verb.Text = Loc.GetString("verb-categories-open");
verb.Text = Loc.GetString("verb-common-open-ui");
verb.IconTexture = "/Textures/Interface/VerbIcons/open.svg.192dpi.png";
}
args.Verbs.Add(verb);

32
Content.Server/Verbs/ToggleAllContextCommand.cs
View File

@@ -1,32 +0,0 @@
using Content.Server.Administration;
using Content.Server.Verbs;
using Content.Shared.Administration;
using Robust.Server.Player;
using Robust.Shared.Console;
using Robust.Shared.GameObjects;
namespace Content.Server.Containers.Commands
{
[AdminCommand(AdminFlags.Debug)]
public class ToggleAllContextCommand : IConsoleCommand
{
public const string CommandName = "toggleallcontext";
// ReSharper disable once StringLiteralTypo
public string Command => CommandName;
public string Description => "Toggles showing all entities visible on the context menu, even when they shouldn't be.";
public string Help => $"{Command}";
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
if (player == null)
{
shell.WriteLine("You need to be a player to use this command.");
return;
}
EntitySystem.Get<VerbSystem>().ToggleSeeAllContext(player);
}
}
}

90
Content.Server/Verbs/VerbSystem.cs
View File

@@ -1,8 +1,5 @@
using System.Collections.Generic;
using Content.Shared.GameTicking;
using Content.Shared.Verbs;
using Robust.Server.Player;
using Robust.Shared.Enums;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
@@ -13,58 +10,18 @@ namespace Content.Server.Verbs
{
[Dependency] private readonly IPlayerManager _playerManager = default!;
/// <summary>
/// List of players that can see all entities on the context menu, ignoring normal visibility rules.
/// </summary>
public readonly HashSet<IPlayerSession> SeeAllContextPlayers = new();
public override void Initialize()
{
base.Initialize();
IoCManager.InjectDependencies(this);
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeNetworkEvent<RequestServerVerbsEvent>(HandleVerbRequest);
SubscribeNetworkEvent<TryExecuteVerbEvent>(HandleTryExecuteVerb);
_playerManager.PlayerStatusChanged += PlayerStatusChanged;
}
public override void Shutdown()
{
base.Shutdown();
_playerManager.PlayerStatusChanged -= PlayerStatusChanged;
}
private void PlayerStatusChanged(object? sender, SessionStatusEventArgs args)
{
if (args.NewStatus == SessionStatus.Disconnected)
{
SeeAllContextPlayers.Remove(args.Session);
}
}
public void Reset(RoundRestartCleanupEvent ev)
{
SeeAllContextPlayers.Clear();
}
public void ToggleSeeAllContext(IPlayerSession player)
{
if (!SeeAllContextPlayers.Add(player))
{
SeeAllContextPlayers.Remove(player);
}
SetSeeAllContextEvent args = new() { CanSeeAllContext = SeeAllContextPlayers.Contains(player) };
RaiseNetworkEvent(args, player.ConnectedClient);
SubscribeNetworkEvent<ExecuteVerbEvent>(HandleTryExecuteVerb);
}
/// <summary>
/// Called when asked over the network to run a given verb.
/// </summary>
public void HandleTryExecuteVerb(TryExecuteVerbEvent args, EntitySessionEventArgs eventArgs)
public void HandleTryExecuteVerb(ExecuteVerbEvent args, EntitySessionEventArgs eventArgs)
{
var session = eventArgs.SenderSession;
var userEntity = session.AttachedEntity;
@@ -81,18 +38,20 @@ namespace Content.Server.Verbs
}
// Get the list of verbs. This effectively also checks that the requested verb is in fact a valid verb that
// the user can perform. In principle, this might waste time checking & preparing unrelated verbs even
// though we know precisely which one we want. However, MOST entities will only have 1 or 2 verbs of a given
// type. The one exception here is the "other" verb type, which has 3-4 verbs + all the debug verbs. So maybe
// the debug verbs should be made a separate type?
var verbs = GetVerbs(targetEntity, userEntity, args.Type)[args.Type];
// the user can perform.
var verbs = GetLocalVerbs(targetEntity, userEntity, args.Type)[args.Type];
// Note that GetLocalVerbs might waste time checking & preparing unrelated verbs even though we know
// precisely which one we want to run. However, MOST entities will only have 1 or 2 verbs of a given type.
// The one exception here is the "other" verb type, which has 3-4 verbs + all the debug verbs.
// Find the requested verb.
if (verbs.TryGetValue(args.RequestedVerb, out var verb))
TryExecuteVerb(verb);
ExecuteVerb(verb);
else
// 404 Verb not found
Logger.Warning($"{nameof(HandleTryExecuteVerb)} called by player {session} with an invalid verb: {args.RequestedVerb.Category?.Text} {args.RequestedVerb.Text}");
// 404 Verb not found. Note that this could happen due to something as simple as opening the verb menu, walking away, then trying
// to run the pickup-item verb. So maybe this shouldn't even be logged?
Logger.Info($"{nameof(HandleTryExecuteVerb)} called by player {session} with an invalid verb: {args.RequestedVerb.Category?.Text} {args.RequestedVerb.Text}");
}
private void HandleVerbRequest(RequestServerVerbsEvent args, EntitySessionEventArgs eventArgs)
@@ -105,32 +64,17 @@ namespace Content.Server.Verbs
return;
}
var user = player.AttachedEntity;
if (user == null)
if (player.AttachedEntity == null)
{
Logger.Warning($"{nameof(HandleVerbRequest)} called by player {player} with no attached entity.");
return;
}
// Validate input (check that the user can see the entity)
TryGetContextEntities(user,
target.Transform.MapPosition,
out var entities,
buffer: true,
ignoreVisibility: SeeAllContextPlayers.Contains(player));
VerbsResponseEvent response;
if (entities != null && entities.Contains(target))
{
response = new(args.EntityUid, GetVerbs(target, user, args.Type));
}
else
{
// Don't leave the client hanging on "Waiting for server....", send empty response.
response = new(args.EntityUid, null);
}
// We do not verify that the user has access to the requested entity. The individual verbs should check
// this, and some verbs (e.g. view variables) won't even care about whether an entity is accessible through
// the entity menu or not.
var response = new VerbsResponseEvent(args.EntityUid, GetLocalVerbs(target, player.AttachedEntity, args.Type));
RaiseNetworkEvent(response, player.ConnectedClient);
}
}