changes to npc spawning