Fix reorder warnings
Integrate event parsing into NPC definitions