added updated combat stuff to main app