more shop types added, npc traits for shopkeepers