Refactored NpcDefinition
NpcDefinition
fix