make combat work with new console