moved around encounter stuff

Fixed encounter rolling and a check whether the encounter was successful
or not