Items now class-based too.
Fixed NPC inventory after earlier refactoring things.