add player and npc, tested