P35.9

src/Perpetuum/Zones/NpcSystem/AI/AggressorAI.cs

@@ -29,6 +29,13 @@ public override void Update(TimeSpan time)
                 return;
             }
 
+            if (smartCreature.HasFriendsNeedingSupport())
+            {
+                smartCreature.AI.Push(new SupportAI(smartCreature));
+
+                return;
+            }
+
             if (!smartCreature.ThreatManager.IsThreatened)
             {
                 ReturnToHomePosition();

src/Perpetuum/Zones/NpcSystem/AI/CombatAI.cs

@@ -1,4 +1,5 @@
 using Perpetuum.Collections;
+using Perpetuum.Modules;
 using Perpetuum.Modules.Weapons;
 using Perpetuum.PathFinders;
 using Perpetuum.Timers;
@@ -39,9 +40,7 @@ public CombatAI(SmartCreature smartCreature) : base(smartCreature) { }
         public override void Enter()
         {
             stratSelector = InitSelector();
-            moduleActivators = smartCreature.ActiveModules
-                .Select(m => new ModuleActivator(m))
-                .ToList();
+            moduleActivators = BuildCombatModuleActivators();
             IsNpcHasMissiles = smartCreature.ActiveModules
                 .OfType<MissileWeaponModule>()
                 .Any();
@@ -53,7 +52,16 @@ public override void Enter()
 
         protected override List<ModuleActivator> FillModuleActivators()
         {
-            return moduleActivators = smartCreature.ActiveModules
+            return moduleActivators = BuildCombatModuleActivators();
+        }
+
+        // Remote support modules are owned exclusively by SupportAI — without this
+        // filter the standard ModuleActivator visitors would happily target the
+        // current combat lock, healing/energy-feeding the enemy.
+        private List<ModuleActivator> BuildCombatModuleActivators()
+        {
+            return smartCreature.ActiveModules
+                .Where(m => m is not RemoteArmorRepairModule && m is not EnergyTransfererModule)
                 .Select(m => new ModuleActivator(m))
                 .ToList();
         }

src/Perpetuum/Zones/NpcSystem/AI/IdleAI.cs

@@ -31,6 +31,13 @@ public override void Update(TimeSpan time)
                 return;
             }
 
+            if (smartCreature.HasFriendsNeedingSupport())
+            {
+                smartCreature.AI.Push(new SupportAI(smartCreature));
+
+                return;
+            }
+
             if (smartCreature.ThreatManager.IsThreatened)
             {
                 ToAggressorAI();

src/Perpetuum/Zones/NpcSystem/AI/ModuleActivator.cs

@@ -5,7 +5,6 @@
 using Perpetuum.Timers;
 using Perpetuum.Zones.Locking.Locks;
 using Perpetuum.Zones.Terrains;
-using System;
 
 namespace Perpetuum.Zones.NpcSystem.AI
 {