The first step to designing a complete battle system is removing auto-attack, not adding it.