added combat calculator