Water Rework

I suggested melee naval combat here:

That could add another layer of strategy to naval combat