Added support for water and chaos hazards,
but they don't do anything yet.