make battleAutoEnd and allowPsionicCapture work in harmony.