fixed bugs with combat sequence