battle draw; battle bugs fixe
conflict solved
conflict solved2
current turn refactoring; skip turn refactoring; support phase skip added