Base damage rate on damage done instead of damage dealt.
Merge branch 'master' into battle-detection

Conflicts:
	binaries/data/mods/public/simulation/components/Attack.js
	binaries/data/mods/public/simulation/components/Health.js