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

Add events for custom action target validation (#27230)

Browse Source
This commit is contained in:
DrSmugleaf
2024-04-22 01:39:50 -07:00
committed by GitHub
parent 210e6f6444
commit b0e6ff6779
5 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
View File

@@ -200,7 +200,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
var coords = args.Coordinates;
if (!_actionsSystem.ValidateWorldTarget(user, coords, action))
if (!_actionsSystem.ValidateWorldTarget(user, coords, (actionId, action)))
{
// Invalid target.
if (action.DeselectOnMiss)
@@ -235,7 +235,7 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
var entity = args.EntityUid;
if (!_actionsSystem.ValidateEntityTarget(user, entity, action))
if (!_actionsSystem.ValidateEntityTarget(user, entity, (actionId, action)))
{
if (action.DeselectOnMiss)
StopTargeting();

4
Content.Server/Actions/ActionOnInteractSystem.cs
View File

@@ -64,7 +64,7 @@ public sealed class ActionOnInteractSystem : EntitySystem
var entOptions = GetValidActions<EntityTargetActionComponent>(component.ActionEntities, args.CanReach);
for (var i = entOptions.Count - 1; i >= 0; i--)
{
var action = entOptions[i].Comp;
var action = entOptions[i];
if (!_actions.ValidateEntityTarget(args.User, args.Target.Value, action))
entOptions.RemoveAt(i);
}
@@ -88,7 +88,7 @@ public sealed class ActionOnInteractSystem : EntitySystem
var options = GetValidActions<WorldTargetActionComponent>(component.ActionEntities, args.CanReach);
for (var i = options.Count - 1; i >= 0; i--)
{
var action = options[i].Comp;
var action = options[i];
if (!_actions.ValidateWorldTarget(args.User, args.ClickLocation, action))
options.RemoveAt(i);
}

4
Content.Shared/Actions/Events/ValidateActionEntityTargetEvent.cs Normal file
View File

@@ -0,0 +1,4 @@
namespace Content.Shared.Actions.Events;
[ByRefEvent]
public record struct ValidateActionEntityTargetEvent(EntityUid User, EntityUid Target, bool Cancelled = false);

6
Content.Shared/Actions/Events/ValidateActionWorldTargetEvent.cs Normal file
View File

@@ -0,0 +1,6 @@
using Robust.Shared.Map;
namespace Content.Shared.Actions.Events;
[ByRefEvent]
public record struct ValidateActionWorldTargetEvent(EntityUid User, EntityCoordinates Target, bool Cancelled = false);

31
Content.Shared/Actions/SharedActionsSystem.cs
View File

@@ -8,14 +8,13 @@ using Content.Shared.Hands;
using Content.Shared.Interaction;
using Content.Shared.Inventory.Events;
using Content.Shared.Mind;
using Content.Shared.Mobs.Components;
using Content.Shared.Rejuvenate;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Content.Shared.Rejuvenate;
namespace Content.Shared.Actions;
@@ -389,7 +388,7 @@ public abstract class SharedActionsSystem : EntitySystem
var targetWorldPos = _transformSystem.GetWorldPosition(entityTarget);
_rotateToFaceSystem.TryFaceCoordinates(user, targetWorldPos);
if (!ValidateEntityTarget(user, entityTarget, entityAction))
if (!ValidateEntityTarget(user, entityTarget, (actionEnt, entityAction)))
return;
_adminLogger.Add(LogType.Action,
@@ -413,7 +412,7 @@ public abstract class SharedActionsSystem : EntitySystem
var entityCoordinatesTarget = GetCoordinates(netCoordinatesTarget);
_rotateToFaceSystem.TryFaceCoordinates(user, entityCoordinatesTarget.ToMapPos(EntityManager, _transformSystem));
if (!ValidateWorldTarget(user, entityCoordinatesTarget, worldAction))
if (!ValidateWorldTarget(user, entityCoordinatesTarget, (actionEnt, worldAction)))
return;
_adminLogger.Add(LogType.Action,
@@ -445,7 +444,17 @@ public abstract class SharedActionsSystem : EntitySystem
PerformAction(user, component, actionEnt, action, performEvent, curTime);
}
public bool ValidateEntityTarget(EntityUid user, EntityUid target, EntityTargetActionComponent action)
public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity<EntityTargetActionComponent> actionEnt)
{
if (!ValidateEntityTargetBase(user, target, actionEnt))
return false;
var ev = new ValidateActionEntityTargetEvent(user, target);
RaiseLocalEvent(actionEnt, ref ev);
return !ev.Cancelled;
}
private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTargetActionComponent action)
{
if (!target.IsValid() || Deleted(target))
return false;
@@ -484,7 +493,17 @@ public abstract class SharedActionsSystem : EntitySystem
return _interactionSystem.CanAccessViaStorage(user, target);
}
public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, WorldTargetActionComponent action)
public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity<WorldTargetActionComponent> action)
{
if (!ValidateWorldTargetBase(user, coords, action))
return false;
var ev = new ValidateActionWorldTargetEvent(user, coords);
RaiseLocalEvent(action, ref ev);
return !ev.Cancelled;
}
private bool ValidateWorldTargetBase(EntityUid user, EntityCoordinates coords, WorldTargetActionComponent action)
{
if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null))
return false;