Right, the trick in this case is to make sure that p(secondHit) is calculated correctly when the attacker and defender both have an arbitrary (really just 0-2) focus tokens.