Reverse order of unique roll if/else

On second reading, having the negative clause (!unique) first was really not a
good idea. This should be a bit easier to understand.
Refactor d to f in roll/rollUnique

Since main refers to the number of faces as f, it's easier to understand if
the roll functions refer to the number of faces in the same way.