More combat resolution code