Showing damage percent

Changes the percentage to show as it would have before. Also, I finally merged properly.