Added damage type calculations