Fixed bug with negative bonuses
Changed other combat rolls to use new output functions