Refactor & bug fixes : shield & class ammo damage