Correctly factor in the damage modifier (mostly used by special attacks)

Put a brief and concise description of the changes you made here.

• Detailed Changes added to CHANGELOG (Required to be merged)

• Changes tested to ensure they function as expected (Required to be merged)

• I acknowledge that this contribution will be released under the AGPL license.