update combat

update combat with critical damage or not