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

This reverts commit cce308f5e86728d71bbfe7de91fb642e5a27972f.