Updated NPCs (again)

Removed the npc.ai[] instances for the time being, I'll just use class
defined counters to handle.