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

Drone Tweaks (#7024)

Browse Source
This commit is contained in:
Rane
2022-03-13 05:53:01 -04:00
committed by GitHub
parent e3ead6a3ba
commit ec1160c01d
8 changed files with 64 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Drone/Components/DroneComponent.cs
View File

@@ -8,6 +8,14 @@ namespace Content.Server.Drone.Components
[DataField("tools")] public List<EntitySpawnEntry> Tools = new();
public List<EntityUid> ToolUids = new();
public bool AlreadyAwoken = false;
public float InteractionBlockRange = 2.5f;
public float InteractionBlockRange = 2.15f;
/// <summary>
/// If you are using drone component for
/// something that shouldn't have restrictions set this to
/// false.
/// </summary>
[DataField("applyLaws")]
public bool ApplyLaws = true;
}
}

20
Content.Server/Drone/DroneSystem.cs
View File

@@ -1,5 +1,7 @@
using Content.Shared.Drone;
using Content.Server.Drone.Components;
using Content.Shared.Actions;
using Content.Server.Light.Components;
using Content.Shared.MobState;
using Content.Shared.Interaction.Events;
using Content.Shared.Interaction.Components;
@@ -16,6 +18,7 @@ using Content.Server.Ghost.Roles.Components;
using Content.Server.Hands.Components;
using Content.Server.UserInterface;
using Robust.Shared.Player;
using Robust.Shared.Timing;
namespace Content.Server.Drone
{
@@ -24,6 +27,9 @@ namespace Content.Server.Drone
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly TagSystem _tagSystem = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
public override void Initialize()
{
base.Initialize();
@@ -39,7 +45,9 @@ namespace Content.Server.Drone
private void OnInteractionAttempt(EntityUid uid, DroneComponent component, InteractionAttemptEvent args)
{
if (NonDronesInRange(uid, component))
if (!component.ApplyLaws)
return;
if (args.Target != null && !HasComp<UnremoveableComponent>(args.Target) && NonDronesInRange(uid, component))
args.Cancel();
if (HasComp<SharedItemComponent>(args.Target) && !HasComp<UnremoveableComponent>(args.Target))
@@ -51,6 +59,8 @@ namespace Content.Server.Drone
private void OnActivateUIAttempt(EntityUid uid, DroneComponent component, UserOpenActivatableUIAttemptEvent args)
{
if (!component.ApplyLaws)
return;
if (!_tagSystem.HasTag(args.Target, "DroneUsable"))
{
args.Cancel();
@@ -109,6 +119,11 @@ namespace Content.Server.Drone
}
}
if (TryComp<ActionsComponent>(uid, out var actions) && TryComp<UnpoweredFlashlightComponent>(uid, out var flashlight))
{
_actionsSystem.AddAction(uid, flashlight.ToggleAction, null, actions);
}
drone.AlreadyAwoken = true;
}
}
@@ -145,7 +160,8 @@ namespace Content.Server.Drone
{
if (HasComp<MindComponent>(entity) && !HasComp<DroneComponent>(entity) && !HasComp<GhostComponent>(entity))
{
_popupSystem.PopupEntity(Loc.GetString("drone-too-close"), uid, Filter.Entities(uid));
if (_gameTiming.IsFirstTimePredicted)
_popupSystem.PopupEntity(Loc.GetString("drone-too-close", ("being", entity)), uid, Filter.Entities(uid));
return true;
}
}