Now using the values generated by AttackCalculator

Also had to add variables to track sustained attack across multiple
weapons.