Improve trap type generation (|amethyst)