Finished implementing new battle behaviors