Combo Type rework; Added beats method.

Combo type is now an integer. Use beats to see if a combo can be played
over another one.