Updating combat formulae to account for equipment