Changed desire type to enum.

This should also make it a bit easier see where your own desire fits
the most. This should also fix my own custom desire types.