2024 12 06 hostile ai on grid suggestions

Content.Server/NPC/HTN/HTNSystem.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading;
-using Content.Server._NF.PacifiedZone;
 using Content.Server.Administration.Managers;
 using Robust.Shared.CPUJob.JobQueues;
 using Robust.Shared.CPUJob.JobQueues.Queues;
@@ -16,15 +15,13 @@
 using Robust.Shared.Utility;
 using Content.Server.Worldgen; // Frontier
 using Content.Server.Worldgen.Components; // Frontier
-using Content.Server.Worldgen.Systems;
-using Content.Shared.Body.Systems;
-using Content.Shared.Coordinates;
-using Content.Shared.Gibbing.Systems;
-using Content.Shared.NPC.Components;
-using Content.Shared.NPC.Systems;
-using Content.Shared.Popups;
+using Content.Server.Worldgen.Systems; // Frontier
+using Content.Shared.Body.Systems; // Frontier
+using Content.Shared.NPC.Components; // Frontier
+using Content.Shared.NPC.Systems; // Frontier
+using Content.Shared.Popups; // Frontier
 using Content.Shared.Tiles; // Frontier
-using Robust.Server.GameObjects;
+using Robust.Server.GameObjects; // Frontier
 using Robust.Shared.Audio.Systems; // Frontier
 
 namespace Content.Server.NPC.HTN;
@@ -85,7 +82,7 @@ private void OnLoad()
         // Clear all NPCs in case they're hanging onto stale tasks
         var query = AllEntityQuery<HTNComponent>();
 
-        while (query.MoveNext(out var comp)) // Frontier
+        while (query.MoveNext(out var comp))
         {
             comp.PlanningToken?.Cancel();
             comp.PlanningToken = null;
@@ -172,7 +169,7 @@ public void UpdateNPC(ref int count, int maxUpdates, float frameTime)
         _planQueue.Process();
         var query = EntityQueryEnumerator<ActiveNPCComponent, HTNComponent>();
 
-        while(query.MoveNext(out var uid, out var activeNpcComponent, out var comp))
+        while(query.MoveNext(out var uid, out _, out var comp))
         {
             // If we're over our max count or it's not MapInit then ignore the NPC.
             if (count >= maxUpdates)
@@ -198,6 +195,7 @@ public void UpdateNPC(ref int count, int maxUpdates, float frameTime)
                 }
                 continue;
             }
+            // End Frontier: Disable hostile AI in pacified zones
 
             if (comp.PlanningJob != null)
             {

Content.Shared/Tiles/ProtectedGridComponent.cs

@@ -1,5 +1,5 @@
-using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
+using Robust.Shared.Audio; // Frontier
 
 namespace Content.Shared.Tiles;
 
@@ -23,10 +23,10 @@ public sealed partial class ProtectedGridComponent : Component
     [DataField]
     public bool PreventArtifactTriggers = false;
     [DataField]
-    public bool KillHostileMobs = true;
+    public bool KillHostileMobs = false;
 
     /// <summary>
-    /// The sound made when spawning a coordinates disk
+    /// The sound made when a hostile mob is killed when entering a protected grid.
     /// </summary>
     [DataField]
     public SoundSpecifier HostileMobKillSound = new SoundPathSpecifier("/Audio/Effects/holy.ogg");

Resources/Maps/_NF/Outpost/frontier.yml

@@ -3968,6 +3968,7 @@ entities:
       preventRCDUse: True
       preventFloorPlacement: True
       preventFloorRemoval: True
+      killHostileMobs: True
     - type: SpreaderGrid
     - type: IFF
       readOnly: True