Feature/door remote radial (#36378)
* it works! kinda * so it works now * minor cleanup * central button now is useful too * more cleanup * minor cleanup * more cleanup * refactor: migrated code from toolbox (as it was rejected as too specific) * feat: moved border drawing for radial menu into RadialMenuTextureButton. Radial menu position setting into was moved to OverrideArrange to not being called on every frame * refactor: major reworks! * renamed DrawBagleSector to DrawAnnulusSector * Remove strange indexing * Regularize math * refactor: re-orienting segment elements to be Y-mirrored * refactor: extracted radial menu radius multiplier property, changed color pallet for radial menu button * refactor: removed icon backgrounds on textures used in current radial menu buttons with sectors, RadialContainer Radius renamed and now actually changed control radius. * refactor: in RadialMenuTextureButtonWithSector all sector colors are converted to and from sRGB in property getter-setters * refactor: renamed srgb to include Srgb suffix so devs gonna see that its srgb clearly * fix: enabled any functional keys pressed when pushing radial menu buttons * fix: radial menu sector now scales with UIScale * fix: accept only one event when clicking on radial menu ContextualButton * fix: now radial menu buttons accepts only click/alt-click, now clicks outside menu closes menu always * feat: simple radial menu prototype for easier creation * refactor: cleanup, restored emote filtering, button models now have class hierarchy * refactor: remove usage of closure from 'outside code' * refactor: remove non existing type from UiControlTest * refactor: remove unused using * refactor: revert ability to declare radial menu layers in xaml, scale 32px sprites using scale in radial menu * refactor: whitespaces * feat: now door remote have some kind of ui to switch mode * refactor: subscribe for dispose on existing radial menus * feat: now simple radial menu button models can have custom color for each sector background (and hover background color). Also added OpenOverMouseScreenPosition inside SimpleRadialMenu * fix: AI door menu now can be closed by verb if it gets unpowered * refactor: simplify code for DoorRemoteBoundUserInterface * fix open/close mode sprite * remove broken merge changes * refactor: changed DoorRemoteSystem to be fully in shared * refactor: localize DoorRemoteBoundUserInterface * refactor: fix multiple invocation for TryToggleDoor inside DoorRemoteSystem on prediction * refactor: extracted sprites and loc strings into prototype for cleaner code. Currently selected mode now have different background. * refactor: changed hover selected color to recommmended * refactor: reuse stylenano colors! * review * refactor: remove StyleNano reference * refactor: revert removal of item status for door remote * refactor: fix status control misprediction * refactor: remove invalid comments, rename client DoorRemoteSystem comp after handle method * refactor: fix DoorRemoteStatusControl not displaying status on entity pickup --------- Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru> Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
Fildrance
@@ -1,108 +1,5 @@
|
||||
using Content.Server.Administration.Logs;
|
||||
using Content.Server.Doors.Systems;
|
||||
using Content.Server.Power.EntitySystems;
|
||||
using Content.Shared.Access.Components;
|
||||
using Content.Shared.Database;
|
||||
using Content.Shared.Doors.Components;
|
||||
using Content.Shared.Examine;
|
||||
using Content.Shared.Interaction;
|
||||
using Content.Shared.Remotes.Components;
|
||||
using Content.Shared.Remotes.EntitySystems;
|
||||
|
||||
namespace Content.Shared.Remotes
|
||||
{
|
||||
public sealed class DoorRemoteSystem : SharedDoorRemoteSystem
|
||||
{
|
||||
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
|
||||
[Dependency] private readonly AirlockSystem _airlock = default!;
|
||||
[Dependency] private readonly DoorSystem _doorSystem = default!;
|
||||
[Dependency] private readonly ExamineSystemShared _examine = default!;
|
||||
namespace Content.Server.Remotes;
|
||||
|
||||
public override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
|
||||
SubscribeLocalEvent<DoorRemoteComponent, BeforeRangedInteractEvent>(OnBeforeInteract);
|
||||
}
|
||||
|
||||
private void OnBeforeInteract(Entity<DoorRemoteComponent> entity, ref BeforeRangedInteractEvent args)
|
||||
{
|
||||
bool isAirlock = TryComp<AirlockComponent>(args.Target, out var airlockComp);
|
||||
|
||||
if (args.Handled
|
||||
|| args.Target == null
|
||||
|| !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
|
||||
// Only able to control doors if they are within your vision and within your max range.
|
||||
// Not affected by mobs or machines anymore.
|
||||
|| !_examine.InRangeUnOccluded(args.User,
|
||||
args.Target.Value,
|
||||
SharedInteractionSystem.MaxRaycastRange,
|
||||
null))
|
||||
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
args.Handled = true;
|
||||
|
||||
if (!this.IsPowered(args.Target.Value, EntityManager))
|
||||
{
|
||||
Popup.PopupEntity(Loc.GetString("door-remote-no-power"), args.User, args.User);
|
||||
return;
|
||||
}
|
||||
|
||||
var accessTarget = args.Used;
|
||||
// This covers the accesses the REMOTE has, and is not effected by the user's ID card.
|
||||
if (entity.Comp.IncludeUserAccess) // Allows some door remotes to inherit the user's access.
|
||||
{
|
||||
accessTarget = args.User;
|
||||
// This covers the accesses the USER has, which always includes the remote's access since holding a remote acts like holding an ID card.
|
||||
}
|
||||
|
||||
if (TryComp<AccessReaderComponent>(args.Target, out var accessComponent)
|
||||
&& !_doorSystem.HasAccess(args.Target.Value, accessTarget, doorComp, accessComponent))
|
||||
{
|
||||
if (isAirlock)
|
||||
_doorSystem.Deny(args.Target.Value, doorComp, accessTarget);
|
||||
Popup.PopupEntity(Loc.GetString("door-remote-denied"), args.User, args.User);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (entity.Comp.Mode)
|
||||
{
|
||||
case OperatingMode.OpenClose:
|
||||
if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, accessTarget))
|
||||
_adminLogger.Add(LogType.Action,
|
||||
LogImpact.Medium,
|
||||
$"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
|
||||
break;
|
||||
case OperatingMode.ToggleBolts:
|
||||
if (TryComp<DoorBoltComponent>(args.Target, out var boltsComp))
|
||||
{
|
||||
if (!boltsComp.BoltWireCut)
|
||||
{
|
||||
_doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, accessTarget);
|
||||
_adminLogger.Add(LogType.Action,
|
||||
LogImpact.Medium,
|
||||
$"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
case OperatingMode.ToggleEmergencyAccess:
|
||||
if (airlockComp != null)
|
||||
{
|
||||
_airlock.SetEmergencyAccess((args.Target.Value, airlockComp), !airlockComp.EmergencyAccess);
|
||||
_adminLogger.Add(LogType.Action,
|
||||
LogImpact.Medium,
|
||||
$"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
throw new InvalidOperationException(
|
||||
$"{nameof(DoorRemoteComponent)} had invalid mode {entity.Comp.Mode}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public sealed class DoorRemoteSystem : SharedDoorRemoteSystem;
|
||||
|
||||
Reference in New Issue
Block a user