new buff + bar order, updated dmg calculation