NPCs no longer consider anchored pipes as weapons (#30061)

* Anchored pipes are no longer considered weapons

* Switch to overload utilizing a TransformQuery

diff --git a/Content.Server/NPC/Queries/Queries/RemoveAnchored.cs b/Content.Server/NPC/Queries/Queries/RemoveAnchored.cs
new file mode 100644 (file)
index 0000000..ef9fa20
--- /dev/null
+++ b/Content.Server/NPC/Queries/Queries/RemoveAnchored.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.NPC.Queries.Queries;
+
+/// <summary>
+/// Remove anchored entities from the query
+/// </summary>
+public sealed partial class RemoveAnchoredFilter : UtilityQueryFilter
+{
+
+}

diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
index 72833fc35ef9cc8be08b007d965ea2119d9aa9ca..5e1823227a8984b6197df268e1e319c02e09587d 100644 (file)
--- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs
+++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs
@@ -499,6 +499,26 @@ public sealed class NPCUtilitySystem : EntitySystem
 
                 break;
             }
+            case RemoveAnchoredFilter:
+            {
+                _entityList.Clear();
+
+                foreach (var ent in entities)
+                {
+                    if (!TryComp(ent, out TransformComponent? xform))
+                        continue;
+
+                    if (xform.Anchored)
+                        _entityList.Add(ent);
+                }
+
+                foreach (var ent in _entityList)
+                {
+                    entities.Remove(ent);
+                }
+
+                break;
+            }
             case PuddleFilter:
             {
                 _entityList.Clear();

diff --git a/Resources/Prototypes/NPCs/utility_queries.yml b/Resources/Prototypes/NPCs/utility_queries.yml
index 3d5385ecbcd651f3635c4fa3131cc0d5a927e06f..06bc0a9a9ebe6f2b7ee3c4c07aef66bca76b8477 100644 (file)
--- a/Resources/Prototypes/NPCs/utility_queries.yml
+++ b/Resources/Prototypes/NPCs/utility_queries.yml
@@ -131,6 +131,7 @@
             types:
               Blunt: 0
         - type: Item
+    - !type:RemoveAnchoredFilter
   considerations:
     - !type:TargetMeleeCon
       curve: !type:QuadraticCurve