update combat

separate combat damage calculation