1762 brought two new countries into the war. What city was captured in the first Spain-Portugal conflict?