updated attack and defense in calcdamage