mark's version of battle mechanics
Revert "mark's version of battle mechanics"

This reverts commit 646cffc031fc9a8401a52fb90d6eb9dd6a1139b1.