From 696698f7414643acd8be5c7b511ee3b6c028400a Mon Sep 17 00:00:00 2001 From: Obique Date: Sun, 1 Jul 2018 13:26:29 -0500 Subject: [PATCH] Added weapon speed changing according to primary/secondary category --- .../holocore/resources/support/npc/ai/NpcCombatMode.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.java b/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.java index 76eca944c..a4c62bc69 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.java +++ b/src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.java @@ -107,7 +107,10 @@ public class NpcCombatMode extends NpcMode { if (target.getPosture() != Posture.INCAPACITATED && target.getPosture() != Posture.DEAD && attackCountdown.decrementAndGet() <= 0) { attack(target, weapon); - attackCountdown.set((int) spawner.getPrimaryWeaponSpeed()); // Only primary weapons enabled right now + if (getAI().getPrimaryWeapons().contains(weapon)) + attackCountdown.set((int) spawner.getPrimaryWeaponSpeed()); + else + attackCountdown.set((int) spawner.getSecondaryWeaponSpeed()); } }