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

Split various drone behaviors out of drone component (innate tool, unpowered flashlight) (#10474)

Browse Source
This commit is contained in:
Rane
2022-08-31 22:09:20 -04:00
committed by GitHub
parent 45349f159d
commit 7bee0063a6
9 changed files with 129 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,5 @@
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.MobState.Components;
using Content.Shared.Interaction.Events;
@@ -12,19 +10,16 @@ using Content.Shared.Throwing;
using Content.Shared.Item;
using Content.Shared.Emoting;
using Content.Shared.Body.Components;
using Content.Shared.IdentityManagement;
using Content.Shared.Popups;
using Content.Server.Popups;
using Content.Server.Mind.Components;
using Content.Server.Ghost.Components;
using Content.Server.Ghost.Roles.Components;
using Content.Server.Hands.Components;
using Content.Server.Tools.Innate;
using Content.Server.UserInterface;
using Robust.Shared.Player;
using Content.Shared.Hands.EntitySystems;
using Content.Shared.Popups;
using Content.Shared.Storage;
using Robust.Shared.Random;
using Robust.Shared.Timing;
using Content.Shared.IdentityManagement;
namespace Content.Server.Drone
{
@@ -33,10 +28,8 @@ 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 SharedHandsSystem _handsSystem = default!;
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly InnateToolSystem _innateToolSystem = default!;
public override void Initialize()
{
@@ -53,8 +46,6 @@ namespace Content.Server.Drone
private void OnInteractionAttempt(EntityUid uid, DroneComponent component, InteractionAttemptEvent args)
{
if (!component.ApplyLaws)
return;
if (args.Target != null && !HasComp<UnremoveableComponent>(args.Target) && NonDronesInRange(uid, component))
args.Cancel();
@@ -67,8 +58,6 @@ 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();
@@ -89,23 +78,13 @@ namespace Content.Server.Drone
private void OnMobStateChanged(EntityUid uid, DroneComponent drone, MobStateChangedEvent args)
{
if (args.Component.IsDead())
if (args.CurrentMobState == DamageState.Dead)
{
var body = Comp<SharedBodyComponent>(uid); //There's no way something can have a mobstate but not a body...
if (TryComp<InnateToolComponent>(uid, out var innate))
_innateToolSystem.Cleanup(uid, innate);
foreach (var item in drone.ToolUids)
{
if (_tagSystem.HasTag(item, "Drone"))
{
RemComp<UnremoveableComponent>(item);
}
else
{
Del(item);
}
}
body.Gib();
if (TryComp<SharedBodyComponent>(uid, out var body))
body.Gib();
Del(uid);
}
}
@@ -115,37 +94,6 @@ namespace Content.Server.Drone
UpdateDroneAppearance(uid, DroneStatus.On);
_popupSystem.PopupEntity(Loc.GetString("drone-activated"), uid,
Filter.Pvs(uid), PopupType.Large);
if (drone.AlreadyAwoken == false)
{
var spawnCoord = Transform(uid).Coordinates;
if (drone.Tools.Count == 0) return;
if (TryComp<HandsComponent>(uid, out var hands) && hands.Count >= drone.Tools.Count)
{
var items = EntitySpawnCollection.GetSpawns(drone.Tools, _robustRandom);
foreach (var entry in items)
{
var item = Spawn(entry, spawnCoord);
AddComp<UnremoveableComponent>(item);
if (!_handsSystem.TryPickupAnyHand(uid, item, checkActionBlocker: false))
{
QueueDel(item);
Logger.Error($"Drone ({ToPrettyString(uid)}) failed to pick up innate item ({ToPrettyString(item)})");
continue;
}
drone.ToolUids.Add(item);
}
}
if (TryComp<ActionsComponent>(uid, out var actions) && TryComp<UnpoweredFlashlightComponent>(uid, out var flashlight))
{
_actionsSystem.AddAction(uid, flashlight.ToggleAction, null, actions);
}
drone.AlreadyAwoken = true;
}
}
private void OnMindRemoved(EntityUid uid, DroneComponent drone, MindRemovedMessage args)