fixed battle system bugs