Fix wisps not using their noospheric zap

Simple-Station · Oct 21, 2024 · 98e4c66 · 98e4c66
1 parent 74ab67f
commit 98e4c66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Content.Server/Nyanotrasen/Psionics/NPC/PsionicNpcCombatSystem.cs b/Content.Server/Nyanotrasen/Psionics/NPC/PsionicNpcCombatSystem.cs
@@ -10,6 +10,7 @@
 
 namespace Content.Server.Psionics.NPC;
 
+// TODO this is nyanotrasen shitcode. It works, but it needs to be refactored to be more generic.
 public sealed class PsionicNpcCombatSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
@@ -37,7 +38,6 @@ private void ZapCombat(Entity<NoosphericZapPowerComponent> ent, ref NPCSteeringE
             || action is null)
             return;
 
-        // TODO: when action refactor is merged and cherry picked update this to get ActionComponent
         var actionTarget = Comp<EntityTargetActionComponent>(action.Value);
         if (actionTarget.Cooldown is {} cooldown && cooldown.End > _timing.CurTime
             || !TryComp<NPCRangedCombatComponent>(ent, out var combat)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml
@@ -160,3 +160,4 @@
     - GlimmerMonster
   - type: NPCRetaliation
     attackMemoryLength: 10
+  - type: NPCRangedCombat