update combat