Updates to combat engine and manager