restructured player and NPCs to allow for more NPC types