Made Combatant and Move classes use templates.