Add immuneGrids arg to EMP, no marauder emp immune (#1998)

Co-authored-by: Dvir <[email protected]>
new-frontiers-14 · Sep 14, 2024 · ce6c74f · ce6c74f
1 parent d2b3d58
commit ce6c74f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/Content.Server/Emp/EmpSystem.cs b/Content.Server/Emp/EmpSystem.cs
@@ -39,15 +39,18 @@ public override void Initialize()
     /// <param name="range">The range of the EMP pulse.</param>
     /// <param name="energyConsumption">The amount of energy consumed by the EMP pulse.</param>
     /// <param name="duration">The duration of the EMP effects.</param>
-    public void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration)
+    /// <param name="immuneGrids">Frontier: a list of the grids that should not be affected by the 
+    public void EmpPulse(MapCoordinates coordinates, float range, float energyConsumption, float duration, List<EntityUid>? immuneGrids = null)
     {
         foreach (var uid in _lookup.GetEntitiesInRange(coordinates, range))
         {
-            // Block EMP on grid
+            // Frontier: Block EMP on grid
             var gridUid = Transform(uid).GridUid;
-            var attemptEv = new EmpAttemptEvent();
-            if (TryComp<ProtectedGridComponent>(gridUid, out var prot) && prot.PreventEmpEvents)
+            if (gridUid != null &&
+                (immuneGrids != null && immuneGrids.Contains(gridUid.Value) ||
+                TryComp<ProtectedGridComponent>(gridUid, out var prot) && prot.PreventEmpEvents))
                 continue;
+            // End Frontier: block EMP on grid
 
             TryEmpEffects(uid, energyConsumption, duration);
         }

diff --git a/Content.Server/_NF/M_Emp/M_EmpSystem.cs b/Content.Server/_NF/M_Emp/M_EmpSystem.cs
@@ -291,7 +291,15 @@ private bool SpawnM_Emp(EntityUid uid, M_EmpGeneratorComponent component)
             var empEnergyConsumption = 2700000;
             var empDisabledDuration = 60;
 
-            _emp.EmpPulse(Transform(uid).MapPosition, empRange, empEnergyConsumption, empDisabledDuration);
+            var xform = Transform(uid);
+            List<EntityUid>? immuneGridList = null;
+            if (xform.GridUid != null)
+            {
+                immuneGridList = new List<EntityUid> {
+                    xform.GridUid.Value
+                };
+            }
+            _emp.EmpPulse(xform.MapPosition, empRange, empEnergyConsumption, empDisabledDuration, immuneGrids: immuneGridList);
 
             return true;
         }

diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/marauder.yml
@@ -10,8 +10,6 @@
   guidebookPage: Null
   class:
   - Capital
-  gridProtection:
-  - EmpEvents
 
 - type: gameMap
   id: Marauder