Magnet (#568)

* Magnet * Ore * Not Needed * Bags + Magnets = Good * Fix * Update portable_generator.yml * Update books_bag.yml
new-frontiers-14 · Nov 13, 2023 · 7d9b5e9 · 7d9b5e9
1 parent c3042bf
commit 7d9b5e9
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 58 deletions.
diff --git a/Content.Shared/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs b/Content.Shared/Storage/Components/MaterialReclaimerMagnetPickupComponent.cs
@@ -1,6 +1,3 @@
-using Content.Shared.Tag;
-using Content.Shared.Whitelist;
-
 namespace Content.Server.Storage.Components;
 
 /// <summary>
@@ -14,10 +11,4 @@ public sealed partial class MaterialReclaimerMagnetPickupComponent : Component
 
     [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;
 }
diff --git a/Content.Shared/Storage/Components/MaterialStorageMagnetPickupComponent.cs b/Content.Shared/Storage/Components/MaterialStorageMagnetPickupComponent.cs
@@ -1,6 +1,3 @@
-using Content.Shared.Tag;
-using Content.Shared.Whitelist;
-
 namespace Content.Server.Storage.Components;
 
 /// <summary>
@@ -14,10 +11,4 @@ public sealed partial class MaterialStorageMagnetPickupComponent : Component
 
     [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;
 }
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -1,10 +1,7 @@
 using Content.Server.Storage.Components;
-using Content.Shared.Hands;
 using Content.Shared.Inventory;
-using Content.Shared.Stacks;
 using Robust.Shared.Map;
 using Robust.Shared.Physics.Components;
-using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
 namespace Content.Shared.Storage.EntitySystems;
@@ -39,7 +36,7 @@ private void OnMagnetUnpaused(EntityUid uid, MagnetPickupComponent component, re
 
     private void OnMagnetMapInit(EntityUid uid, MagnetPickupComponent component, MapInitEvent args)
     {
-        component.NextScan = _timing.CurTime + TimeSpan.FromSeconds(1f);
+        component.NextScan = _timing.CurTime;
     }
 
     public override void Update(float frameTime)

diff --git a/Content.Shared/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MaterialReclaimerMagnetPickupSystem.cs
@@ -12,7 +12,6 @@ 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);
@@ -40,8 +39,8 @@ private void OnMagnetMapInit(EntityUid uid, MaterialReclaimerMagnetPickupCompone
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        var currentTime = _timing.CurTime;
         var query = EntityQueryEnumerator<MaterialReclaimerMagnetPickupComponent, MaterialReclaimerComponent, TransformComponent>();
+        var currentTime = _timing.CurTime;
 
         while (query.MoveNext(out var uid, out var comp, out var storage, out var xform))
         {
@@ -54,12 +53,6 @@ public override void Update(float frameTime)
 
             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;
 

diff --git a/Content.Shared/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MaterialStorageMagnetPickupSystem.cs
@@ -12,7 +12,6 @@ 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);
@@ -40,8 +39,8 @@ private void OnMagnetMapInit(EntityUid uid, MaterialStorageMagnetPickupComponent
     public override void Update(float frameTime)
     {
         base.Update(frameTime);
-        var currentTime = _timing.CurTime;
         var query = EntityQueryEnumerator<MaterialStorageMagnetPickupComponent, MaterialStorageComponent, TransformComponent>();
+        var currentTime = _timing.CurTime;
 
         while (query.MoveNext(out var uid, out var comp, out var storage, out var xform))
         {
@@ -54,12 +53,6 @@ public override void Update(float frameTime)
 
             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;
 

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
@@ -26,3 +26,4 @@
         - Bottle
         - Syringe
   - type: Dumpable
+  - type: MagnetPickup # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -137,4 +137,4 @@
         - Produce
         - Seed
   - type: Dumpable
-  - type: MagnetPickup
+  - type: MagnetPickup # Frontier
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml
@@ -23,3 +23,4 @@
           - Book
           - Document
     - type: Dumpable
+    - type: MagnetPickup # Frontier
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -878,11 +878,8 @@
         - IngotGold30
         - IngotSilver30
         - MaterialBananium10
-    - type: MaterialStorageMagnetPickup
+    - type: MaterialStorageMagnetPickup # Frontier
       range: 0.30
-      whitelist:
-        tags:
-          - Ore
 
 - type: entity
   parent: BaseLathe

diff --git a/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml b/Resources/Prototypes/Entities/Structures/Machines/material_reclaimer.yml
@@ -100,19 +100,5 @@
     solution: output
   - type: StaticPrice
     price: 500
-  - type: MaterialReclaimerMagnetPickup
+  - type: MaterialReclaimerMagnetPickup # Frontier
     range: 0.30
-    whitelist:
-      components:
-      - PhysicalComposition
-      - SpaceGarbage
-      tags:
-      - Trash
-      - Recyclable
-    blacklist:
-      components:
-      - Material
-      - Pda
-      - IdCard
-      tags:
-      - HighRiskItem
diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/tools.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Mail/tools.yml
@@ -17,3 +17,4 @@
     whitelist:
       components:
         - Mail
+  - type: MagnetPickup # Frontier
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,3 +26,4 @@ @@
             - Bottle
             - Syringe
       - type: Dumpable
+      - type: MagnetPickup # Frontier