Added npc combat interactivity