Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storage Magnet #362

Merged
merged 8 commits into from
Sep 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Content.Shared.Tag;
using Content.Shared.Whitelist;

namespace Content.Server.Storage.Components;

/// <summary>
/// Applies an ongoing pickup area around the attached entity.
/// </summary>
[RegisterComponent]
public sealed partial class MaterialReclaimerMagnetPickupComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("nextScan")]
public TimeSpan NextScan = TimeSpan.Zero;

[ViewVariables(VVAccess.ReadWrite), DataField("range")]
public float Range = 1f;

[ViewVariables(VVAccess.ReadWrite), DataField("whitelist")]
public EntityWhitelist? Whitelist;

[ViewVariables(VVAccess.ReadWrite), DataField("blacklist")]
public EntityWhitelist? Blacklist;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using Content.Shared.Tag;
using Content.Shared.Whitelist;

namespace Content.Server.Storage.Components;

/// <summary>
/// Applies an ongoing pickup area around the attached entity.
/// </summary>
[RegisterComponent]
public sealed partial class MaterialStorageMagnetPickupComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("nextScan")]
public TimeSpan NextScan = TimeSpan.Zero;

[ViewVariables(VVAccess.ReadWrite), DataField("range")]
public float Range = 1f;

[ViewVariables(VVAccess.ReadWrite), DataField("whitelist")]
public EntityWhitelist? Whitelist;

[ViewVariables(VVAccess.ReadWrite), DataField("blacklist")]
public EntityWhitelist? Blacklist;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
using Content.Server.Storage.Components;
using Content.Shared.Materials;
using Robust.Shared.Physics.Components;
using Robust.Shared.Timing;

namespace Content.Shared.Storage.EntitySystems;

/// <summary>
/// <see cref="MaterialReclaimerMagnetPickupComponent"/>
/// </summary>
public sealed class MaterialReclaimerMagnetPickupSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedMaterialReclaimerSystem _storage = default!;

private static readonly TimeSpan ScanDelay = TimeSpan.FromSeconds(1);

private EntityQuery<PhysicsComponent> _physicsQuery;

public override void Initialize()
{
base.Initialize();
_physicsQuery = GetEntityQuery<PhysicsComponent>();
SubscribeLocalEvent<MaterialReclaimerMagnetPickupComponent, MapInitEvent>(OnMagnetMapInit);
SubscribeLocalEvent<MaterialReclaimerMagnetPickupComponent, EntityUnpausedEvent>(OnMagnetUnpaused);
}

private void OnMagnetUnpaused(EntityUid uid, MaterialReclaimerMagnetPickupComponent component, ref EntityUnpausedEvent args)
{
component.NextScan += args.PausedTime;
}

private void OnMagnetMapInit(EntityUid uid, MaterialReclaimerMagnetPickupComponent component, MapInitEvent args)
{
component.NextScan = _timing.CurTime;
}

public override void Update(float frameTime)
{
base.Update(frameTime);
var currentTime = _timing.CurTime;
var query = EntityQueryEnumerator<MaterialReclaimerMagnetPickupComponent, MaterialReclaimerComponent, TransformComponent>();

while (query.MoveNext(out var uid, out var comp, out var storage, out var xform))
{
if (comp.NextScan < currentTime)
continue;

comp.NextScan += ScanDelay;

var parentUid = xform.ParentUid;

foreach (var near in _lookup.GetEntitiesInRange(uid, comp.Range, LookupFlags.Dynamic | LookupFlags.Sundries))
{
if (comp.Blacklist is { } blacklist && blacklist.IsValid(near, EntityManager) == true)
continue;

if (comp.Whitelist is { } whitelist && whitelist.IsValid(near, EntityManager) == false)
continue;

if (!_physicsQuery.TryGetComponent(near, out var physics) || physics.BodyStatus != BodyStatus.OnGround)
continue;

if (near == parentUid)
continue;

if (!_storage.TryStartProcessItem(uid, near))
continue;
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
using Content.Server.Storage.Components;
using Content.Shared.Materials;
using Robust.Shared.Physics.Components;
using Robust.Shared.Timing;

namespace Content.Shared.Storage.EntitySystems;

/// <summary>
/// <see cref="MaterialStorageMagnetPickupComponent"/>
/// </summary>
public sealed class MaterialStorageMagnetPickupSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SharedMaterialStorageSystem _storage = default!;

private static readonly TimeSpan ScanDelay = TimeSpan.FromSeconds(1);

private EntityQuery<PhysicsComponent> _physicsQuery;

public override void Initialize()
{
base.Initialize();
_physicsQuery = GetEntityQuery<PhysicsComponent>();
SubscribeLocalEvent<MaterialStorageMagnetPickupComponent, MapInitEvent>(OnMagnetMapInit);
SubscribeLocalEvent<MaterialStorageMagnetPickupComponent, EntityUnpausedEvent>(OnMagnetUnpaused);
}

private void OnMagnetUnpaused(EntityUid uid, MaterialStorageMagnetPickupComponent component, ref EntityUnpausedEvent args)
{
component.NextScan += args.PausedTime;
}

private void OnMagnetMapInit(EntityUid uid, MaterialStorageMagnetPickupComponent component, MapInitEvent args)
{
component.NextScan = _timing.CurTime;
}

public override void Update(float frameTime)
{
base.Update(frameTime);
var currentTime = _timing.CurTime;
var query = EntityQueryEnumerator<MaterialStorageMagnetPickupComponent, MaterialStorageComponent, TransformComponent>();

while (query.MoveNext(out var uid, out var comp, out var storage, out var xform))
{
if (comp.NextScan < currentTime)
continue;

comp.NextScan += ScanDelay;

var parentUid = xform.ParentUid;

foreach (var near in _lookup.GetEntitiesInRange(uid, comp.Range, LookupFlags.Dynamic | LookupFlags.Sundries))
{
if (comp.Blacklist is { } blacklist && blacklist.IsValid(near, EntityManager) == true)
continue;

if (comp.Whitelist is { } whitelist && whitelist.IsValid(near, EntityManager) == false)
continue;

if (!_physicsQuery.TryGetComponent(near, out var physics) || physics.BodyStatus != BodyStatus.OnGround)
continue;

if (near == parentUid)
continue;

if (!_storage.TryInsertMaterialEntity(uid, near, uid, storage))
continue;
}
}
}
}
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -841,6 +841,11 @@
- IngotGold30
- IngotSilver30
- MaterialBananium10
- type: MaterialStorageMagnetPickup
range: 0.30
whitelist:
tags:
- Ore

- type: entity
parent: BaseLathe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,19 @@
solution: output
- type: StaticPrice
price: 500
- type: MaterialReclaimerMagnetPickup
range: 0.30
whitelist:
components:
- PhysicalComposition
- SpaceGarbage
tags:
- Trash
- Recyclable
blacklist:
components:
- Material
- Pda
- IdCard
tags:
- HighRiskItem
Loading