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

This reverts commit be72763a158705cff7759f1b4175d7bd6a5a38f5.