Added AttackType functionality and DamageCalculator