updated combat in main app