Move calculateAttackDamage and related functions to attack-damage branch