NPC stuff I missed

NPCActionInfo no longer keys by area, number
NPCActionRequirement no longer keys by area, number
NPCFactory calls NPCActionInfo and NPCActionRequirement with new
signatures