made attacks that pass energy and health
Merge remote-tracking branch 'origin/master'