B46: added water map types, converted tiles into dictionary for faster operations