changed damage system to have less redundancy