Only sec glasses can show contraband: second attempt (#36412)
* Add base code for cheking contraband in hud * Fix missing using in InventorySystem.Relay * Fix errors and update HUD yml * Add show contraband with component on entity * fix component description * Update Content.Shared/Contraband/ShowContrabandDetailsComponent.cs Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> * Update "if" for check if ent hasComp in contrabandSystem * Remove << InventorySystem.Relay.cs * Update Content.Shared/Contraband/ShowContrabandDetailsComponent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/CCVar/CCVars.Game.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Fix partial class ShowContrabandSystem Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Contraband/ShowContrabandDetailsComponent.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Update Content.Shared/Inventory/InventorySystem.Relay.cs Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> * Some update ShowContrabandSystem * Try with record struct * back again ti default class with EntityEventArgs * Remove EntityEventArgs * Finally use record struct --------- Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
@@ -1,4 +1,3 @@
|
||||
using System.Linq;
|
||||
using Content.Shared.Access.Systems;
|
||||
using Content.Shared.CCVar;
|
||||
using Content.Shared.Examine;
|
||||
@@ -8,6 +7,7 @@ using Content.Shared.Verbs;
|
||||
using Robust.Shared.Configuration;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Utility;
|
||||
using System.Linq;
|
||||
|
||||
namespace Content.Shared.Contraband;
|
||||
|
||||
@@ -22,6 +22,7 @@ public sealed class ContrabandSystem : EntitySystem
|
||||
[Dependency] private readonly ExamineSystemShared _examine = default!;
|
||||
|
||||
private bool _contrabandExamineEnabled;
|
||||
private bool _contrabandExamineOnlyInHudEnabled;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override void Initialize()
|
||||
@@ -29,6 +30,7 @@ public sealed class ContrabandSystem : EntitySystem
|
||||
SubscribeLocalEvent<ContrabandComponent, GetVerbsEvent<ExamineVerb>>(OnDetailedExamine);
|
||||
|
||||
Subs.CVar(_configuration, CCVars.ContrabandExamine, SetContrabandExamine, true);
|
||||
Subs.CVar(_configuration, CCVars.ContrabandExamineOnlyInHUD, SetContrabandExamineOnlyInHUD, true);
|
||||
}
|
||||
|
||||
public void CopyDetails(EntityUid uid, ContrabandComponent other, ContrabandComponent? contraband = null)
|
||||
@@ -42,12 +44,21 @@ public sealed class ContrabandSystem : EntitySystem
|
||||
Dirty(uid, contraband);
|
||||
}
|
||||
|
||||
private void OnDetailedExamine(EntityUid ent,ContrabandComponent component, ref GetVerbsEvent<ExamineVerb> args)
|
||||
private void OnDetailedExamine(EntityUid ent, ContrabandComponent component, ref GetVerbsEvent<ExamineVerb> args)
|
||||
{
|
||||
|
||||
if (!_contrabandExamineEnabled)
|
||||
return;
|
||||
|
||||
// Checking if contraband is only shown in the HUD
|
||||
if (_contrabandExamineOnlyInHudEnabled)
|
||||
{
|
||||
var ev = new GetContrabandDetailsEvent();
|
||||
RaiseLocalEvent(args.User, ref ev);
|
||||
if (!ev.CanShowContraband)
|
||||
return;
|
||||
}
|
||||
|
||||
// CanAccess is not used here, because we want people to be able to examine legality in strip menu.
|
||||
if (!args.CanInteract)
|
||||
return;
|
||||
@@ -114,4 +125,9 @@ public sealed class ContrabandSystem : EntitySystem
|
||||
{
|
||||
_contrabandExamineEnabled = val;
|
||||
}
|
||||
|
||||
private void SetContrabandExamineOnlyInHUD(bool val)
|
||||
{
|
||||
_contrabandExamineOnlyInHudEnabled = val;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
using Robust.Shared.GameStates;
|
||||
|
||||
namespace Content.Shared.Contraband;
|
||||
|
||||
/// <summary>
|
||||
/// This component allows you to see Contraband details on examine items
|
||||
/// </summary>
|
||||
[RegisterComponent, NetworkedComponent]
|
||||
public sealed partial class ShowContrabandDetailsComponent : Component;
|
||||
27
Content.Shared/Contraband/ShowContrabandSystem.cs
Normal file
27
Content.Shared/Contraband/ShowContrabandSystem.cs
Normal file
@@ -0,0 +1,27 @@
|
||||
using Content.Shared.Inventory;
|
||||
|
||||
namespace Content.Shared.Contraband;
|
||||
|
||||
public sealed partial class ShowContrabandSystem : EntitySystem
|
||||
{
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
Subs.SubscribeWithRelay<ShowContrabandDetailsComponent, GetContrabandDetailsEvent>(OnGetContrabandDetails);
|
||||
|
||||
}
|
||||
|
||||
private void OnGetContrabandDetails(Entity<ShowContrabandDetailsComponent> ent, ref GetContrabandDetailsEvent args)
|
||||
{
|
||||
args.CanShowContraband = true;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raised on an entity and its inventory to determine if it can see contraband information in the examination window.
|
||||
/// </summary>
|
||||
[ByRefEvent]
|
||||
public record struct GetContrabandDetailsEvent(bool CanShowContraband = false) : IInventoryRelayEvent
|
||||
{
|
||||
SlotFlags IInventoryRelayEvent.TargetSlots => SlotFlags.EYES;
|
||||
}
|
||||
Reference in New Issue
Block a user