Wouldn't this test be better as `if roll == 1 && countedroll > 0`?