Battle logic improved changes