Fleshed out the Combat and Elemental types system

Still not playable at any level