combat bug fixed

endless cycle